This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f53d2d4bbe170617e8500c7fa2c29803fa52512d
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Feb 3 01:26:44 2025 +0100
Fixed typo, cleanup
(cherry picked from commit 97c7a49cda57e0780f4208584b3ea3883313c6b3)
---
main/helpcontent2/helpers/help_hid.lst | 2 +-
main/sc/inc/sc.hrc | 239 ++++++++++++++++----------------
main/sc/sdi/oleobjsh.sdi | 10 +-
main/sc/source/ui/drawfunc/oleobjsh.cxx | 20 ++-
4 files changed, 131 insertions(+), 140 deletions(-)
diff --git a/main/helpcontent2/helpers/help_hid.lst
b/main/helpcontent2/helpers/help_hid.lst
index b18ebb8c90..e20c9dc252 100644
--- a/main/helpcontent2/helpers/help_hid.lst
+++ b/main/helpcontent2/helpers/help_hid.lst
@@ -3534,7 +3534,7 @@ HID_SCSHELL_DRAWSH,58800,
HID_SCSHELL_DRTXTOB,58801,
HID_SCSHELL_FORMATSH,58808,
HID_SCSHELL_GRAPHIC,58811,
-HID_SCSHELL_OLEOBEJCTSH,58809,
+HID_SCSHELL_OLEOBJECTSH,58809,
HID_SCSHELL_PAGEBREAK,58812,
HID_SCSHELL_PIVOTSH,58802,
HID_SCSHELL_PREVWSH,58803,
diff --git a/main/sc/inc/sc.hrc b/main/sc/inc/sc.hrc
index c269a33343..1e62ae7514 100644
--- a/main/sc/inc/sc.hrc
+++ b/main/sc/inc/sc.hrc
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,28 +7,27 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef SC_SC_HRC
#define SC_SC_HRC
#ifndef _SFX_HRC
-#include <sfx2/sfx.hrc> // ->#include <solar.hrc>
+#include <sfx2/sfx.hrc> // ->#include <solar.hrc>
#endif
#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc> // ->Svx-IDs
+#include <svx/dialogs.hrc> // ->Svx-IDs
#endif
#include "sfx2/sfxcommands.h"
@@ -54,7 +53,7 @@
#define SC_SIDEBAR_PROPERTY_BEGIN (SID_SC_START + 400)
#define SC_SIDEBAR_PROPERTY_END (SID_SC_START + 499)
-// kompatibel zu frueher bleiben:
+// kompatibel zu früher bleiben:
#define SC_RESOURCE_START (RID_APP_START+5000)
#define SC_RESOURCE_END (RID_APP_END)
@@ -68,7 +67,7 @@
// ---------------------------------------------------------------------------
-// Hilfe IDs fuer Vorlagen ---------------------------------------------------
+// Hilfe IDs für Vorlagen ---------------------------------------------------
#define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 )
#define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 )
#define HID_SC_SHEET_CELL_ERG1 (HID_SC_SHEET_START +2 )
@@ -77,7 +76,7 @@
#define HID_SC_SHEET_PAGE_STD (HID_SC_SHEET_START +10 )
#define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 )
-// Hilfe IDs fuer Shells (Helferlein) (max.20) -------------------------------
+// Hilfe IDs für Shells (Helferlein) (max.20) -------------------------------
#define HID_SCSHELL_APP (HID_SC_SHELL_START +0 )
#define HID_SCSHELL_DOCSH (HID_SC_SHELL_START +1 )
#define HID_SCSHELL_DRAWSH (HID_SC_SHELL_START +2 )
@@ -89,7 +88,7 @@
#define HID_SCSHELL_DRAWFORMSH (HID_SC_SHELL_START +8 )
#define HID_SCSHELL_CELLSH (HID_SC_SHELL_START +9 )
#define HID_SCSHELL_FORMATSH (HID_SC_SHELL_START +10)
-#define HID_SCSHELL_OLEOBEJCTSH (HID_SC_SHELL_START +11)
+#define HID_SCSHELL_OLEOBJECTSH (HID_SC_SHELL_START +11)
#define HID_SCSHELL_CHARTSH (HID_SC_SHELL_START +12)
#define HID_SCSHELL_GRAPHIC (HID_SC_SHELL_START +13)
#define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14)
@@ -120,35 +119,35 @@
#define FID_MARKPAGEUP (SC_VIEW_START + 18)
#define FID_MARKPAGEDOWN (SC_VIEW_START + 19)
-// Slot-IDs fuer Attribute:
+// Slot-IDs für Attribute:
-#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page
+#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page
#define SID_SCATTR_VER_JUSTIFY (SC_VIEW_START + 31)
#define SID_SCATTR_MARGIN (SC_VIEW_START + 32)
-#define SID_SCATTR_STACKED (SC_VIEW_START + 33)
+#define SID_SCATTR_STACKED (SC_VIEW_START + 33)
#define SID_SCATTR_LINEBREAK (SC_VIEW_START + 35)
-#define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) //
Protection-Page
+#define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // Protection-Page
// sonstige Slot-IDs:
-#define SID_SCUSERLISTS (SC_VIEW_START + 37) // Benutzerdef.Listen
-#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item
-#define SID_SCVIEWOPTIONS (SC_VIEW_START + 39)
-#define SID_SCDOCOPTIONS (SC_VIEW_START + 40)
+#define SID_SCUSERLISTS (SC_VIEW_START + 37) //
Benutzerdef.Listen
+#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item
+#define SID_SCVIEWOPTIONS (SC_VIEW_START + 39)
+#define SID_SCDOCOPTIONS (SC_VIEW_START + 40)
// Cursorbewegungen als Properties:
-#define SID_CURRENTCELL (SC_VIEW_START + 41)
-#define SID_CURRENTTAB (SC_VIEW_START + 42)
+#define SID_CURRENTCELL (SC_VIEW_START + 41)
+#define SID_CURRENTTAB (SC_VIEW_START + 42)
#define SID_CURRENTDOC (SC_VIEW_START + 43)
#define SID_CURRENTOBJECT (SC_VIEW_START + 44)
-// Slot-IDs fuer spez. ToolBox-Funktionen:
+// Slot-IDs für spez. ToolBox-Funktionen:
#define SID_NUMBER_CURRENCY (SC_VIEW_START + 45)
#define SID_NUMBER_PERCENT (SC_VIEW_START + 46)
-// "Slot" Ids fuer Eingabezeilen Images:
+// "Slot" Ids für Eingabezeilen Images:
#define SID_INPUT_FUNCTION (SC_VIEW_START + 47)
#define SID_INPUT_SUM (SC_VIEW_START + 48)
#define SID_INPUT_EQUAL (SC_VIEW_START + 49)
@@ -167,12 +166,12 @@
#define SID_LINKS (SC_VIEW_START + 60)
#define SID_INSERT_SIMAGE (SC_VIEW_START + 61)
#define SID_INSERT_SCHART (SC_VIEW_START + 62)
-#define SID_INSERT_SMATH (SC_VIEW_START + 63)
+#define SID_INSERT_SMATH (SC_VIEW_START + 63)
#define SID_STANDARD_FONTS (SC_VIEW_START + 64)
#define SID_MIRROR_VERTICAL (SC_VIEW_START + 65)
#define SID_MIRROR_HORIZONTAL (SC_VIEW_START + 66)
#define SID_CELL_FORMAT_RESET (SC_VIEW_START + 67)
-#define SID_SCPRINTOPTIONS (SC_VIEW_START + 68)
+#define SID_SCPRINTOPTIONS (SC_VIEW_START + 68)
#define SID_WINDOW_SPLIT (SC_VIEW_START + 69)
#define SID_WINDOW_FIX (SC_VIEW_START + 70)
#ifdef SID_DRAW_CHART
@@ -181,12 +180,12 @@
#define SID_DRAW_CHART (SC_VIEW_START + 71)
#define SID_UPDATETABLINKS (SC_VIEW_START + 72)
-//TabPage Eingabe
-#define SID_SC_INPUT_SELECTION (SC_VIEW_START + 73)
-#define SID_SC_INPUT_SELECTIONPOS (SC_VIEW_START + 74)
-#define SID_SC_INPUT_EDITMODE (SC_VIEW_START + 75)
-#define SID_SC_INPUT_FMT_EXPAND (SC_VIEW_START + 76)
-#define SID_SC_INPUT_RANGEFINDER (SC_VIEW_START + 77)
+// TabPage Eingabe
+#define SID_SC_INPUT_SELECTION (SC_VIEW_START + 73)
+#define SID_SC_INPUT_SELECTIONPOS (SC_VIEW_START + 74)
+#define SID_SC_INPUT_EDITMODE (SC_VIEW_START + 75)
+#define SID_SC_INPUT_FMT_EXPAND (SC_VIEW_START + 76)
+#define SID_SC_INPUT_RANGEFINDER (SC_VIEW_START + 77)
#define SID_SC_INPUT_REF_EXPAND (SC_VIEW_START + 78)
#define SID_SC_INPUT_MARK_HEADER (SC_VIEW_START + 79)
@@ -195,40 +194,40 @@
#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82)
#define SID_EURO_CONVERTER (SC_VIEW_START + 83)
-//#define SID_CHG_PROTECT (SC_VIEW_START + 84) -> moved to SVX
-#define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85)
+//#define SID_CHG_PROTECT (SC_VIEW_START + 84) // -> moved to SVX
+#define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85)
#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86)
-#define SID_ENABLE_HYPHENATION (SC_VIEW_START + 87)
+#define SID_ENABLE_HYPHENATION (SC_VIEW_START + 87)
#define SID_RENAME_OBJECT (SC_VIEW_START + 88)
#define SID_FOCUS_INPUTLINE (SC_VIEW_START + 89)
-#define SID_SELECT_TABLES (SC_VIEW_START + 90)
+#define SID_SELECT_TABLES (SC_VIEW_START + 90)
// #97776# new entry "Filter..." in DP popup menu
-#define SID_DP_FILTER (SC_VIEW_START + 91)
+#define SID_DP_FILTER (SC_VIEW_START + 91)
// #101160# Replace cell contents warning
-#define SID_SC_INPUT_REPLCELLSWARN (SC_VIEW_START + 92)
+#define SID_SC_INPUT_REPLCELLSWARN (SC_VIEW_START + 92)
// additional IDs for list/range validity
-#define FID_VALID_LISTTYPE (SC_VIEW_START + 93)
+#define FID_VALID_LISTTYPE (SC_VIEW_START + 93)
// #i68101# ID for changing Title & Descriptopn of an Object
#define SID_TITLE_DESCRIPTION_OBJECT (SC_VIEW_START + 94)
// #i59082# assign macro to shape
-#define SID_ASSIGNMACRO (SC_VIEW_START + 95)
+#define SID_ASSIGNMACRO (SC_VIEW_START
+ 95)
#ifdef ISSUE66550_HLINK_FOR_SHAPES
// #i66550# hyperlinks in shapes
-#define SID_DRAW_HLINK_EDIT (SC_VIEW_START + 96)
-#define SID_DRAW_HLINK_DELETE (SC_VIEW_START + 97)
+#define SID_DRAW_HLINK_EDIT (SC_VIEW_START + 96)
+#define SID_DRAW_HLINK_DELETE (SC_VIEW_START + 97)
#endif
// "Zoom / Synchronize sheets" in options dialog
-#define SID_SC_OPT_SYNCZOOM (SC_VIEW_START + 98)
+#define SID_SC_OPT_SYNCZOOM (SC_VIEW_START + 98)
// NOTE: last valid ID is (SC_VIEW_START + 99)
@@ -240,25 +239,25 @@
#define FID_DATACHANGED (SC_MESSAGE_START + 3)
#define FID_REFMODECHANGED (SC_MESSAGE_START + 4)
#define FID_KILLEDITVIEW (SC_MESSAGE_START + 5)
-#define SID_SOLVE (SC_MESSAGE_START + 6)
-#define FID_FONT_SELECTED (SC_MESSAGE_START + 7)
-#define FID_FILTER_OK (SC_MESSAGE_START + 8)
+#define SID_SOLVE (SC_MESSAGE_START + 6)
+#define FID_FONT_SELECTED (SC_MESSAGE_START + 7)
+#define FID_FILTER_OK (SC_MESSAGE_START + 8)
#define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9)
#define SID_TABDELETED (SC_MESSAGE_START + 10)
#define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11)
-#define SID_DLG_RETOK (SC_MESSAGE_START + 12)
+#define SID_DLG_RETOK (SC_MESSAGE_START + 12)
#define FID_ANYDATACHANGED (SC_MESSAGE_START + 13)
-#define SID_STATUS_DOCPOS (SC_MESSAGE_START + 14)
-#define SID_STATUS_PAGESTYLE (SC_MESSAGE_START + 15)
-#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16)
+#define SID_STATUS_DOCPOS (SC_MESSAGE_START + 14)
+#define SID_STATUS_PAGESTYLE (SC_MESSAGE_START + 15)
+#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16)
#define FID_KILLEDITVIEW_NOPAINT (SC_MESSAGE_START + 17)
-#define SID_DLG_MATRIX (SC_MESSAGE_START + 18)
+#define SID_DLG_MATRIX (SC_MESSAGE_START + 18)
#define SC_HINT_DBAREAS_CHANGED (SC_MESSAGE_START + 19)
-#define SC_HINT_AREAS_CHANGED (SC_MESSAGE_START + 20)
-#define SC_HINT_TABLES_CHANGED (SC_MESSAGE_START + 21)
+#define SC_HINT_AREAS_CHANGED (SC_MESSAGE_START + 20)
+#define SC_HINT_TABLES_CHANGED (SC_MESSAGE_START + 21)
-#define SID_STATUS_SELMODE_ERG (SC_MESSAGE_START + 22)
-#define SID_STATUS_SELMODE_ERW (SC_MESSAGE_START + 23)
+#define SID_STATUS_SELMODE_ERG (SC_MESSAGE_START + 22)
+#define SID_STATUS_SELMODE_ERW (SC_MESSAGE_START + 23)
#define SID_STATUS_SELMODE_NORM (SC_MESSAGE_START + 24)
#define SID_CHART_SOURCE (SC_MESSAGE_START + 25)
@@ -282,18 +281,18 @@
#define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50)
#define SID_OPENDLG_PIVOTTABLE (SC_MESSAGE_START + 51)
#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52)
-#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53)
+#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53)
#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54)
//#define SID_OPENDLG_CHART (SC_MESSAGE_START + 55)
#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56)
#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57)
//#define SID_OPENDLG_MODCHART (SC_MESSAGE_START + 58)
#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59)
-#define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60)
+#define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60)
//<!--Added by PengYunQuan for Validity Cell Range Picker
-#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
+#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
//-->Added by PengYunQuan for Validity Cell Range Picker
-#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
+#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
// Funktionen ------------------------------------------------------------
@@ -301,7 +300,7 @@
//#define FID_PRINT_PREVIEW (SC_FUNCTION_START)
#define FID_DOC_MANAGER (SC_FUNCTION_START + 1)
#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2)
-#define SID_MAIL (SC_FUNCTION_START + 3)
+#define SID_MAIL (SC_FUNCTION_START + 3)
#define FILE_MENU_END (SC_FUNCTION_START + 20)
#define EDIT_MENU_START (FILE_MENU_END)
@@ -317,15 +316,15 @@
#define FID_SEARCH_REPLACE_DLG (EDIT_MENU_START + 10)
#define FID_EDIT_OBJECT (EDIT_MENU_START + 11)
#define SID_SC_NAVIGATOR (EDIT_MENU_START + 12)
-#define SID_SC_WIZARD (EDIT_MENU_START + 13)
-#define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14)
-#define SID_HFEDIT (EDIT_MENU_START + 15)
+#define SID_SC_WIZARD (EDIT_MENU_START + 13)
+#define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14)
+#define SID_HFEDIT (EDIT_MENU_START + 15)
-#define SID_DEL_ROWS (EDIT_MENU_START + 16)//JN
-#define SID_DEL_COLS (EDIT_MENU_START + 17)//JN
+#define SID_DEL_ROWS (EDIT_MENU_START + 16)//JN
+#define SID_DEL_COLS (EDIT_MENU_START + 17)//JN
//#define FID_CHG_RECORD (EDIT_MENU_START + 18) ->
moved to SVX
-#define FID_CHG_SHOW (EDIT_MENU_START + 19)
+#define FID_CHG_SHOW (EDIT_MENU_START + 19)
#define EDIT_MENU_END (EDIT_MENU_START + 20)
#define VIEW_MENU_START (EDIT_MENU_END)
@@ -338,13 +337,13 @@
#define FID_SCREEN_OPTIONS (VIEW_MENU_START + 6)
#define FID_PAGEBREAKMODE (VIEW_MENU_START + 7)
#define FID_FUNCTION_BOX (VIEW_MENU_START + 8)
-#define FID_NORMALVIEWMODE (VIEW_MENU_START + 9)
+#define FID_NORMALVIEWMODE (VIEW_MENU_START + 9)
#define FID_TOGGLEFORMULA (VIEW_MENU_START + 10)
// Compare/Merge jetzt aus Sfx
//#define FID_CHG_COMPARE (VIEW_MENU_START + 16)// DANGER DIRTY ID
//#define FID_CHG_MERGE (VIEW_MENU_START + 17)// DANGER
DIRTY ID
-#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER
DIRTY ID
-#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER
DIRTY ID
+#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER DIRTY ID
+#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER
DIRTY ID
#define VIEW_MENU_END (VIEW_MENU_START + 20)
#define INSERT_MENU_START (VIEW_MENU_END)
@@ -363,10 +362,10 @@
#define FID_INSERT_NAME (INSERT_MENU_START + 12)
#define FID_USE_NAME (INSERT_MENU_START + 13)
#define FID_APPLY_NAME (INSERT_MENU_START + 14)
-#define FID_INS_TABLE_EXT (INSERT_MENU_START + 15)
+#define FID_INS_TABLE_EXT (INSERT_MENU_START + 15)
//#define SID_CHARMAP (INSERT_MENU_START + 15)//!!!
kommt von sfx
//aus sfx: #define SID_INSERT_POSTIT (INSERT_MENU_START + 16)
-#define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! sollte vom Svx
kommen
+#define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! sollte
vom Svx kommen
#define FID_INS_CELLSDOWN (INSERT_MENU_START + 18)
#define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19)
#define INSERT_MENU_END (INSERT_MENU_START + 20)
@@ -387,8 +386,8 @@
#define SID_SCSTYLES (FORMAT_MENU_START + 12)
#define FID_MERGE_ON (FORMAT_MENU_START + 13)
#define FID_MERGE_OFF (FORMAT_MENU_START + 14)
-#define SID_FORMATPAGE (FORMAT_MENU_START + 15)
-#define SID_TEXT_STANDARD (FORMAT_MENU_START + 16)
+#define SID_FORMATPAGE (FORMAT_MENU_START + 15)
+#define SID_TEXT_STANDARD (FORMAT_MENU_START + 16)
#define SID_DRAWTEXT_ATTR_DLG (FORMAT_MENU_START + 17)
#define FID_TABLE_VISIBLE (FORMAT_MENU_START + 18)
#define FID_COL_OPT_DIRECT (FORMAT_MENU_START + 19)
@@ -396,7 +395,7 @@
#define EXTRA_MENU_START (FORMAT_MENU_END)
#define FID_VOICE_CONTROL (EXTRA_MENU_START + 1)
-#define SID_RECALC_TITLE (EXTRA_MENU_START + 2)
+#define SID_RECALC_TITLE (EXTRA_MENU_START + 2)
#define FID_AUTO_CALC (EXTRA_MENU_START + 3)
#define FID_RECALC (EXTRA_MENU_START + 4)
#define FID_UPDATE_DIAGRAMS (EXTRA_MENU_START + 5)
@@ -461,10 +460,10 @@
#define FID_TAB_APPEND (TAB_POPUP_START+5)
#define FID_TAB_INDEX (TAB_POPUP_START+6)
#define FID_TAB_RTL (TAB_POPUP_START+7)
-#define FID_TAB_DESELECTALL (TAB_POPUP_START+8)
+#define FID_TAB_DESELECTALL (TAB_POPUP_START+8)
#define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9)
#define FID_TAB_SET_TAB_BG_COLOR (TAB_POPUP_START + 10)
-#define FID_TAB_EVENTS (TAB_POPUP_START+11)
+#define FID_TAB_EVENTS (TAB_POPUP_START+11)
#define TAB_POPUP_END (TAB_POPUP_START + 20)
@@ -526,10 +525,10 @@
#define SID_FILL_NONE (DETECTIVE_START+11)
#define SID_FILL_SELECT (DETECTIVE_START+12)
-#define SID_DETECTIVE_INVALID (DETECTIVE_START+13)
+#define SID_DETECTIVE_INVALID (DETECTIVE_START+13)
-#define SID_DETECTIVE_REFRESH (DETECTIVE_START+14)
-#define SID_DETECTIVE_AUTO (DETECTIVE_START+15)
+#define SID_DETECTIVE_REFRESH (DETECTIVE_START+14)
+#define SID_DETECTIVE_AUTO (DETECTIVE_START+15)
#define DETECTIVE_END (DETECTIVE_START+20)
@@ -537,7 +536,7 @@
//aus sfx: #define SID_ENTER_STRING (SID_API_SLOTS)
#define SID_INSERT_MATRIX (SID_API_SLOTS+1)
-#define SID_DELETE_NOTE (SID_API_SLOTS+2)
+#define SID_DELETE_NOTE (SID_API_SLOTS+2)
#define SID_PREVIEW_START (SID_API_SLOTS+20)
@@ -549,7 +548,7 @@
#define SID_PREVIEW_ZOOMIN (SID_PREVIEW_START+5)
#define SID_PREVIEW_ZOOMOUT (SID_PREVIEW_START+6)
#define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7)
-#define SID_PREVIEW_MARGIN (SID_PREVIEW_START+8)
+#define SID_PREVIEW_MARGIN (SID_PREVIEW_START+8)
#define SID_PREVIEW_SCALINGFACTOR (SID_PREVIEW_START+9)
#define SID_PREVIEW_END (SID_PREVIEW_START+20)
@@ -602,10 +601,10 @@
#define SID_CURSORENTERUP (SID_KEYFUNC_START + 37)
#define SID_CURSORENTERDOWN (SID_KEYFUNC_START + 38)
-#define SID_MARKARRAYFORMULA (SID_KEYFUNC_START + 39)
+#define SID_MARKARRAYFORMULA (SID_KEYFUNC_START + 39)
-#define SID_NEXT_TABLE_SEL (SID_KEYFUNC_START + 40)
-#define SID_PREV_TABLE_SEL (SID_KEYFUNC_START + 41)
+#define SID_NEXT_TABLE_SEL (SID_KEYFUNC_START + 40)
+#define SID_PREV_TABLE_SEL (SID_KEYFUNC_START + 41)
#define SID_KEYFUNC_END (SID_KEYFUNC_START + 50)
@@ -621,7 +620,7 @@
#define SID_FILL_DIR (SID_NEW_SLOTS+7)
#define SID_FILL_COUNT (SID_NEW_SLOTS+8)
#define SID_WITH_UNDO (SID_NEW_SLOTS+9)
-#define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10)
+#define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10)
//aus sfx: #define SID_ATTR_SECIALCHAR (SID_NEW_SLOTS+10)
#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11)
#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12)
@@ -659,7 +658,7 @@
#define SID_TOGGLE_REL (SID_NEW_SLOTS+38)
#define SID_DATA_SELECT (SID_NEW_SLOTS+39)
-// Suchen & Ersetzen
+// Suchen & Ersetzen
#define FID_SEARCH (SID_NEW_SLOTS+40)
#define FID_REPEAT_SEARCH (SID_NEW_SLOTS+41)
#define FID_REPLACE (SID_NEW_SLOTS+42)
@@ -680,7 +679,7 @@
#define FID_VALIDATION (SID_NEW_SLOTS+54)
-// Slots fuer Toolbox Controller in der Werkzeugleiste
+// Slots für Toolbox Controller in der Werkzeugleiste
#define SID_TBXCTL_INSERT (SID_NEW_SLOTS+55)
#define SID_TBXCTL_INSCELLS (SID_NEW_SLOTS+56)
#define SID_TBXCTL_INSOBJ (SID_NEW_SLOTS+57)
@@ -689,7 +688,7 @@
#define FID_NOTE_VISIBLE (SID_NEW_SLOTS+59)
-// Items fuer Gueltigkeit
+// Items für Gültigkeit
#define FID_VALID_MODE (SID_NEW_SLOTS+60)
#define FID_VALID_CONDMODE (SID_NEW_SLOTS+61)
#define FID_VALID_VALUE1 (SID_NEW_SLOTS+62)
@@ -708,7 +707,7 @@
#define FID_FOCUS_POSWND (SID_NEW_SLOTS+74)
-// einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu)
+// einzelne Slots für verschiedene Unterstreich-Arten (Popup-Menu)
#define SID_ULINE_VAL_NONE (SID_NEW_SLOTS+75)
#define SID_ULINE_VAL_SINGLE (SID_NEW_SLOTS+76)
#define SID_ULINE_VAL_DOUBLE (SID_NEW_SLOTS+77)
@@ -777,11 +776,11 @@
#define RID_OUTLINEBITMAPS (SC_RESOURCE_START+12)
#define RID_DRAW_WIN (SC_RESOURCE_START+13)
#define RID_CNTRLR_WIN (SC_RESOURCE_START+14)
-#define RID_GLOBSTR (SC_RESOURCE_START+15)
+#define RID_GLOBSTR (SC_RESOURCE_START+15)
#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19)
#define RID_SCFUNCTIONS (SC_RESOURCE_START+20)
#define RID_POPUP_PIVOT (SC_RESOURCE_START+21)
-#define RID_IMGLIST_INPUTWIN (SC_RESOURCE_START+22)
+#define RID_IMGLIST_INPUTWIN (SC_RESOURCE_START+22)
#define RID_ERRHDLSC (SC_RESOURCE_START+23)
#define RID_POPUP_GRAPHIC (SC_RESOURCE_START+24)
#define RID_POPUP_DRAWTEXT (SC_RESOURCE_START+29)
@@ -812,7 +811,7 @@
// free
// free
#define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57)
-#define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58)
+#define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58)
#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60)
#define RID_POPUP_MEDIA (SC_RESOURCE_START+61)
#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
@@ -826,11 +825,11 @@
#define STR_COLWIDTH_TITLE (STR_START + 5)
#define STR_OPT_COLWIDTH (STR_START + 6)
#define STR_OPT_COLWIDTH_TITLE (STR_START + 7)
-#define SCSTR_UNDEFINED (STR_START + 8)
-#define SCSTR_NONAME (STR_START + 9)
-#define SCSTR_NONE (STR_START + 10)
-#define SCSTR_EMPTY (STR_START + 11)
-#define SCSTR_NOTEMPTY (STR_START + 12)
+#define SCSTR_UNDEFINED (STR_START + 8)
+#define SCSTR_NONAME (STR_START + 9)
+#define SCSTR_NONE (STR_START + 10)
+#define SCSTR_EMPTY (STR_START + 11)
+#define SCSTR_NOTEMPTY (STR_START + 12)
#define SCSTR_COLUMN (STR_START + 13)
#define SCSTR_ROW (STR_START + 14)
#define SCSTR_NEW (STR_START + 15)
@@ -855,7 +854,7 @@
#define SCSTR_EDITSHELL (STR_START + 34)
#define SCSTR_DRAWSHELL (STR_START + 35)
#define SCSTR_DRAWTEXTSHELL (STR_START + 36)
-#define SCSTR_NEWTABLE (STR_START + 37)
+#define SCSTR_NEWTABLE (STR_START + 37)
#define SCSTR_PREVIEWSHELL (STR_START + 38)
#define SCSTR_PROTECTDOC (STR_START + 39)
@@ -872,8 +871,8 @@
#define SCSTR_UNKNOWN (STR_START + 49)
#define SCSTR_CHAR_ATTRS (STR_START + 50)
-#define SCSTR_ALL (STR_START + 51)
-#define SCSTR_STDFILTER (STR_START + 52)
+#define SCSTR_ALL (STR_START + 51)
+#define SCSTR_STDFILTER (STR_START + 52)
// Cfg-Item-Namen
#define SCSTR_CFG_APP (STR_START + 53)
@@ -894,7 +893,7 @@
#define SCSTR_CFG_INPUT (STR_START + 65)
-#define SCSTR_TOP10FILTER (STR_START + 66)
+#define SCSTR_TOP10FILTER (STR_START + 66)
#define SCSTR_CFG_NAVIPI (STR_START + 67)
@@ -998,7 +997,7 @@
#define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
#define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
-#define STR_ACC_TOOLBAR_FORMULA (STR_START + 182)
+#define STR_ACC_TOOLBAR_FORMULA (STR_START + 182)
#define STR_ACC_DOC_SPREADSHEET (STR_START + 185)
#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
#define STR_ACC_DOC_SPREADSHEET_READONLY (STR_START + 187)
@@ -1028,7 +1027,7 @@
#define SCSTR_CONTENT_NOTE (STR_START + 256)
#define SCSTR_CONTENT_AREALINK (STR_START + 257)
#define SCSTR_CONTENT_DRAWING (STR_START + 258)
-// hier ein wenig Platz fuer Erweiterungen
+// hier ein wenig Platz für Erweiterungen
// Eingabezeile, Quickhelp-Strings (HelpText jetzt per HelpId aus Hilfe)
#define SCSTR_QHELP_INPUTWND (STR_START + 307)
@@ -1040,11 +1039,11 @@
#define SCSTR_QHELP_BTNEQUAL (STR_START + 313)
// Validator
-#define SCSTR_VALID_MINIMUM (STR_START + 314)
-#define SCSTR_VALID_MAXIMUM (STR_START + 315)
-#define SCSTR_VALID_VALUE (STR_START + 316)
-#define SCSTR_VALID_RANGE (STR_START + 317)
-#define SCSTR_VALID_LIST (STR_START + 318)
+#define SCSTR_VALID_MINIMUM (STR_START + 314)
+#define SCSTR_VALID_MAXIMUM (STR_START + 315)
+#define SCSTR_VALID_VALUE (STR_START + 316)
+#define SCSTR_VALID_RANGE (STR_START + 317)
+#define SCSTR_VALID_LIST (STR_START + 318)
// Formulator
#define SCSTR_FUDB (STR_START + 389)
@@ -1057,9 +1056,9 @@
#define SCSTR_FUTAB (STR_START + 396)
#define SCSTR_FUTEXT (STR_START + 397)
//
-#define SCSTR_COMPILER_STRINGS (STR_START + 398)
-#define SCSTR_FILTER_STRINGS (STR_START + 399)
-#define SCSTR_COMPILER_INTL_STR (STR_START + 400)
+#define SCSTR_COMPILER_STRINGS (STR_START + 398)
+#define SCSTR_FILTER_STRINGS (STR_START + 399)
+#define SCSTR_COMPILER_INTL_STR (STR_START + 400)
// Media shell
#define SCSTR_MEDIASHELL (STR_START + 401)
@@ -1086,7 +1085,7 @@
#define RID_IMG_H_DROP_URL (BMP_START + 5)
#define RID_IMG_H_DROP_LINK (BMP_START + 6)
#define RID_IMG_H_DROP_COPY (BMP_START + 7)
-#define RID_IMG_SELECT_CURRENT (BMP_START + 8)
+#define RID_IMG_SELECT_CURRENT (BMP_START + 8)
#define RID_IMG_UNSELECT_CURRENT (BMP_START + 9)
#define RID_SCPTR_PIVOTCOL (BMP_START + 81)
@@ -1104,7 +1103,7 @@
#define RID_SCDLG_ATTR (SC_DIALOGS_START)
#define RID_SCPAGE_NUMBER (SC_DIALOGS_START + 1)
#define RID_SCPAGE_ALIGNMENT (SC_DIALOGS_START + 2)
-#define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3)
+#define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3)
#define RID_SCDLG_SORT (SC_DIALOGS_START + 5)
#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6)
#define RID_SCPAGE_SORT_OPTIONS (SC_DIALOGS_START + 7)
@@ -1181,13 +1180,13 @@
#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
//#define RID_SCDLG_CHARTRANGE (SC_DIALOGS_START + 78)
-#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79)
-#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80)
+#define RID_SCPAGE_STAT
(SC_DIALOGS_START + 79)
+#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80)
#define RID_SCDLG_AREAS
(SC_DIALOGS_START + 81)
-#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82)
+#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82)
- // Popup fuer Statusbar-Controller
+// Popup für Statusbar-Controller
#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83)
#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84)
#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85)
@@ -1197,9 +1196,9 @@
#define RID_SUMCTL_AVG (SC_DIALOGS_START + 89)
#define RID_SUMCTL_NONE
(SC_DIALOGS_START + 90)
-#define RID_SCDLG_ASCII (SC_DIALOGS_START + 91)
+#define RID_SCDLG_ASCII
(SC_DIALOGS_START + 91)
- // Popup fuer Drop-Modus im Navigator
+// Popup für Drop-Modus im Navigator
#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92)
#define RID_DROPMODE_URL (SC_DIALOGS_START + 93)
#define RID_DROPMODE_LINK (SC_DIALOGS_START + 94)
@@ -1232,7 +1231,7 @@
#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112)
#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113)
-#define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114)
+#define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114)
#define RID_SCPAGE_INPUT (SC_DIALOGS_START + 115)
#define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116)
@@ -1308,5 +1307,3 @@
#define MID_4 4
#endif
-
-
diff --git a/main/sc/sdi/oleobjsh.sdi b/main/sc/sdi/oleobjsh.sdi
index a41570b65a..fa13e439a7 100644
--- a/main/sc/sdi/oleobjsh.sdi
+++ b/main/sc/sdi/oleobjsh.sdi
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// ===========================================================================
shell ScOleObjectShell : ScDrawShell
{
diff --git a/main/sc/source/ui/drawfunc/oleobjsh.cxx
b/main/sc/source/ui/drawfunc/oleobjsh.cxx
index 4f170729eb..40fc5500fd 100644
--- a/main/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/main/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,25 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
//------------------------------------------------------------------
#include <editeng/eeitem.hxx>
@@ -68,9 +64,9 @@ TYPEINIT1( ScOleObjectShell, ScDrawShell );
ScOleObjectShell::ScOleObjectShell(ScViewData* pData) :
ScDrawShell(pData)
{
- SetHelpId(HID_SCSHELL_OLEOBEJCTSH);
+ SetHelpId(HID_SCSHELL_OLEOBJECTSH);
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("OleObject")));
-
SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OLE));
+
SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_OLE));
}
ScOleObjectShell::~ScOleObjectShell()
@@ -80,6 +76,6 @@ ScOleObjectShell::~ScOleObjectShell()
void ScOleObjectShell::HandleSelectionChange (void)
{
- // Do not call the implementation in the base class. Let
- // Activate()/Deactivate() handle context switches.
+ // Do not call the implementation in the base class. Let
+ // Activate()/Deactivate() handle context switches.
}
