summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r--dbaccess/source/ui/dlg/AutoControls.src3
-rw-r--r--dbaccess/source/ui/dlg/AutoControls_tmpl.hrc31
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hrc1
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.src1
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.hrc3
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.hrc1
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.src19
-rw-r--r--dbaccess/source/ui/dlg/dbadmin2.src2
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.hrc2
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.src11
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.hrc1
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.hrc1
12 files changed, 0 insertions, 76 deletions
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_