diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-18 16:56:16 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-19 20:04:22 +0200 |
| commit | 3db8d606d5cdb5f0569a4263d4793c17920d0ae1 (patch) | |
| tree | e8b5e1e6275c4ccc0cd55c94e39ae7d8bc598e4e /dbaccess | |
| parent | e175eb3cedded28909247f4d46f2c17ff2f58be2 (diff) | |
hrc and src files: squeeze multiple newlines
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done
Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
Diffstat (limited to 'dbaccess')
33 files changed, 0 insertions, 149 deletions
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."; |