Merge branch 'master' into feature/gnumake4

Conflicts:
dbaccess/AllLangResTarget_adabasui.mk
dbaccess/AllLangResTarget_dba.mk
dbaccess/AllLangResTarget_dbmm.mk
dbaccess/AllLangResTarget_sdbt.mk
dbaccess/Executable_odbcconfig.mk
dbaccess/JunitTest_dbaccess_unoapi.mk
dbaccess/Library_adabasui.mk
dbaccess/Library_dba.mk
dbaccess/Library_dbaxml.mk
dbaccess/Library_dbmm.mk
dbaccess/Library_sdbt.mk
dbaccess/Makefile
dbaccess/Module_dbaccess.mk
dbaccess/Package_inc.mk
dbaccess/Package_uiconfig.mk
dbaccess/prj/build.lst
dbaccess/qa/unoapi/Test.java
dbaccess/source/core/api/CacheSet.hxx
dbaccess/source/core/dataaccess/SharedConnection.hxx
dbaccess/source/core/dataaccess/connection.cxx
dbaccess/source/filter/xml/xmlAutoStyle.cxx
dbaccess/source/filter/xml/xmlColumn.cxx
dbaccess/source/filter/xml/xmlComponent.cxx
dbaccess/source/filter/xml/xmlConnectionData.cxx
dbaccess/source/filter/xml/xmlConnectionResource.cxx
dbaccess/source/filter/xml/xmlDataSource.cxx
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
dbaccess/source/filter/xml/xmlDocuments.cxx
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
dbaccess/source/filter/xml/xmlHelper.cxx
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
dbaccess/source/filter/xml/xmlLogin.cxx
dbaccess/source/filter/xml/xmlQuery.cxx
dbaccess/source/filter/xml/xmlServerDatabase.cxx
dbaccess/source/filter/xml/xmlTable.cxx
dbaccess/source/filter/xml/xmlTableFilterList.cxx
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/app/AppTitleWindow.cxx
dbaccess/source/ui/app/AppView.cxx
dbaccess/source/ui/browser/AsyncronousLink.cxx
dbaccess/source/ui/browser/genericcontroller.cxx
dbaccess/source/ui/control/ColumnControlWindow.cxx
dbaccess/source/ui/control/RelationControl.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
dbaccess/source/ui/control/VertSplitView.cxx
dbaccess/source/ui/control/toolboxcontroller.cxx
dbaccess/source/ui/dlg/CollectionView.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
dbaccess/source/ui/dlg/RelationDlg.cxx
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/dlgsize.cxx
dbaccess/source/ui/dlg/queryorder.cxx
dbaccess/source/ui/dlg/tablespage.cxx
dbaccess/source/ui/misc/TableCopyHelper.cxx
dbaccess/source/ui/misc/ToolBoxHelper.cxx
dbaccess/source/ui/misc/WExtendPages.cxx
dbaccess/source/ui/misc/WNameMatch.cxx
dbaccess/source/ui/misc/WTypeSelect.cxx
dbaccess/source/ui/querydesign/ConnectionLine.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
dbaccess/source/ui/querydesign/ConnectionLineData.cxx
dbaccess/source/ui/querydesign/JAccess.cxx
dbaccess/source/ui/querydesign/JoinController.cxx
dbaccess/source/ui/querydesign/JoinDesignView.cxx
dbaccess/source/ui/querydesign/JoinExchange.cxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/QTableConnection.cxx
dbaccess/source/ui/querydesign/QTableConnectionData.cxx
dbaccess/source/ui/querydesign/QTableWindow.cxx
dbaccess/source/ui/querydesign/QTableWindowData.cxx
dbaccess/source/ui/querydesign/QueryDesignView.cxx
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
dbaccess/source/ui/querydesign/QueryTextView.cxx
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnection.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindow.cxx
dbaccess/source/ui/querydesign/TableWindowAccess.cxx
dbaccess/source/ui/querydesign/TableWindowData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/querydesign/TableWindowTitle.cxx
dbaccess/source/ui/querydesign/querydlg.cxx
dbaccess/source/ui/querydesign/queryview.cxx
dbaccess/source/ui/relationdesign/RTableConnection.cxx
dbaccess/source/ui/relationdesign/RelationDesignView.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
dbaccess/source/ui/tabledesign/TEditControl.cxx
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
dbaccess/source/ui/tabledesign/TableDesignView.cxx
dbaccess/source/ui/tabledesign/TableFieldControl.cxx
dbaccess/source/ui/tabledesign/TableRow.cxx
dbaccess/source/ui/tabledesign/TableRowExchange.cxx
dbaccess/source/ui/tabledesign/TableUndo.cxx
dbaccess/source/ui/uno/ColumnControl.cxx
dbaccess/source/ui/uno/ColumnPeer.cxx
reportdesign/AllLangResTarget_rpt.mk
reportdesign/AllLangResTarget_rptui.mk
reportdesign/Library_rpt.mk
reportdesign/Library_rptui.mk
reportdesign/Library_rptxml.mk
reportdesign/Module_reportdesign.mk
reportdesign/Package_uiconfig.mk
reportdesign/Package_xml.mk
reportdesign/prj/build.lst
reportdesign/prj/makefile.mk

1 files changed, 0 insertions, 33 deletions

diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 4d6812143598..ea4341914e82 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -141,7 +141,6 @@ ModalDialog DLG_DATABASE_WIZARD
     };
 };
 
-
 String STR_DATABASEDEFAULTNAME
 {
     Text[ en-US ]  = "New Database" ;
@@ -164,7 +163,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
         WordBreak = TRUE;
     };
 
-
     FixedText FT_MYSQL_HELPTEXT
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -203,7 +201,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
         Text[ en-US ] = "Connect directly" ;
         Hide = TRUE ;
     };
-
 };
 
 #define AUTHENTEDIT_X   (EDIT_X - 10)
@@ -224,7 +221,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
         WordBreak = TRUE;
     };
 
-
     FixedText FT_AUTHENTIFICATIONHELPTEXT\
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -263,7 +259,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         Text[ en-US ] = "~Test Connection" ;
     };
-
 };
 
 
@@ -275,7 +270,6 @@ TabPage PAGE_DBWIZARD_FINAL
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-
     FixedText FT_FINALHEADER
     {
         Pos = MAP_APPFONT ( START_X , 8 ) ;
@@ -292,7 +286,6 @@ TabPage PAGE_DBWIZARD_FINAL
         WordBreak = TRUE ;
     };
 
-
     RadioButton RB_REGISTERDATASOURCE
     {
         HelpId = HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE;
@@ -302,7 +295,6 @@ TabPage PAGE_DBWIZARD_FINAL
         Text[ en-US ] = "~Yes, register the database for me" ;
     };
 
-
     RadioButton RB_DONTREGISTERDATASOURCE
     {
         HelpId = HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE ;
@@ -352,7 +344,6 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-
     String STR_MYSQLJDBC_HEADERTEXT
     {
         Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ;
@@ -416,7 +407,6 @@ TabPage PAGE_DBWIZARD_DBASE
         Text[ en-US ] = "Set up a connection to dBASE files" ;
     };
 
-
     String STR_DBASE_HELPTEXT
     {
         Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
@@ -425,34 +415,27 @@ TabPage PAGE_DBWIZARD_DBASE
      AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION)
 };
 
-
 TabPage PAGE_DBWIZARD_TEXT
 {
     HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_TEXT";
-
     String STR_TEXT_HEADERTEXT
     {
         Text[ en-US ]   = "Set up a connection to text files" ;
     };
 
-
     String STR_TEXT_HELPTEXT
     {
         Text[ en-US ]   = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ;
     };
 
-
     String STR_TEXT_PATH_OR_FILE{
         Text[ en-US ]  = "Path to text files";
     };
 
-
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE)
     AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
  };
 
-
-
 TabPage PAGE_DBWIZARD_MSACCESS
 {
     HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS";
@@ -466,17 +449,14 @@ TabPage PAGE_DBWIZARD_MSACCESS
         Text[ en-US ] = "Set up a connection to a Microsoft Access database" ;
     };
 
-
     String STR_MSACCESS_HELPTEXT
     {
         Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
     };
 
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION)
-// FT_MSACCESS_MDB_FILE
 };
 
-
 TabPage PAGE_DBWIZARD_LDAP
 {
     HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP";
@@ -493,7 +473,6 @@ TabPage PAGE_DBWIZARD_LDAP
         WordBreak = TRUE;
     };
 
-
     FixedText FT_LDAP_HELPTEXT
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -518,7 +497,6 @@ TabPage PAGE_DBWIZARD_LDAP
     };
 };
 
-
 TabPage PAGE_DBWIZARD_ADABAS
 {
     HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS";
@@ -532,7 +510,6 @@ TabPage PAGE_DBWIZARD_ADABAS
         Text[ en-US ]   = "Set up a connection to an Adabas D database" ;
     };
 
-
     String STR_ADABAS_HELPTEXT{
         Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
     };
@@ -540,7 +517,6 @@ TabPage PAGE_DBWIZARD_ADABAS
     AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME)
 };
 
-
 TabPage PAGE_DBWIZARD_ADO
 {
     HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO";
@@ -559,7 +535,6 @@ TabPage PAGE_DBWIZARD_ADO
     };
 
     AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL)
-
 };
 
 
@@ -594,8 +569,6 @@ TabPage PAGE_DBWIZARD_USERDEFINED
     AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE)
 };
 
-
-
 TabPage PAGE_DBWIZARD_JDBC
 {
     HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC";
@@ -637,12 +610,10 @@ TabPage PAGE_DBWIZARD_ORACLE
         Text[ en-US ] = "Default: 1521" ;
     };
 
-
     String STR_ORACLE_DRIVERCLASSTEXT{
         Text [ en-US ] = "Oracle JDBC ~driver class";
     };
 
-
     String STR_ORACLE_HELPTEXT{
         Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
@@ -664,12 +635,10 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "Set up a connection to spreadsheets";
     };
 
-
     String STR_SPREADSHEET_HELPTEXT{
         Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
     };
 
-
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH )
 
     String STR_SPREADSHEETPATH{
@@ -685,5 +654,3 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "~Password required" ;
     };
 };
-
-