diff options
229 files changed, 0 insertions, 987 deletions
diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/accessibility/helper/accessiblestrings.hrc index 12454d4c3696..60c4392a7562 100644 --- a/accessibility/inc/accessibility/helper/accessiblestrings.hrc +++ b/accessibility/inc/accessibility/helper/accessiblestrings.hrc @@ -22,7 +22,6 @@ #define RID_TK_ACC_START 1000 - // Accessible Action Id's #define RID_STR_ACC_ACTION_CLICK ( RID_TK_ACC_START + 0 ) #define RID_STR_ACC_ACTION_TOGGLEPOPUP ( RID_TK_ACC_START + 1 ) diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src index 495df2342a30..6c7b879cdaa0 100644 --- a/avmedia/source/viewer/mediawindow.src +++ b/avmedia/source/viewer/mediawindow.src @@ -24,43 +24,31 @@ String AVMEDIA_STR_INSERTMEDIA_DLG Text[en-US] = "Insert Movie and Sound"; }; - - STRING AVMEDIA_STR_OPENMEDIA_DLG { Text[en-US] = "Open Movie and Sound"; }; - - String AVMEDIA_STR_ALL_MEDIAFILES { Text[en-US] = "All movie and sound files"; }; - - String AVMEDIA_STR_ALL_FILES { Text[en-US] = "All files"; }; - - Bitmap AVMEDIA_BMP_AUDIOLOGO { file = "avaudiologo.png"; }; - - Bitmap AVMEDIA_BMP_EMPTYLOGO { file = "avemptylogo.png"; }; - - ErrorBox AVMEDIA_ERR_URL { BUTTONS = WB_OK ; diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src index 7e490c80eee1..6aa952d6037d 100644 --- a/basctl/source/dlged/dlgresid.src +++ b/basctl/source/dlged/dlgresid.src @@ -114,7 +114,6 @@ String RID_STR_CLASS_SPINCONTROL Text = "SpinButton" ; }; - // Property Browser Headline ---------------------------------------------------------------- String RID_STR_BRWTITLE_PROPERTIES @@ -130,8 +129,6 @@ String RID_STR_BRWTITLE_MULTISELECT Text [ en-US ] = "Multiselection"; }; - - String RID_STR_DEF_LANG { Text [ en-US ] = "[Default Language]" ; diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc index 7542db132969..54d6ca12d508 100644 --- a/basctl/source/inc/dlgresid.hrc +++ b/basctl/source/inc/dlgresid.hrc @@ -63,8 +63,6 @@ #define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 70 ) - - #endif // BASCTL_DLGRESID_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 643ed3dadee1..d15b5172e09e 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.hrc @@ -25,7 +25,6 @@ #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } #endif - // chart types // Images: @@ -45,11 +44,9 @@ #define IMG_STEP_CENTER_X (RID_APP_START + 14) #define IMG_STEP_CENTER_Y (RID_APP_START + 15) - //Chart Subtypes // Bitmaps: - // Column Chart Subtypes #define BMP_COLUMNS_2D_1 (RID_APP_START + 1) #define BMP_COLUMNS_2D_2 (RID_APP_START + 2) @@ -75,7 +72,6 @@ #define BMP_PYRAMID_3D_3 (RID_APP_START + 18) #define BMP_PYRAMID_3D_4 (RID_APP_START + 19) - // Bar Chart Subtypes #define BMP_BARS_2D_1 (RID_APP_START + 20) @@ -102,7 +98,6 @@ #define BMP_PYRAMIDQ_3D_3 (RID_APP_START + 37) #define BMP_PYRAMIDQ_3D_4 (RID_APP_START + 38) - // Pie and Donut Chart Subtypes #define BMP_CIRCLES_2D (RID_APP_START + 39) @@ -114,7 +109,6 @@ #define BMP_DONUT_3D (RID_APP_START + 45) #define BMP_DONUT_3D_EXPLODED (RID_APP_START + 46) - // Points and Lines Chart Subtypes #define BMP_POINTS_XVALUES (RID_APP_START + 47) @@ -122,7 +116,6 @@ #define BMP_POINTS_STACKED (RID_APP_START + 49) #define BMP_POINTS_STACKED (RID_APP_START + 49) - #define BMP_LINE_P_XVALUES (RID_APP_START + 50) #define BMP_LINE_O_XVALUES (RID_APP_START + 51) #define BMP_LINE3D_XVALUES (RID_APP_START + 52) @@ -159,7 +152,6 @@ #define BMP_LINE_O_STACKED_STEPPED (RID_APP_START + 104) #define BMP_LINE3D_STACKED_STEPPED (RID_APP_START + 105) - // Area Chart Subtypes #define BMP_AREAS_2D (RID_APP_START + 68) @@ -169,7 +161,6 @@ #define BMP_AREAS_3D_1 (RID_APP_START + 72) #define BMP_AREAS_3D_2 (RID_APP_START + 73) - // Net Chart Subtypes #define BMP_NET (RID_APP_START + 74) @@ -181,7 +172,6 @@ #define BMP_NET_FILL (RID_APP_START + 80) #define BMP_NET_FILL_STACK (RID_APP_START + 81) - // Stock Chart Subtypes #define BMP_STOCK_1 (RID_APP_START + 82) @@ -189,13 +179,11 @@ #define BMP_STOCK_3 (RID_APP_START + 84) #define BMP_STOCK_4 (RID_APP_START + 85) - // Column + Line Chart Subtypes #define BMP_COLUMN_LINE (RID_APP_START + 86) #define BMP_COLUMN_LINE_STACKED (RID_APP_START + 87) - // Bubble Chart Subtypes #define BMP_BUBBLE_1 (RID_APP_START + 88) diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src index 49bd2f8b4147..79cd6a9894d1 100644 --- a/chart2/source/controller/dialogs/Bitmaps.src +++ b/chart2/source/controller/dialogs/Bitmaps.src @@ -275,7 +275,6 @@ Bitmap BMP_POINTS_STACKED File = "stackdirectpoints_52x60.png" ; }; - Bitmap BMP_LINE_P_XVALUES { File = "valueaxisdirectboth_52x60.png" ; @@ -289,7 +288,6 @@ Bitmap BMP_LINE3D_XVALUES File = "valueaxisdirect3d_52x60.png" ; }; - Bitmap BMP_LINE_P_XCATEGORY { File = "nostackdirectboth_52x60.png" ; @@ -303,7 +301,6 @@ Bitmap BMP_LINE3D_XCATEGORY File = "nostackdirect3d_52x60.png" ; }; - Bitmap BMP_LINE_P_STACKED { File = "stackdirectboth_52x60.png" ; @@ -317,7 +314,6 @@ Bitmap BMP_LINE3D_STACKED File = "stackdirect3d_52x60.png" ; }; - Bitmap BMP_LINE_P_XVALUES_SMOOTH { File = "valueaxissmoothboth_52x60.png" ; @@ -509,8 +505,6 @@ Bitmap BMP_STOCK_4 File = "stockcolumnsattach_52x60.png" ; }; - - //error indicator Image BMP_INDICATE_BOTH_VERTI { @@ -555,7 +549,6 @@ Image BMP_INDICATE_LEFT }; }; - //regression curves Image BMP_REGRESSION_NONE { diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index cae75924ece8..ebd27e0855aa 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -20,7 +20,6 @@ #ifndef _CHART2_RESOURCE_IDS_HRC #define _CHART2_RESOURCE_IDS_HRC - //for strings see Strings.hrc //for Bimaps see Bimaps.hrc diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 4b0f3e333dae..d783e0595fe1 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -409,8 +409,6 @@ String STR_STATUS_PIE_SEGMENT_EXPLODED Text [ en-US ] = "Pie exploded by %PERCENTVALUE percent"; }; - - String STR_OBJECT_FOR_SERIES { Text [ en-US ] = "%OBJECTNAME for Data Series '%SERIESNAME'" ; @@ -421,8 +419,6 @@ String STR_OBJECT_FOR_ALL_SERIES Text [ en-US ] = "%OBJECTNAME for all Data Series" ; }; - - String STR_ACTION_EDIT_CHARTTYPE { Text [ en-US ] = "Edit chart type" ; @@ -477,10 +473,6 @@ String STR_ROW_LABEL Text [ en-US ] = "Row %ROWNUMBER" ; }; - - - - //for range didalog String STR_DATA_ROLE_LABEL { diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src index 1cff7519e462..8f93aa8ec51d 100644 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ b/chart2/source/controller/dialogs/Strings_Statistic.src @@ -39,9 +39,6 @@ String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA Text [ en-US ] = "From Data Table" ; }; - - - String STR_REGRESSION_LINEAR { Text [ en-US ] = "Linear" ; diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc index d1a172d21485..ffb7af607117 100644 --- a/chart2/source/controller/inc/MenuResIds.hrc +++ b/chart2/source/controller/inc/MenuResIds.hrc @@ -21,7 +21,6 @@ #include <svl/solar.hrc> - // context menus #define RID_CONTEXTMENU_SHAPE (RID_APP_START + 1) diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc index f13dd08a001f..f5a14bae42d8 100644 --- a/chart2/source/controller/inc/ShapeController.hrc +++ b/chart2/source/controller/inc/ShapeController.hrc @@ -19,7 +19,6 @@ #ifndef CHART_SHAPECONTROLLER_HRC #define CHART_SHAPECONTROLLER_HRC - //Command Ids: #define COMMAND_ID_FORMAT_LINE 1 #define COMMAND_ID_FORMAT_AREA 2 diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc index 1836fed013b0..faf70bde1047 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hrc +++ b/chart2/source/controller/main/DrawCommandDispatch.hrc @@ -19,7 +19,6 @@ #ifndef CHART_DRAWCOMMANDDISPATCH_HRC #define CHART_DRAWCOMMANDDISPATCH_HRC - //Command Ids: #define COMMAND_ID_OBJECT_SELECT 1 #define COMMAND_ID_DRAW_LINE 2 diff --git a/chart2/source/controller/menus/ShapeContextMenu.src b/chart2/source/controller/menus/ShapeContextMenu.src index 402bffc3982e..de00637356e9 100644 --- a/chart2/source/controller/menus/ShapeContextMenu.src +++ b/chart2/source/controller/menus/ShapeContextMenu.src @@ -19,7 +19,6 @@ #include "MenuResIds.hrc" #include "ShapeController.hrc" - Menu RID_CONTEXTMENU_SHAPE { ItemList = diff --git a/chart2/source/controller/menus/ShapeEditContextMenu.src b/chart2/source/controller/menus/ShapeEditContextMenu.src index 36c6afd7199e..8e22df4f9fde 100644 --- a/chart2/source/controller/menus/ShapeEditContextMenu.src +++ b/chart2/source/controller/menus/ShapeEditContextMenu.src @@ -19,7 +19,6 @@ #include "MenuResIds.hrc" #include "ShapeController.hrc" - Menu RID_CONTEXTMENU_SHAPEEDIT { ItemList = diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index 59de25d68de0..950050ba228f 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -85,7 +85,6 @@ #define STR_REGRESSION_POLYNOMIAL (RID_APP_START + 300) #define STR_REGRESSION_MOVING_AVERAGE (RID_APP_START + 301) - //for scale tab page //see Strings_Scale.src @@ -96,7 +95,6 @@ #define STR_INVALID_INTERVALS (RID_APP_START + 291) #define STR_INVALID_TIME_UNIT (RID_APP_START + 292) - //for range dialog #define STR_DATA_ROLE_LABEL (RID_APP_START + 241) #define STR_DATA_ROLE_X (RID_APP_START + 242) @@ -123,7 +121,6 @@ #define STR_DATA_SELECT_RANGE_FOR_CATEGORIES (RID_APP_START + 253) #define STR_DATA_SELECT_RANGE_FOR_DATALABELS (RID_APP_START + 195) - //chart objects //e.g. used as titles for insert dialogs and object properties dialog //also used in tip help, in status descriptions e.g. '%object% marked' or in undo action e.g. 'moved %object%' @@ -197,7 +194,6 @@ #define STR_OBJECT_CURVE_EQUATION (RID_APP_START + 268) #define STR_OBJECT_SHAPE (RID_APP_START + 290) - //Titles for tabpages and dialogs #define STR_PAGE_LINE (RID_APP_START + 216) @@ -233,7 +229,6 @@ #define STR_PAGE_POSITIONING (RID_APP_START + 277) #define STR_PAGE_ASIAN (RID_APP_START + 281) - //strings used as description for actions on toolbar icons, as tip help or for undo #define STR_ACTION_EDIT_CHARTTYPE (RID_APP_START + 78) @@ -246,7 +241,6 @@ #define STR_ACTION_REARRANGE_CHART (RID_APP_START + 94) #define STR_ACTION_EDIT_TEXT (RID_APP_START + 95) - //statusbar strings and balloon help #define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) @@ -257,7 +251,6 @@ #define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) #define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) - //warning and info boxes #define STR_ACTION_NOTPOSSIBLE (RID_APP_START + 107) diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc index 0e8c69ee5441..8144bce7ea3d 100644 --- a/connectivity/source/inc/resource/ado_res.hrc +++ b/connectivity/source/inc/resource/ado_res.hrc @@ -23,7 +23,6 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" - // = the ado driver's resource strings #define STR_INVALID_COLUMN_DESCRIPTOR_ERROR ( STR_ADO_BASE + 1 ) @@ -37,7 +36,6 @@ #define STR_TYPE_NOT_CONVERT ( STR_ADO_BASE + 9 ) #define STR_NO_CONNECTION ( STR_ADO_BASE + 10 ) - #endif // CONNECTIVITY_RESOURCE_ADO_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc index 0984584bb689..343c983a99a7 100644 --- a/connectivity/source/inc/resource/calc_res.hrc +++ b/connectivity/source/inc/resource/calc_res.hrc @@ -23,10 +23,8 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" - // = the calc driver's resource strings - #define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE + 0 ) #endif // CONNECTIVITY_RESOURCE_CALC_HRC diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc index 891a47abc0bb..a4f24a46aa3e 100644 --- a/connectivity/source/inc/resource/common_res.hrc +++ b/connectivity/source/inc/resource/common_res.hrc @@ -22,10 +22,8 @@ #include "resource/conn_shared_res.hrc" - // = common strings - #define STR_STRING_LENGTH_EXCEEDED ( STR_COMMON_BASE + 1 ) #define STR_CANNOT_CONVERT_STRING ( STR_COMMON_BASE + 2 ) #define STR_URI_SYNTAX_ERROR ( STR_COMMON_BASE + 3 ) diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc index f136389b35e9..9008b45bb495 100644 --- a/connectivity/source/inc/resource/conn_shared_res.hrc +++ b/connectivity/source/inc/resource/conn_shared_res.hrc @@ -20,7 +20,6 @@ #ifndef CONNECTIVITY_SHARED_RES_HRC #define CONNECTIVITY_SHARED_RES_HRC - // = normal resource ids, per driver // Mozilla driver resource ids diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc index b9d80342a63c..54f0232825df 100644 --- a/connectivity/source/inc/resource/dbase_res.hrc +++ b/connectivity/source/inc/resource/dbase_res.hrc @@ -23,10 +23,8 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" - // = the calc driver's resource strings - #define STR_COULD_NOT_DELETE_INDEX ( STR_DBASE_BASE + 0 ) #define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE ( STR_DBASE_BASE + 1 ) #define STR_SQL_NAME_ERROR ( STR_DBASE_BASE + 2 ) diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc index b4dcdf373f1b..6cb16db7e14f 100644 --- a/connectivity/source/inc/resource/evoab2_res.hrc +++ b/connectivity/source/inc/resource/evoab2_res.hrc @@ -23,10 +23,8 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" - // = the calc driver's resource strings - #define STR_CANNOT_OPEN_BOOK ( STR_EVOAB2_BASE + 0 ) #define STR_SORT_BY_COL_ONLY ( STR_EVOAB2_BASE + 1 ) diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc index 054e3157606f..f7072f684974 100644 --- a/connectivity/source/inc/resource/file_res.hrc +++ b/connectivity/source/inc/resource/file_res.hrc @@ -25,7 +25,6 @@ // = the file driver's resource strings - #define STR_QUERY_COMPLEX_COUNT ( STR_FILE_BASE + 0 ) #define STR_QUERY_INVALID_BETWEEN ( STR_FILE_BASE + 1 ) #define STR_TABLE_READONLY ( STR_FILE_BASE + 2 ) diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc index cd9da8f5ccfa..29be9d2fe19e 100644 --- a/connectivity/source/inc/resource/hsqldb_res.hrc +++ b/connectivity/source/inc/resource/hsqldb_res.hrc @@ -23,10 +23,8 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" - // = the hsqldb driver's resource strings - #define STR_NO_STORAGE ( STR_HSQLDB_BASE + 0 ) #define STR_INVALID_FILE_URL ( STR_HSQLDB_BASE + 1 ) #define STR_NO_TABLE_CONTAINER ( STR_HSQLDB_BASE + 2 ) diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc index f33081c71d07..019e99449b9d 100644 --- a/connectivity/source/inc/resource/kab_res.hrc +++ b/connectivity/source/inc/resource/kab_res.hrc @@ -25,7 +25,6 @@ // = the kab driver's resource strings - #define STR_NO_KDE_INST ( STR_KAB_BASE + 0 ) #define STR_KDE_VERSION_TOO_OLD ( STR_KAB_BASE + 1 ) #define STR_KDE_VERSION_TOO_NEW ( STR_KAB_BASE + 2 ) diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc index f407039a59be..188372b78512 100644 --- a/connectivity/source/inc/resource/macab_res.hrc +++ b/connectivity/source/inc/resource/macab_res.hrc @@ -25,7 +25,6 @@ // = the macab driver's resource strings - #define STR_NO_TABLE ( STR_MACAB_BASE + 0 ) #define STR_NO_MAC_OS_FOUND ( STR_MACAB_BASE + 1 ) diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc index 5278c77322d9..cd8cf9e3121d 100644 --- a/connectivity/source/inc/resource/mork_res.hrc +++ b/connectivity/source/inc/resource/mork_res.hrc @@ -22,10 +22,8 @@ #include "resource/conn_shared_res.hrc" - // = the mozab driver's resource strings - #define STR_MOZILLA_ADDRESSBOOKS ( STR_MORK_BASE + 0 ) #define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MORK_BASE + 1 ) #define STR_OE_ADDRESSBOOK ( STR_MORK_BASE + 2 ) diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc index fb36c6356b7c..909a303f310f 100644 --- a/connectivity/source/inc/resource/mozab_res.hrc +++ b/connectivity/source/inc/resource/mozab_res.hrc @@ -22,10 +22,8 @@ #include "resource/conn_shared_res.hrc" - // = the mozab driver's resource strings - #define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 ) #define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MOZAB_BASE + 1 ) #define STR_OE_ADDRESSBOOK ( STR_MOZAB_BASE + 2 ) diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src index be2bae608a6f..91cc203c35cc 100644 --- a/connectivity/source/resource/conn_log_res.src +++ b/connectivity/source/resource/conn_log_res.src @@ -19,10 +19,8 @@ #include "resource/jdbc_log.hrc" - // = log messages for the JDBC driver - String STR_LOG_DRIVER_CONNECTING_URL { Text = "jdbcBridge: connecting to URL '$1$'"; diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index 99273cd3a2d2..1d39e10bdda5 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -27,10 +27,8 @@ #include "resource/kab_res.hrc" #include "resource/hsqldb_res.hrc" - // = the mozab driver's resource strings - String STR_MOZILLA_ADDRESSBOOKS { Text [ en-US ] = "Mozilla/Seamonkey Address Book Directory"; @@ -195,7 +193,6 @@ String STR_COULD_NOT_CONNECT_LDAP Text [ en-US ] = "The connection to the LDAP server could not be established."; }; - // = common strings String STR_NO_CONNECTION_GIVEN @@ -321,7 +318,6 @@ String STR_LOAD_FILE_ERROR_MESSAGE Text [ en-US ] = "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$"; }; - // = the ado driver's resource strings String STR_TYPE_NOT_CONVERT @@ -524,7 +520,6 @@ String STR_NO_VALID_FILE_URL Text [ en-US ] = "The URL '$URL$' is not valid. A connection can not be created."; }; - String STR_NO_CLASSNAME { Text [ en-US ] = "The driver class '$classname$' could not be loaded."; diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src index 0cc502a7c4c0..3c9c4944790a 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -69,7 +69,6 @@ ModalDialog RID_SVXDLG_ASSIGNCOMPONENT }; }; - //DF String RID_SVXSTR_EVENT_STARTAPP { diff --git a/cui/source/dialogs/colorpicker.src b/cui/source/dialogs/colorpicker.src index adbfbbc79ab0..f94e3c5ee3a4 100644 --- a/cui/source/dialogs/colorpicker.src +++ b/cui/source/dialogs/colorpicker.src @@ -64,8 +64,6 @@ #define CMYK_Y3 (CMYK_Y2 + METRIC_HEIGHT + 2) #define CMYK_Y4 (CMYK_Y3 + METRIC_HEIGHT + 2) - - ModalDialog RID_CUI_DIALOG_COLORPICKER { HelpID = "cui:ModalDialog:ColorPicker"; @@ -270,10 +268,8 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER TabStop = TRUE ; }; - // HSB - FixedLine FL_HSB { Pos = MAP_APPFONT ( CONTROL_AREA_X , HSB_Y0 ) ; @@ -345,10 +341,8 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Unit = FUNIT_PERCENT ; }; - // CMYK - FixedLine FL_CMYK { Pos = MAP_APPFONT ( CONTROL_AREA_X , CMYK_Y0 ) ; @@ -440,10 +434,8 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER Unit = FUNIT_PERCENT ; }; - // bottom buttons - FixedLine FT_BOTTOMLINE { Pos = MAP_APPFONT ( 0 , BOTTOMLINE_Y ) ; diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc index bbec93ad414e..3f595dbabb03 100644 --- a/cui/source/dialogs/hangulhanjadlg.hrc +++ b/cui/source/dialogs/hangulhanjadlg.hrc @@ -64,7 +64,6 @@ #define ED_NEWWORD 21 #define FT_SUGGESTION 22 - // Hangul / Hanja Options Dialog #define BTN_OPTIONS 10 diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc index aca23edfff5d..dcb0c71478e8 100644 --- a/cui/source/dialogs/svuidlg.hrc +++ b/cui/source/dialogs/svuidlg.hrc @@ -31,7 +31,6 @@ #define STR_CLOSELINKMSG_MULTI 32024 #define STR_WAITINGLINK 32028 - #define MD_UPDATE_BASELINKS 32002 #define FT_FILES 31 #define FT_LINKS 32 diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 2d7f5270de9d..e741b43e8110 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -87,7 +87,6 @@ #define RID_SVXSTR_CONNECTOR (RID_SVX_START + 221) #define RID_SVXSTR_DIMENSION_LINE (RID_SVX_START + 222) - #define RID_SVXSTR_CHARNAME_TRANSPARENT (RID_SVX_START + 237) #define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238) #define RID_SVXSTR_CHARNAME_NOSTYLE (RID_SVX_START + 239) diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 9beeeeac2124..537c1505b7c5 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -22,8 +22,6 @@ // ******************************************************************* - - InfoBox RID_SVX_MSGBOX_LANGUAGE_RESTART { Message [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION"; diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src index 388a6f290b51..2ae96d304c60 100644 --- a/cui/source/tabpages/frmdirlbox.src +++ b/cui/source/tabpages/frmdirlbox.src @@ -58,6 +58,4 @@ String RID_SVXSTR_PAGEDIR_LTR_VERT Text [ en-US ] = "Left-to-right (vertical)"; }; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index f5d6fe666d42..9d4bc33e4732 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -105,7 +105,6 @@ #define SID_QUERY_PROP_DLG ( SID_DBACCESS_START + 69 ) - #endif // _DBACCESS_SLOTID_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc index 49d28aff27d8..cc1a8a099df0 100644 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ b/dbaccess/source/core/inc/dbamiscres.hrc @@ -20,7 +20,6 @@ #ifndef _DBA_MISCRES_HRC_ #define _DBA_MISCRES_HRC_ - // string ids (relative to other resources, that's why not unique) #define STR_MYSQL_ODBC 1 #define STR_MYSQL_JDBC 2 @@ -49,7 +48,6 @@ #define STR_END STR_MYSQL_NATIVE + 1 - #endif // _DBA_MISCRES_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index 4fb36ef4a869..1784a3d39182 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -300,8 +300,6 @@ String RID_STR_UPDATE_FAILED Text [ en-US ] = "Current row could not be updated."; }; - - String RID_STR_NO_INSERT_PRIVILEGE { Text [ en-US ] = "INSERT privilege not available."; diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index 7b1516c7ad06..2918be19d506 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -22,38 +22,29 @@ #include <svl/solar.hrc> - //= bases #define RID_DBMM_DIALOG_START RID_DBACCESS_START + 0 #define RID_DBMM_TAPPAGE_START RID_DBACCESS_START + 0 #define RID_DBMM_STRING_START RID_DBACCESS_START + 0 - //= dialogs - #define DLG_MACRO_MIGRATION RID_DBMM_DIALOG_START + 0 - //= error boxes - #define ERR_INVALID_BACKUP_LOCATION RID_DBMM_DIALOG_START + 0 - //= tab pages - #define TP_PREPARE ( RID_DBMM_TAPPAGE_START + 0 ) #define TP_SAVE_DBDOC_AS ( RID_DBMM_TAPPAGE_START + 1 ) #define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 ) #define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 ) - //= strings - #define STR_FORM ( RID_DBMM_STRING_START + 0 ) #define STR_REPORT ( RID_DBMM_STRING_START + 1 ) #define STR_OVERALL_PROGRESS ( RID_DBMM_STRING_START + 2 ) diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index 314f089cb28c..52da579410d8 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -20,7 +20,6 @@ #include "dbmm_global.hrc" #include "macromigration.hrc" - ModalDialog DLG_MACRO_MIGRATION { HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION"; @@ -52,10 +51,8 @@ ModalDialog DLG_MACRO_MIGRATION }; }; - //= PreparationPage - TabPage TP_PREPARE { HelpID = "dbaccess:TabPage:TP_PREPARE"; @@ -103,10 +100,8 @@ TabPage TP_PREPARE }; }; - //= SaveDBDocPage - TabPage TP_SAVE_DBDOC_AS { HelpID = "dbaccess:TabPage:TP_SAVE_DBDOC_AS"; @@ -180,10 +175,8 @@ TabPage TP_SAVE_DBDOC_AS }; }; - //= ProgressPage - TabPage TP_MIGRATE { HelpID = "dbaccess:TabPage:TP_MIGRATE"; @@ -294,10 +287,8 @@ TabPage TP_MIGRATE }; }; - //= ResultPage - TabPage TP_SUMMARY { HelpID = "dbaccess:TabPage:TP_SUMMARY"; @@ -433,7 +424,6 @@ String STR_EXCEPTION Text [ en-US ] = "caught exception:"; }; - ErrorBox ERR_INVALID_BACKUP_LOCATION { Buttons = WB_OK; diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc index ea05a55da266..1eb36a30e22a 100644 --- a/dbaccess/source/inc/dbastrings.hrc +++ b/dbaccess/source/inc/dbastrings.hrc @@ -26,12 +26,10 @@ #undef STRINGCONSTANTS_INCLUDED_INDIRECT #include "stringconstants.inc" - //= SQLSTATE #define SQLSTATE_GENERAL "01000" - //= Properties #define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode" diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc index 3bb0adf9e6ec..2b74696396d2 100644 --- a/dbaccess/source/inc/dbustrings.hrc +++ b/dbaccess/source/inc/dbustrings.hrc @@ -26,7 +26,6 @@ #undef STRINGCONSTANTS_INCLUDED_INDIRECT #include "stringconstants.inc" - //= URLs #define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign" @@ -38,12 +37,10 @@ #define URL_COMPONENT_APPLICATION ".component:DB/Application" #define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign" - //= service names #define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" - //= other DBU relevant strings #define FRAME_NAME_QUERY_PREVIEW "QueryPreview" @@ -52,7 +49,6 @@ #define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign" #define PROPERTY_HELP_URL "HelpURL" - //= other DBU properties #define PROPERTY_TRISTATE "TriState" diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index 1106a0e72697..130be75d062f 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hrc @@ -24,7 +24,6 @@ #error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!" #endif - //= property ids #define PROPERTY_ID_TITLE 1 diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index a28176765276..ae0dbe3ef783 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc @@ -22,10 +22,8 @@ #include <svl/solar.hrc> - #define RID_SDBT_STRINGS_START RID_DBACCESS_START - //- String-IDs #define STR_QUERY_AND_TABLE_DISTINCT_NAMES RID_SDBT_STRINGS_START + 0 #define STR_BASENAME_TABLE RID_SDBT_STRINGS_START + 1 diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 585fa43b1644..36f8145fc055 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -25,7 +25,6 @@ #define MN_PROPS 25 - String RID_STR_NEW_FORM { Text [ en-US ] = "Create Form in Design View..." ; diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index 31ac28c1ec9d..3e3531bd230c 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -99,7 +99,6 @@ String STR_NAME_ALREADY_EXISTS Text [ en-US ] = "The name \"#\" already exists."; }; - String STR_NO_COLUMNNAME_MATCHING { Text [ en-US ] = "No matching column names were found."; diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index dc2b1c7eada5..486a910c4a21 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -89,7 +89,4 @@ String STR_ADD_TABLE_OR_QUERY Text [ en-US ] = "Add Table or Query" ; }; - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 4452d32276d3..c6fdea8635ab 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -23,7 +23,6 @@ #include "dbaccess_helpid.hrc" #include "dbu_dlg.hrc" - #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 #define RELATED_CONTROLS 4 @@ -87,7 +86,6 @@ #define STR_AUTODELIMITER_MUST_DIFFER 104 #define STR_AUTONO_WILDCARDS 105 - #define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \ FixedText FT_AUTOWIZARDHEADER \ { \ @@ -105,9 +103,6 @@ WordBreak = TRUE; \ }; - - - #define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2) \ FixedText FT_AUTOBROWSEURL { \ Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ @@ -143,9 +138,6 @@ Text[ en-US ] = "Create New"; \ }; - - - #define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTODATABASENAME \ { \ @@ -163,9 +155,6 @@ Border = TRUE ; \ }; - - - #define AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOHOSTNAME \ { \ @@ -183,9 +172,6 @@ Border = TRUE ; \ }; - - - #define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOBASEDN \ { \ @@ -203,8 +189,6 @@ Border = TRUE ; \ }; \ - - // MBA: the HID set in the FixText can't make any sense; in case this macro was called from within the // AUTOHELP_JDBCCONTROLGROUP, the FixText would have got the same HID as an EditField from the // also called AUTO_JDBCDRIVERCLASSGROUP macro; thus I conclude that we can remove the HID from the FixedText @@ -233,8 +217,6 @@ Text[ en-US ] = "" ; \ }; - - #define AUTO_CHARSET( AUTO_Y, AUTOPAGE_X ) \ FixedLine FL_DATACONVERT \ { \ @@ -259,7 +241,6 @@ CurPos = 0 ; \ }; \ - #define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X) \ \ FixedText FT_AUTOEXTENSIONHEADER \ @@ -431,16 +412,10 @@ Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; \ }; - - - #define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2) \ AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2) - - - #define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2) \ \ FixedText FT_AUTOJDBCDRIVERCLASS \ @@ -469,8 +444,6 @@ Text[ en-US ] = "Test class" ; \ }; - - #define AUTO_SOCKETCONTROLGROUP(AUTO_Y) \ FixedText FT_SOCKET \ { \ @@ -487,7 +460,6 @@ Border = TRUE ; \ }; - #define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4, AUTO_HID5 ) \ AUTO_WIZARDHELPTEXT( 6 ) \ AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \ @@ -496,9 +468,6 @@ AUTO_SOCKETCONTROLGROUP(129) \ AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5) - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc index 3837328413fb..805c3dfb363e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hrc +++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc @@ -20,7 +20,6 @@ #ifndef DBAUI_CONNECTIONPAGE_HRC #define DBAUI_CONNECTIONPAGE_HRC - // control ids #define FT_USERNAME 1 diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 72a6d8825e96..428ed65d55c9 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -22,7 +22,6 @@ #include "ConnectionPage.hrc" #include "AutoControls.hrc" - TabPage PAGE_CONNECTION { HelpID = "dbaccess:TabPage:PAGE_CONNECTION"; diff --git a/dbaccess/source/ui/dlg/admincontrols.hrc b/dbaccess/source/ui/dlg/admincontrols.hrc index 68902cc984be..cd50b86e9c7a 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hrc +++ b/dbaccess/source/ui/dlg/admincontrols.hrc @@ -25,18 +25,15 @@ #define FT_COMMON_PORT_DEFAULT 3 #define FT_COMMON_PORT 4 - #define RB_MYSQL_HOST_PORT 1 #define RB_MYSQL_SOCKET 2 #define RB_MYSQL_NAMED_PIPE 3 - #define ED_MYSQL_DATABASE_NAME 1 #define ED_MYSQL_SOCKET 2 #define ED_COMMON_HOST_NAME 3 #define ED_MYSQL_NAMED_PIPE 4 - #define NF_COMMON_PORT 1 #endif // ADMINCONTROLS_HRC diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index e8da953eefdd..c5d65e61b0c8 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -20,7 +20,6 @@ #ifndef _DBAUI_DBADMIN_HRC_ #define _DBAUI_DBADMIN_HRC_ - // control ids #define FT_USERNAME 3 diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index 5f18d1ff2134..6abc6be147ca 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -24,8 +24,6 @@ #include "browserids.hxx" #include "admincontrols.hrc" - - #define AUTO_USECATALOG(AUTO_Y) \ CheckBox CB_USECATALOG \ { \ @@ -36,8 +34,6 @@ Text[ en-US ] = "Use catalog for file-based databases"; \ }; - - #define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \ FixedLine FL_SEPARATOR1 \ { \ @@ -77,7 +73,6 @@ Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ }; - ModalDialog DLG_DATABASE_TYPE_CHANGE { OutputSize = TRUE ; @@ -93,8 +88,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE Text [ en-US ] = "Database properties" ; }; - - TabPage PAGE_DBASE { SVLook = TRUE ; @@ -140,8 +133,6 @@ TabPage PAGE_DBASE }; }; - - TabPage PAGE_ADO { SVLook = TRUE ; @@ -152,8 +143,6 @@ TabPage PAGE_ADO AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X) }; - - TabPage PAGE_ODBC { SVLook = TRUE ; @@ -188,8 +177,6 @@ TabPage PAGE_ODBC AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) }; - - TabPage PAGE_MYSQL_ODBC { HelpID = "dbaccess:TabPage:PAGE_MYSQL_ODBC"; @@ -324,8 +311,6 @@ TabPage PAGE_ORACLE_JDBC AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X ) }; - - TabPage PAGE_LDAP { SVLook = TRUE ; @@ -398,9 +383,6 @@ TabPage PAGE_LDAP }; }; - - - TabPage PAGE_TEXT { SVLook = TRUE ; @@ -412,7 +394,6 @@ TabPage PAGE_TEXT AUTO_SEPARATORCONTROLGROUP(UNRELATED_CONTROLS, PAGE_X) }; - TabPage PAGE_USERDRIVER { SVLook = TRUE ; diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index cc8ba251508f..d90d6dbec530 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -24,8 +24,6 @@ #include "toolbox.hrc" #include "AutoControls.hrc" - - String STR_ENTER_CONNECTION_PASSWORD { Text [ en-US ] = "A password is needed to connect to the data source \"$name$\"."; diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index e14e55eb5b54..d775d797caf1 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -24,7 +24,6 @@ #include "dbu_dlg.hrc" #include "browserids.hxx" - #define STR_DBASE_HELPTEXT 28 #define STR_MSACCESS_HELPTEXT 29 #define STR_TEXT_HELPTEXT 30 @@ -74,7 +73,6 @@ #define STR_LDAP_DEFAULT 86 #define STR_PAGETITLE_MYSQL_NATIVE 87 - #define FT_LDAP_HELPTEXT 2 #define FT_MYSQL_HELPTEXT 3 #define FT_MYSQL_HEADERTEXT 4 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 3572bc20e2fb..cc4ed3808544 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -27,8 +27,6 @@ #define EDIT_HEIGHT 12 #define EDIT_X 101 - - ModalDialog DLG_DATABASE_WIZARD { OutputSize = TRUE ; @@ -64,7 +62,6 @@ ModalDialog DLG_DATABASE_WIZARD Text[ en-US ] = "Set up a connection to text files" ; }; - String STR_PAGETITLE_MSACCESS { Text[ en-US ] = "Set up Microsoft Access connection" ; @@ -126,7 +123,6 @@ String STR_DATABASEDEFAULTNAME Text[ en-US ] = "New Database" ; }; - TabPage PAGE_DBWIZARD_MYSQL_INTRO { HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO"; @@ -264,7 +260,6 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC Text [ en-US ] = "MySQL JDBC d~river class:"; }; - String STR_MYSQL_DEFAULT { Text[ en-US ] = "Default: 3306"; @@ -298,7 +293,6 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE }; }; - TabPage PAGE_DBWIZARD_DBASE { HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_DBASE"; @@ -422,7 +416,6 @@ TabPage PAGE_DBWIZARD_ADO AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL) }; - TabPage PAGE_DBWIZARD_ODBC { HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ODBC"; @@ -475,8 +468,6 @@ TabPage PAGE_DBWIZARD_JDBC AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS) }; - - TabPage PAGE_DBWIZARD_ORACLE { HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ORACLE"; @@ -506,7 +497,6 @@ TabPage PAGE_DBWIZARD_ORACLE AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS) }; - TabPage PAGE_DBWIZARD_SPREADSHEET { HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_SPREADSHEET"; @@ -530,7 +520,6 @@ TabPage PAGE_DBWIZARD_SPREADSHEET Text[ en-US ] = "~Location and file name" ; }; - CheckBox CB_SPREADSHEETPASSWORDREQUIRED { HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED ; diff --git a/dbaccess/source/ui/dlg/indexdialog.hrc b/dbaccess/source/ui/dlg/indexdialog.hrc index 6edd2d2b9222..7e1dcf77499e 100644 --- a/dbaccess/source/ui/dlg/indexdialog.hrc +++ b/dbaccess/source/ui/dlg/indexdialog.hrc @@ -20,7 +20,6 @@ #ifndef _DBAUI_INDEXDIALOG_HRC_ #define _DBAUI_INDEXDIALOG_HRC_ - #define CTR_INDEXLIST 1 #define CTR_FIELDS 2 diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc index 67ce488a61a5..e625f51154e0 100644 --- a/dbaccess/source/ui/dlg/paramdialog.hrc +++ b/dbaccess/source/ui/dlg/paramdialog.hrc @@ -28,7 +28,6 @@ #define BT_OK 7 #define BT_CANCEL 8 - #define STR_COULD_NOT_CONVERT_PARAM 1 #endif // _DBAUI_PARAMDIALOG_HRC_ diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index 3269c4bc99f3..a08629d45ee3 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -22,7 +22,6 @@ #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } - #define IL_TOOL_2 \ \ IdList = {\ @@ -36,7 +35,6 @@ 5;\ } - ImageList IMG_INDEX_DLG_SC { MASKCOLOR; @@ -75,10 +73,8 @@ Image IMG_TABLEFOLDER_TREE_L MASKCOLOR; }; - //= database object icons - // the whole database Image DATABASE_TREE_ICON @@ -87,7 +83,6 @@ Image DATABASE_TREE_ICON MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; - // tables and table folders Image TABLE_TREE_ICON @@ -102,7 +97,6 @@ Image TABLEFOLDER_TREE_ICON MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - // views Image VIEW_TREE_ICON @@ -111,7 +105,6 @@ Image VIEW_TREE_ICON MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - // queries and query folders Image QUERY_TREE_ICON @@ -126,7 +119,6 @@ Image QUERYFOLDER_TREE_ICON MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - // forms and form folders Image FORM_TREE_ICON @@ -141,7 +133,6 @@ Image FORMFOLDER_TREE_ICON MASKCOLOR; }; - // reports and report folders Image REPORT_TREE_ICON diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index 13cd58e9f43e..9065a06d62d0 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -41,7 +41,6 @@ #define INDENTED_X 6 #define INDENT_BELOW_RADIO 10 - #define STR_PARENTTITLE_GENERAL RID_STR_DLG_START + 0 // FREE // FREE diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index aa1c6bc52c9b..19f1ad3cfc8c 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -74,7 +74,6 @@ #define STR_QUERY_NATURAL_JOIN RID_STR_QRY_START + 52 // please adjust checking when inserting new strings - #if STR_QUERY_NATURAL_JOIN > RID_STR_QRY_END #error resource id overflow in #file, #line #endif diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 714d4b9f33dd..963fe36b8185 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -68,12 +68,10 @@ #define RID_STR_APP_START RID_STR_GEN_END #define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 - #if RID_STR_GEN_END > RID_DBACCESS_END #error Resource-Id Ueberlauf in #file, #line #endif - // dialog ids #define DLG_PARAMETERS RID_DIALOG_START + 5 @@ -134,14 +132,12 @@ #define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56 #define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57 - // error boxes #define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 #define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 #define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 - // query boxes #define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 @@ -159,7 +155,6 @@ #define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 #define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 - // images #define TABLE_TREE_ICON RID_IMAGE_START + 0 @@ -186,14 +181,11 @@ // free #define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55 - - // image lists #define IMG_JOINS RID_IMAGELIST_START + 0 #define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 #define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 - // menus #define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 @@ -210,15 +202,11 @@ #define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 #define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 - - - // controls #define RID_DB_TAB_EDITOR RID_CONTROL_START + 0 #define RID_MYSQL_NATIVE_SETTINGS RID_CONTROL_START + 1 - // strings #define STR_TBL_TITLE RID_STR_GEN_START #define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 @@ -268,13 +256,11 @@ #define STR_TITLE_RENAME RID_STR_GEN_START + 45 #define STR_TITLE_PASTE_AS RID_STR_GEN_START + 46 - // untyped resources #define RSC_CHARSETS RID_UNTYPED_START + 2 #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 - // various #define PB_FORMAT RID_MISC_START + 0 diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc index 86f2b8f83c25..4c4d3a0ae84c 100644 --- a/dbaccess/source/ui/inc/sbagrid.hrc +++ b/dbaccess/source/ui/inc/sbagrid.hrc @@ -24,7 +24,6 @@ // Tabelle #define SBA_WHICHID_START 100 - // Spalten // Formatierung #define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc index 5a03481d0edc..6aeaa14674dd 100644 --- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc +++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc @@ -23,43 +23,36 @@ Identifier = ID_BROWSER_REFRESH ; \ Text [ en-US ] = "Refresh"; \ - #define MID_NEW_VIEW_DESIGN \ Identifier = ID_NEW_VIEW_DESIGN; \ HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; \ Text [ en-US ] = "New ~View Design" ; \ - #define MID_NEW_TABLE_DESIGN \ Identifier = ID_NEW_TABLE_DESIGN; \ HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ; \ Text [ en-US ] = "New ~Table Design" ;\ - #define MID_QUERY_NEW_DESIGN \ Identifier = ID_NEW_QUERY_DESIGN; \ HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \ Text [ en-US ] = "New ~Query (Design View)" ; \ - #define MID_QUERY_NEW_SQL \ Identifier = ID_NEW_QUERY_SQL; \ HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \ Text [ en-US ] = "New Query (~SQL View)" ; \ - #define MID_DBUI_QUERY_EDIT_JOINCONNECTION \ Identifier = ID_QUERY_EDIT_JOINCONNECTION; \ HelpId = HID_QUERY_EDIT_JOINCONNECTION ; \ Text [ en-US ] = "Edit..."; \ - #define MID_COLUMN_WIDTH\ Identifier = ID_BROWSER_COLWIDTH ;\ HelpID = HID_BROWSER_COLUMNWIDTH ;\ Text [ en-US ] = "Column ~Width..." ;\ - #define MID_DOCUMENT_CREATE_REPWIZ\ Identifier = ID_DOCUMENT_CREATE_REPWIZ ;\ HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\ diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 6ac54ee83702..c4f8c3f46d61 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -182,7 +182,6 @@ Menu RID_SBA_RTF_PKEYPOPUP }; }; - TabPage TAB_WIZ_NAME_MATCHING { HelpID = "dbaccess:TabPage:TAB_WIZ_NAME_MATCHING"; diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index ce7eb3701649..9f334adea336 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -19,7 +19,6 @@ #include "dbu_misc.hrc" - Resource RSC_CHARSETS { String 1 diff --git a/dbaccess/source/ui/querydesign/Query.hrc b/dbaccess/source/ui/querydesign/Query.hrc index 54b1f86625a9..75e2c02b3f0d 100644 --- a/dbaccess/source/ui/querydesign/Query.hrc +++ b/dbaccess/source/ui/querydesign/Query.hrc @@ -22,7 +22,6 @@ #define IMG_PRIMARY_KEY 1 #define IMG_FOREIGN_KEY 2 - #endif // DBAUI_QUERY_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 89aa1b8fdea8..a62ba6ec8c34 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -256,8 +256,6 @@ ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK Message [ en-US ] = "[*] cannot be used as a sort criterion."; }; - - String STR_QRY_TOO_MANY_TABLES { Text [ en-US ] = "There are too many tables."; diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index 9246f22a008a..1036b212d35a 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -19,7 +19,6 @@ #include "desktop.hrc" - String STR_RECOVER_QUERY { Text [ en-US ] = "Should the file \"$1\" be restored?" ; diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 08d4b78c5e29..1ef23bc3ff07 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -132,7 +132,6 @@ #define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97) #define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98) - #define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101) #define RID_WARNINGBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+102) #define RID_WARNINGBOX_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103) diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src index ccddf40267f9..9e5a0288397f 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -49,7 +49,6 @@ String RID_CTX_ITEM_OPTIONS Text [ en-US ] = "~Options..."; }; - String RID_STR_ADDING_PACKAGES { Text [ en-US ] = "Adding %EXTENSION_NAME"; @@ -168,7 +167,6 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION "Click 'Cancel' to stop disabling the extension."; }; - String RID_STR_UNSUPPORTED_PLATFORM { Text [ en-US ] = "The extension '%Name' does not work on this computer."; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src index f1c3a425e231..ccb5c5334833 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src @@ -21,7 +21,6 @@ #include "dp_gui.hrc" - #define LOCAL_WIDTH (60 * RSC_BS_CHARWIDTH) #define LOCAL_LIST_HEIGHT (7 * RSC_BS_CHARHEIGHT) #define LOCAL_BUTTON_WIDTH 80 @@ -124,7 +123,6 @@ ModalDialog RID_DLG_UPDATEINSTALL { RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y); - Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); Text[en-US] = "OK"; }; @@ -158,7 +156,6 @@ ModalDialog RID_DLG_UPDATEINSTALL { Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); }; - String RID_DLG_UPDATE_INSTALL_INSTALLING { Text[en-US] = "Installing extensions..."; }; @@ -179,7 +176,6 @@ ModalDialog RID_DLG_UPDATEINSTALL { Text[en-US] = "The error message is: "; }; - String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION { Text[en-US] = "Error while installing extension %NAME. "; }; diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src index 3373a172da4e..e01a160d26dd 100644 --- a/desktop/source/deployment/manager/dp_manager.src +++ b/desktop/source/deployment/manager/dp_manager.src @@ -19,7 +19,6 @@ #include "dp_manager.hrc" - String RID_STR_COPYING_PACKAGE { Text [ en-US ] = "Copying: "; diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc index 0e910fadbffc..59cb6136c458 100644 --- a/desktop/source/deployment/registry/help/dp_help.hrc +++ b/desktop/source/deployment/registry/help/dp_help.hrc @@ -27,7 +27,6 @@ #define RID_STR_HELPPROCESSING_GENERAL_ERROR (RID_DEPLOYMENT_HELP_START+3) #define RID_STR_HELPPROCESSING_XMLPARSING_ERROR (RID_DEPLOYMENT_HELP_START+4) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src index 821206f2e232..47fe49f6cd7e 100644 --- a/desktop/source/deployment/unopkg/unopkg.src +++ b/desktop/source/deployment/unopkg/unopkg.src @@ -19,7 +19,6 @@ #include "deployment.hrc" - String RID_STR_UNOPKG_ACCEPT_LIC_1 { Text [ en-US ] = "Extension Software License Agreement of $NAME:"; diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src index eb4c248bf0dc..6355d142a17a 100644 --- a/editeng/source/editeng/editeng.src +++ b/editeng/source/editeng/editeng.src @@ -65,7 +65,6 @@ String RID_EDITUNDO_TRANSLITERATE Text [ en-US ] = "Change Case"; }; - Menu RID_MENU_SPELL { ItemList = @@ -109,7 +108,6 @@ Menu RID_MENU_SPELL }; }; - String RID_STR_WORD { Text [ en-US ] = "Word is %x"; diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src index 0cd0c086c403..e173867c5cf9 100644 --- a/editeng/source/items/svxitems.src +++ b/editeng/source/items/svxitems.src @@ -1072,4 +1072,3 @@ String RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index a203b4126165..36ec5bba52f5 100644 --- a/extensions/inc/extensio.hrc +++ b/extensions/inc/extensio.hrc @@ -21,7 +21,6 @@ #include <svl/solar.hrc> - // - resource id ranges #define RID_ABP_START ( RID_MORE_EXTENSIONS_START + 0 ) diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index d810755bab62..a6cd4c50512e 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -33,7 +33,6 @@ #define RID_QUERYBOX_START RID_ABP_START #define RID_BITMAP_START RID_ABP_START - // dialogs #define RID_DLG_ADDRESSBOOKSOURCEPILOT ( RID_DIALOG_START + 0 ) @@ -53,7 +52,6 @@ #define RID_STRING_END RID_STR_NOFIELDSASSIGNED - // error boxes #define RID_ERR_NEEDTYPESELECTION ( RID_ERRORBOX_START + 0 ) @@ -61,7 +59,6 @@ #define RID_ERRORBOX_END RID_ERR_NEEDTYPESELECTION - // query boxes #define RID_QRY_NOTABLES ( RID_QUERYBOX_START + 0 ) @@ -71,7 +68,6 @@ #define RID_QUERYBOX_END RID_QRY_NO_EVO_GW - // untyped resources #define RID_RSC_NOTUSEDYET ( RID_UNTYPED_START + 0 ) @@ -79,7 +75,6 @@ #define RID_UNTYPED_END RID_RSC_NOTUSEDYET - // bitmaps #define BMP_HEADERIMAGE ( RID_BITMAP_START + 0 ) @@ -87,8 +82,6 @@ #define RID_BITMAP_END BMP_HEADERIMAGE - - //= range checks #if RID_DIALOG_END > RID_ABP_END @@ -110,7 +103,6 @@ #error "please adjust the resource id ranges!!" #endif - // local resource ids #define FL_SEPARATOR 1 @@ -122,7 +114,6 @@ #define STR_MANUAL_FIELD_MAPPING 4 #define STR_FINAL_CONFIRM 5 - // some defines #define WINDOW_SIZE_X 240 #define WINDOW_SIZE_Y 185 diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index 48f9c334076c..a4ec8c7ff966 100644 --- a/extensions/source/abpilot/abspilot.src +++ b/extensions/source/abpilot/abspilot.src @@ -19,7 +19,6 @@ #include "abpresid.hrc" - ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT { Text [ en-US ] = "Address Book Data Source Wizard" ; @@ -65,7 +64,6 @@ ErrorBox RID_ERR_NEEDTYPESELECTION Message [ en-US ] = "Please select a type of address book."; }; - QueryBox RID_QRY_NOTABLES { Buttons = WB_YES_NO; @@ -74,7 +72,6 @@ QueryBox RID_QRY_NOTABLES Message [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; }; - QueryBox RID_QRY_NO_EVO_GW { Buttons = WB_YES_NO; @@ -83,7 +80,6 @@ QueryBox RID_QRY_NO_EVO_GW Message [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?"; }; - String RID_STR_DEFAULT_NAME { Text [ en-US ] = "Addresses"; @@ -114,7 +110,6 @@ String RID_STR_NOFIELDSASSIGNED Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\""; }; - Bitmap BMP_HEADERIMAGE { file = "addresspilot.bmp"; diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 7b2fd1016b60..cb9a7e22f2a2 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -80,7 +80,6 @@ #define ST_CUSTOM4 (RID_BIB_STRING + 35) #define ST_CUSTOM5 (RID_BIB_STRING + 36) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/datman.hrc b/extensions/source/bibliography/datman.hrc index b7515baafca4..0b938438329b 100644 --- a/extensions/source/bibliography/datman.hrc +++ b/extensions/source/bibliography/datman.hrc @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define BT_OK 1 #define BT_CANCEL 2 #define BT_HELP 3 diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index eccf57b20bc3..0aad843de951 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -23,7 +23,6 @@ #include "dbpilots.hrc" #include "extensio.hrc" - // basics #define RID_DIALOG_START RID_DBP_START @@ -31,7 +30,6 @@ #define RID_STRING_START RID_DBP_START #define RID_ERRORBOX_START RID_DBP_START - // strings #define RID_STR_GROUPWIZ_DBFIELD (RID_STRING_START + 1 ) @@ -48,7 +46,6 @@ // please adjust RID_STRING_END (below) when adding new strings #define RID_STRING_END RID_STR_TIMEPOSTFIX - // dialogs #define RID_DLG_GROUPBOXWIZARD ( RID_DIALOG_START + 1 ) @@ -58,7 +55,6 @@ // please adjust RID_DIALOG_END (below) when adding new dialogs #define RID_DIALOG_END RID_DLG_GRIDWIZARD - // tab pages #define RID_PAGE_TABLESELECTION ( RID_PAGE_START + 1 ) @@ -76,7 +72,6 @@ // please adjust RID_PAGE_END (below) when adding new tab pages #define RID_PAGE_END RID_PAGE_GW_FIELDSELECTION - // ErrorBox #define RID_ERR_INVALID_FORM_CONNECTION ( RID_ERRORBOX_START + 1 ) @@ -84,9 +79,6 @@ // please adjust RID_ERRORBOX_END (below) when adding new error boxes #define RID_ERRORBOX_END RID_ERR_INVALID_FORM_CONNECTION - - - //= range checks #if RID_STRING_END > RID_DBP_END @@ -102,10 +94,8 @@ #error "please adjust the resource id ranges!!" #endif - // local ids - // FixedLine #define FL_DATA 1 @@ -116,7 +106,6 @@ #define FL_FRAME 6 #define FL_FORMSETINGS 7 - // FixedText #define FT_DATASOURCE 1 @@ -147,7 +136,6 @@ #define FT_FORMCONTENTTYPELABEL 26 #define FT_FORMCONTENTTYPE 27 - // ListBox #define LB_DATASOURCE 1 @@ -160,7 +148,6 @@ #define LB_EXISTING_FIELDS 7 #define LB_SELECTED_FIELDS 8 - // Edit #define ET_RADIOLABELS 1 @@ -168,7 +155,6 @@ #define ET_NAMEIT 3 #define ET_DISPLAYEDFIELD 4 - // PushButton #define PB_MOVETORIGHT 1 @@ -179,7 +165,6 @@ #define PB_ALLFIELDSLEFT 6 #define PB_FORMDATASOURCE 7 - // RadioButton #define RB_DEFSELECTION_YES 1 @@ -187,25 +172,21 @@ #define RB_STOREINFIELD_YES 3 #define RB_STOREINFIELD_NO 4 - // ComboBox #define CMB_VALUELISTFIELD 1 #define CMB_TABLEFIELD 2 - // String #define STR_FIELDINFO_LISTBOX 1 #define STR_FIELDINFO_COMBOBOX 2 - // Image #define IMG_TABLE 1 #define IMG_QUERY 3 - #define WINDOW_SIZE_X 260 #define WINDOW_SIZE_Y 185 #define WINDOW_HALF_SIZE_X ( WINDOW_SIZE_X / 2 ) @@ -216,8 +197,6 @@ #define ITEM_BUTTON_SIZE_X 20 #define ITEM_BUTTON_SIZE_Y 12 - - #endif // _EXTENSIONS_DBP_DBPRESID_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index befc4fc3911e..b892c119f3a4 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -22,7 +22,6 @@ #include "propresid.hrc" - // - Strings #define RID_STR_FORMS ( RID_FORMBROWSER_START + 1 ) @@ -268,13 +267,10 @@ #define RID_STR_SCROLL_TOP ( RID_FORMBROWSER_START + 258 ) #define RID_STR_SCROLL_LEFT ( RID_FORMBROWSER_START + 259 ) - - // - message strings #define RID_STR_CONFIRM_DELETE_DATA_TYPE ( RID_FORMBROWSER_START + 500 ) - // - dialogs #define RID_DLG_SELECTLABELCONTROL ( RID_PROPCONTROLLER_START + 0 ) @@ -282,12 +278,10 @@ #define RID_DLG_FORMLINKS ( RID_PROPCONTROLLER_START + 2 ) #define RID_DLG_SELECTION ( RID_PROPCONTROLLER_START + 3 ) - // - ImageLists #define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 ) - // - untyped resources #define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 ) @@ -324,14 +318,12 @@ #define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 ) #define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 ) - // - ImageList - local ids // HACK HACK HACK // as long as we have no real property browser, but this outsourcing only, // we do not duplicate images. Instead we do some hard coding for the image ids - #define RID_SVXIMG_CONTROL 10144 #define RID_SVXIMG_BUTTON 10594 #define RID_SVXIMG_RADIOBUTTON 10595 @@ -361,7 +353,6 @@ #define RID_SVXIMG_SPINBUTTON 10769 #define RID_SVXIMG_NAVIGATIONBAR 10607 - #endif // _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc index fd378c763774..d4548649a7f9 100644 --- a/extensions/source/propctrlr/propresid.hrc +++ b/extensions/source/propctrlr/propresid.hrc @@ -26,10 +26,8 @@ // arbitrary at the moment #define RID_FORMBROWSER_START RID_PROPCONTROLLER_START + 2000 - // - Strings - #define RID_STR_STANDARD ( RID_PROPCONTROLLER_START + 0 ) #define RID_STR_PROPPAGE_DEFAULT ( RID_PROPCONTROLLER_START + 1 ) #define RID_STR_PROPPAGE_DATA ( RID_PROPCONTROLLER_START + 2 ) diff --git a/filter/source/graphicfilter/eps/epsstr.src b/filter/source/graphicfilter/eps/epsstr.src index 2c0e2fc57695..2a1139514450 100644 --- a/filter/source/graphicfilter/eps/epsstr.src +++ b/filter/source/graphicfilter/eps/epsstr.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "strings.hrc" String KEY_VERSION_CHECK diff --git a/filter/source/pdf/pdf.src b/filter/source/pdf/pdf.src index 3aedc330ffd8..bf491d31856c 100644 --- a/filter/source/pdf/pdf.src +++ b/filter/source/pdf/pdf.src @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "pdf.hrc" String PDF_PROGRESS_BAR diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.src b/filter/source/xsltdialog/xmlfilterdialogstrings.src index c5a694a33876..af886465f1df 100644 --- a/filter/source/xsltdialog/xmlfilterdialogstrings.src +++ b/filter/source/xsltdialog/xmlfilterdialogstrings.src @@ -19,7 +19,6 @@ #include "xmlfilterdialogstrings.hrc" - String STR_COLUMN_HEADER_NAME { Text [ en-US ] = "Name"; diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc index 2275f445988e..86a976b916e8 100644 --- a/forms/source/inc/frm_resource.hrc +++ b/forms/source/inc/frm_resource.hrc @@ -22,10 +22,8 @@ #include <svl/solar.hrc> - #define RID_FRM_STRINGS_START RID_FORMLAYER_START - //- String-IDs #define RID_BASELISTBOX_ERROR_FILLLIST ( RID_FRM_STRINGS_START + 0 ) #define RID_STR_IMPORT_GRAPHIC ( RID_FRM_STRINGS_START + 1 ) diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index 7820fd65ae01..c924aab7102c 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -22,11 +22,9 @@ #include <rtl/ustring.hxx> #include "frm_strings.hxx" - namespace frm { - // PropertyId's, welche eine Zuordnung zu einen PropertyName haben #define PROPERTY_ID_START 0 @@ -297,11 +295,8 @@ namespace frm // start ID fuer aggregierte Properties #define PROPERTY_ID_AGGREGATE_ID (PROPERTY_ID_START + 10000) - } - - #endif // _FRM_PROPERTY_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/resource/strings.src b/forms/source/resource/strings.src index 4df1bd7933ee..3a252c7d78ab 100644 --- a/forms/source/resource/strings.src +++ b/forms/source/resource/strings.src @@ -94,7 +94,6 @@ String RID_STR_CLEAR_GRAPHICS Text [ en-US ] = "Remove Image"; }; - String RID_STR_INVALIDSTREAM { Text [ en-US ] = "The given stream is invalid."; diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src index e223e619ac5d..b878f21c7ed8 100644 --- a/forms/source/resource/xforms.src +++ b/forms/source/resource/xforms.src @@ -19,7 +19,6 @@ #include "frm_resource.hrc" - String RID_STR_XFORMS_NO_BINDING_EXPRESSION { Text [ en-US ] = "Please enter a binding expression."; diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index b824f05cd9bc..444c2742643a 100644 --- a/formula/source/core/inc/core_resource.hrc +++ b/formula/source/core/inc/core_resource.hrc @@ -22,18 +22,15 @@ #include <svl/solar.hrc> - #define RID_CORE_STRINGS_START RID_FORMULA_START #define RID_CORE_OTHER_START RID_FORMULA_START - //- String-IDs #define RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF (RID_CORE_OTHER_START + 0) #define RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML (RID_CORE_OTHER_START + 1) #define RID_STRLIST_FUNCTION_NAMES_ENGLISH (RID_CORE_OTHER_START + 2) #define RID_STRLIST_FUNCTION_NAMES (RID_CORE_OTHER_START + 3) - #endif // _FORMULA_CORE_RESOURCE_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc index 8075948714c8..8a4c92def14b 100644 --- a/formula/source/ui/dlg/formdlgs.hrc +++ b/formula/source/ui/dlg/formdlgs.hrc @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define FT_RESULT 1 #define WND_RESULT 2 #define FT_EDITNAME 3 diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index f7aae91eed81..c7f268c3ea68 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -21,7 +21,6 @@ #include "ForResId.hrc" #include "helpids.hrc" - #define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } TabPage RID_FORMULATAB_FUNCTION @@ -447,7 +446,6 @@ ModelessDialog RID_FORMULADLG_FORMULA }; }; - Image RID_BMP_REFBTN1 { ImageBitmap = Bitmap diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src index 5b282799868c..6ccda7a8cc37 100644 --- a/formula/source/ui/dlg/parawin.src +++ b/formula/source/ui/dlg/parawin.src @@ -23,7 +23,6 @@ #define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } - #define FT_ARGBLOCK( y ) \ Pos = MAP_APPFONT (6 , y ) ; \ Size = MAP_APPFONT ( 74 , 8 ) ; \ @@ -54,8 +53,6 @@ TabStop = FALSE ; \ QuickHelpText [ en-US ] = "Select"; \ - - // jetzt alles zusammen TabPage RID_FORMULATAB_PARAMETER diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 853114bc58ce..07fedcf4935c 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -54,8 +54,6 @@ #define RID_FORMULATAB_PARAMETER (RID_PAGE_START + 3) #define RID_FORMULADLG_FORMULA_MODAL (RID_PAGE_START + 4) - - #endif // FORMULA_FORRESID_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc index bdc9455c04c6..c3df806dda72 100644 --- a/fpicker/source/office/OfficeFilePicker.hrc +++ b/fpicker/source/office/OfficeFilePicker.hrc @@ -20,6 +20,5 @@ #define RID_FILEOPEN_NOTEXISTENTFILE (RID_FPICKER_START+24) #define STR_SVT_NOREMOVABLEDEVICE (RID_FPICKER_START+25) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index c2ae61eae7fb..0a814d25b9d3 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -55,7 +55,6 @@ #define BTN_EXPLORERFILE_CONNECT_TO_SERVER 51 #define EXPLORERFILE_SPLITTER 52 - #define STR_EXPLORERFILE_OPEN 1 #define STR_EXPLORERFILE_SAVE 2 #define STR_EXPLORERFILE_BUTTONSAVE 3 diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index 880461787e37..793c7e6501fd 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -138,7 +138,6 @@ #define SID_ATTR_BRUSH ( SID_EDIT_START + 3 ) #define SID_ATTR_BRUSH_CHAR ( SID_EDIT_START + 4 ) - #define SID_FIELD ( SID_EDIT_START + 7 ) #define SID_ATTR_FRAMEDIRECTION ( SID_EDIT_START + 8 ) #define SID_ATTR_PARA ( SID_EDIT_START + 9 ) diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc index a17f5a0790bb..014c9f9a40b1 100644 --- a/include/editeng/editrids.hrc +++ b/include/editeng/editrids.hrc @@ -329,7 +329,6 @@ #define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286) #define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287) - #define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_EDIT_START + 288) #define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_EDIT_START + 289) diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc index 28a831a14c5c..1e9e623a8466 100644 --- a/include/editeng/memberids.hrc +++ b/include/editeng/memberids.hrc @@ -33,7 +33,6 @@ #define MID_LINESPACE 0x3b #define MID_LINE_STYLE 0x90 - //NameOrIndex #define MID_NAME 16 #define MID_GRAFURL 32 diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 6d642ae2d190..bd1ad39d7c23 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -485,7 +485,6 @@ #define SC_OPCODE_NONE 0xFFFF - #endif /* FORMULA_COMPILER_HRC */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index ad533aa26641..4c529946a5a9 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -27,8 +27,6 @@ #define RID_GROUPS_SFXOFFSET 32700 #define RID_GROUPS_END 32767 - - #define EVENT_SFX_START 5000 // EVENT_SFX_END 9999 @@ -74,14 +72,11 @@ #define SFX_EVENT_SAVEDOCFAILED (EVENT_SFX_START + 28) #define SFX_EVENT_SAVETODOCFAILED (EVENT_SFX_START + 29) - // Events for Controls etc. #define SFX_EVENT_MOUSEOVER_OBJECT ( EVENT_SFX_START + 100 ) #define SFX_EVENT_MOUSECLICK_OBJECT ( EVENT_SFX_START + 101 ) #define SFX_EVENT_MOUSEOUT_OBJECT ( EVENT_SFX_START + 102 ) - - #define RID_SFX_APP_START (RID_SFX_START + 256) #define RID_SFX_MENU_START (RID_SFX_START + 768) // RID_SFX_CONFIG_START (RID_SFX_START + 1536) @@ -100,8 +95,6 @@ // RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) // RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) - - #define SFX_OBJECTBAR_APPLICATION 0 #define SFX_OBJECTBAR_OBJECT 1 #define SFX_OBJECTBAR_TOOLS 2 @@ -115,7 +108,6 @@ // temporary due to compatibility - #define MSG_QUERY_LASTVERSION RID_SFX_START #define RID_APPLICATION RID_SFX_START @@ -128,8 +120,6 @@ #define RID_APPTITLE (RID_SFX_START+4) - - #define DLG_STYLE_DESIGNER (RID_SFX_START+8) #define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216) @@ -155,7 +145,6 @@ #define STR_MB (RID_SFX_START+113) #define STR_GB (RID_SFX_START+114) - #define STR_STANDARD_SHORTCUT (RID_SFX_START+117) #define STR_REPAIREDDOCUMENT (RID_SFX_START+118) #define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119) @@ -181,14 +170,11 @@ #define SFX_FILE_THUMBNAIL_MATH (RID_SFX_START+167) #define SFX_FILE_THUMBNAIL_DEFAULT (RID_SFX_START+168) - - // group ids // !! If you add a new group, please change sfxbasecontroller.cxx and // !! com.sun.star.frame.CommandGroup accordingly! - #define GID_INTERN (RID_GROUPS_SFXOFFSET+ 0) #define GID_APPLICATION (RID_GROUPS_SFXOFFSET+ 1) #define GID_DOCUMENT (RID_GROUPS_SFXOFFSET+ 2) @@ -217,8 +203,6 @@ #define GID_CONTROLS (RID_GROUPS_SFXOFFSET+25) #define GID_NAVIGATION (RID_GROUPS_SFXOFFSET+26) - - #define RID_OPTIONS_START (SID_LIB_START + 2000) // RID_OPTIONS_END (RID_OPTIONS_START + 100) diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 17381b3baecb..1257b580f59b 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -27,7 +27,6 @@ // Changing just one part here doesn't add new // docking windows automatically! - #define SID_DOCKWIN_0 SID_DOCKWIN_START #define SID_DOCKWIN_1 SID_DOCKWIN_START+1 #define SID_DOCKWIN_2 SID_DOCKWIN_START+2 @@ -39,12 +38,8 @@ #define SID_DOCKWIN_8 SID_DOCKWIN_START+8 #define SID_DOCKWIN_9 SID_DOCKWIN_START+9 - - #define SID_UNKNOWN SID_SFX_START - - // default-ids for application #define SID_QUITAPP (SID_SFX_START + 300) #define SID_ABOUT (SID_SFX_START + 301) @@ -286,7 +281,6 @@ // SID_SFX_free_START (SID_SFX_START + 1728) // SID_SFX_free_END (SID_SFX_START + 3999) - #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) // FREE, was SID_VIEW_ZOOM_MODE // FREE, was SID_VIEW_POS_SIZE @@ -538,7 +532,6 @@ #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87) #define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88) - // PathTabPage #define SID_ATTR_PATHGROUP (SID_OPTIONS_START + 10) #define SID_ATTR_PATHNAME (SID_OPTIONS_START + 11) @@ -703,8 +696,6 @@ #define ID_VAL_ZOOM (SID_SD_START+234) #define SID_SIZE_OPTIMAL (SID_SD_START+99) - - #define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL) #define SID_ZOOM_ENTIRE_PAGE (SID_SIZE_PAGE) #define SID_ZOOM_PAGE_WIDTH (SID_SVX_START + 1420) @@ -714,8 +705,6 @@ #define SID_ZOOM_150_PERCENT (SID_SVX_START + 1423) #define SID_ZOOM_200_PERCENT (SID_SVX_START + 1424) - - // SfxScriptOrganizerItem #define MID_SCRIPT_ORGANIZER_LANGUAGE 1 // Don't use zero for MID's. It's forbidden to do it! @@ -725,12 +714,10 @@ #define FN_XFORMS_INIT (SID_SW_START + 1053) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) - #define SID_RESTORE_EDITING_VIEW (SID_SFX_START + 1663) #endif // #ifndef _SFXSIDS_HRC - // SfxSecurityPage related stuff #define FN_EDIT2 (SID_SW_START + 1800) diff --git a/include/svl/memberid.hrc b/include/svl/memberid.hrc index 4d501b5ae2ab..ef5639523e8e 100644 --- a/include/svl/memberid.hrc +++ b/include/svl/memberid.hrc @@ -20,7 +20,6 @@ #ifndef _MEMBERID_HRC #define _MEMBERID_HRC - #define MID_X 1 #define MID_Y 2 #define MID_RECT_LEFT 3 @@ -55,7 +54,6 @@ #define MID_SEARCH_TRANSLITERATEFLAGS 18 #define MID_SEARCH_COMMAND 19 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hrc index 0bacbbff1bae..6f624343da6a 100644 --- a/include/svtools/controldims.hrc +++ b/include/svtools/controldims.hrc @@ -20,7 +20,6 @@ #ifndef _SVT_CONTROLDIMS_HRC_ #define _SVT_CONTROLDIMS_HRC_ - // From: Dialogue Specification and Guidelines - Visual Design V1.3 // by Christian Jansen diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index 83ecedb860d2..64a4e7437983 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -24,7 +24,6 @@ #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) - // various unsorted stuff #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) @@ -251,21 +250,16 @@ #define STR_LOGICAL_FIELD_NAMES (STR_SVT_ADDRESSTEMPLATE_START+32) #define STR_SVT_ADDRESSTEMPLATE_END (STR_LOGICAL_FIELD_NAMES) - - - // dialogs #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) - // bitmaps #define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3) #define BMP_LIST_ADD (RID_SVTOOLS_BITMAP_START + 4) - // image lists #define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1) @@ -284,7 +278,6 @@ #define WARNINGBOX_INVALIDJAVASETTINGS_MAC (RID_SVTOOLS_START+25) #define ERRORBOX_JVMCREATIONFAILED_MAC (RID_SVTOOLS_START+26) - // images #define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0) #define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1) diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index f35a97f1ed96..27562670edf6 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -87,7 +87,6 @@ #define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) #define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) - // why extra defines for pages that already exist? #define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) #define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) @@ -136,8 +135,6 @@ #define SID_SD_TP_MISC (RID_OFA_START + 231) #define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) - - // ResId's fuer Dialoge aus StarDraw #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) @@ -284,7 +281,6 @@ #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 248) - // Close (in TabDialog line/aria) #define RID_SVXSTR_CLOSE (RID_SVX_START + 260) @@ -371,7 +367,6 @@ #define RID_SVXSTR_GRAFMODE_MONO (RID_SVX_START + 522) #define RID_SVXSTR_GRAFMODE_WATERMARK (RID_SVX_START + 523) - // Strings for Plugin-Filedialog #define STR_INSERT_VIDEO_EXTFILTER_IVF (RID_SVX_START + 524) #define STR_INSERT_VIDEO_EXTFILTER_AVI (RID_SVX_START + 525) @@ -991,7 +986,6 @@ // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!! #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1271) - // if we have _a_lot_ time, we should group the resource ids by type, instead // of grouping them by semantics. The reason is that resource ids have to be // unique relative to a fixed type (you can't have two dialogs with the same @@ -1000,14 +994,10 @@ // I suggest sticking to per-type ids instead of per-semantic ids, this is // better maintainable (IMO), and does not waste that much ids - // "Window" resource ids - - // "ModalDialog" resource ids - // "Menu" resource ids #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) @@ -1021,8 +1011,6 @@ #define RID_SVXPAGE_DOCRECOVERY_SAVE ( RID_SVX_START + 8 ) #define RID_SVXPAGE_DOCRECOVERY_RECOVER ( RID_SVX_START + 9 ) - - // !!!! double defined ID's (see below) !!! #define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc index 2b20fdf3bd42..90ef6975ca89 100644 --- a/include/svx/svdstr.hrc +++ b/include/svx/svdstr.hrc @@ -323,12 +323,10 @@ #define STR_UndoObjDescription (STR_UndoBegin +18) #define STR_UndoEnd (STR_UndoObjDescription) - #define STR_LayerBegin (STR_UndoEnd+1) #define STR_StandardLayerName (STR_LayerBegin +0) #define STR_LayerEnd (STR_StandardLayerName) - #define STR_ItemBegin (STR_LayerEnd+1) #define STR_ItemValBegin (STR_ItemBegin) #define STR_ItemValON (STR_ItemValBegin + 0) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index ec38491ea821..cec1a0ee9f14 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -32,10 +32,8 @@ #undef SID_INSERT_FRAME #endif - // Member-Id's - #define MID_APPFLAG 0x20 #define MID_AUTOBREAK 0x21 #define MID_BREAKxxx 0x22 @@ -90,15 +88,12 @@ // Event-Id's Block 2 - #define SVX_EVENT_IMAGE_LOAD (SID_LIB_START) #define SVX_EVENT_IMAGE_ABORT (SID_LIB_START + 1) #define SVX_EVENT_IMAGE_ERROR (SID_LIB_START + 2) - // Function-Id's - // Function-Id's #define FID_SVX_START (SID_LIB_START + 500) @@ -111,20 +106,16 @@ #define FID_SEARCH_SEARCHSET (FID_SVX_START + 4) #define FID_SEARCH_REPLACESET (FID_SVX_START + 5) - // SFX-Id's - #define SID_POLY_MERGE (SID_SFX_START + 679) #define SID_POLY_SUBSTRACT (SID_SFX_START + 680) #define SID_POLY_INTERSECT (SID_SFX_START + 681) #define SID_POLY_FORMEN (SID_SFX_START + 682) #define SID_DISTRIBUTE_DLG (SID_SFX_START + 683) - // Basic IDE-Id's - #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) #define SID_BASICIDE_CHOOSEMACRO ( SID_BASICIDE_START + 2 ) @@ -167,18 +158,14 @@ #define SID_BASICIDE_IMAGESTART ( SID_BASICIDE_START + 50 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) - // StarBase-Id's - #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // Daten in Felder #define SID_SBA_BRW_INSERT (SID_SBA_START+101) // Daten in Text #define SID_SBA_BRW_MERGE (SID_SBA_START+102) // Serienbrief - // SD-Id's - #define SID_RULER (SID_SD_START+40) #define SID_BEZIER_CONVERT (SID_SD_START+65) #define SID_BEZIER_ELIMINATE_POINTS (SID_SD_START+30) @@ -225,7 +212,6 @@ #define ID_VAL_USELASTCOLUMNSTYLE (SID_SD_START+327) #define ID_VAL_USEBANDINGCOLUMNSTYLE (SID_SD_START+328) - // Writer-Id's #define FN_EDIT (SID_SW_START + 100) @@ -260,13 +246,11 @@ #define FN_PGPREVIEW (SID_SW_START + 1250) #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) - // Svx-Id's // When adding new entries here, note that other SID_SVX_START entries exist in // include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the // same id for two different attributes - // CAUTION! Range <1 .. 22> used by EditEngine (!) #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) @@ -1021,10 +1005,8 @@ // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id #define SID_SVX_FIRSTFREE (SID_OFFER_IMPORT + 1) - // Overflow check for slot IDs - #if SID_SVX_FIRSTFREE > SID_SVX_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc index 44a68ebdbd9f..aa46f5757957 100644 --- a/include/svx/svxitems.hrc +++ b/include/svx/svxitems.hrc @@ -111,7 +111,6 @@ #error Resource-Ueberlauf in #line, #file #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/fpicker.hrc b/include/vcl/fpicker.hrc index 01f6fd0fe921..387b38981f85 100644 --- a/include/vcl/fpicker.hrc +++ b/include/vcl/fpicker.hrc @@ -28,6 +28,5 @@ #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION (STR_SVT_FILEPICKER_START+13) #define STR_SVT_ALREADYEXISTOVERWRITE (STR_SVT_FILEPICKER_START+14) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 4272840368e8..160d0347bc0c 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -121,7 +121,6 @@ #define STR_TRANSPARENT ( RID_STRING_START + 68 ) #define RID_STR_FIELDSELECTION ( RID_STRING_START + 69 ) - #define RID_STR_UNDO_ADD_GROUP_HEADER ( RID_STRING_START + 70 ) #define RID_STR_UNDO_REMOVE_GROUP_HEADER ( RID_STRING_START + 71 ) #define RID_STR_UNDO_ADD_GROUP_FOOTER ( RID_STRING_START + 72 ) @@ -219,7 +218,6 @@ #define RID_STR_VERTICALALIGN (RID_STRING_START + 160) #define RID_STR_PARAADJUST (RID_STRING_START + 161) - #define RID_IMG_TREENODE_COLLAPSED ( RID_IMAGE_START + 1 ) #define RID_IMG_TREENODE_EXPANDED ( RID_IMAGE_START + 2 ) #define REPORT_TREE_ICON ( RID_IMAGE_START + 5 ) diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index 99610d856995..ead77509b5dd 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_resource.hrc @@ -22,10 +22,8 @@ #include <svl/solar.hrc> - #define RID_CORE_STRINGS_START RID_RPT_START - //- String-IDs #define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) #define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) @@ -44,7 +42,6 @@ #define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) #define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) - #endif // REPORTDESIGN_CORE_RESOURCE_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc index bc9a4dd8bd4e..f8e6c0708637 100644 --- a/reportdesign/source/inc/stringconstants.hrc +++ b/reportdesign/source/inc/stringconstants.hrc @@ -24,10 +24,8 @@ #error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!" #endif - //= service names - #define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText" #define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField" #define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl" @@ -42,7 +40,6 @@ //= property names - #define PROPERTY_VISIBLE "Visible" #define PROPERTY_NAME "Name" #define PROPERTY_HEIGHT "Height" diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc index 456544487905..ab0082a40dc1 100644 --- a/reportdesign/source/inc/xmlstrings.hrc +++ b/reportdesign/source/inc/xmlstrings.hrc @@ -25,7 +25,6 @@ #include "stringconstants.hrc" #undef STRINGCONSTANTS_INCLUDED_INDIRECT - //= XML #define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter" diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 6b756580dbad..688d27959636 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -260,7 +260,6 @@ String STR_TRANSPARENT #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } - ImageList IMG_CONDFORMAT_DLG_SC { MASKCOLOR; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc index 0700f5251f57..64d6d3bd4d72 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.hrc +++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc @@ -40,7 +40,6 @@ #define FL_SEPARATOR3 (23) #define TB_TOOLBOX (27) - #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 #define FIXEDTEXT_WIDTH 60 diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 870356fe3569..63f4086dee03 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -22,7 +22,6 @@ #include <svx/globlmn.hrc> #include <svx/svxids.hrc> - FloatingWindow RID_GROUPS_SORTING { OutputSize = TRUE ; @@ -358,7 +357,6 @@ Menu RID_GROUPSROWPOPUPMENU }; }; - #define DEF_MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } #define DEF_IL_GROUPSORT \ diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index a89be1e3bc7d..616984b7345b 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -41,7 +41,6 @@ String RID_STR_CLASS_FORMATTEDFIELD Text = "FormattedField" ; }; - // Property Browser Headline ---------------------------------------------------------------- String RID_STR_BRWTITLE_PROPERTIES @@ -94,7 +93,6 @@ String RID_STR_PROPTITLE_GROUP Text [ en-US ] = "Group"; }; - Image RID_IMG_TREENODE_COLLAPSED { ImageBitmap = Bitmap { File = "plus.png"; } ; diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 43bda66ddcb8..d350aad3466d 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -273,7 +273,6 @@ // functions - #define SID_OPEN_CALC (SC_FUNCTION_START + 4) #define FILE_MENU_END (SC_FUNCTION_START + 20) @@ -477,7 +476,6 @@ #define SID_DELETE_NOTE (SID_API_SLOTS+2) - #define SID_PREVIEW_START (SID_API_SLOTS+20) #define SID_PREVIEW_NEXT (SID_PREVIEW_START) #define SID_PREVIEW_PREVIOUS (SID_PREVIEW_START+1) @@ -746,7 +744,6 @@ #define SCSTR_SHOWTABLE (STR_START + 20) #define SCSTR_HIDDENTABLES (STR_START + 21) - #define SCSTR_TABLE (STR_START + 24) #define SCSTR_NAME (STR_START + 25) #define SCSTR_INSTABLE (STR_START + 26) diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src index 924e507c4f72..702f54f1b6db 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src +++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src @@ -300,7 +300,6 @@ Resource RID_STATISTICS_DLGS Text [ en-US ] = "Variable 2"; }; - /*F Test */ String STR_FTEST_OBSERVATIONS_LABEL { diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index d2c08c0389f6..14a42ae79afb 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -37,8 +37,6 @@ StringArray SCSTR_DPFUNCLISTBOX }; }; - - ModalDialog RID_SCDLG_DPSHOWDETAIL { OutputSize = TRUE; @@ -85,6 +83,4 @@ ModalDialog RID_SCDLG_DPSHOWDETAIL Text [ en-US ] = "Show Detail"; }; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index fae81bf2b1d4..d72234ec988f 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -153,7 +153,6 @@ };\ }; - // Popup-Menues --------------------------------------------------------------------- String RID_POPUP_DRAWFORM @@ -175,7 +174,6 @@ Menu RID_POPUP_DRAWFORM MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MenuItem { ITEM_FORM_CONTROL_PROPERTIES }; diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 8ae856d4cb3a..1981bb1e067d 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -364,10 +364,6 @@ };\ }; - - - - // Objekt-Leisten String RID_DRAW_OBJECTBAR @@ -413,7 +409,6 @@ Menu RID_POPUP_DRAW MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MN_MIRRORSUB @@ -447,10 +442,8 @@ Menu RID_POPUP_DRAW }; }; - // Popup-Menue fuer (Uno-) Controls - Menu RID_POPUP_CONTROL { ItemList = @@ -463,7 +456,6 @@ Menu RID_POPUP_CONTROL MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MenuItem { ITEM_FORM_CONTROL_PROPERTIES }; @@ -481,10 +473,8 @@ Menu RID_POPUP_CONTROL }; }; - // Grafik - Menu RID_POPUP_GRAPHIC { ItemList = @@ -501,7 +491,6 @@ Menu RID_POPUP_GRAPHIC MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MN_MIRRORSUB @@ -524,10 +513,8 @@ Menu RID_POPUP_GRAPHIC }; }; - // Media - Menu RID_POPUP_MEDIA { ItemList = @@ -540,7 +527,6 @@ Menu RID_POPUP_MEDIA MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MN_MIRRORSUB @@ -554,10 +540,8 @@ Menu RID_POPUP_MEDIA }; }; - // Ole-Objekt - Menu RID_POPUP_OLE { ItemList = @@ -577,7 +561,6 @@ Menu RID_POPUP_OLE MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MN_ARRANGESUB @@ -590,10 +573,8 @@ Menu RID_POPUP_OLE }; }; - // Charts - Menu RID_POPUP_CHART { ItemList = @@ -613,7 +594,6 @@ Menu RID_POPUP_CHART MN_RENAME_OBJECT //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; MN_ARRANGESUB @@ -632,10 +612,8 @@ Menu RID_POPUP_CHART }; }; - // PopUpDraw Text - String RID_POPUP_DRAWTEXT { Text [ en-US ] = "Pop-up menu for text objects" ; diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index b8df46eea585..67fdbe365f3b 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sc.hrc" // -> RID_SCPAGE_AREAS - // TabPage: Tabelle #define IMG_LEFTRIGHT (SC_DIALOGS_START + 43 + 23) diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index cc257a227246..56d571ad18e5 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -29,5 +29,4 @@ Image IMG_TOPDOWN MaskColor = STD_MASKCOLOR; }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src index 91723cdd5a70..569171f0ca01 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src @@ -27,7 +27,6 @@ #define TOOLBOX_BORDER_WIDTH 107 #define POPUPPANEL_MARGIN_SMALL_PIXEL 8 - Image IMG_CELL_BORDER { ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";}; @@ -69,7 +68,6 @@ Image IMG_LINE_STYLE9 ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";}; }; - // fill color popup Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR @@ -95,7 +93,6 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR }; }; - // line color popup Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR @@ -116,7 +113,6 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR }; }; - // cell line style popup Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE @@ -152,7 +148,6 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE }; }; - // cell border style popup Control RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index 9c3c3921b4c4..91c45393f9fb 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -18,8 +18,6 @@ */ #include "sc.hrc" - - #define PART1 \ MenuItem\ {\ @@ -28,7 +26,6 @@ Text [ en-US ] = "~Format Cells..." ; \ }; - #define PART2 \ MenuItem\ {\ @@ -49,8 +46,6 @@ Text [ en-US ] = "~Paste" ; \ }; - - Menu RID_POPUP_ROWHEADER { ItemList = @@ -120,8 +115,6 @@ Menu RID_POPUP_ROWHEADER }; }; - - Menu RID_POPUP_COLHEADER { ItemList = diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index 1a7d0d5380ed..384b783e02a9 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -20,7 +20,6 @@ #include "sc.hrc" #include <svx/globlmn.hrc> - // Popup-Menues ---------------------------------------------------------------- String RID_POPUP_CELLS @@ -110,7 +109,6 @@ Menu RID_POPUP_CELLS MenuItem { Separator = TRUE ; }; - MenuItem { Identifier = SID_CUT ; @@ -349,7 +347,6 @@ Menu RID_POPUP_PREVIEW }; }; - String RID_POPUP_EDIT { Text [ en-US ] = "Text Input pop-up menu" ; diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 3812f6e37b20..f8e126402a3e 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -8746,7 +8746,6 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 }; }; - // -=*# Resource for function CHISQDIST #*=- Resource SC_OPCODE_CHISQ_DIST { @@ -8829,7 +8828,6 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 }; }; - // -=*# Resource for function CHIINV #*=- Resource SC_OPCODE_CHI_INV { diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 0268edbbec92..78d954105ced 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -410,7 +410,6 @@ String SCSTR_CHAR_ATTRS Text [ en-US ] = "Font Attributes" ; }; - String SCSTR_CLPBRD_CLEAR { Text [ en-US ] = "You have a large amount of data saved in the clipboard.\nDo you want the clipboard contents to be available in other applications?" ; diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index 3181f9292799..6912ce8beffd 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -56,7 +56,6 @@ String SCSTR_QHELP_BTNEQUAL Text [ en-US ] = "Function" ; }; - String SCSTR_QHELP_EXPAND_FORMULA { Text [ en-US ] = "Expand Formula Bar" ; diff --git a/scaddins/source/analysis/analysis.hrc b/scaddins/source/analysis/analysis.hrc index 7593d5d0ea06..4657499dfc67 100644 --- a/scaddins/source/analysis/analysis.hrc +++ b/scaddins/source/analysis/analysis.hrc @@ -19,17 +19,14 @@ #ifndef SCADDINS_ANALYSIS_HRC #define SCADDINS_ANALYSIS_HRC - #define ANALYSIS_RESOURCE_START 1000 - #define RID_ANALYSIS_FUNCTION_DESCRIPTIONS (ANALYSIS_RESOURCE_START+1000) #define RID_ANALYSIS_FUNCTION_NAMES (ANALYSIS_RESOURCE_START+2000) #define RID_ANALYSIS_DEFFUNCTION_NAMES (ANALYSIS_RESOURCE_START+3000) #define ANALYSIS_FUNCDESC_START (ANALYSIS_RESOURCE_START) - #define ANALYSIS_Workday (ANALYSIS_FUNCDESC_START) #define ANALYSIS_Yearfrac (ANALYSIS_FUNCDESC_START+1) #define ANALYSIS_Edate (ANALYSIS_FUNCDESC_START+2) diff --git a/scaddins/source/datefunc/datefunc.hrc b/scaddins/source/datefunc/datefunc.hrc index 157eeed2c5b8..aade8089aa56 100644 --- a/scaddins/source/datefunc/datefunc.hrc +++ b/scaddins/source/datefunc/datefunc.hrc @@ -20,14 +20,12 @@ #ifndef _SCA_DATEFUNC_HRC #define _SCA_DATEFUNC_HRC - #define DATE_RESOURCE_START 1000 #define RID_DATE_FUNCTION_DESCRIPTIONS DATE_RESOURCE_START #define RID_DATE_FUNCTION_NAMES (DATE_RESOURCE_START+1000) #define RID_DATE_DEFFUNCTION_NAMES (DATE_RESOURCE_START+2000) - #define DATE_FUNCDESC_START (RID_DATE_FUNCTION_DESCRIPTIONS+1) #define DATE_FUNCDESC_DiffWeeks (DATE_FUNCDESC_START) @@ -39,7 +37,6 @@ #define DATE_FUNCDESC_WeeksInYear (DATE_FUNCDESC_START+6) #define DATE_FUNCDESC_Rot13 (DATE_FUNCDESC_START+7) - #define DATE_FUNCNAME_START (RID_DATE_FUNCTION_NAMES+1) #define DATE_FUNCNAME_DiffWeeks (DATE_FUNCNAME_START) @@ -51,7 +48,6 @@ #define DATE_FUNCNAME_WeeksInYear (DATE_FUNCNAME_START+6) #define DATE_FUNCNAME_Rot13 (DATE_FUNCNAME_START+7) - #define DATE_DEFFUNCNAME_START (RID_DATE_DEFFUNCTION_NAMES+1) #define DATE_DEFFUNCNAME_DiffWeeks (DATE_DEFFUNCNAME_START) @@ -63,7 +59,6 @@ #define DATE_DEFFUNCNAME_WeeksInYear (DATE_DEFFUNCNAME_START+6) #define DATE_DEFFUNCNAME_Rot13 (DATE_DEFFUNCNAME_START+7) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src index b2e842752a55..17a64b19f243 100644 --- a/scaddins/source/datefunc/datefunc.src +++ b/scaddins/source/datefunc/datefunc.src @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "datefunc.hrc" - Resource RID_DATE_FUNCTION_DESCRIPTIONS { Resource DATE_FUNCDESC_DiffWeeks @@ -200,7 +198,6 @@ Resource RID_DATE_FUNCTION_DESCRIPTIONS }; }; - Resource RID_DATE_FUNCTION_NAMES { String DATE_FUNCNAME_DiffWeeks @@ -237,7 +234,6 @@ Resource RID_DATE_FUNCTION_NAMES }; }; - Resource RID_DATE_DEFFUNCTION_NAMES { diff --git a/scaddins/source/pricing/pricing.hrc b/scaddins/source/pricing/pricing.hrc index 154aa083c450..64cd4c106965 100644 --- a/scaddins/source/pricing/pricing.hrc +++ b/scaddins/source/pricing/pricing.hrc @@ -20,14 +20,12 @@ #ifndef _SCA_PRICING_HRC #define _SCA_PRICING_HRC - #define PRICING_RESOURCE_START 1000 #define RID_PRICING_FUNCTION_DESCRIPTIONS PRICING_RESOURCE_START #define RID_PRICING_FUNCTION_NAMES (PRICING_RESOURCE_START+1000) #define RID_PRICING_DEFFUNCTION_NAMES (PRICING_RESOURCE_START+2000) - #define PRICING_FUNCDESC_START (RID_PRICING_FUNCTION_DESCRIPTIONS+1) #define PRICING_FUNCDESC_OptBarrier (PRICING_FUNCDESC_START) @@ -35,7 +33,6 @@ #define PRICING_FUNCDESC_OptProbHit (PRICING_FUNCDESC_START+2) #define PRICING_FUNCDESC_OptProbInMoney (PRICING_FUNCDESC_START+3) - #define PRICING_FUNCNAME_START (RID_PRICING_FUNCTION_NAMES+1) #define PRICING_FUNCNAME_OptBarrier (PRICING_FUNCNAME_START) @@ -43,7 +40,6 @@ #define PRICING_FUNCNAME_OptProbHit (PRICING_FUNCNAME_START+2) #define PRICING_FUNCNAME_OptProbInMoney (PRICING_FUNCNAME_START+3) - #define PRICING_DEFFUNCNAME_START (RID_PRICING_DEFFUNCTION_NAMES+1) #define PRICING_DEFFUNCNAME_OptBarrier (PRICING_DEFFUNCNAME_START) @@ -51,7 +47,6 @@ #define PRICING_DEFFUNCNAME_OptProbHit (PRICING_DEFFUNCNAME_START+2) #define PRICING_DEFFUNCNAME_OptProbInMoney (PRICING_DEFFUNCNAME_START+3) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/source/pricing/pricing.src b/scaddins/source/pricing/pricing.src index cc039c5e9b7c..0515032bcd9b 100644 --- a/scaddins/source/pricing/pricing.src +++ b/scaddins/source/pricing/pricing.src @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "pricing.hrc" - // function and parameter description Resource RID_PRICING_FUNCTION_DESCRIPTIONS { @@ -149,8 +147,6 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS }; }; - - Resource PRICING_FUNCDESC_OptTouch { String 1 // description @@ -258,7 +254,6 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS }; }; - Resource PRICING_FUNCDESC_OptProbHit { String 1 // description @@ -321,7 +316,6 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS }; }; - Resource PRICING_FUNCDESC_OptProbInMoney { String 1 // description @@ -402,12 +396,8 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS }; }; - - - }; - // function names as accessible from cells Resource RID_PRICING_FUNCTION_NAMES { @@ -430,7 +420,6 @@ Resource RID_PRICING_FUNCTION_NAMES }; - // These were originally meant to be able to load Excel documents that for // some time were stored with localized function names. // This is not relevant to this add-in, so we only supply the same @@ -446,7 +435,6 @@ Resource RID_PRICING_DEFFUNCTION_NAMES }; }; - StringArray PRICING_DEFFUNCNAME_OptTouch { ItemList = diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index aa15783071f7..ef8631f9e662 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -395,7 +395,6 @@ #define SID_EDIT_HYPERLINK (SID_SD_START+382) - #define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400) #define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 8a764af0347b..3e2d4a41228d 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -133,7 +133,6 @@ #define STR_TASKPANEVIEWSHELL RID_GLOB_START+117 #define STR_TASKPANELAYOUTMENU RID_GLOB_START+118 - #define RID_CUSTOMANIMATION_START RID_GLOB_START+120 // RID_CUSTOMANIMATION_END RID_GLOB_START+199 #define RID_ANNOTATIONS_START RID_GLOB_START+200 diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index 0e6f235b963e..bebd5d65c55c 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -386,7 +386,6 @@ String STR_POOLSHEET_ARROW Text [ en-US ] = "Arrow" ; }; - String STR_LOAD_DOC { Text [ en-US ] = "Load Document" ; diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index 21a46aea5dd9..7bfc21ecc31d 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -80,7 +80,6 @@ ModalDialog DLG_PUBLISHING Text [ en-US ] = "Select an existing design or create a new one"; }; - // Page 2, type of publishing FixedLine PAGE2_TITEL { diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index 9a5c5c6fab49..30ee1adb2844 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -111,7 +111,6 @@ Text [ en-US ] = "~Page Setup..." ; \ }; - #define MN_INSERT_SLIDE \ MenuItem\ {\ @@ -165,7 +164,6 @@ Text [ en-US ] = "Display Objects from Master" ; \ }; - #define MN_PAGE_MENU \ MenuItem\ {\ @@ -237,8 +235,6 @@ Text [ en-US ] = "D~elete Master" ; \ }; - - #define MN_DELETE_PAGE \ MenuItem\ {\ @@ -830,7 +826,6 @@ Text [ en-US ] = "~Delete" ; \ }; - #define MN_SET_DEFAULT\ MenuItem\ {\ diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 527a572465b1..7f8692f35924 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -230,8 +230,6 @@ Menu RID_FORM_CONTROL_POPUP }; }; - - Menu RID_DRAW_SNAPOBJECT_POPUP { ItemList = @@ -242,7 +240,6 @@ Menu RID_DRAW_SNAPOBJECT_POPUP }; }; - Menu RID_DRAW_GLUEPOINT_POPUP { ItemList = @@ -266,7 +263,6 @@ Menu RID_DRAW_GLUEPOINT_POPUP }; }; - Menu RID_SLIDE_SORTER_IMPRESS_SEL_POPUP { ItemList = @@ -285,7 +281,6 @@ Menu RID_SLIDE_SORTER_IMPRESS_SEL_POPUP }; }; - Menu RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP { ItemList = @@ -304,7 +299,6 @@ Menu RID_SLIDE_SORTER_DRAW_SEL_POPUP }; }; - Menu RID_SLIDE_SORTER_DRAW_NOSEL_POPUP { ItemList = @@ -325,7 +319,6 @@ Menu RID_SLIDE_SORTER_MASTER_SEL_POPUP }; }; - Menu RID_SLIDE_SORTER_MASTER_NOSEL_POPUP { ItemList = @@ -334,7 +327,6 @@ Menu RID_SLIDE_SORTER_MASTER_NOSEL_POPUP }; }; - Menu RID_OUTLINE_POPUP { ItemList = @@ -354,7 +346,6 @@ Menu RID_OUTLINE_POPUP }; }; - Menu RID_BEZIER_POPUP { ItemList = @@ -363,7 +354,6 @@ Menu RID_BEZIER_POPUP }; }; - Menu RID_LAYERTAB_POPUP { ItemList = @@ -441,7 +431,6 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP Text [ en-US ] = "Apply to ~Selected Slides"; }; - SEPARATOR MenuItem diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 0cb12a0e64de..e5d23ab09f92 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "menuids3.src" #ifndef SD_POPUP @@ -26,9 +24,6 @@ #include "menuids.src" #endif - - - // TEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_TEXTOBJ_POPUP @@ -69,7 +64,6 @@ }; }; - // OUTLINETEXTOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_OUTLINETEXTOBJ_POPUP @@ -111,7 +105,6 @@ }; }; - // GEOMOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GEOMOBJ_POPUP @@ -154,7 +147,6 @@ }; }; - // Customshape POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_CUSTOMSHAPE_POPUP @@ -199,7 +191,6 @@ }; }; - // 3DOSCENE_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DSCENE_POPUP @@ -237,7 +228,6 @@ }; }; - // 3DOSCENE2_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DSCENE2_POPUP @@ -276,7 +266,6 @@ }; }; - // 3DOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_3DOBJ_POPUP @@ -314,7 +303,6 @@ }; }; - // GROUPOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GROUPOBJ_POPUP @@ -354,7 +342,6 @@ }; }; - // LINEOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_LINEOBJ_POPUP @@ -395,7 +382,6 @@ }; }; - // EDGEOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_EDGEOBJ_POPUP @@ -438,7 +424,6 @@ }; }; - // MEASUREOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MEASUREOBJ_POPUP @@ -481,8 +466,6 @@ }; }; - - // POLYLINEOBJ_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_POLYLINEOBJ_POPUP @@ -525,7 +508,6 @@ }; }; - // NOSEL_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_NOSEL_POPUP @@ -555,7 +537,6 @@ }; }; - // MULTISELECTION_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MULTISELECTION_POPUP @@ -595,7 +576,6 @@ }; }; - // GRAPHIC_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_GRAPHIC_POPUP @@ -708,7 +688,6 @@ }; }; - // Media_POPUP #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_MEDIA_POPUP @@ -739,7 +718,6 @@ }; }; - // Table shape context menu #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP Menu RID_DRAW_TABLE_POPUP diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 6596db03f0ca..c68e9ada945a 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -336,8 +336,6 @@ Bitmap BMP_WAIT_ICON File = "waiticon.bmp"; }; - - Bitmap BMP_FADE_EFFECT_INDICATOR { File = "fade_effect_indicator.bmp"; diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 57dd9cba545d..218225a198fa 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -259,7 +259,6 @@ Hide = TRUE; \ }; - // Object bar #define TBI_FORMAT_BEZIER_EDIT_RC \ @@ -326,8 +325,6 @@ Hide = TRUE; \ }; - - // Option bar #define TBI_FORMAT_BEZIER_EDIT \ diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index 83f393396f04..9e2ea15ddf46 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.hrc @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #define PAGE1_TITEL 2 #define PAGE1_NEW_DESIGN 3 #define PAGE1_OLD_DESIGN 4 @@ -25,8 +24,6 @@ #define PAGE1_DEL_DESIGN 6 #define PAGE1_DESC 7 - - #define PAGE2_TITEL 21 #define PAGE2_STANDARD 22 #define PAGE2_FRAMES 23 @@ -61,8 +58,6 @@ #define PAGE2_CGI 48 #define PAGE2_VERT 49 - - #define PAGE3_TITEL_1 51 #define PAGE3_PNG 51 #define PAGE3_GIF 52 @@ -78,8 +73,6 @@ #define PAGE3_VERT 62 #define PAGE3_HIDDEN_SLIDES 63 - - #define PAGE4_TITEL_1 66 #define PAGE4_AUTHOR_TXT 67 #define PAGE4_AUTHOR 68 @@ -92,14 +85,10 @@ #define PAGE4_DOWNLOAD 75 #define PAGE4_CREATED 76 - - #define PAGE5_TITEL 81 #define PAGE5_TEXTONLY 82 #define PAGE5_BUTTONS 83 - - #define PAGE6_TITEL 101 #define PAGE6_DEFAULT 102 #define PAGE6_USER 103 @@ -111,8 +100,6 @@ #define PAGE6_DOCCOLORS 109 #define PAGE6_PREVIEW 111 - - #define BUT_LAST 200 #define BUT_NEXT 201 #define BUT_FINISH 202 @@ -120,8 +107,6 @@ #define BUT_HELP 204 #define BOTTOM_LINE 205 - - #define DLG_PUBLISHING 739 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 79896d165fc2..23a401474a7d 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -252,7 +252,6 @@ #define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95 #define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96 - /* * Do not change ResourceIDs for toolboxes without also changing the strings in * strings.hrc to the same IDs. A toolbox and its configuration string have to diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index dcc60424cf49..276e3a0b670d 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -253,7 +253,6 @@ #define STR_EFFECT_NONE (RID_APP_START+400) - #define STR_INSERT_TEXT (RID_APP_START+432) #define STR_SLIDE_SINGULAR (RID_APP_START+433) #define STR_SLIDE_PLURAL (RID_APP_START+434) @@ -287,7 +286,6 @@ #define STR_NEW_CUSTOMSHOW (RID_APP_START+512) #define STR_COPY_CUSTOMSHOW (RID_APP_START+513) - #define STR_BREAK_METAFILE (RID_APP_START+521) #define STR_BREAK_FAIL (RID_APP_START+522) diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc index dd0b112d4af8..9ef4d51c6a19 100644 --- a/sfx2/inc/filedlghelper.hrc +++ b/sfx2/inc/filedlghelper.hrc @@ -38,7 +38,6 @@ #define STR_LB_VERSION (RID_SFX_EXPLORER_START + 64) #define STR_PB_SAVEACOPY (RID_SFX_EXPLORER_START + 65) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 448e68d297ba..5528f8f25e84 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -324,8 +324,6 @@ String RID_STR_HLPFILENOTEXIST Text [ en-US ] = "The help file for this topic is not installed." ; }; - - String RID_ENVTOOLBOX { Text [ en-US ] = "Function Bar" ; diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src index 4d190773e2a5..d9dda37c26ee 100644 --- a/sfx2/source/dialog/dialog.src +++ b/sfx2/source/dialog/dialog.src @@ -95,7 +95,6 @@ Menu MN_CONTEXT_TEMPLDLG }; }; - String SID_NAVIGATOR { Text [ en-US ] = "Navigator"; diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src index 8e9c54537127..2cdb6a60ea65 100644 --- a/sfx2/source/dialog/filedlghelper.src +++ b/sfx2/source/dialog/filedlghelper.src @@ -20,7 +20,6 @@ #include "sfxlocal.hrc" #include "filedlghelper.hrc" - String STR_SFX_FILEDLG_ACTUALVERSION { Text [ en-US ] = "Current version"; @@ -106,7 +105,6 @@ String STR_PB_SAVEACOPY Text [ en-US ] = "Save a Copy" ; }; - String STR_LB_IMAGE_TEMPLATE { Text [ en-US ] = "Style:" ; diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src index 51c9c79f9a70..119374b173f7 100644 --- a/sfx2/source/dialog/recfloat.src +++ b/sfx2/source/dialog/recfloat.src @@ -20,7 +20,6 @@ #include "helpid.hrc" #include "dialog.hrc" - #define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } FloatingWindow SID_RECORDING_FLOATWINDOW diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index afd9c1d1a3f0..b805b84aa4db 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -108,7 +108,6 @@ #define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) - #define STR_PACKNGO_NOACCESS (RID_SFX_DOC_START+ 79) #define STR_PACKNGO_NEWMEDIUM (RID_SFX_DOC_START+ 80) @@ -118,7 +117,6 @@ #define STR_OBJECT (RID_SFX_DOC_START+ 84) - #define DLG_MACROQUERY (RID_SFX_DOC_START+87) #define BTN_OK (RID_SFX_DOC_START+88) #define BTN_CANCEL (RID_SFX_DOC_START+89) diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index 2d09e7483422..b72d055d1c24 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -20,7 +20,6 @@ #include "doc.hrc" #define __RSC - QueryBox MSG_CONFIRM_FILTER { Buttons = WB_YES_NO ; diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src index 35d69dbab082..a4a313508a38 100644 --- a/sfx2/source/doc/templatelocnames.src +++ b/sfx2/source/doc/templatelocnames.src @@ -60,9 +60,6 @@ String STR_TEMPLATE_NAME10_DEF Text = "Vintage" ; }; - - - String STR_TEMPLATE_NAME1 { Text [ en-US ] = "Abstract Green" ; diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src index b80b17c90182..eb2de4eb7525 100644 --- a/sfx2/source/view/view.src +++ b/sfx2/source/view/view.src @@ -64,7 +64,6 @@ String STR_PRINT_NEWORISIZE Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ; }; - InfoBox MSG_CANT_CLOSE { Message [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 3575b6e6f6cb..e31c68cbd40f 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -677,7 +677,6 @@ #define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189) #define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190) - #define RID_ALIGNLX_HELP (RID_APP_START + 4275) #define RID_ALIGNCX_HELP (RID_APP_START + 4276) #define RID_ALIGNRX_HELP (RID_APP_START + 4277) diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 7df736e55b51..0c2203d9e384 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -1197,9 +1197,6 @@ String RID_CATEGORY_EXAMPLES Text [ en-US ] = "Examples" ; }; - - - Menu RID_COMMANDMENU { ItemList = diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 066c59640d59..a6eebb46f7b2 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -234,7 +234,6 @@ String STR_STATSTR_WRITING Text [ en-US ] = "Saving document..." ; }; - String STR_MATH_DOCUMENT_FULLTYPE_CURRENT { Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Formula"; diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src index 3d5798cf7755..65c99be84e32 100644 --- a/starmath/source/toolbox.src +++ b/starmath/source/toolbox.src @@ -24,7 +24,6 @@ #define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; } - FloatingWindow RID_TOOLBOXWINDOW { HelpId = HID_SMA_OPERATOR_WIN ; @@ -1506,8 +1505,6 @@ FloatingWindow RID_TOOLBOXWINDOW }; }; - - #define UNBINOPS_IDLIST \ IdList = \ { \ diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src index a7f5b8a88bc2..5e520e6d655c 100644 --- a/svl/source/misc/mediatyp.src +++ b/svl/source/misc/mediatyp.src @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // Internet Media Type Presentations - - #include <svl/svl.hrc> String STR_SVT_MIMETYPE_APP_OCTSTREAM diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src index 10a5c05a79cb..4a96d61f24dc 100644 --- a/svtools/source/contnr/fileview.src +++ b/svtools/source/contnr/fileview.src @@ -63,7 +63,6 @@ String STR_SVT_MB Text [ en-US ] = "MB" ; }; - String STR_SVT_GB { Text [ en-US ] = "GB" ; diff --git a/svtools/source/contnr/templwin.hrc b/svtools/source/contnr/templwin.hrc index d9df10b9299d..34af9102a0d7 100644 --- a/svtools/source/contnr/templwin.hrc +++ b/svtools/source/contnr/templwin.hrc @@ -34,7 +34,6 @@ #define TI_DOCTEMPLATE_DOCINFO 4 #define TI_DOCTEMPLATE_PREVIEW 5 - #define DI_TITLE 1 #define DI_FROM 2 #define DI_DATE 3 diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src index c3ab86671e12..f352a9941081 100644 --- a/svtools/source/control/ctrlbox.src +++ b/svtools/source/control/ctrlbox.src @@ -22,7 +22,6 @@ #define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } #endif - String STR_SVT_AUTOMATIC_COLOR { Text [ en-US ] = "Automatic"; diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc index f66061fa2800..17a51b25d7d2 100644 --- a/svtools/source/dialogs/addresstemplate.hrc +++ b/svtools/source/dialogs/addresstemplate.hrc @@ -20,7 +20,6 @@ #ifndef _SVT_ADDRESSTEMPLATE_HRC_ #define _SVT_ADDRESSTEMPLATE_HRC_ - #define FIELD_PAIRS_VISIBLE 5 #define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index c1e2da1c063c..c8c0fc197929 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -61,7 +61,6 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced."; }; - String STR_WARNING_JAVANOTFOUND { Text[ en-US ] = "JRE Required" ; @@ -77,7 +76,6 @@ String STR_QUESTION_JAVADISABLED Text[ en-US ] = "Enable JRE" ; }; - String STR_ERROR_JVMCREATIONFAILED { Text[ en-US ] = "JRE is Defective" ; diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 9ba061fcc8d8..6a650fabfba2 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -128,7 +128,6 @@ Command = CMD_SID_SET_SUB_SCRIPT; \ Text [ en-US ] = "Su~bscript"; \ - #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Command = ".uno:LeftPara" ; \ @@ -239,7 +238,6 @@ Command = ".uno:ToggleObjectBezierMode" ; \ Text [ en-US ] = "Edit ~Points" ;\ - #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ @@ -275,7 +273,6 @@ Command = ".uno:Zoom" ; \ Text [ en-US ] = "~Zoom..." ; \ - #define ITEM_FORMAT_NUMBERING \ MenuItem\ {\ @@ -283,7 +280,6 @@ Text [ en-US ] = "~Bullets and Numbering..." ; \ }; - #define ITEM_POLY_MERGE \ MenuItem\ {\ @@ -323,7 +319,6 @@ };\ }; - /*------------------------------------------------------------------------ Context Menus ------------------------------------------------------------------------*/ @@ -517,7 +512,6 @@ Command = CMD_SID_OPEN_SMARTTAGMENU; \ Text [ en-US ] = "Open ~Smart Tag Menu" ; \ - #endif // #ifndef _GLOBLMN_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src index 56b85cb28bdb..66722c87d262 100644 --- a/svx/source/accessibility/accessibility.src +++ b/svx/source/accessibility/accessibility.src @@ -64,7 +64,6 @@ String RID_SVXSTR_A11Y_AND Text [ en-US ] = "and" ; }; - // SvxRectCtl String RID_SVXSTR_RECTCTL_ACC_CORN_NAME @@ -87,7 +86,6 @@ String RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR Text [ en-US ] = "Selection of a major angle." ; }; - String RID_SVXSTR_RECTCTL_ACC_CHLD_LT { Text [ en-US ] = "Top left" ; @@ -133,7 +131,6 @@ String RID_SVXSTR_RECTCTL_ACC_CHLD_RB Text [ en-US ] = "Bottom right" ; }; - String RID_SVXSTR_RECTCTL_ACC_CHLD_A000 { Text [ en-US ] = "0 degrees" ; diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index 4d613641b27f..53f59d45d45b 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -22,10 +22,8 @@ #include "bmpmask.hrc" #include "helpid.hrc" - #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index aec18aa74e5e..cae14d19a6e8 100644 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc @@ -18,14 +18,11 @@ */ #include <svx/dialogs.hrc> - // ImapDlg dialog #define RID_SVX_CONTOURDLG_START RID_SVX_CONTOUR_START - /******************************************************************************/ - #define RID_SVXDLG_CONTOUR (RID_SVX_CONTOURDLG_START) #define TBX1 1 @@ -58,8 +55,6 @@ #define CD_IMAPDLG 1300 - /******************************************************************************/ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 43f3f4d2a638..e3dd2dc4d576 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -155,7 +155,6 @@ FloatingWindow RID_SVXDLG_CONTOUR Identifier = TBI_REDO ; HelpId = HID_CONTDLG_REDO ; - Text [ en-US ] = "Redo " ; }; ToolBoxItem diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 288a125d8956..7ede1369699c 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -41,7 +41,6 @@ #define FL_SAVE_BOTTOM 8 #define BT_SAVE_OK 9 - #define SAVE_WIDTH 290 #define SAVE_HEIGHT 238 #define SAVE_TITLEWINHEIGHT 36 diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index bcc2569e880a..c290b6ea7900 100644 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc @@ -18,14 +18,11 @@ */ #include <svx/dialogs.hrc> - // ImapDlg-Dialog #define RID_SVX_IMAPDLG_START RID_SVX_IMAP_START - /******************************************************************************/ - #define RID_SVXDLG_IMAP (RID_SVX_IMAPDLG_START) #define RID_SVXCTL_IMAP (RID_SVX_IMAPDLG_START + 7) @@ -63,7 +60,6 @@ /******************************************************************************/ - #define RID_SVXMN_IMAP (RID_SVX_IMAPDLG_START + 1) #define MN_URL 1 @@ -79,11 +75,9 @@ /******************************************************************************/ - #define RID_SVXCTL_FT_TARGET (RID_SVX_IMAPDLG_START + 3) #define RID_SVXCTL_CBB_TARGET (RID_SVX_IMAPDLG_START + 4) - /******************************************************************************/ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index 486217ae0a28..9bc815b26984 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -230,7 +230,6 @@ ModelessDialog RID_SVXDLG_IMAP HScroll = TRUE ; }; - #define IMAPDLG_IDLIST \ IdList = \ { \ @@ -344,5 +343,4 @@ Menu RID_SVXMN_IMAP /******************************************************************************/ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src index d49d65702edd..57fe9f976041 100644 --- a/svx/source/dialog/prtqry.src +++ b/svx/source/dialog/prtqry.src @@ -19,7 +19,6 @@ #include <svx/dialogs.hrc> - String RID_SVXSTR_QRY_PRINT_TITLE { Text [ en-US ] = "Printing selection"; diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index f4387bc36591..9fad4bcff161 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -185,7 +185,6 @@ String STR_INSERT_VIDEO_TITLE Text [ en-US ] = "Insert video" ; }; - // BM: some additional standard colors String RID_SVXSTR_COLOR_VIOLET @@ -347,11 +346,8 @@ String RID_SVXSTR_LINECAP_SQUARE Text [ en-US ] = "Line cap square"; }; - - // Reference-strings for standardcolor-table - /* do not translate */ String RID_SVXSTR_COLOR_BLACK_DEF { @@ -484,11 +480,8 @@ String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF Text = "Blue classic" ; }; - - // Reference-strings for standard-gradient-table - /* do not translate */ String RID_SVXSTR_GRDT0_DEF { @@ -1249,11 +1242,8 @@ String RID_SVXSTR_GRDT69 Text [ en-US ] = "Green Gradient"; }; - - // Reference-strings for standard-hatch-table - /* do not translate */ String RID_SVXSTR_HATCH0_DEF { @@ -1355,11 +1345,8 @@ String RID_SVXSTR_HATCH10 Text [ en-US ] = "Hatching" ; }; - - // Reference-strings for standard-bitmap-table - /* do not translate */ String RID_SVXSTR_BMP0_DEF { @@ -1562,10 +1549,8 @@ String RID_SVXSTR_BMP21 Text [ en-US ] = "Bitmap"; }; - // Reference-strings for standard-dash-table - /* do not translate */ String RID_SVXSTR_DASH0_DEF { @@ -1687,11 +1672,8 @@ String RID_SVXSTR_DASH12 Text [ en-US ] = "Line Style"; }; - - // Reference-strings for standard-line-end-table - /* do not translate */ String RID_SVXSTR_LEND0_DEF { @@ -1885,11 +1867,8 @@ String RID_SVXSTR_LEND20 Text [ en-US ] = "Arrowhead"; }; - - // Reference-strings for standard transparence gradients - /* do not translate */ String RID_SVXSTR_TRASNGR0_DEF { @@ -1901,7 +1880,6 @@ String RID_SVXSTR_TRASNGR0 Text [ en-US ] = "Transparency"; }; - // RID_SVXSTR_FIELDUNIT_TABLE -------------------------------------------- StringArray RID_SVXSTR_FIELDUNIT_TABLE diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index a2618aa1d6e3..6ce305325316 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -49,7 +49,6 @@ #define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; - DockingWindow RID_SVXFLOAT_3D { HelpID = CMD_SID_3D_WIN ; diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index 587d97a35026..3121ea9f5b9b 100644 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src @@ -87,7 +87,6 @@ StringArray RID_ATTR_NAMES }; }; - String RID_SVXITEMS_EXTRAS_CHARCOLOR { Text [ en-US ] = "Font color" ; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src index 09525909cdc8..b24b1ec1a915 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -188,7 +188,6 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR SpinSize = 5 ; }; - ToolBox BTN_LEFT_SECOND { Border = FALSE ; diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src index b8f60b929863..62811f617079 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.src +++ b/svx/source/sidebar/text/TextPropertyPanel.src @@ -20,7 +20,6 @@ #include <sfx2/sidebar/ResourceDefinitions.hrc> #include "helpid.hrc" - Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE { OutputSize = TRUE; @@ -47,7 +46,6 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE Text [ en-US ] = "~More Options..."; }; - Image IMG_SINGLE { ImageBitmap = Bitmap{File = "symphony/line1.bmp";}; @@ -180,7 +178,6 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE }; - Control RID_POPUPPANEL_TEXTPAGE_SPACING { OutputSize = TRUE; diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index e94b4f3ee4c6..68afcee64aff 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -131,7 +131,6 @@ #error Resource-Ueberlauf bei den HIDs der OFA #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/src/app.src b/svx/source/src/app.src index e33edf7fbbb5..b2e90d23554d 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -20,7 +20,6 @@ #include <svx/svxids.hrc> #include "app.hrc" - String RID_APPTITLE { Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ; diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index c4908e383e7b..a9e98a7c775c 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -289,7 +289,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED MaskColor = STD_MASKCOLOR; }; - Image RID_SVXBMP_SLIDERBUTTON { ImageBitmap = Bitmap diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 957c2aeeff51..364749a015fc 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -440,7 +440,6 @@ String STR_ObjNamePluralGRAFMACLNK Text [ en-US ] = "Linked Mac graphics" ; }; - // Svg support String STR_ObjNameSingulGRAFSVG @@ -452,7 +451,6 @@ String STR_ObjNamePluralGRAFSVG Text [ en-US ] = "SVGs" ; }; - String STR_ObjNameSingulOLE2 { Text [ en-US ] = "embedded object (OLE)" ; @@ -545,7 +543,6 @@ String STR_ObjNameSingulPlural Text [ en-US ] = "draw object(s)" ; }; - // New in 537: names for 3D objects String STR_ObjNameSingulCube3d { @@ -622,7 +619,6 @@ String STR_ObjNamePluralSphere3d Text [ en-US ] = "spheres"; }; - String STR_EditWithCopy { Text [ en-US ] = "with copy" ; @@ -1110,7 +1106,6 @@ String STR_StandardLayerName Text [ en-US ] = "Standard" ; }; - String STR_ItemValON { Text [ en-US ] = "on" ; @@ -1331,7 +1326,6 @@ String STR_ItemValCIRC_ARC Text [ en-US ] = "Arc" ; }; - String STR_ItemNam_SHADOW { Text [ en-US ] = "Shadow" ; @@ -1561,7 +1555,6 @@ String STR_ItemNam_SHEARANGLE Text [ en-US ] = "Shear angle" ; }; - // Now: bitmaps: Bitmap BMAP_GrafikEi { File = "grafikei.png" ; }; Bitmap BMAP_GrafikDe { File = "grafikde.png" ; }; diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 3600a28cc02c..cb7afff74e17 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -198,7 +198,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH }; }; - DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING { HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING"; diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc index d42845fa5db7..1b36f26725c7 100644 --- a/sw/inc/access.hrc +++ b/sw/inc/access.hrc @@ -60,7 +60,6 @@ #error Resource-Id Ueberlauf in #file, #line #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc index 67a018792d63..5affd93b6ff9 100644 --- a/sw/inc/comcore.hrc +++ b/sw/inc/comcore.hrc @@ -21,10 +21,8 @@ #include "rcid.hrc" - // Strings - #define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0) #define MSG_COMCORE_ASKSEARCH (RC_COMCORE_BEGIN + 1) #define STR_TABLE_DEFNAME (RC_COMCORE_BEGIN + 2) @@ -43,7 +41,6 @@ #define STR_SPELL_TITLE (RC_COMCORE_BEGIN + 15) #define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16) - #define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19) #define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20) #define STR_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21) @@ -101,7 +98,6 @@ // !!!!!!!!!!!!!!!!!!!!!!!!!! always set the correct end !!!!!!!!!!!! #define STR_AUTOFMTREDL_END 22 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc index 01dd46c45404..41a859164d9d 100644 --- a/sw/inc/dochdl.hrc +++ b/sw/inc/dochdl.hrc @@ -33,7 +33,6 @@ #define STR_PRIVATEOLE (RC_DOCHDL_BEGIN + 10) #define STR_DDEFORMAT (RC_DOCHDL_BEGIN + 11) - #define DOCHDL_ACT_END STR_DDEFORMAT #if DOCHDL_ACT_END > RC_DOCHDL_END diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc index 4967221d7073..99d77062483d 100644 --- a/sw/inc/fldui.hrc +++ b/sw/inc/fldui.hrc @@ -255,8 +255,6 @@ #define STR_FORMULA (STR_EXTRA + 12) #define STR_ALL_DATABASE (STR_EXTRA + 13) - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 43420c17c589..7edfdace9fdc 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -68,8 +68,6 @@ #define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38) - - #define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40) #define SW_STR_NONE (RC_GLOBALS_BEGIN + 41) @@ -122,11 +120,9 @@ // Sw-pages #define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26) - #define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79) //maximum: RC_GLOBALS_BEGIN + 120 - #if STR_DOC_STAT > RC_GLOBALS_END #error Resource-Id Ueberlauf in #file, #line #endif diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc index 423fad5c48ed..ddcf72a23dd2 100644 --- a/sw/inc/poolfmt.hrc +++ b/sw/inc/poolfmt.hrc @@ -21,10 +21,8 @@ #include "rcid.hrc" - // The Formats - // Drawing Templates: #define STR_POOLCHR_FOOTNOTE (RC_POOLCHRFMT_BEGIN+ 0) #define STR_POOLCHR_PAGENO (RC_POOLCHRFMT_BEGIN+ 1) @@ -63,7 +61,6 @@ #define STR_POOLFRM_WATERSIGN (RC_POOLFRMFMT_BEGIN+ 5) #define STR_POOLFRM_LABEL (RC_POOLFRMFMT_BEGIN+ 6) - // The Templates // Category Text @@ -234,7 +231,6 @@ #define STR_POOLCOLL_HTML_DD (RC_POOLCOLL_HTML_BEGIN+ 3) #define STR_POOLCOLL_HTML_DT (RC_POOLCOLL_HTML_BEGIN+ 4) - // Page styles #define STR_POOLPAGE_STANDARD (RC_POOLPAGEDESC_BEGIN+ 0) @@ -248,7 +244,6 @@ #define STR_POOLPAGE_ENDNOTE (RC_POOLPAGEDESC_BEGIN+ 8) #define STR_POOLPAGE_LANDSCAPE (RC_POOLPAGEDESC_BEGIN+ 9) - // Numbering styles #define STR_POOLNUMRULE_NUM1 (RC_POOLNUMRULE_BEGIN+ 0) diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index 904fe5937afe..4e8428a0a52b 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -25,7 +25,6 @@ // Areas for the UI-Directories - #define RC_BASE RID_SW_START // From solar.hrc #define RC_APP RC_BASE @@ -121,7 +120,6 @@ #define RC_INDEX_BEGIN RC_INDEX // RC_INDEX_END (RC_INDEX + 99) - #define RC_RIBBAR_BEGIN RC_RIBBAR #define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79) @@ -165,7 +163,6 @@ #define RC_CONFIG_BEGIN RC_CONFIG #define RC_CONFIG_END (RC_CONFIG + 99) - // Miscellaneous #define RC_MISC_BEGIN RC_MISC #define RC_MISC_END (RC_MISC + 99) @@ -184,7 +181,6 @@ #define RC_POOLCHRFMT_HTML_BEGIN RC_POOLHTMLCHRFMT // RC_POOLCHRFMT_HTML_END (RC_POOLHTMLCHRFMT+ 30) - // Frame-Templates #define RC_POOLFRMFMT_BEGIN RC_POOLFRMFMT // RC_POOLFRMFMT_END (RC_POOLFRMFMT + 20) @@ -204,7 +200,6 @@ #define RC_POOLCOLL_HTML_BEGIN (RC_POOLTXTCOLL + 140) // RC_POOLCOLL_HTML_END (RC_POOLTXTCOLL + 169) - // Pooltemplates Page #define RC_POOLPAGEDESC_BEGIN RC_POOLPAGEDESC // RC_POOLPAGEDESC_END (RC_POOLPAGEDESC + 10) diff --git a/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc index bd67f0e0a48b..59195eef51f4 100644 --- a/sw/source/core/inc/pagefrm.hrc +++ b/sw/source/core/inc/pagefrm.hrc @@ -17,7 +17,6 @@ #define STR_PAGE_BREAK RC_PAGEFRM_BEGIN + 1 #define STR_COLUMN_BREAK RC_PAGEFRM_BEGIN + 2 - // If you add resources, don't forget to update this #define PAGEFRM_ACT_END STR_COLUMN_BREAK diff --git a/sw/source/core/uibase/dbui/mailmergechildwindow.src b/sw/source/core/uibase/dbui/mailmergechildwindow.src index e3dac452fa83..780c0d3ef85e 100644 --- a/sw/source/core/uibase/dbui/mailmergechildwindow.src +++ b/sw/source/core/uibase/dbui/mailmergechildwindow.src @@ -27,7 +27,6 @@ #define WORKAROUND \ Text [ en-US ] = "Return to Mail Merge Wizard" ; \ - FloatingWindow DLG_MAILMERGECHILD\ { OutputSize = TRUE ; diff --git a/sw/source/core/uibase/docvw/annotation.hrc b/sw/source/core/uibase/docvw/annotation.hrc index 5fe3e497c680..e94aa557b29b 100644 --- a/sw/source/core/uibase/docvw/annotation.hrc +++ b/sw/source/core/uibase/docvw/annotation.hrc @@ -34,13 +34,11 @@ #define STR_REPLY (RC_ANNOTATION_BEGIN + 7) #define STR_FORMAT_ALL_NOTES (RC_ANNOTATION_BEGIN + 8) - #define ANNOTATION_ACT_END STR_REPLY #if ANNOTATION_ACT_END > RC_ANNOTATION_END #error Resource-Id Ueberlauf in #file, #line #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/docvw/docvw.hrc b/sw/source/core/uibase/docvw/docvw.hrc index 7f5e5b6e9786..3347b1862639 100644 --- a/sw/source/core/uibase/docvw/docvw.hrc +++ b/sw/source/core/uibase/docvw/docvw.hrc @@ -48,7 +48,6 @@ #define MN_READONLY_GRAPHICTOGALLERY (RC_DOCVW_BEGIN + 24) #define MN_READONLY_BACKGROUNDTOGALLERY (RC_DOCVW_BEGIN + 60) - #define STR_CHAIN_OK (RC_DOCVW_BEGIN + 2) #define STR_CHAIN_NOT_EMPTY (RC_DOCVW_BEGIN + 3) #define STR_CHAIN_IS_IN_CHAIN (RC_DOCVW_BEGIN + 4) @@ -85,7 +84,6 @@ #error Resource-Id Ueberlauf in #file, #line #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/inc/app.hrc b/sw/source/core/uibase/inc/app.hrc index c5ac3f54edfe..8896a3d72e88 100644 --- a/sw/source/core/uibase/inc/app.hrc +++ b/sw/source/core/uibase/inc/app.hrc @@ -28,7 +28,6 @@ // For the interface because the RID_APP_BEGIN is now Desktop. #define RID_SW_NAME ( RC_APP_BEGIN + 8) - #define STR_UNBENANNT (RC_APP_BEGIN + 13) #define STR_VERSION (RC_APP_BEGIN + 14) #define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) @@ -55,7 +54,6 @@ #define STR_FDLG_TEMPLATE_BUTTON (RC_APP_BEGIN + 1) #define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) - // Ids for all the PopUpMenues #define MN_FORMAT_STYLE (RC_APP_BEGIN + 17) #define MN_FORMAT_ALGN (RC_APP_BEGIN + 18) diff --git a/sw/source/core/uibase/inc/frmui.hrc b/sw/source/core/uibase/inc/frmui.hrc index 60c81b32aac5..e138db1c02f3 100644 --- a/sw/source/core/uibase/inc/frmui.hrc +++ b/sw/source/core/uibase/inc/frmui.hrc @@ -64,7 +64,6 @@ #error Resource-Id Ueberlauf in #file, #line #endif - #endif // FRMUI_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/inc/globdoc.hrc b/sw/source/core/uibase/inc/globdoc.hrc index 8c954b379294..e633bade88a1 100644 --- a/sw/source/core/uibase/inc/globdoc.hrc +++ b/sw/source/core/uibase/inc/globdoc.hrc @@ -27,14 +27,10 @@ #define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) #define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) - - #define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63) - #define GLOBDOC_ACT_END MN_GLOBAL_TEXT_POPUPMENU - #if GLOBDOC_ACT_END > RC_GLOBDOC_END #error Resource-Id Ueberlauf in #file, #line #endif diff --git a/sw/source/core/uibase/inc/popup.hrc b/sw/source/core/uibase/inc/popup.hrc index 88ed692f644a..4fea654a72e0 100644 --- a/sw/source/core/uibase/inc/popup.hrc +++ b/sw/source/core/uibase/inc/popup.hrc @@ -43,7 +43,6 @@ #error Resource-Id Ueberlauf in #file, #line #endif - #endif // _POPUP_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/uibase/inc/shells.hrc b/sw/source/core/uibase/inc/shells.hrc index 36b48c5835fe..7af1b8c5a36f 100644 --- a/sw/source/core/uibase/inc/shells.hrc +++ b/sw/source/core/uibase/inc/shells.hrc @@ -55,7 +55,6 @@ #define STR_SHELLNAME_DRAW_TEXT (RC_SHELLS_BEGIN + 31) #define STR_SHELLNAME_MEDIA (RC_SHELLS_BEGIN + 32) - #define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33) #define STR_SHELLNAME_BEZIER (RC_SHELLS_BEGIN + 34) diff --git a/sw/source/core/uibase/inc/table.hrc b/sw/source/core/uibase/inc/table.hrc index 6f7635bd4d36..f7ce08d9a17c 100644 --- a/sw/source/core/uibase/inc/table.hrc +++ b/sw/source/core/uibase/inc/table.hrc @@ -21,11 +21,8 @@ #define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) - #define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7) - - #define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13) #define TABLE_ACT_END MSG_WRONG_TABLENAME diff --git a/sw/source/core/uibase/inc/utlui.hrc b/sw/source/core/uibase/inc/utlui.hrc index 60ff13ff6140..9007b886838a 100644 --- a/sw/source/core/uibase/inc/utlui.hrc +++ b/sw/source/core/uibase/inc/utlui.hrc @@ -22,12 +22,9 @@ #include "rcid.hrc" - #define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1) #define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) - - // Strings in NumberFormatter-Listbox #define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) // hyperlink status bar control @@ -138,7 +135,6 @@ #define STR_AUTH_FIELD_ISBN (STR_AUTH_FIELD_START + 30) #define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN) - #define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) #define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) @@ -154,7 +150,6 @@ #define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE (RC_UTLUI_BEGIN + 17) #define IMG_PAGE_BREAK (RC_UTLUI_BEGIN + 18) - //local ids of the Database ImageLists #define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/ #define IMG_EXPAND 18003 /*RID_SVXIMG_EXPANDEDNODE*/ diff --git a/sw/source/core/uibase/inc/web.hrc b/sw/source/core/uibase/inc/web.hrc index aef47e9d2bb1..bf279f94c0bc 100644 --- a/sw/source/core/uibase/inc/web.hrc +++ b/sw/source/core/uibase/inc/web.hrc @@ -34,8 +34,6 @@ #define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) #define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) - - #define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE #if WEB_ACT_END > RC_WEB_END diff --git a/sw/source/core/uibase/ribbar/inputwin.hrc b/sw/source/core/uibase/ribbar/inputwin.hrc index 5e168a0d0552..a62748a019c1 100644 --- a/sw/source/core/uibase/ribbar/inputwin.hrc +++ b/sw/source/core/uibase/ribbar/inputwin.hrc @@ -19,7 +19,6 @@ #ifndef _INPUTWIN_HRC #define _INPUTWIN_HRC - //PopupMenu Id's #define MN_CALC_PHD 1 #define MN_CALC_SQRT 2 diff --git a/sw/source/core/uibase/utlui/navipi.src b/sw/source/core/uibase/utlui/navipi.src index e1b4e6df7d23..cf9ec60cb605 100644 --- a/sw/source/core/uibase/utlui/navipi.src +++ b/sw/source/core/uibase/utlui/navipi.src @@ -472,7 +472,6 @@ ImageList IMG_NAVI_ENTRYBMP NAVI_ENTRY_IDS }; - String STR_ACCESS_TL_GLOBAL { Text [ en-US ] = "Global View"; diff --git a/sw/source/core/uibase/wrtsh/wrtsh.hrc b/sw/source/core/uibase/wrtsh/wrtsh.hrc index 87435e1bce99..824a47f1c053 100644 --- a/sw/source/core/uibase/wrtsh/wrtsh.hrc +++ b/sw/source/core/uibase/wrtsh/wrtsh.hrc @@ -21,8 +21,6 @@ #include "rcid.hrc" - - #define STR_DDEERROR_APP1 (RC_WRTSH_BEGIN + 2) #define STR_DDEERROR_APP2 (RC_WRTSH_BEGIN + 3) #define STR_DDEERROR_DATA1 (RC_WRTSH_BEGIN + 4) diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index 639409f4c10d..f258063057dc 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -69,7 +69,6 @@ // !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!! #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// !!!! umsetzen !!! - // Id's nur fuer die Undo/Redo faehigen "Funktionen" #define STR_MOVE_UNDO (CORE_REPEAT_END + 1) #define STR_INSERT_GLOSSARY (CORE_REPEAT_END + 2) diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index fbded3791dce..1ff30702bece 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -165,8 +165,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; }; - - // Bitmap for the NumberingTemplates in the Organizer Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; }; @@ -191,7 +189,6 @@ String STR_WRITER_DOCUMENT_FULLTYPE Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Text Document"; }; - String STR_CANTOPEN { Text [ en-US ] = "Cannot open document." ; @@ -284,10 +281,8 @@ String STR_DOC_STAT Text [ en-US ] = "Statistics" ; }; - // Statusbar-titles - String STR_STATSTR_W4WREAD { Text [ en-US ] = "Importing document..." ; @@ -378,7 +373,6 @@ String STR_STATSTR_SWGPRTOLENOTIFY Text [ en-US ] = "Adapt Objects..."; }; - QueryBox MSG_COMCORE_ASKSEARCH { Buttons = WB_YES_NO_CANCEL ; @@ -708,7 +702,6 @@ ToolBox RID_MODULE_TOOLBOX Scroll = TRUE ; }; - String STR_CAPTION_TABLE { Text [ en-US ] = "%PRODUCTNAME Writer Table"; diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src index 5fe85a102c25..df68e4d8d4f8 100644 --- a/sw/source/ui/app/error.src +++ b/sw/source/ui/app/error.src @@ -38,7 +38,6 @@ InfoBox ERR_CLPBRD_READ Message [ en-US ] = "Error reading from the clipboard." ; }; - #define ERR_CODE( class, err ) (class | (err - ERROR_SW_BASE)) #define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE)) @@ -136,7 +135,6 @@ Resource RID_SW_ERRHDL Text [ en-US ] = "The structure of a linked table cannot be modified." ; }; - String WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS ) { Text [ en-US ] = "No drawings could be read." ; diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 95816563a615..4fa9b14c52a9 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -48,7 +48,6 @@ Text [ en-US ] = "Pa~ge..." ; \ }; - #define MN_TEXT_ATTR\ MenuItem\ {\ @@ -185,7 +184,6 @@ /* --------------------- D O C U M E N T -------------------------- */ - #define _MN_EDIT_FIELD \ MenuItem \ { \ @@ -262,7 +260,6 @@ _MN_EDIT_OPEN_HYPERLINK \ _MN_EDIT_OPEN_SMARTTAGMENU - #define MN_RESET\ MenuItem\ {\ @@ -650,7 +647,6 @@ ITEM_FORMAT_FRAME_TO_TOP\ };\ - #define MN_DRAW5 \ MenuItem\ {\ @@ -715,7 +711,6 @@ ITEM_REPLACE_CONTROL\ };\ - #define MN_ANNOTATIONS \ MenuItem\ {\ @@ -776,7 +771,6 @@ String MN_TEXT_POPUPMENU Text [ en-US ] = "Text" ; }; - String MN_TAB_POPUPMENU { Text [ en-US ] = "Table" ; @@ -898,7 +892,6 @@ Menu MN_TAB_POPUPMENU };\ }; - #define MN_MOUSE_FRAME_WITH_CONTOUR MN_MOUSE_FRAME_BEGIN String MN_DRAW_POPUPMENU diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src index 39d7d9ea43b8..e9c2a7aed777 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ b/sw/source/ui/dbui/mmaddressblockpage.src @@ -26,7 +26,6 @@ < "< none >" ; > ; \ }; - #define WORKAROUND\ Text [ en-US ] = "New Address Block"; diff --git a/sw/source/ui/dbui/mmgreetingspage.src b/sw/source/ui/dbui/mmgreetingspage.src index 09b093479814..721596c28d4b 100644 --- a/sw/source/ui/dbui/mmgreetingspage.src +++ b/sw/source/ui/dbui/mmgreetingspage.src @@ -26,7 +26,6 @@ < "< not available >" ; > ; \ }; - #define GREETINGS_BODY \ CheckBox CB_PERSONALIZED \ { \ diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src index 4d3ac7674a47..5e56e441826a 100644 --- a/sw/source/ui/dochdl/dochdl.src +++ b/sw/source/ui/dochdl/dochdl.src @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dochdl.hrc" #include "globals.hrc" - String STR_NOGLOS { Text [ en-US ] = "AutoText for Shortcut '%1' not found." ; @@ -31,7 +29,6 @@ String STR_NO_TABLE Text [ en-US ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table."; }; - InfoBox MSG_ERR_INSERT_GLOS { Message [ en-US ] = "AutoText could not be created." ; diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index 5be5a028309f..f2ed93c63c37 100644 --- a/sw/source/ui/utlui/utlui.src +++ b/sw/source/ui/utlui/utlui.src @@ -22,7 +22,6 @@ #include "helpid.h" #include "comcore.hrc" - Resource RID_SHELLRES_AUTOFMTSTRS { String STR_AUTOFMTREDL_DEL_EMPTY_PARA+1 diff --git a/uui/source/nameclashdlg.hrc b/uui/source/nameclashdlg.hrc index fd8d972b2fa6..b19bca05ff16 100644 --- a/uui/source/nameclashdlg.hrc +++ b/uui/source/nameclashdlg.hrc @@ -20,8 +20,6 @@ #ifndef UUI_NAMECLASHDLG_HRC #define UUI_NAMECLASHDLG_HRC - - #define FT_FILE_EXISTS_WARNING 20 #define EDIT_NEW_NAME 21 #define BTN_OVERWRITE 22 diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index bda7498be9a5..cb4355a7b61c 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -19,14 +19,11 @@ #include <svids.hrc> - - Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET) { File = "check.png"; }; - Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET) { File = "checkmono.bmp"; @@ -42,8 +39,6 @@ Bitmap (SV_RESID_BITMAP_SCROLLMSK) File = "scrmsk.png"; }; - - Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET) { File = "radio.png"; @@ -294,9 +289,6 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRINTERADMIN) File = "printeradmin_16_8.png" ; }; - - - Bitmap (SV_ICON_LARGE_START) { File = "mainapp_32.png" ; diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src index 92aac72d3883..bf795ba73c26 100644 --- a/wizards/source/euro/euro.src +++ b/wizards/source/euro/euro.src @@ -60,13 +60,11 @@ String STEP_ZERO + 6 Text [ en-US ] = "Currencies:"; }; - String STEP_ZERO + 7 { Text [ en-US ] = "C~ontinue>>"; }; - String STEP_ZERO + 8 { Text [ en-US ] = "C~lose"; @@ -122,7 +120,6 @@ String STEP_CONVERTER + 9 Text [ en-US ] = "Templates:"; }; - String STEP_AUTOPILOT { Text [ en-US ] = "Extent"; @@ -158,19 +155,16 @@ String STEP_AUTOPILOT + 6 Text [ en-US ] = "Target directory:"; }; - String STEP_AUTOPILOT + 7 { Text [ en-US ] = "Temporarily unprotect sheet without query"; }; - String STEP_AUTOPILOT + 10 { Text [ en-US ] = "Also convert fields and tables in text documents"; }; - String STATUSLINE { Text [ en-US ] = "Conversion status: "; @@ -186,27 +180,21 @@ String STATUSLINE + 2 Text [ en-US ] = "Registration of the relevant ranges: Sheet %1Number%1 of %2TotPageCount%2"; }; - String STATUSLINE + 3 { Text [ en-US ] = "Entry of the ranges to be converted..."; }; - - String STATUSLINE + 4 { Text [ en-US ] = "Sheet protection for each sheet will be restored..."; }; - String STATUSLINE + 5 { Text [ en-US ] = "Conversion of the currency units in the cell templates..."; }; - - String MESSAGES { Text [ en-US ] = "~Finish"; @@ -232,70 +220,56 @@ String MESSAGES + 4 Text [ en-US ] = "non-existant"; }; - String MESSAGES + 5 { Text [ en-US ] = "Euro Converter"; }; - - String MESSAGES + 6 { Text [ en-US ] = "Should protected spreadsheets be temporarily unprotected?"; }; - String MESSAGES + 7 { Text [ en-US ] = "Enter the password to unprotect the table %1TableName%1"; }; - String MESSAGES + 8 { Text [ en-US ] = "Wrong Password!"; }; - String MESSAGES + 9 { Text [ en-US ] = "Protected Sheet"; }; - String MESSAGES + 10 { Text [ en-US ] = "Warning!"; }; - String MESSAGES + 11 { Text [ en-US ] = "Protection for the sheets will not be removed."; }; - String MESSAGES + 12 { Text [ en-US ] = "Sheet cannot be unprotected"; }; - String MESSAGES + 13 { Text [ en-US ] = "The Wizard cannot edit this document as cell formats cannot be modified in documents containing protected spreadsheets."; }; - - String MESSAGES + 14 { Text [ en-US ] = "Please note that the Euro Converter will, otherwise, not be able to edit this document!"; }; - - String MESSAGES + 15 { Text [ en-US ] = "Please choose a currency to be converted first!"; @@ -316,31 +290,26 @@ String MESSAGES + 18 Text [ en-US ] = "Cancel"; }; - String MESSAGES + 19 { Text [ en-US ] = "Please select a %PRODUCTNAME Calc document for editing!"; }; - String MESSAGES + 20 { Text [ en-US ] = "'<1>' is not a directory!"; }; - String MESSAGES + 21 { Text [ en-US ] = "Document is read-only!"; }; - String MESSAGES + 22 { Text [ en-US ] = "The '<1>' file already exists.<CR>Do you want to overwrite it?"; }; - String MESSAGES + 23 { Text [ en-US ] = "Do you really want to terminate conversion at this point?"; @@ -456,7 +425,6 @@ String STEP_LASTPAGE Text [ en-US ] = "Progress"; }; - String STEP_LASTPAGE + 1 { Text [ en-US ] = "Retrieving the relevant documents..."; diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index e4e04f74dbae..40e16700cde5 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -27,14 +27,12 @@ #define RID_DB_REPORT_WIZARD_START 2400 #define RID_DB_TABLE_WIZARD_START 2600 - #define RID_LETTERWIZARDDIALOG_START 3000 #define RID_LETTERWIZARDGREETING_START 3080 #define RID_LETTERWIZARDSALUTATION_START 3090 #define RID_LETTERWIZARDROADMAP_START 3100 #define RID_LETTERWIZARDLANGUAGE_START 3110 - #define RID_FAXWIZARDDIALOG_START 3200 #define RID_FAXWIZARDCOMMUNICATION_START 3270 #define RID_FAXWIZARDGREETING_START 3280 @@ -50,10 +48,6 @@ #define RID_AGENDAWIZARDDIALOG_START 5000 - - - - String RID_COMMON_START + 0 { Text [ en-US ] = "The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk."; @@ -164,10 +158,8 @@ String RID_COMMON_START + 21 Text [ en-US] = "The wizard could not be run, because important files were not found.\nUnder 'Tools - Options - %PRODUCTNAME - Paths' click the 'Default' button to reset the paths to the original default settings.\nThen run the wizard again."; }; - // end of common section - String RID_DB_COMMON_START + 0 { Text [ en-US] = "C~reate"; @@ -200,7 +192,6 @@ String RID_DB_COMMON_START + 6 Text [ en-US] = "An error occurred while running the wizard. The wizard will be terminated."; }; - String RID_DB_COMMON_START + 14 { Text [ en-US ] = "No connection to the database could be established."; @@ -216,13 +207,11 @@ String RID_DB_COMMON_START + 21 Text [ en-US ] = "~Stop"; }; - String RID_DB_COMMON_START + 30 { Text[ en-US ] = "The document could not be saved."; }; - String RID_DB_COMMON_START + 33 { Text[ en-US ] = "Exiting the wizard"; @@ -238,13 +227,11 @@ String RID_DB_COMMON_START + 35 Text[ en-US ] = "The connection to the data source could not be established."; }; - String RID_DB_COMMON_START + 36 { Text[ en-US ] = "The file path entered is not valid."; }; - String RID_DB_COMMON_START + 37 { Text[ en-US ] = "Please select a data source"; @@ -290,12 +277,8 @@ String RID_DB_COMMON_START + 45 Text [ en-US] = "The field names from '%NAME' could not be retrieved."; }; - - - // Form Wizard - String RID_DB_FORM_WIZARD_START + 0 { Text [ en-US ] = "Form Wizard"; @@ -356,7 +339,6 @@ String RID_DB_FORM_WIZARD_START + 13 Text [ en-US ] = "Fields in form"; }; - String RID_DB_FORM_WIZARD_START + 19 { Text [ en-US ] = "The join '<FIELDNAME1>' and '<FIELDNAME2>' has been selected twice.\nBut joins may only be used once."; @@ -402,8 +384,6 @@ String RID_DB_FORM_WIZARD_START + 27 Text [ en-US ] = "F~ourth joined main form field"; }; - - String RID_DB_FORM_WIZARD_START + 28 { Text [ en-US ] = "Field border"; @@ -414,7 +394,6 @@ String RID_DB_FORM_WIZARD_START + 29 Text [ en-US ] = "No border"; }; - String RID_DB_FORM_WIZARD_START + 30 { Text [ en-US ] = "3D look"; @@ -470,7 +449,6 @@ String RID_DB_FORM_WIZARD_START + 40 Text [ en-US ] = "As Data Sheet"; }; - String RID_DB_FORM_WIZARD_START + 41 { Text [ en-US ] = "Arrangement of the main form"; @@ -481,7 +459,6 @@ String RID_DB_FORM_WIZARD_START + 42 Text [ en-US ] = "Arrangement of the subform"; }; - String RID_DB_FORM_WIZARD_START + 44 { Text [ en-US ] = "The form is to be ~used for entering new data only."; @@ -512,21 +489,16 @@ String RID_DB_FORM_WIZARD_START + 49 Text [ en-US ] = "Do not allow ~addition of new data"; }; - - String RID_DB_FORM_WIZARD_START + 50 { Text [ en-US ] = "Name of ~the form"; }; - - String RID_DB_FORM_WIZARD_START + 51 { Text [ en-US ] = "How do you want to proceed after creating the form?"; }; - String RID_DB_FORM_WIZARD_START + 52 { Text [ en-US ] = "~Work with the form"; @@ -537,26 +509,21 @@ String RID_DB_FORM_WIZARD_START + 53 Text [ en-US ] = "~Modify the form"; }; - String RID_DB_FORM_WIZARD_START + 55 { Text [ en-US ] = "~Page Styles"; }; - - String RID_DB_FORM_WIZARD_START + 80 { Text [ en-US ] = "Field selection"; }; - String RID_DB_FORM_WIZARD_START + 81 { Text [ en-US ] = "Set up a subform"; }; - String RID_DB_FORM_WIZARD_START + 82 { Text [ en-US ] = "Add subform fields"; @@ -597,13 +564,11 @@ String RID_DB_FORM_WIZARD_START + 89 Text [ en-US ] = "(Time)"; }; - String RID_DB_FORM_WIZARD_START + 90 { Text [ en-US ] = "Select the fields of your form"; }; - String RID_DB_FORM_WIZARD_START + 91 { Text [ en-US ] = "Decide if you want to set up a subform"; @@ -644,9 +609,6 @@ String RID_DB_FORM_WIZARD_START + 98 Text [ en-US ] = "A form with the name '%FORMNAME' already exists.\nChoose another name."; }; - - - String RID_DB_QUERY_WIZARD_START + 0 { Text [ en-US ] = "Query Wizard"; @@ -657,13 +619,11 @@ String RID_DB_QUERY_WIZARD_START + 1 Text [ en-US] = "Query"; }; - String RID_DB_QUERY_WIZARD_START + 2 { Text [ en-US] = "Query Wizard"; }; - String RID_DB_QUERY_WIZARD_START + 3 { Text [ en-US] = "~Tables"; @@ -674,7 +634,6 @@ String RID_DB_QUERY_WIZARD_START + 4 Text [ en-US] = "A~vailable fields"; }; - String RID_DB_QUERY_WIZARD_START + 5 { Text [ en-US] = "Name ~of the query"; @@ -695,7 +654,6 @@ String RID_DB_QUERY_WIZARD_START + 8 Text [ en-US] = "~How do you want to proceed after creating the query?"; }; - String RID_DB_QUERY_WIZARD_START + 9 { Text [ en-US] = "Match ~all of the following"; @@ -716,13 +674,11 @@ String RID_DB_QUERY_WIZARD_START + 12 Text [ en-US] = "~Summary query (Shows only results of aggregate functions.)"; }; - String RID_DB_QUERY_WIZARD_START + 16 { Text [ en-US] = "Aggregate functions"; }; - String RID_DB_QUERY_WIZARD_START + 17 { Text [ en-US] = "Fields"; @@ -733,7 +689,6 @@ String RID_DB_QUERY_WIZARD_START + 18 Text [ en-US] = "~Group by"; }; - String RID_DB_QUERY_WIZARD_START + 19 { Text [ en-US] = "Field"; @@ -749,13 +704,11 @@ String RID_DB_QUERY_WIZARD_START + 21 Text [ en-US] = "Table: "; }; - String RID_DB_QUERY_WIZARD_START + 22 { Text [ en-US] = "Query: "; }; - String RID_DB_QUERY_WIZARD_START + 24 { Text [ en-US] = "Condition"; @@ -766,7 +719,6 @@ String RID_DB_QUERY_WIZARD_START + 25 Text [ en-US] = "Value"; }; - // don't change anything to the next 10 values // they are list elements and need to be as follows String RID_DB_QUERY_WIZARD_START + 26 @@ -779,7 +731,6 @@ String RID_DB_QUERY_WIZARD_START + 27 Text [ en-US] = "is not equal to"; }; - String RID_DB_QUERY_WIZARD_START + 28 { Text [ en-US] = "is smaller than"; @@ -820,7 +771,6 @@ String RID_DB_QUERY_WIZARD_START + 35 Text [ en-US] = "is not null"; }; - String RID_DB_QUERY_WIZARD_START + 36 { Text [ en-US] = "true"; @@ -841,7 +791,6 @@ String RID_DB_QUERY_WIZARD_START + 39 Text [ en-US] = "or"; }; - String RID_DB_QUERY_WIZARD_START + 40 { Text [ en-US] = "get the sum of"; @@ -852,7 +801,6 @@ String RID_DB_QUERY_WIZARD_START + 41 Text [ en-US] = "get the average of"; }; - String RID_DB_QUERY_WIZARD_START + 42 { Text [ en-US] = "get the minimum of"; @@ -863,7 +811,6 @@ String RID_DB_QUERY_WIZARD_START + 43 Text [ en-US] = "get the maximum of"; }; - String RID_DB_QUERY_WIZARD_START + 44 { Text [ en-US] = "get the sum of <FIELD>"; @@ -884,7 +831,6 @@ String RID_DB_QUERY_WIZARD_START + 47 Text [ en-US] = "get the maximum of <FIELD>"; }; - String RID_DB_QUERY_WIZARD_START + 48 { Text [ en-US] = "(none)"; @@ -895,19 +841,16 @@ String RID_DB_QUERY_WIZARD_START + 50 Text [ en-US] = "Fie~lds in the Query: "; }; - String RID_DB_QUERY_WIZARD_START + 51 { Text [ en-US] = "Sorting order: "; }; - String RID_DB_QUERY_WIZARD_START + 52 { Text [ en-US] = "No sorting fields were assigned."; }; - String RID_DB_QUERY_WIZARD_START + 53 { Text [ en-US] = "Search conditions: "; @@ -918,19 +861,16 @@ String RID_DB_QUERY_WIZARD_START + 54 Text [ en-US] = "No conditions were assigned."; }; - String RID_DB_QUERY_WIZARD_START + 55 { Text [ en-US] = "Aggregate functions: "; }; - String RID_DB_QUERY_WIZARD_START + 56 { Text [ en-US] = "No aggregate functions were assigned."; }; - String RID_DB_QUERY_WIZARD_START + 57 { Text [ en-US] = "Grouped by: "; @@ -941,19 +881,16 @@ String RID_DB_QUERY_WIZARD_START + 58 Text [ en-US] = "No Groups were assigned."; }; - String RID_DB_QUERY_WIZARD_START + 59 { Text [ en-US ] = "Grouping conditions: "; }; - String RID_DB_QUERY_WIZARD_START + 60 { Text [ en-US] = "No grouping conditions were assigned."; }; - String RID_DB_QUERY_WIZARD_START + 70 { Text [ en-US] = "Select the fields (columns) for your query"; @@ -964,13 +901,11 @@ String RID_DB_QUERY_WIZARD_START + 71 Text [ en-US] = "Select the sorting order"; }; - String RID_DB_QUERY_WIZARD_START + 72 { Text [ en-US] = "Select the search conditions"; }; - String RID_DB_QUERY_WIZARD_START + 73 { Text [ en-US] = "Select the type of query"; @@ -986,25 +921,21 @@ String RID_DB_QUERY_WIZARD_START + 75 Text [ en-US] = "Select the grouping conditions"; }; - String RID_DB_QUERY_WIZARD_START + 76 { Text [ en-US] = "Assign aliases if desired"; }; - String RID_DB_QUERY_WIZARD_START + 77 { Text [ en-US] = "Check the overview and decide how to proceed"; }; - String RID_DB_QUERY_WIZARD_START + 80 { Text [ en-US] = "Field selection"; }; - String RID_DB_QUERY_WIZARD_START + 81 { Text [ en-US] = "Sorting order"; @@ -1040,13 +971,11 @@ String RID_DB_QUERY_WIZARD_START + 87 Text [ en-US] = "Overview"; }; - String RID_DB_QUERY_WIZARD_START + 88 { Text [ en-US] = "A field that has not been assigned an aggregate function must be used in a group."; }; - String RID_DB_QUERY_WIZARD_START + 89 { Text [ en-US] = "The condition '<FIELDNAME> <LOGICOPERATOR> <VALUE>' was chosen twice. Each condition can only be chosen once"; @@ -1067,7 +996,6 @@ String RID_DB_QUERY_WIZARD_START + 92 Text [ en-US] = "<FIELDTITLE> (<FIELDNAME>)"; }; - String RID_DB_QUERY_WIZARD_START + 93 { Text [ en-US] = "<FIELDNAME> (<SORTMODE>)"; @@ -1083,7 +1011,6 @@ String RID_DB_QUERY_WIZARD_START + 95 Text [ en-US] = "<CALCULATEDFUNCTION> <FIELDNAME>"; }; - String RID_DB_QUERY_WIZARD_START + 96 { Text [ en-US] = "<FIELDNAME> <LOGICOPERATOR> <VALUE>"; @@ -1094,7 +1021,6 @@ String RID_DB_REPORT_WIZARD_START + 0 Text [ en-US ] = "Report Wizard"; }; - String RID_DB_REPORT_WIZARD_START + 3 { Text [ en-US ] = "~Table"; @@ -1105,7 +1031,6 @@ String RID_DB_REPORT_WIZARD_START + 4 Text [ en-US ] = "Colu~mns"; }; - String RID_DB_REPORT_WIZARD_START + 7 { Text [ en-US ] = "Report_"; @@ -1121,8 +1046,6 @@ String RID_DB_REPORT_WIZARD_START + 9 Text [ en-US ] = "~Fields in report"; }; - - String RID_DB_REPORT_WIZARD_START + 11 { Text [ en-US ] = "Grouping"; @@ -1138,13 +1061,11 @@ String RID_DB_REPORT_WIZARD_START + 13 Text [ en-US ] = "Choose layout"; }; - String RID_DB_REPORT_WIZARD_START + 14 { Text [ en-US ] = "Create report"; }; - String RID_DB_REPORT_WIZARD_START + 15 { Text [ en-US ] = "Layout of data"; @@ -1155,7 +1076,6 @@ String RID_DB_REPORT_WIZARD_START + 16 Text [ en-US ] = "Layout of headers and footers"; }; - String RID_DB_REPORT_WIZARD_START + 19 { Text [ en-US ] = "Fields"; @@ -1166,13 +1086,11 @@ String RID_DB_REPORT_WIZARD_START + 20 Text [ en-US ] = "~Sort by"; }; - String RID_DB_REPORT_WIZARD_START + 21 { Text [ en-US ] = "T~hen by"; }; - String RID_DB_REPORT_WIZARD_START + 22 { Text [ en-US ] = "Orientation"; @@ -1188,44 +1106,36 @@ String RID_DB_REPORT_WIZARD_START + 24 Text [ en-US ] = "Landscape"; }; - - String RID_DB_REPORT_WIZARD_START + 28 { Text [ en-US ] = "Which fields do you want to have in your report?"; }; - String RID_DB_REPORT_WIZARD_START + 29 { Text [ en-US ] = "Do you want to add grouping levels?"; }; - String RID_DB_REPORT_WIZARD_START + 30 { Text [ en-US ] = "According to which fields do you want to sort the data?"; }; - String RID_DB_REPORT_WIZARD_START + 31 { Text [ en-US ] = "How do you want your report to look?"; }; - String RID_DB_REPORT_WIZARD_START + 32 { Text [ en-US ] = "Decide how you want to proceed"; }; - String RID_DB_REPORT_WIZARD_START + 33 { Text [ en-US ] = "Title of report"; }; - String RID_DB_REPORT_WIZARD_START + 34 { Text [ en-US ] = "Display report"; @@ -1246,13 +1156,11 @@ String RID_DB_REPORT_WIZARD_START + 37 Text [ en-US ] = "Descending"; }; - String RID_DB_REPORT_WIZARD_START + 40 { Text [ en-US ] = "~Dynamic report"; }; - String RID_DB_REPORT_WIZARD_START + 41 { Text [ en-US ] = "~Create report now"; @@ -1268,14 +1176,11 @@ String RID_DB_REPORT_WIZARD_START + 43 Text [ en-US ] = "Static report"; }; - String RID_DB_REPORT_WIZARD_START + 44 { Text [ en-US ] = "Save as"; }; - - String RID_DB_REPORT_WIZARD_START + 50 { Text [ en-US ] = "Groupings"; @@ -1321,13 +1226,11 @@ String RID_DB_REPORT_WIZARD_START + 58 Text [ en-US ] = "De~scending"; }; - String RID_DB_REPORT_WIZARD_START + 60 { Text [ en-US ] = "Binary fields cannot be displayed in the report."; }; - String RID_DB_REPORT_WIZARD_START + 61 { Text [ en-US ] = "The table '<TABLENAME>' does not exist."; @@ -1363,13 +1266,11 @@ String RID_DB_REPORT_WIZARD_START + 67 Text [ en-US ] = "Importing data..."; }; - String RID_DB_REPORT_WIZARD_START + 68 { Text [ en-US ] = "Labeling fields"; }; - String RID_DB_REPORT_WIZARD_START + 69 { Text [ en-US ] = "How do you want to label the fields?"; @@ -1380,43 +1281,36 @@ String RID_DB_REPORT_WIZARD_START + 70 Text [ en-US ] = "Label"; }; - String RID_DB_REPORT_WIZARD_START + 71 { Text [ en-US ] = "Field"; }; - String RID_DB_REPORT_WIZARD_START + 72 { Text [ en-US ] = "An error occurred in the wizard.<BR>The template '%PATH' could be erroneous.<BR>Either the required sections or tables do not exist or exist under the wrong name.<BR>See the Help for more detailed information.<BR>Please select another template."; }; - String RID_DB_REPORT_WIZARD_START + 73 { Text [ en-US ] = "There is an invalid user field in a table."; }; - String RID_DB_REPORT_WIZARD_START + 74 { Text [ en-US ] = "The sort criterion '<FIELDNAME>' was chosen twice. Each criterion can only be chosen once."; }; - String RID_DB_REPORT_WIZARD_START + 75 { Text [ en-US ] = "Note: The dummy text will be replaced by data from the database when the report is created."; }; - String RID_DB_REPORT_WIZARD_START + 76 { Text [ en-US ] = "A report '%REPORTNAME' already exists in the database. Please assign another name."; }; - String RID_DB_REPORT_WIZARD_START + 78 { Text [ en-US ] = "How do you want to proceed after creating the report?"; @@ -1601,8 +1495,6 @@ String RID_DB_REPORT_WIZARD_START + 122 Text [ en-US ] = "Worldmap"; }; - - String RID_DB_TABLE_WIZARD_START + 1 { Text [ en-US] = "Table Wizard"; @@ -1628,7 +1520,6 @@ String RID_DB_TABLE_WIZARD_START + 5 Text [ en-US] = "Create table"; }; - String RID_DB_TABLE_WIZARD_START + 8 { Text [ en-US] = "Select fields for your table"; @@ -1649,7 +1540,6 @@ String RID_DB_TABLE_WIZARD_START + 11 Text [ en-US] = "Create table"; }; - String RID_DB_TABLE_WIZARD_START + 14 { Text [ en-US] = "This wizard helps you to create a table for your database. After selecting a table category and a sample table, choose the fields you want to include in your table. You can include fields from more than one sample table."; @@ -1660,7 +1550,6 @@ String RID_DB_TABLE_WIZARD_START + 15 Text [ en-US] = "Ca~tegory"; }; - String RID_DB_TABLE_WIZARD_START + 16 { Text [ en-US] = "B~usiness"; @@ -1676,13 +1565,11 @@ String RID_DB_TABLE_WIZARD_START + 18 Text [ en-US] = "~Sample tables"; }; - String RID_DB_TABLE_WIZARD_START + 19 { Text [ en-US] = "A~vailable fields"; }; - String RID_DB_TABLE_WIZARD_START + 20 { Text [ en-US] = "Field information"; @@ -1708,13 +1595,11 @@ String RID_DB_TABLE_WIZARD_START + 24 Text [ en-US] = "Field type"; }; - String RID_DB_TABLE_WIZARD_START + 25 { Text [ en-US] = "~Selected fields"; }; - String RID_DB_TABLE_WIZARD_START + 26 { Text [ en-US] = "A primary key uniquely identifies each record in a database table. Primary keys ease the linking of information in separate tables, and it is recommended that you have a primary key in every table. Without a primary key, it will not be possible to enter data into this table."; @@ -1725,7 +1610,6 @@ String RID_DB_TABLE_WIZARD_START + 27 Text [ en-US] = "~Create a primary key"; }; - String RID_DB_TABLE_WIZARD_START + 28 { Text [ en-US] = "~Automatically add a primary key"; @@ -1746,19 +1630,16 @@ String RID_DB_TABLE_WIZARD_START + 31 Text [ en-US] = "F~ieldname"; }; - String RID_DB_TABLE_WIZARD_START + 32 { Text [ en-US] = "~Primary key fields"; }; - String RID_DB_TABLE_WIZARD_START + 33 { Text [ en-US] = "Auto ~value"; }; - String RID_DB_TABLE_WIZARD_START + 34 { Text [ en-US] = "What do you want to name your table?"; @@ -1769,7 +1650,6 @@ String RID_DB_TABLE_WIZARD_START + 35 Text [ en-US] = "Congratulations. You have entered all the information needed to create your table."; }; - String RID_DB_TABLE_WIZARD_START + 36 { Text [ en-US] = "What do you want to do next?"; @@ -1800,13 +1680,11 @@ String RID_DB_TABLE_WIZARD_START + 41 Text [ en-US] = "The table name '%TABLENAME' contains a character ('%SPECIALCHAR') that might not be supported by the database."; }; - String RID_DB_TABLE_WIZARD_START + 42 { Text [ en-US] = "The field name '%FIELDNAME' contains a special character ('%SPECIALCHAR') that might not be supported by the database."; }; - String RID_DB_TABLE_WIZARD_START + 43 { Text [ en-US] = "Field"; @@ -2211,7 +2089,6 @@ String RID_LETTERWIZARDGREETING_START + 3 Text [ en-US] = "Cheers"; }; - // Letter Wizard Roadmap Start String RID_LETTERWIZARDROADMAP_START + 1 { @@ -2557,7 +2434,6 @@ String RID_FAXWIZARDSALUTATION_START + 4 Text [ en-US] = "Hi,"; }; - // Fax Wizard Greeting Start String RID_FAXWIZARDGREETING_START + 1 { @@ -2579,7 +2455,6 @@ String RID_FAXWIZARDGREETING_START + 4 Text [ en-US] = "Love"; }; - // Fax Wizard Roadmap Start String RID_FAXWIZARDROADMAP_START + 1 { @@ -2692,7 +2567,6 @@ String RID_WEBWIZARDDIALOG_START +22 Text [ en-US ] = "Modified:"; }; - String RID_WEBWIZARDDIALOG_START +24 { Text [ en-US ] = "~Preview"; @@ -2888,7 +2762,6 @@ String RID_WEBWIZARDDIALOG_START +73 Text [ en-US ] = "FTP target '%FILENAME' is a file."; }; - String RID_WEBWIZARDDIALOG_START +74 { Text [ en-US ] = "The local target '%FILENAME' is a file."; @@ -3249,7 +3122,6 @@ String RID_WEBWIZARDDIALOG_START +151 Text [ en-US ] = "Size: %NUMBERKB"; }; - String RID_WEBWIZARDDIALOG_START +152 { Text [ en-US ] = "File not found. Would you like to specify a new file location?"; diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src index dfaccd6f5979..ed27ba56e9fc 100644 --- a/wizards/source/importwizard/importwi.src +++ b/wizards/source/importwizard/importwi.src @@ -88,8 +88,6 @@ #define sSumMSTableTemplates 3211 #define sSumMSDrawTemplates 3212 - - String sHelpButton { Text [ en-US ] = "~Help"; @@ -130,8 +128,6 @@ String sWelcometextLabel3 Text [ en-US ] = "Select the document type for conversion:"; }; - - String sMSTemplateCheckbox_1_ { Text [ en-US ] = "Word templates"; @@ -162,21 +158,16 @@ String sMSDocumentCheckbox_3_ Text [ en-US ] = "PowerPoint/Publisher documents"; }; - String sSearchInSubDir { Text [ en-US ] = "Including subdirectories"; }; - - String sMSContainerName { Text [ en-US ] = "Microsoft Office"; }; - - String sSummaryHeader { Text [ en-US ] = "Summary:"; @@ -187,19 +178,16 @@ String sTextImportLabel Text [ en-US ] = "Import from:"; }; - String sTextExportLabel { Text [ en-US ] = "Save to:"; }; - String sGroupnameDefault { Text [ en-US ] = "Imported_Templates"; }; - String sProgressDesc1 { Text [ en-US ] = "Progress: "; @@ -215,31 +203,26 @@ String sProgressMoreDocs Text [ en-US ] = "Documents"; }; - String sProgressMoreTemplates { Text [ en-US ] = "Templates"; }; - String sNoDirCreation { Text [ en-US ] = "The '%1' directory cannot be created: "; }; - String sMsgDirNotThere { Text [ en-US ] = "The '%1' directory does not exist."; }; - String sQueryfornewCreation { Text [ en-US ] = "Do you want to create it now?"; }; - String sFileExists { Text [ en-US ] = "The '<1>' file already exists.<CR>Do you want to overwrite it?"; @@ -250,13 +233,11 @@ String sMorePathsError3 Text [ en-US ] = "Directories do not exist"; }; - String sOverwriteallFiles { Text [ en-US ] = "Do you want to overwrite documents without being asked?"; }; - String sreeditMacro { Text [ en-US ] = "Document macro has to be revised."; @@ -267,14 +248,11 @@ String scouldNotsaveDocument Text [ en-US ] = "Document '<1>' could not be saved."; }; - String scouldNotopenDocument { Text [ en-US ] = "Document '<1>' could not be opened."; }; - - String sConvertError1 { Text [ en-US ] = "Do you really want to terminate conversion at this point?"; @@ -295,7 +273,6 @@ String sRTErrorHeader Text [ en-US ] = "Error"; }; - String sPathDialogMessage { Text [ en-US ] = "Select a directory"; @@ -321,13 +298,11 @@ String sProgressPage3 Text [ en-US ] = "Converting the documents"; }; - String sProgressFound { Text [ en-US ] = "Found:"; }; - String sProgressPage5 { Text [ en-US ] = "%1 found"; @@ -338,13 +313,11 @@ String sReady Text [ en-US ] = "Finished"; }; - String sSourceDocuments { Text [ en-US ] = "Source documents"; }; - String sTargetDocuments { Text [ en-US ] = "Target documents"; @@ -355,26 +328,21 @@ String sCreateLogfile Text [ en-US ] = "Create log file"; }; - String sLogfileSummary { Text [ en-US ] = "<COUNT> documents converted"; }; - - String sLogfileHelpText { Text [ en-US ] = "A log file will be created in your work directory"; }; - String sshowLogfile { Text [ en-US ] = "Show log file"; }; - String sSumInclusiveSubDir { Text [ en-US ] = "All subdirectories will be taken into account"; @@ -385,37 +353,31 @@ String sSumSaveDokumente Text [ en-US ] = "These will be exported to the following directory:"; }; - String sSumMSTextDocuments { Text [ en-US ] = "All Word documents contained in the following directory will be imported:"; }; - String sSumMSTableDocuments { Text [ en-US ] = "All Excel documents contained in the following directory will be imported:"; }; - String sSumMSDrawDocuments { Text [ en-US ] = "All PowerPoint/Publisher documents contained in the following directory will be imported:"; }; - String sSumMSTextTemplates { Text [ en-US ] = "All Word templates contained in the following directory will be imported:"; }; - String sSumMSTableTemplates { Text [ en-US ] = "All Excel templates contained in the following directory will be imported:"; }; - String sSumMSDrawTemplates { Text [ en-US ] = "All PowerPoint templates contained in the following directory will be imported:"; diff --git a/wizards/source/template/template.src b/wizards/source/template/template.src index ca3aa8237589..abcfcfc4a244 100644 --- a/wizards/source/template/template.src +++ b/wizards/source/template/template.src @@ -302,7 +302,6 @@ String CorrespondenceDialog+3 Text [ en-US ] = "Use of This Template"; }; - String CorrespondenceFields { Text [ en-US ] = "Click placeholder and overwrite"; @@ -338,7 +337,6 @@ String CorrespondenceFields+6 Text [ en-US ] = "Country"; }; - String CorrespondenceFields+7 { Text [ en-US ] = "ZIP/Postal Code"; @@ -354,121 +352,101 @@ String CorrespondenceFields+9 Text [ en-US ] = "Title"; }; - String CorrespondenceFields+10 { Text [ en-US ] = "Position"; }; - String CorrespondenceFields+11 { Text [ en-US ] = "Form of Address"; }; - String CorrespondenceFields+12 { Text [ en-US ] = "Initials"; }; - String CorrespondenceFields+13 { Text [ en-US ] = "Salutation"; }; - String CorrespondenceFields+14 { Text [ en-US ] = "Home Phone"; }; - String CorrespondenceFields+15 { Text [ en-US ] = "Work Phone"; }; - String CorrespondenceFields+16 { Text [ en-US ] = "Fax"; }; - String CorrespondenceFields+17 { Text [ en-US ] = "E-Mail"; }; - String CorrespondenceFields+18 { Text [ en-US ] = "URL"; }; - String CorrespondenceFields+19 { Text [ en-US ] = "Notes"; }; - String CorrespondenceFields+20 { Text [ en-US ] = "Alt. Field 1"; }; - String CorrespondenceFields+21 { Text [ en-US ] = "Alt. Field 2"; }; - String CorrespondenceFields+22 { Text [ en-US ] = "Alt. Field 3"; }; - String CorrespondenceFields+23 { Text [ en-US ] = "Alt. Field 4"; }; - String CorrespondenceFields+24 { Text [ en-US ] = "ID"; }; - String CorrespondenceFields+25 { Text [ en-US ] = "State"; }; - String CorrespondenceFields+26 { Text [ en-US ] = "Office Phone"; }; - String CorrespondenceFields+27 { Text [ en-US ] = "Pager"; }; - String CorrespondenceFields+28 { Text [ en-US ] = "Mobile Phone"; }; - String CorrespondenceFields+29 { Text [ en-US ] = "Other Phone"; @@ -484,7 +462,6 @@ String CorrespondenceFields+31 Text [ en-US ] = "Invite"; }; - String TextField { Text [ en-US ] = "User data field is not defined!"; @@ -496,7 +473,6 @@ String Newsletter Text [ en-US ] = "General layout"; }; - String Newsletter + 1 { Text [ en-US ] = "Default layout"; diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc index 52edfa09a94c..5c4a2dfdbee3 100644 --- a/xmlsecurity/inc/xmlsecurity/global.hrc +++ b/xmlsecurity/inc/xmlsecurity/global.hrc @@ -26,7 +26,6 @@ #define RID_XMLSECTP_DETAILS 1004 #define RID_XMLSECTP_MACROWARN 1009 - #define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013 #endif diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index d50d8d52c041..e92b65ad4181 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -49,7 +49,6 @@ #define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH) #define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_DESC_X-RSC_CD_PUSHBUTTON_WIDTH) - // --------- tab dialog Certificate viewer --------- #define CS_COL_0 RSC_SP_DLG_INNERBORDER_LEFT diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src index efc06da60d8a..d4baf8f69bd0 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src @@ -32,7 +32,6 @@ ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT "Save document in ODF 1.2 format and add all desired signatures again."; }; - QueryBox MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN { Buttons = WB_YES_NO ; |