diff options
Diffstat (limited to 'dbaccess/source/ui/dlg')
113 files changed, 1831 insertions, 1831 deletions
diff --git a/dbaccess/source/ui/dlg/AdabasPage.hrc b/dbaccess/source/ui/dlg/AdabasPage.hrc index a36dbb25da27..52b14304d910 100644 --- a/dbaccess/source/ui/dlg/AdabasPage.hrc +++ b/dbaccess/source/ui/dlg/AdabasPage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,23 +27,23 @@ #ifndef DBAUI_ADABASPAGE_HRC #define DBAUI_ADABASPAGE_HRC -#define FT_CACHE_SIZE 1 -#define FT_DATA_INCREMENT 2 -#define FT_CTRLPASSWORD 3 -#define FT_CTRLUSERNAME 4 +#define FT_CACHE_SIZE 1 +#define FT_DATA_INCREMENT 2 +#define FT_CTRLPASSWORD 3 +#define FT_CTRLUSERNAME 4 -#define NF_DATA_INCREMENT 1 -#define NF_CACHE_SIZE 2 +#define NF_DATA_INCREMENT 1 +#define NF_CACHE_SIZE 2 -#define CB_SHUTDB 1 +#define CB_SHUTDB 1 -#define FL_1 1 +#define FL_1 1 -#define PB_STAT 1 +#define PB_STAT 1 -#define ET_CTRLPASSWORD 1 -#define ET_CTRLUSERNAME 2 +#define ET_CTRLPASSWORD 1 +#define ET_CTRLUSERNAME 2 #endif // DBAUI_ADABASPAGE_HRC diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index 6f4af6e9aae8..b1c24e3b090f 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,20 +63,20 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, const Reference< XMultiServiceFactory >& _xFactory) : ModalDialog( pParent, ModuleRes(DLG_ADABASSTAT) ) ,m_FL_FILES( this , ModuleRes(FL_FILES)) - ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) - ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) - ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) - ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) - ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) - ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) + ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) + ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) + ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) + ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) + ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) + ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) ,m_FL_SIZES( this , ModuleRes(FL_SIZES)) - ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) - ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) - ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) - ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) - ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) - ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) - ,m_PB_OK( this , ModuleRes(PB_OK)) + ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) + ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) + ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) + ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) + ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) + ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) + ,m_PB_OK( this , ModuleRes(PB_OK)) ,m_xConnection(_xCurrentConnection) ,m_bErrorShown(sal_False) { @@ -90,17 +90,17 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, Reference<XStatement> xStmt; Reference<XResultSet> xRes; - sal_Bool bCanSelect = sal_False; + sal_Bool bCanSelect = sal_False; ::rtl::OUString aStmt; ::rtl::OUString sSchema = _rUser.toAsciiUpperCase(); Reference<XDatabaseMetaData> xMetaData; - // first read the sizes + // first read the sizes try { xMetaData = m_xConnection->getMetaData(); bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("SERVERDBSTATISTICS"),sSchema); - + if(bCanSelect) { aStmt = ::rtl::OUString::createFromAscii("SELECT SERVERDBSIZE, UNUSEDPAGES FROM "); @@ -154,7 +154,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, try { bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("DATADEVSPACES"),sSchema); - + if(bCanSelect) { // then the db files @@ -198,7 +198,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent, try { bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("CONFIGURATION"),sSchema); - + if(bCanSelect) { aStmt = ::rtl::OUString::createFromAscii("SELECT * FROM "); diff --git a/dbaccess/source/ui/dlg/AdabasStat.hrc b/dbaccess/source/ui/dlg/AdabasStat.hrc index 32734ea9075a..d2bb95c38b2e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hrc +++ b/dbaccess/source/ui/dlg/AdabasStat.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,22 +28,22 @@ #define DBAUI_ADABASSTAT_HRC -#define FT_SYSDEVSPACE 1 -#define FT_TRANSACTIONLOG 2 -#define FT_DATADEVSPACE 3 -#define FT_SIZE 4 -#define FT_FREESIZE 5 -#define FT_MEMORYUSING 6 +#define FT_SYSDEVSPACE 1 +#define FT_TRANSACTIONLOG 2 +#define FT_DATADEVSPACE 3 +#define FT_SIZE 4 +#define FT_FREESIZE 5 +#define FT_MEMORYUSING 6 -#define ET_SYSDEVSPACE 1 -#define ET_TRANSACTIONLOG 2 -#define ET_MEMORYUSING 3 -#define ET_SIZE 4 -#define ET_FREESIZE 5 +#define ET_SYSDEVSPACE 1 +#define ET_TRANSACTIONLOG 2 +#define ET_MEMORYUSING 3 +#define ET_SIZE 4 +#define ET_FREESIZE 5 -#define LB_DATADEVS 1 +#define LB_DATADEVS 1 -#define PB_OK 1 +#define PB_OK 1 #define FL_FILES 1 #define FL_SIZES 2 diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index 7bba19f59724..f9cec381c65b 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,32 +47,32 @@ namespace dbaui protected: FixedLine m_FL_FILES; - FixedText m_FT_SYSDEVSPACE; - OPropEditCtrl m_ET_SYSDEVSPACE; - FixedText m_FT_TRANSACTIONLOG; - OPropEditCtrl m_ET_TRANSACTIONLOG; - FixedText m_FT_DATADEVSPACE; - OPropListBoxCtrl m_LB_DATADEVS; + FixedText m_FT_SYSDEVSPACE; + OPropEditCtrl m_ET_SYSDEVSPACE; + FixedText m_FT_TRANSACTIONLOG; + OPropEditCtrl m_ET_TRANSACTIONLOG; + FixedText m_FT_DATADEVSPACE; + OPropListBoxCtrl m_LB_DATADEVS; FixedLine m_FL_SIZES; - FixedText m_FT_SIZE; - OPropEditCtrl m_ET_SIZE; - FixedText m_FT_FREESIZE; - OPropEditCtrl m_ET_FREESIZE; - FixedText m_FT_MEMORYUSING; - OPropNumericEditCtrl m_ET_MEMORYUSING; + FixedText m_FT_SIZE; + OPropEditCtrl m_ET_SIZE; + FixedText m_FT_FREESIZE; + OPropEditCtrl m_ET_FREESIZE; + FixedText m_FT_MEMORYUSING; + OPropNumericEditCtrl m_ET_MEMORYUSING; - OKButton m_PB_OK; + OKButton m_PB_OK; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; /// valid as long as the page is active - sal_Bool m_bErrorShown; // true when we shown already the error + m_xConnection; /// valid as long as the page is active + sal_Bool m_bErrorShown; // true when we shown already the error // check if the given table is accessable by the connected user sal_Bool checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName ); void showError(); public: - OAdabasStatistics( Window* pParent, + OAdabasStatistics( Window* pParent, const ::rtl::OUString& _rUser, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src index ff29ac12383d..77472536425e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ b/dbaccess/source/ui/dlg/AdabasStat.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,129 +37,129 @@ ModalDialog DLG_ADABASSTAT { - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + OutputSize = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; FixedLine FL_FILES { - Pos = MAP_APPFONT ( 6 , 3 ) ; + Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 8 ) ; Text [ en-US ] = "Database files"; }; FixedText FT_SYSDEVSPACE { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "S~YSDEVSPACE:"; }; Edit ET_SYSDEVSPACE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 14 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 14 ) ; + Size = MAP_APPFONT ( 128 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_TRANSACTIONLOG { - Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 32 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~TRANSACTIONLOG:"; }; Edit ET_TRANSACTIONLOG { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 31 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 31 ) ; + Size = MAP_APPFONT ( 128 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_DATADEVSPACE { - Pos = MAP_APPFONT ( 12 , 49 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 49 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "DATAD~EVSPACE:"; }; ListBox LB_DATADEVS { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 48 ) ; - Size = MAP_APPFONT ( 128 , 42 ) ; - TabStop = TRUE; - AutoHScroll = TRUE; - VScroll = TRUE; - HScroll = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 48 ) ; + Size = MAP_APPFONT ( 128 , 42 ) ; + TabStop = TRUE; + AutoHScroll = TRUE; + VScroll = TRUE; + HScroll = TRUE; }; FixedLine FL_SIZES { - Pos = MAP_APPFONT ( 6 , 99 ) ; + Pos = MAP_APPFONT ( 6 , 99 ) ; Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; Text [ en-US ] = "Database sizes"; }; FixedText FT_SIZE { - Pos = MAP_APPFONT ( 12 , 110 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 110 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "S~ize (MB):"; }; Edit ET_SIZE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 109 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 109 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_FREESIZE { - Pos = MAP_APPFONT ( 12 , 127 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 127 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~Free memory space (MB):"; }; Edit ET_FREESIZE { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 126 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 126 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; FixedText FT_MEMORYUSING { - Pos = MAP_APPFONT ( 12 , 144 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 144 ) ; + Size = MAP_APPFONT ( 102 , 10 ) ; Text [ en-US ] = "~Memory utilization (in %):"; }; NumericField ET_MEMORYUSING { - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 144 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; + Border = TRUE ; + Pos = MAP_APPFONT ( 120 , 144 ) ; + Size = MAP_APPFONT ( 60 , 12 ) ; + TabStop = TRUE ; + ReadOnly = TRUE; }; OKButton PB_OK { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; + Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; }; Text [ en-US ] = "Database Statistics"; diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index 1bfe3c0233a9..9036489b37ea 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ String STR_MSACCESS_MDB_FILE Text[ en-US ] = "Microsoft Access database file"; }; - + String STR_NO_ADDITIONAL_SETTINGS { Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button."; diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 425e713094f3..5ec09c3ae5c7 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ #endif -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define EDIT_X 101 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define EDIT_X 101 #define FT_AUTOJDBCDRIVERCLASS 80 #define FT_AUTOFIELDSEPARATOR 81 @@ -107,55 +107,55 @@ #define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \ - FixedText FT_AUTOWIZARDHEADER \ - { \ + FixedText FT_AUTOWIZARDHEADER \ + { \ Pos = MAP_APPFONT ( START_X , 8 ) ; \ Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = ""; \ - WordBreak = TRUE; \ + WordBreak = TRUE; \ }; \ \ - FixedText FT_AUTOWIZARDHELPTEXT \ - { \ + FixedText FT_AUTOWIZARDHELPTEXT \ + { \ Pos = MAP_APPFONT ( START_X , INIT_Y ) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , AUTO_LINECOUNT * FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = ""; \ - WordBreak = TRUE; \ + WordBreak = TRUE; \ }; // ------------------------------------------------------------------------------------------------- -#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ - FixedText FT_AUTOBROWSEURL { \ - Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ - Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = ""; \ - }; \ +#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ + FixedText FT_AUTOBROWSEURL { \ + Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ + Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = ""; \ + }; \ \ \ Edit ET_AUTOBROWSEURL \ - { \ - Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \ - Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ - TabStop = TRUE ; \ - Border = TRUE ; \ - }; \ + { \ + Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \ + Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ + TabStop = TRUE ; \ + Border = TRUE ; \ + }; \ \ - PushButton PB_AUTOBROWSEURL \ - { \ - Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - HelpId = (AUTO_HID + 1); \ - TabStop = TRUE ; \ + PushButton PB_AUTOBROWSEURL \ + { \ + Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ + Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ + HelpId = (AUTO_HID + 1); \ + TabStop = TRUE ; \ Text[ en-US ] = "Browse"; \ }; // -------------------------------------------------------------------------------------------------- -#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTODATABASENAME \ { \ Pos = MAP_APPFONT ( START_X , AUTO_Y + 2) ; \ @@ -163,39 +163,39 @@ Text[ en-US ] = "Database name"; \ }; \ \ - Edit ET_AUTODATABASENAME \ - { \ - Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \ - Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Edit ET_AUTODATABASENAME \ + { \ + Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \ + Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; // -------------------------------------------------------------------------------------------------- #define AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID) \ - FixedText FT_AUTOHOSTNAME \ + FixedText FT_AUTOHOSTNAME \ { \ Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \ Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ); \ Text [ en-US ] = "Server" ; \ }; \ \ - Edit ET_AUTOHOSTNAME \ + Edit ET_AUTOHOSTNAME \ { \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - HelpId = AUTO_HID; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + HelpId = AUTO_HID; \ TabStop = TRUE ; \ - Border = TRUE ; \ - }; + Border = TRUE ; \ + }; // -------------------------------------------------------------------------------------------------- -#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOBASEDN \ { \ Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \ @@ -207,9 +207,9 @@ { \ HelpId = AUTO_HID ; \ Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; \ // -------------------------------------------------------------------------------------------------- @@ -225,18 +225,18 @@ \ NumericField NF_AUTOPORTNUMBER \ { \ - HelpId = AUTO_HID ; \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + HelpId = AUTO_HID ; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ Size = MAP_APPFONT ( 22 , EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ NoThousandSep = TRUE; \ }; \ \ FixedText FT_AUTOPORTNUMBERDEFAULT \ { \ - HelpId = AUTO_HID + 1 ; \ - Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ + HelpId = AUTO_HID + 1 ; \ + Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "" ; \ }; @@ -267,12 +267,12 @@ CurPos = 0 ; \ }; \ -// -------------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------------- #define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X) \ \ FixedText FT_AUTOEXTENSIONHEADER \ { \ - Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \ + Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \ Size = MAP_APPFONT ( AUTOPAGE_X - 2*START_X , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Specify the type of files you want to access" ; \ }; \ @@ -305,9 +305,9 @@ { \ HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION; \ Pos = MAP_APPFONT (START_X + 66, AUTO_Y + 3*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS - 2 ) ; \ - Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ - TabStop = TRUE ; \ - Border = TRUE ; \ + Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \ + TabStop = TRUE ; \ + Border = TRUE ; \ }; \ \ FIXEDTEXT FT_AUTOOWNEXTENSIONAPPENDIX \ @@ -332,7 +332,7 @@ }; \ ComboBox CM_AUTOFIELDSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 60 ) ; \ Text = ";" ; \ TabStop = TRUE ; \ @@ -437,7 +437,7 @@ String STR_AUTONO_WILDCARDS \ { \ Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; \ - }; + }; #define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT) @@ -445,8 +445,8 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ - AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ +#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ + AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID) @@ -455,11 +455,11 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ \ FixedText FT_AUTOJDBCDRIVERCLASS \ { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \ + Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \ Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ; \ Text [ en-US ] = "JDBC d~river class"; \ }; \ @@ -470,7 +470,7 @@ Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - BUTTON_WIDTH - RELATED_CONTROLS - UNRELATED_CONTROLS , EDIT_HEIGHT ) ; \ TabStop = TRUE ; \ Border = TRUE ; \ - HelpId = AUTO_HID; \ + HelpId = AUTO_HID; \ }; \ \ PushButton PB_AUTOTESTDRIVERCLASS \ @@ -478,8 +478,8 @@ TabStop = TRUE ; \ Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - Size = MAP_APPFONT (50, 14); \ - HelpId = AUTO_HID + 1; \ + Size = MAP_APPFONT (50, 14); \ + HelpId = AUTO_HID + 1; \ Text[ en-US ] = "Test class" ; \ }; @@ -493,22 +493,22 @@ Text [ en-US ] = "Socket" ; \ }; \ \ - Edit ET_SOCKET \ + Edit ET_SOCKET \ { \ - Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ - Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ + Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \ + Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \ TabStop = TRUE ; \ - Border = TRUE ; \ - }; + Border = TRUE ; \ + }; -#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ +#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ AUTO_WIZARDHELPTEXT( 6 ) \ AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \ - AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ - AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ + AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ + AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ AUTO_SOCKETCONTROLGROUP(129) \ - AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) + AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) // -------------------------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index c3308fd53f9a..196a19453198 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <osl/thread.h> #include <connectivity/dbexception.hxx> -#define FILEDIALOG_DEF_IMAGEBORDER 10 +#define FILEDIALOG_DEF_IMAGEBORDER 10 //......................................................................... namespace dbaui { @@ -79,17 +79,17 @@ OCollectionView::OCollectionView( Window * pParent ,const ::rtl::OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) - , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) - , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) - , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) - , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) - , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) - , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) - , m_aFL( this, ModuleRes( FL_1 ) ) - , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) - , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) - , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) - , m_sPath( ModuleRes( STR_PATHNAME ) ) + , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) + , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) + , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) ) + , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE ) + , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) ) + , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) ) + , m_aFL( this, ModuleRes( FL_1 ) ) + , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) ) + , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) + , m_aPB_HELP( this, ModuleRes( PB_HELP ) ) + , m_sPath( ModuleRes( STR_PATHNAME ) ) , m_xContent(_xContent) , m_xORB(_xORB) , m_bCreateForm(sal_True) @@ -336,7 +336,7 @@ void OCollectionView::initCurrentPath() } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/CollectionView.hrc b/dbaccess/source/ui/dlg/CollectionView.hrc index 0a385ff7f23c..8c43b4c0c5a5 100644 --- a/dbaccess/source/ui/dlg/CollectionView.hrc +++ b/dbaccess/source/ui/dlg/CollectionView.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef DBAUI_COLLECTIONVIEW_HRC #define DBAUI_COLLECTIONVIEW_HRC -#define CTRL_VIEW 1 +#define CTRL_VIEW 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_CANCEL 1 +#define PB_HELP 1 -#define ED_EXPLORERFILE_FILENAME 1 +#define ED_EXPLORERFILE_FILENAME 1 -#define FT_EXPLORERFILE_CURRENTPATH 1 -#define FT_EXPLORERFILE_FILENAME 2 +#define FT_EXPLORERFILE_CURRENTPATH 1 +#define FT_EXPLORERFILE_FILENAME 2 -#define BTN_EXPLORERFILE_NEWFOLDER 1 -#define BTN_EXPLORERFILE_UP 2 -#define BTN_EXPLORERFILE_SAVE 3 +#define BTN_EXPLORERFILE_NEWFOLDER 1 +#define BTN_EXPLORERFILE_UP 2 +#define BTN_EXPLORERFILE_SAVE 3 -#define STR_PATHNAME 1 +#define STR_PATHNAME 1 -#define FL_1 1 +#define FL_1 1 #endif //DBAUI_COLLECTIONVIEW_HRC diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src index 018893384dab..3b82d565a7ac 100644 --- a/dbaccess/source/ui/dlg/CollectionView.src +++ b/dbaccess/source/ui/dlg/CollectionView.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,14 +34,14 @@ #define WIN_X 200 #define WIN_Y 192 -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define FIXEDLINE_HEIGHT 1 -#define IMG_SIZE 15 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define BUTTON_HEIGHT 14 +#define FIXEDLINE_HEIGHT 1 +#define IMG_SIZE 15 ModalDialog DLG_COLLECTION_VIEW @@ -55,7 +55,7 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( WIN_X , WIN_Y ) ; Text [ en-US ] = "Save" ; - + FixedText FT_EXPLORERFILE_CURRENTPATH { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS ) ; @@ -76,7 +76,7 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ; QuickHelpText [ en-US ] = "Up One Level" ; }; - + Control CTRL_VIEW { TabStop = TRUE ; @@ -98,13 +98,13 @@ ModalDialog DLG_COLLECTION_VIEW Border = TRUE ; TabStop = TRUE ; }; - + FixedLine FL_1 { Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ; Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ; }; - + PushButton BTN_EXPLORERFILE_SAVE { Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; @@ -113,22 +113,22 @@ ModalDialog DLG_COLLECTION_VIEW TabStop = TRUE ; Text [ en-US ] = "Save" ; }; - + CancelButton PB_CANCEL { TabStop = TRUE ; - Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - + HelpButton PB_HELP { TabStop = TRUE ; - Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - - + + String STR_PATHNAME { Text [ en-US ] = "~Path:" ; @@ -141,7 +141,7 @@ String STR_NEW_FOLDER }; Image IMG_NAVIGATION_BTN_UP_SC { - ImageBitmap = Bitmap { File = "fp010"; }; + ImageBitmap = Bitmap { File = "fp010"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image IMG_NAVIGATION_BTN_UP_SCH diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 7e6ac39f658f..743cf89beb5e 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -307,28 +307,28 @@ DBG_NAME(OConnectionHelper) sal_Bool bOldFashion = sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength(); if(!bOldFashion) // we have a normal adabas installation - { // so we check the local database names in $DBROOT/config - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; + { // so we check the local database names in $DBROOT/config + sAdabasConfigDir = sRootDir; + sAdabasWorkDir = sRootDir; } if(sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength() && sRootDir.getLength()) { - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); if(!aInstalledDBs.size() && bOldFashion) { - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); + sAdabasConfigDir = sRootDir; + sAdabasWorkDir = sRootDir; + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); } ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, true,m_pItemSetHelper->getWriteOutputSet()); if (RET_OK == aSelector.Execute()) { setURLNoPrefix(aSelector.GetSelected()); - // checkCreateDatabase( ::dbaccess::DST_ADABAS); + // checkCreateDatabase( ::dbaccess::DST_ADABAS); SetRoadmapStateValue(sal_True); callModifiedHdl(); } @@ -560,7 +560,7 @@ DBG_NAME(OConnectionHelper) do { if ( !createDirectoryDeep(_rURL) ) - { // could not create the directory + { // could not create the directory sQuery = String(ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY)); sQuery.SearchAndReplaceAscii("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); @@ -634,7 +634,7 @@ DBG_NAME(OConnectionHelper) { } if (bIsFolder && aAdabasConfigDir.get().is()) - { // we have a content for the directory, loop through all entries + { // we have a content for the directory, loop through all entries Sequence< ::rtl::OUString > aProperties(1); aProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); @@ -678,8 +678,8 @@ DBG_NAME(OConnectionHelper) StringBag aInstalledDBs; // collect the names of the installed databases StringBag aConfigDBs,aWrkDBs; - aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); - aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); + aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); + aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); ConstStringBagIterator aOuter = aConfigDBs.begin(); ConstStringBagIterator aOuterEnd = aConfigDBs.end(); for(;aOuter != aOuterEnd;++aOuter) @@ -730,16 +730,16 @@ DBG_NAME(OConnectionHelper) { case EVENT_GETFOCUS: if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - { // a descendant of the URL edit field got the focus + { // a descendant of the URL edit field got the focus m_aConnectionURL.SaveValueNoPrefix(); } break; case EVENT_LOSEFOCUS: if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) - { // a descendant of the URL edit field lost the focus + { // a descendant of the URL edit field lost the focus if (!commitURL()) - return 1L; // handled + return 1L; // handled } break; } // switch (_rNEvt.GetType()) @@ -760,15 +760,15 @@ DBG_NAME(OConnectionHelper) INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels + ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels // search a level which exists // #106016# --------------------- IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; while ( eParentExists == PATH_NOT_EXIST && aParser.getSegmentCount()) { - aToBeCreated.push_back(aParser.getName()); // remember the local name for creation - aParser.removeSegment(); // cut the local name + aToBeCreated.push_back(aParser.getName()); // remember the local name for creation + aParser.removeSegment(); // cut the local name eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), sal_False); } @@ -802,7 +802,7 @@ DBG_NAME(OConnectionHelper) Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) @@ -847,7 +847,7 @@ DBG_NAME(OConnectionHelper) if ( m_pCollection->isFileSystemBased(m_eType) ) { if ( ( sURL != sOldPath ) && ( 0 != sURL.Len() ) ) - { // the text changed since entering the control + { // the text changed since entering the control // the path may be in system notation .... OFileNotation aTransformer(sURL); @@ -907,7 +907,7 @@ DBG_NAME(OConnectionHelper) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 3e4c538d084c..b9b378329a0d 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,11 +35,11 @@ #include <sfx2/filedlghelper.hxx> -#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ - if (editcontrol.GetText() != editcontrol.GetSavedValue()) \ - { \ - itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \ - modifiedflag = sal_True; \ +#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ + if (editcontrol.GetText() != editcontrol.GetSavedValue()) \ + { \ + itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \ + modifiedflag = sal_True; \ } //......................................................................... @@ -59,21 +59,21 @@ namespace dbaui class OConnectionHelper : public OGenericAdministrationPage { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; public: OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); - FixedText m_aFT_Connection; - OConnectionURLEdit m_aConnectionURL; - PushButton m_aPB_Connection; + FixedText m_aFT_Connection; + OConnectionURLEdit m_aConnectionURL; + PushButton m_aPB_Connection; ::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member. public: // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance + ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance virtual long PreNotify( NotifyEvent& _rNEvt ); // <method>OGenericAdministrationPage::fillControls</method> @@ -85,25 +85,25 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes - //String getURL( OConnectionURLEdit* _m_pConnection ) const; - //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); + //String getURL( OConnectionURLEdit* _m_pConnection ) const; + //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection ); - String getURLNoPrefix( ) const; - void setURLNoPrefix( const String& _rURL ); + String getURLNoPrefix( ) const; + void setURLNoPrefix( const String& _rURL ); /** checks if the path is existence - @param _rURL + @param _rURL The URL to check. - */ - sal_Int32 checkPathExistence(const String& _rURL); - + */ + sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; - sal_Bool createDirectoryDeep(const String& _rPathNormalized); - sal_Bool commitURL(); + + IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const; + sal_Bool createDirectoryDeep(const String& _rPathNormalized); + sal_Bool commitURL(); /** opens the FileOpen dialog and asks for a FileName - @param _aFileOpen + @param _aFileOpen Executes the file open dialog, which must be filled from caller. */ void askForFileName(::sfx2::FileDialogHelper& _aFileOpen); @@ -113,21 +113,21 @@ namespace dbaui OGenericAdministrationPage::SetServiceFactory(_rxORB); } - protected: - void setURL( const String& _rURL ); + protected: + void setURL( const String& _rURL ); virtual bool checkTestConnection(); private: DECL_LINK(OnBrowseConnections, PushButton*); StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude); StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); - String impl_getURL( sal_Bool _bPrefix ) const; - void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); + String impl_getURL( sal_Bool _bPrefix ) const; + void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); void implUpdateURLDependentStates() const; }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_CONNECTIONHELPER_HXX diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 03f2b5f057df..af1745c72852 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OConnectionTabPage( pParent, _rAttrSet ) ); } @@ -376,7 +376,7 @@ namespace dbaui return 0L; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc index 347b0f0bac28..6c18a3e42ced 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hrc +++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 140ea6792efc..ff50f7d715fb 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,24 +48,24 @@ namespace dbaui */ class OConnectionTabPage : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; protected: - // connection - FixedLine m_aFL1; + // connection + FixedLine m_aFL1; // user authentification - FixedLine m_aFL2; - FixedText m_aUserNameLabel; - Edit m_aUserName; - CheckBox m_aPasswordRequired; + FixedLine m_aFL2; + FixedText m_aUserNameLabel; + Edit m_aUserName; + CheckBox m_aPasswordRequired; // jdbc driver - FixedLine m_aFL3; - FixedText m_aJavaDriverLabel; - Edit m_aJavaDriver; - PushButton m_aTestJavaDriver; + FixedLine m_aFL3; + FixedText m_aJavaDriverLabel; + Edit m_aJavaDriver; + PushButton m_aTestJavaDriver; // connection test - PushButton m_aTestConnection; + PushButton m_aTestConnection; // called when the test connection button was clicked @@ -73,10 +73,10 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(sal_False); } inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); } @@ -101,7 +101,7 @@ namespace dbaui virtual bool checkTestConnection(); }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 8ead374bdef4..22eed5dee2fa 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index fcc5af853afd..066e6c23519c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ namespace dbaui - OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_DBASE, _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE); oDBWizardPage->FreeResource(); @@ -94,35 +94,35 @@ namespace dbaui } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADABAS, _rAttrSet, STR_ADABAS_HELPTEXT, STR_ADABAS_HEADERTEXT, STR_ADABAS_DATABASE_NAME); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ODBC, _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE); oDBWizardPage->FreeResource(); return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_USERDEFINED, _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL); oDBWizardPage->FreeResource(); @@ -201,12 +201,12 @@ namespace dbaui //! TODO //if ( m_eType >= ::dbaccess::DST_USERDEFINE1 ) //{ - // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); - // FixedText* ppTextControls[] ={&m_aFT_Connection}; - // for (size_t i = 0; i < SAL_N_ELEMENTS(ppTextControls); ++i) - // { - // ppTextControls[i]->SetText(sDisplayName); - // } + // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType); + // FixedText* ppTextControls[] ={&m_aFT_Connection}; + // for (size_t i = 0; i < SAL_N_ELEMENTS(ppTextControls); ++i) + // { + // ppTextControls[i]->SetText(sDisplayName); + // } //} callModifiedHdl(); @@ -238,7 +238,7 @@ namespace dbaui return 0L; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index c49fcc8d28ad..96eba0545bce 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace dbaui { //......................................................................... -/* // #106016# -------------- +/* // #106016# -------------- enum IS_PATH_EXIST { PATH_NOT_EXIST = 0, @@ -60,7 +60,7 @@ namespace dbaui */ class OConnectionTabPageSetup : public OConnectionHelper { - sal_Bool m_bUserGrabFocus : 1; + sal_Bool m_bUserGrabFocus : 1; protected: FixedText m_aFT_HelpText; @@ -69,17 +69,17 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); @@ -90,8 +90,8 @@ namespace dbaui <p>The new URL must be of the type which is currently selected, only the parts which do not affect the type may be changed (compared to the previous URL).</p> */ - void changeConnectionURL( const String& _rNewDSN ); - String getConnectionURL( ) const; + void changeConnectionURL( const String& _rNewDSN ); + String getConnectionURL( ) const; protected: @@ -102,9 +102,9 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 66a1c3b44787..75c0bdd46529 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,16 +73,16 @@ namespace dbaui { //......................................................................... using namespace ::com::sun::star; -// using namespace ::com::sun::star::ucb; -// using namespace ::com::sun::star::ui::dialogs; -// using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::lang; -// using namespace ::com::sun::star::container; -// using namespace ::dbtools; -// using namespace ::svt; +// using namespace ::com::sun::star::ucb; +// using namespace ::com::sun::star::ui::dialogs; +// using namespace ::com::sun::star::sdbc; +// using namespace ::com::sun::star::beans; +// using namespace ::com::sun::star::lang; +// using namespace ::com::sun::star::container; +// using namespace ::dbtools; +// using namespace ::svt; - OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -165,7 +165,7 @@ DBG_NAME(OTextConnectionPageSetup) } - OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -178,12 +178,12 @@ DBG_NAME(OTextConnectionPageSetup) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs) ,m_aFTHeaderText (this, ModuleRes(FT_LDAP_HEADERTEXT)) ,m_aFTHelpText (this, ModuleRes(FT_LDAP_HELPTEXT)) - ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME)) - ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME)) - ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN)) - ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN)) - ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME)) + ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME)) + ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN)) + ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN)) + ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) ,m_aCBUseSSL (this, ModuleRes(CB_WIZ_USESSL)) { @@ -433,16 +433,16 @@ DBG_NAME(OMySQLIntroPageSetup) OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId) :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs) ,m_aFTHelpText (this, ModuleRes(FT_AUTOWIZARDHELPTEXT)) - ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME)) - ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME)) - ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME)) - ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME)) - ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) + ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME)) + ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME)) + ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME)) + ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME)) + ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER)) ,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT)) - ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) - ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) - ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) - ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) + ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER)) + ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) + ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) + ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) ,m_nPortId(_nPortId) { m_aFTDriverClass.SetText(String(ModuleRes(_nDriverClassId))); @@ -474,7 +474,7 @@ DBG_NAME(OMySQLIntroPageSetup) // ----------------------------------------------------------------------- - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_MYSQL_JDBC, @@ -487,7 +487,7 @@ DBG_NAME(OMySQLIntroPageSetup) } // ----------------------------------------------------------------------- - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, PAGE_DBWIZARD_ORACLE, @@ -606,7 +606,7 @@ DBG_NAME(OMySQLIntroPageSetup) } // ----------------------------------------------------------------------- - OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } @@ -617,9 +617,9 @@ DBG_NAME(OMySQLIntroPageSetup) //======================================================================== OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL) - ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) - ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) - ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) + ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS)) + ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS)) + ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS)) { m_aETDriverClass.SetModifyHdl(LINK(this, OJDBCConnectionPageSetup, OnEditModified)); m_aPBTestJavaDriver.SetClickHdl(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl)); @@ -686,7 +686,7 @@ DBG_NAME(OMySQLIntroPageSetup) BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0); bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0); return bEnableTestConnection; -// m_aTestConnection.Enable(bEnableTestConnection); +// m_aTestConnection.Enable(bEnableTestConnection); } @@ -726,7 +726,7 @@ DBG_NAME(OMySQLIntroPageSetup) } - OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); } @@ -778,7 +778,7 @@ DBG_NAME(OSpreadSheetConnectionPageSetup) return bChangedSomething; } - OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAuthentificationPageSetup( pParent, _rAttrSet) ); } @@ -857,7 +857,7 @@ DBG_NAME(OAuthentificationPageSetup) } - OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) { return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index da3735b18cc7..fe236af08f2e 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbaui //......................................................................... class IDatabaseSettingsDialog; -// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); +// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); //======================================================================== @@ -57,8 +57,8 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); protected: @@ -78,12 +78,12 @@ namespace dbaui class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: - + protected: virtual ~OTextConnectionPageSetup(); virtual sal_Bool prepareLeave(); @@ -102,8 +102,8 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } @@ -118,11 +118,11 @@ namespace dbaui FixedText m_aFTHelpText; FixedText m_aFTHostServer; Edit m_aETHostServer; - FixedText m_aFTBaseDN; - Edit m_aETBaseDN; - FixedText m_aFTPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTDefaultPortNumber; + FixedText m_aFTBaseDN; + Edit m_aETBaseDN; + FixedText m_aFTPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTDefaultPortNumber; CheckBox m_aCBUseSSL; }; @@ -145,7 +145,7 @@ namespace dbaui virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual Link getControlModifiedLink(); @@ -168,11 +168,11 @@ namespace dbaui , USHORT _nHelpTextResId , USHORT _nHeaderTextResId , USHORT _nDriverClassId ); - static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -183,19 +183,19 @@ namespace dbaui FixedText m_aFTHelpText; FixedText m_aFTDatabasename; Edit m_aETDatabasename; - FixedText m_aFTHostname; - Edit m_aETHostname; - FixedText m_aFTPortNumber; - FixedText m_aFTDefaultPortNumber; - NumericField m_aNFPortNumber; - - - FixedText m_aFTDriverClass; - Edit m_aETDriverClass; - PushButton m_aPBTestJavaDriver; - - String m_sDefaultJdbcDriverName; - USHORT m_nPortId; + FixedText m_aFTHostname; + Edit m_aETHostname; + FixedText m_aFTPortNumber; + FixedText m_aFTDefaultPortNumber; + NumericField m_aNFPortNumber; + + + FixedText m_aFTDriverClass; + Edit m_aETDriverClass; + PushButton m_aPBTestJavaDriver; + + String m_sDefaultJdbcDriverName; + USHORT m_nPortId; }; @@ -206,21 +206,21 @@ namespace dbaui { public: OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool checkTestConnection(); - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - FixedText m_aFTDriverClass; - Edit m_aETDriverClass; - PushButton m_aPBTestJavaDriver; + FixedText m_aFTDriverClass; + Edit m_aETDriverClass; + PushButton m_aPBTestJavaDriver; }; @@ -240,7 +240,7 @@ namespace dbaui OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs); - static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); Link maClickHdl; void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -248,7 +248,7 @@ namespace dbaui DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); - + protected: virtual BOOL FillItemSet(SfxItemSet& _rSet); @@ -278,8 +278,8 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); protected: @@ -305,8 +305,8 @@ namespace dbaui class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); FixedText m_aFTFinalHeader; FixedText m_aFTFinalHelpText; @@ -337,7 +337,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 8be379b9aa89..88eb810bf869 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/task/XInteractionRequest.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> /** === end UNO includes === **/ @@ -141,7 +141,7 @@ namespace String lcl_createHostWithPort(const SfxStringItem* _pHostName,const SfxInt32Item* _pPortNumber) { String sNewUrl; - + if ( _pHostName && _pHostName->GetValue().Len() ) sNewUrl = _pHostName->GetValue(); @@ -254,7 +254,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pUser, SfxStringItem, DSID_USER, sal_True); if (pUser && pUser->GetValue().Len()) aReturn.push_back( - PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0, + PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0, makeAny(::rtl::OUString(pUser->GetValue())), PropertyState_DIRECT_VALUE)); // check if the connection type requires a password @@ -280,7 +280,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_TASK_INTERACTION_HANDLER), sal_True); } - + String sName = pName ? pName->GetValue() : String(); String sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); ::rtl::OUString sTemp = sName; @@ -333,7 +333,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert } if (!pAuthenticate->wasSelected()) return sal_False; - + sPassword = pAuthenticate->getPassword(); if (pAuthenticate->getRememberPassword()) m_pItemSetHelper->getWriteOutputSet()->Put(SfxStringItem(DSID_PASSWORD, sPassword)); @@ -341,7 +341,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if (sPassword.Len()) aReturn.push_back( - PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0, + PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0, makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE)); } @@ -476,7 +476,7 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc } } - + DBG_ASSERT(m_xDatasource.is(), "ODbDataSourceAdministrationHelper::getCurrentDataSource: no data source!"); return m_xDatasource; } @@ -586,7 +586,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const break; case ::dbaccess::DST_LDAP: { - // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); + // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue()); sNewUrl += lcl_createHostWithPort(NULL,pPortNumber); @@ -612,7 +612,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const struct PropertyValueLess { bool operator() (const PropertyValue& x, const PropertyValue& y) const - { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning + { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning }; DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet); @@ -624,7 +624,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr if (_rxSource.is()) { - for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); ++aDirect ) @@ -662,7 +662,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr for (sal_Int32 i=0; i<aAdditionalInfo.getLength(); ++i, ++pAdditionalInfo) { if (0 == pAdditionalInfo->Name.compareToAscii("JDBCDRV")) - { // compatibility + { // compatibility PropertyValue aCompatibility(*pAdditionalInfo); aCompatibility.Name = ::rtl::OUString::createFromAscii("JavaDriverClass"); aInfos.insert(aCompatibility); @@ -676,7 +676,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr { PropertyValue aSearchFor; ConstMapInt2StringIterator aEnd = m_aIndirectPropTranslator.end(); - for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin(); aIndirect != aEnd; ++aIndirect) { @@ -715,11 +715,11 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r Reference< XPropertySetInfo > xInfo; try { xInfo = _rxDest->getPropertySetInfo(); } catch(Exception&) { } - + const ::rtl::OUString sUrlProp(RTL_CONSTASCII_USTRINGPARAM("URL")); // ----------------------------- // transfer the direct properties - for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); + for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); ++aDirect ) @@ -738,7 +738,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r if ( sUrlProp == aDirect->second ) { Any aValue(makeAny(::rtl::OUString(getConnectionURL()))); - // aValue <<= ::rtl::OUString(); + // aValue <<= ::rtl::OUString(); lcl_putProperty(_rxDest, aDirect->second,aValue); } else @@ -800,7 +800,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } // settings to preserve - MapInt2String aPreservedSettings; + MapInt2String aPreservedSettings; // now aRelevantSettings contains all the property values relevant for the current data source type, // check the original sequence if it already contains any of these values (which have to be overwritten, then) @@ -813,13 +813,13 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS aSearchFor.Name = pInfo->Name; PropertyValueSetIterator aOverwrittenSetting = aRelevantSettings.find(aSearchFor); if (aRelevantSettings.end() != aOverwrittenSetting) - { // the setting was present in the original sequence, and it is to be overwritten -> replace it + { // the setting was present in the original sequence, and it is to be overwritten -> replace it if ( !::comphelper::compare(pInfo->Value,aOverwrittenSetting->Value) ) *pInfo = *aOverwrittenSetting; aRelevantSettings.erase(aOverwrittenSetting); } else if (0 == pInfo->Name.compareToAscii("JDBCDRV")) - { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) + { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) nObsoleteSetting = i; } else @@ -829,7 +829,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::comphelper::removeElementAt(_rInfo, nObsoleteSetting); if ( !aPreservedSettings.empty() ) - { // check if there are settings which + { // check if there are settings which // * are known as indirect properties // * but not relevant for the current data source type // These settings have to be removed: If they're not relevant, we have no UI for changing them. @@ -846,7 +846,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ::std::vector< sal_Int32 > aRemoveIndexes; sal_Int32 nPositionCorrector = 0; ConstMapInt2StringIterator aPreservedEnd = aPreservedSettings.end(); - for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin(); + for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin(); aPreserved != aPreservedEnd; ++aPreserved ) @@ -862,7 +862,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } // now finally remove all such props ::std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); - for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); + for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); aRemoveIndex != aRemoveEnd; ++aRemoveIndex ) @@ -894,7 +894,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS _rInfo.realloc(nOldLength + aRelevantSettings.size()); PropertyValue* pAppendValues = _rInfo.getArray() + nOldLength; ConstPropertyValueSetIterator aRelevantEnd = aRelevantSettings.end(); - for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin(); + for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin(); aLoop != aRelevantEnd; ++aLoop, ++pAppendValues ) @@ -997,9 +997,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no string)!" ) ).getStr() ); } @@ -1027,9 +1027,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no boolean)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no boolean)!" ) ).getStr() ); } @@ -1044,9 +1044,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no int)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no int)!" ) ).getStr() ); } @@ -1077,9 +1077,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } else { DBG_ERROR( - ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) - += ::rtl::OString( translatePropertyId( _nId ) ) - += ::rtl::OString( " should be no string sequence)!" ) + ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" ) + += ::rtl::OString( translatePropertyId( _nId ) ) + += ::rtl::OString( " should be no string sequence)!" ) ).getStr() ); } @@ -1116,8 +1116,8 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection(); DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!"); - USHORT nPortNumberId = 0; - sal_Int32 nPortNumber = -1; + USHORT nPortNumberId = 0; + sal_Int32 nPortNumber = -1; String sNewHostName; //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue()); String sUrlPart; @@ -1175,8 +1175,8 @@ sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSour return sal_True; } // ----------------------------------------------------------------------------- -void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) -{ +void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) +{ DBG_ASSERT( !m_aDataSourceOrName.hasValue(), "ODbDataSourceAdministrationHelper::setDataSourceOrName: already have one!" ); // hmm. We could reset m_xDatasource/m_xModel, probably, and continue working m_aDataSourceOrName = _rDataSourceOrName; @@ -1213,7 +1213,7 @@ SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 02ef746fcd7a..ad5a323cf98e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,23 +68,23 @@ namespace dbaui private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; /// service factory + m_xORB; /// service factory ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; /// database context we're working in + m_xDatabaseContext; /// database context we're working in ::com::sun::star::uno::Reference< ::com::sun::star::uno::XNamingService > - m_xDynamicContext; /// just another interface of the context ... + m_xDynamicContext; /// just another interface of the context ... ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDatasource; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::Any m_aDataSourceOrName; - typedef ::std::set< ::rtl::OUString > StringSet; - typedef StringSet::const_iterator ConstStringSetIterator; - + ::com::sun::star::uno::Any m_aDataSourceOrName; + typedef ::std::set< ::rtl::OUString > StringSet; + typedef StringSet::const_iterator ConstStringSetIterator; - MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) - MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) - Window* m_pParent; - IItemSetHelper* m_pItemSetHelper; + + MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) + MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) + Window* m_pParent; + IItemSetHelper* m_pItemSetHelper; public: ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB @@ -94,15 +94,15 @@ namespace dbaui /** translate the current dialog SfxItems into driver relevant PropertyValues @see successfullyConnected */ - sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); + sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams); /** to be called if the settings got from getCurrentSettings have been used for successfully connecting @see getCurrentSettings */ - void successfullyConnected(); + void successfullyConnected(); /// clear the password in the current data source's item set - void clearPassword(); + void clearPassword(); inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; } @@ -111,16 +111,16 @@ namespace dbaui /** creates a new connection. The caller is responsible to dispose it !!!! */ - ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); + ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); /** return the corresponding driver for the selected URL */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL); /** returns the data source the dialog is currently working with */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource(); // returns the Url of a database document String getDocumentUrl(SfxItemSet& _rDest); @@ -143,9 +143,9 @@ namespace dbaui const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; } /** translates properties of an UNO data source into SfxItems - @param _rxSource + @param _rxSource The data source - @param _rDest + @param _rDest The item set to fill. */ void translateProperties( @@ -153,9 +153,9 @@ namespace dbaui SfxItemSet& _rDest); /** translate SfxItems into properties of an UNO data source - @param _rSource + @param _rSource The item set to read from. - @param _rxDest + @param _rxDest The data source to fill. */ void translateProperties( @@ -169,18 +169,18 @@ namespace dbaui void fillDatasourceInfo(const SfxItemSet& _rSource, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); /// translate the given value into an SfxPoolItem, put this into the given set under the given id - void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); - + void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue); + /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type> ::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem); /// translate the given SfxPoolItem into an <type scope="com.sun.star.Any">uno</type>, set it (under the given name) on the given property set - void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem); + void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem); /** check if the data source described by the given set needs authentication<p/> The return value depends on the data source type only. */ - sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; + sal_Bool hasAuthentication(const SfxItemSet& _rSet) const; #ifdef DBG_UTIL ::rtl::OString translatePropertyId( sal_Int32 _nId ); @@ -188,7 +188,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBADMINIMPL_HXX_ diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 23390d34bba2..e531109c470c 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 13b4b50e5943..754b391b42aa 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,66 +44,66 @@ namespace dbaui /** filles the IDs of the settings which are reflected in indirect data source properties (aka properties in the css.sdb.DataSource.Info sequence) - @param _eType + @param _eType The Type of the data source. - @param _out_rDetailsIds + @param _out_rDetailsIds Will be filled. */ static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ - static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for ODBC */ - static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for user */ - static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for Adabas */ - static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); /** Creates the detail page for LDAP */ - static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); /// Creates the detail page for Text - static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); /// creates the GeneratedValues page - static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx index 47b77106cd3e..ff1f6407d12f 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,9 +66,9 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) OExtensionNotPresentDialog::OExtensionNotPresentDialog( Window* _pParent, uno::Reference< lang::XMultiServiceFactory > _xORB) : ModalDialog( _pParent, ModuleRes(RID_EXTENSION_NOT_PRESENT_DLG) ) ,m_aFI_WARNING(this, ModuleRes(FI_WARNING)) - ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) ) - ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD)) - ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) ) + ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD)) + ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL)) ,m_xMultiServiceFactory(_xORB) { DBG_CTOR( dbu_OExtensionNotPresentDialog, NULL); @@ -84,10 +84,10 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) // set a ClickHandler for the 'Download' button m_aPB_DOWNLOAD.SetClickHdl( LINK( this, OExtensionNotPresentDialog, Download_Click ) ); - + // get message string out of the resource String sText = String( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) ); - // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) ); + // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) ); String sExtensionName = getFromConfigurationExtension("Name"); sText.SearchAndReplaceAscii("%RPT_EXTENSION_NAME", sExtensionName); @@ -137,12 +137,12 @@ DBG_NAME( dbu_OExtensionNotPresentDialog ) // WinBits aBits = m_aFI_WARNING.GetStyle(); // aBits |= WB_SCALE; // m_aFI_WARNING.SetStyle(aBits); - // + // // Size aImageSize = m_aFI_WARNING.GetSizePixel(); // (void) aImageSize; // m_aFI_WARNING.Resize(); - + Resize(); FreeResource(); } @@ -174,9 +174,9 @@ rtl::OUString OExtensionNotPresentDialog::getFromConfigurationExtension(rtl::OUS { // get the URL to open in a browser from Configuration static const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/Extension" ) ); - + ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithServiceFactory( m_xMultiServiceFactory, sConfigName ) ); - + rtl::OUString aValue; aConfiguration.getNodeValue( _sPropertyName ) >>= aValue; return aValue; @@ -195,14 +195,14 @@ IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG ) try { EndDialog( TRUE ); - + rtl::OUString suDownloadURL = getFromConfigurationExtension("DownloadURL"); if (suDownloadURL.getLength() == 0) { // fallback suDownloadURL = UNISTRING("http://extensions.libreoffice.org"); } - + // open such URL in a browser localizeWebserviceURI(suDownloadURL); uno::Reference< com::sun::star::system::XSystemShellExecute > xShellExecute( getShellExecuter() ); diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc index 69794e3a76bc..cb314b9f7683 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,22 +27,22 @@ #ifndef DBU_EXTENSIONNOTPRESENT_HRC #define DBU_EXTENSIONNOTPRESENT_HRC -#define FT_TEXT (1) -#define FI_WARNING (2) -#define PB_DOWNLOAD (10) -#define PB_CANCEL (11) +#define FT_TEXT (1) +#define FI_WARNING (2) +#define PB_DOWNLOAD (10) +#define PB_CANCEL (11) -#define FIXEDTEXT_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 #define CELL_PADDING 8 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 55 -#define BROWSER_HEIGHT 75 -// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) +#define BUTTON_HEIGHT 14 +#define BUTTON_WIDTH 55 +#define BROWSER_HEIGHT 75 +// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) #define LEFT_PADDING 32 /* size for the icon */ #define RIGHT_PADDING 16 -#define DLG_WIDTH ( 250 ) +#define DLG_WIDTH ( 250 ) #define ACTION_LINE_START (CELL_PADDING + ( 3 * FIXEDTEXT_HEIGHT ) + 2 * CELL_PADDING + 1 ) -#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING) +#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING) #endif /* DBU_EXTENSIONNOTPRESENT_HRC */ diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src index 9507c4256360..9944278cd359 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ String RID_STR_EXTENSION_NOT_PRESENT // To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name // String RID_STR_EXTENSION_NAME // { -// Text = "Sun(TM) Report Builder"; +// Text = "Sun(TM) Report Builder"; // }; ModalDialog RID_EXTENSION_NOT_PRESENT_DLG @@ -52,7 +52,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG HelpId = HID_EXTENSION_NOT_PRESENT_DLG; Moveable = TRUE ; Closeable = TRUE ; - + // most of the calulated values here are overridden by the ExtensionNotPresent ctor itself. FixedImage FI_WARNING { @@ -60,12 +60,12 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG Size = (32, 32); Fixed=BMP_EXCEPTION_WARNING; }; - + FixedText FT_TEXT { - Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; - Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; + Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; + Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; // Border = TRUE ; // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT }; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 947bec14a021..e574d4051040 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,15 +68,15 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, ,m_pTableMap(pParent->GetTabWinMap()) ,aFL_CascUpd( this, ModuleRes(FL_CASC_UPD) ) - ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) - ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) - ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) - ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) + ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) ) + ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) ) + ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) ) + ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) ) ,aFL_CascDel( this, ModuleRes(FL_CASC_DEL) ) - ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) - ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) - ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) - ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) + ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) ) + ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) ) + ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) ) + ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) ) ,aPB_OK( this, ModuleRes( PB_OK ) ) ,aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ) @@ -218,7 +218,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) } catch( const SQLException& ) { - ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), + ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), this, static_cast<OJoinTableView*>(GetParent())->getDesignView()->getController().getORB()); } diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc index b0d14aa6d93a..0e1f57174b3b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.hrc +++ b/dbaccess/source/ui/dlg/RelationDlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,18 +34,18 @@ #define FL_CASC_DEL 3 #define FL_CASC_UPD 4 -#define RB_NO_CASC_DEL 1 -#define RB_NO_CASC_UPD 2 -#define RB_CASC_DEL 3 -#define RB_CASC_UPD 4 -#define RB_CASC_DEL_NULL 5 -#define RB_CASC_DEL_DEFAULT 6 -#define RB_CASC_UPD_NULL 7 +#define RB_NO_CASC_DEL 1 +#define RB_NO_CASC_UPD 2 +#define RB_CASC_DEL 3 +#define RB_CASC_UPD 4 +#define RB_CASC_DEL_NULL 5 +#define RB_CASC_DEL_DEFAULT 6 +#define RB_CASC_UPD_NULL 7 #define RB_CASC_UPD_DEFAULT 8 -#define PB_OK 1 -#define PB_CANCEL 2 -#define PB_HELP 3 +#define PB_OK 1 +#define PB_CANCEL 2 +#define PB_HELP 3 #define WND_CONTROL 1 diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index 68399ca52619..f0517f5c989e 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,8 +86,8 @@ ModalDialog DLG_REL_PROPERTIES }; }; - - + + FixedLine FL_CASC_UPD { diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index fe392d82cbe0..ebdc2519bc26 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet() } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 4e2864aaaa52..97922615c81d 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,22 +93,22 @@ DBG_NAME(OTextConnectionHelper) ,m_aRBAccessOtherFiles (this, ModuleRes(RB_AUTOACCESSOTHERS)) ,m_aETOwnExtension (this, ModuleRes(ET_AUTOOWNEXTENSION)) ,m_aFTExtensionExample (this, ModuleRes(FT_AUTOOWNEXTENSIONAPPENDIX)) - ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2)) - ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR)) - ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR)) - ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR)) - ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR)) - ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR)) - ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR)) - ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) - ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) + ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2)) + ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR)) + ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR)) + ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR)) + ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR)) + ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR)) + ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR)) + ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) + ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) ,m_aRowHeader (this, ModuleRes(CB_AUTOHEADER)) ,m_aCharSetHeader (this, ModuleRes(FL_DATACONVERT)) ,m_aCharSetLabel (this, ModuleRes(FT_CHARSET)) ,m_aCharSet (this, ModuleRes(LB_CHARSET)) - ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) - ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) - ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) + ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) + ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) + ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) ,m_nAvailableSections( _nAvailableSections ) { DBG_CTOR(OTextConnectionHelper,NULL); @@ -335,59 +335,59 @@ DBG_NAME(OTextConnectionHelper) String sExtension = GetExtension(); String aErrorText; Control* pErrorWin = NULL; - // if (!m_aFieldSeparator.GetText().Len()) + // if (!m_aFieldSeparator.GetText().Len()) // bug (#42168) if this line is compiled under OS2 (in a product environent) // -> use a temporary variable String aDelText(m_aFieldSeparator.GetText()); if(!aDelText.Len()) - { // Kein FeldTrenner + { // Kein FeldTrenner aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (!m_aDecimalSeparator.GetText().Len()) - { // kein Decimaltrenner + { // kein Decimaltrenner aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText()) - { // Feld und TextTrenner duerfen nicht gleich sein + { // Feld und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aDecimalSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und DecimalTrenner duerfen nicht gleich sein + { // Tausender und DecimalTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aFieldSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und FeldTrenner duerfen nicht gleich sein + { // Tausender und FeldTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aFieldSeparator.GetText() == m_aDecimalSeparator.GetText()) - { // Zehner und FeldTrenner duerfen nicht gleich sein + { // Zehner und FeldTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aTextSeparator.GetText() == m_aThousandsSeparator.GetText()) - { // Tausender und TextTrenner duerfen nicht gleich sein + { // Tausender und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText()) - { // Zehner und TextTrenner duerfen nicht gleich sein + { // Zehner und TextTrenner duerfen nicht gleich sein aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); @@ -500,8 +500,8 @@ DBG_NAME(OTextConnectionHelper) //------------------------------------------------------------------------ String OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const String& rList ) { - sal_Unicode nTok = '\t'; - xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() )); + sal_Unicode nTok = '\t'; + xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() )); if( nPos == COMBOBOX_ENTRY_NOTFOUND ) return rBox.GetText().Copy(0); @@ -517,13 +517,13 @@ DBG_NAME(OTextConnectionHelper) //------------------------------------------------------------------------ void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ) { - char nTok = '\t'; - xub_StrLen nCnt(rList.GetTokenCount( nTok )); - xub_StrLen i; + char nTok = '\t'; + xub_StrLen nCnt(rList.GetTokenCount( nTok )); + xub_StrLen i; for( i=0 ; i<nCnt ; i+=2 ) { - String sTVal( + String sTVal( static_cast< sal_Unicode >( rList.GetToken( (i+1), nTok ).ToInt32())); @@ -544,7 +544,7 @@ DBG_NAME(OTextConnectionHelper) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 8c1d0aa0c0fd..c178e3a68c08 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dbaui { OTextConnectionHelper(); - Link m_aModifiedHandler; /// to be called if something on the page has been modified + Link m_aModifiedHandler; /// to be called if something on the page has been modified public: OTextConnectionHelper( Window* pParent, const short _nAvailableSections ); @@ -71,24 +71,24 @@ namespace dbaui RadioButton m_aRBAccessOtherFiles; Edit m_aETOwnExtension; FixedText m_aFTExtensionExample; - FixedLine m_aLineFormat; - FixedText m_aFieldSeparatorLabel; - ComboBox m_aFieldSeparator; - FixedText m_aTextSeparatorLabel; - ComboBox m_aTextSeparator; - FixedText m_aDecimalSeparatorLabel; - ComboBox m_aDecimalSeparator; - FixedText m_aThousandsSeparatorLabel; - ComboBox m_aThousandsSeparator; - CheckBox m_aRowHeader; + FixedLine m_aLineFormat; + FixedText m_aFieldSeparatorLabel; + ComboBox m_aFieldSeparator; + FixedText m_aTextSeparatorLabel; + ComboBox m_aTextSeparator; + FixedText m_aDecimalSeparatorLabel; + ComboBox m_aDecimalSeparator; + FixedText m_aThousandsSeparatorLabel; + ComboBox m_aThousandsSeparator; + CheckBox m_aRowHeader; FixedLine m_aCharSetHeader; FixedText m_aCharSetLabel; CharSetListBox m_aCharSet; - String m_aFieldSeparatorList; - String m_aTextSeparatorList; - String m_aTextNone; + String m_aFieldSeparatorList; + String m_aTextSeparatorList; + String m_aTextNone; String m_aOldExtension; - Link m_aGetExtensionHandler; /// to be called if a new type is selected + Link m_aGetExtensionHandler; /// to be called if a new type is selected short m_nAvailableSections; @@ -100,11 +100,11 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); private: - String GetSeparator( const ComboBox& rBox, const String& rList ); - void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ); + String GetSeparator( const ComboBox& rBox, const String& rList ); + void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal ); void SetExtension(const String& _rVal); - + public: void implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid); void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -116,7 +116,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index d22e8c4839a7..961375276259 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,16 +64,16 @@ using namespace comphelper; class OPasswordDialog : public ModalDialog { - FixedLine aFLUser; - FixedText aFTOldPassword; - Edit aEDOldPassword; - FixedText aFTPassword; - Edit aEDPassword; - FixedText aFTPasswordRepeat; - Edit aEDPasswordRepeat; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + FixedLine aFLUser; + FixedText aFTOldPassword; + Edit aEDOldPassword; + FixedText aFTPassword; + Edit aEDPassword; + FixedText aFTPasswordRepeat; + Edit aEDPasswordRepeat; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; DECL_LINK( OKHdl_Impl, OKButton * ); @@ -82,24 +82,24 @@ class OPasswordDialog : public ModalDialog public: OPasswordDialog( Window* pParent,const String& _sUserName); - String GetOldPassword() const { return aEDOldPassword.GetText(); } - String GetNewPassword() const { return aEDPassword.GetText(); } + String GetOldPassword() const { return aEDOldPassword.GetText(); } + String GetNewPassword() const { return aEDPassword.GetText(); } }; OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : ModalDialog( _pParent, ModuleRes( DLG_PASSWORD) ), - aFLUser ( this, ModuleRes( FL_USER ) ), - aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ), - aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ), - aFTPassword ( this, ModuleRes( FT_PASSWORD ) ), - aEDPassword ( this, ModuleRes( ED_PASSWORD ) ), - aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ), - aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ), - aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ), - aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), - aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) + aFLUser ( this, ModuleRes( FL_USER ) ), + aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ), + aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ), + aFTPassword ( this, ModuleRes( FT_PASSWORD ) ), + aEDPassword ( this, ModuleRes( ED_PASSWORD ) ), + aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ), + aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ), + aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ), + aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ), + aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) ) { // hide until a help is avalable aHelpBtn.Hide(); @@ -142,14 +142,14 @@ DBG_NAME(OUserAdmin); //================================================================================ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, ModuleRes(TAB_PAGE_USERADMIN), _rAttrSet) - ,m_FL_USER( this , ModuleRes(FL_USER)) - ,m_FT_USER( this , ModuleRes(FT_USER)) - ,m_LB_USER( this , ModuleRes(LB_USER)) - ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER)) - ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD)) - ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER)) + ,m_FL_USER( this , ModuleRes(FL_USER)) + ,m_FT_USER( this , ModuleRes(FT_USER)) + ,m_LB_USER( this , ModuleRes(LB_USER)) + ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER)) + ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD)) + ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER)) ,m_FL_TABLE_GRANTS( this , ModuleRes(FL_TABLE_GRANTS)) - ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS)) + ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS)) { DBG_CTOR(OUserAdmin,NULL); m_LB_USER.SetSelectHdl(LINK(this, OUserAdmin, ListDblClickHdl)); @@ -186,7 +186,7 @@ void OUserAdmin::FillUserNames() m_aUserNames = m_xUsers->getElementNames(); const ::rtl::OUString* pBegin = m_aUserNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); + const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength(); ::rtl::OUString sUserName = m_UserName; for(;pBegin != pEnd;++pBegin) m_LB_USER.InsertEntry(*pBegin); @@ -215,7 +215,7 @@ void OUserAdmin::FillUserNames() } // ----------------------------------------------------------------------- -SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) +SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserAdmin( pParent, _rAttrSet ) ); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hrc b/dbaccess/source/ui/dlg/UserAdmin.hrc index 6a012724f49a..35ae40db6632 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hrc +++ b/dbaccess/source/ui/dlg/UserAdmin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,33 +27,33 @@ #ifndef DBAUI_USERADMIN_HRC #define DBAUI_USERADMIN_HRC -#define FT_USER 1 - -#define LB_USER 1 - -#define NF_TIMEOUT 1 +#define FT_USER 1 -#define FL_TABLE_GRANTS 1 -#define FL_USER 2 +#define LB_USER 1 + +#define NF_TIMEOUT 1 + +#define FL_TABLE_GRANTS 1 +#define FL_USER 2 -#define CTRL_TABLE_GRANTS 1 +#define CTRL_TABLE_GRANTS 1 -#define PB_NEWUSER 2 -#define PB_CHANGEPWD 3 -#define PB_DELETEUSER 4 +#define PB_NEWUSER 2 +#define PB_CHANGEPWD 3 +#define PB_DELETEUSER 4 -#define FT_OLDPASSWORD 19 -#define ED_OLDPASSWORD 19 -#define FT_PASSWORD 20 -#define ED_PASSWORD 21 -#define FT_PASSWORD_REPEAT 22 -#define ED_PASSWORD_REPEAT 23 +#define FT_OLDPASSWORD 19 +#define ED_OLDPASSWORD 19 +#define FT_PASSWORD 20 +#define ED_PASSWORD 21 +#define FT_PASSWORD_REPEAT 22 +#define ED_PASSWORD_REPEAT 23 -#define BTN_PASSWORD_OK 50 -#define BTN_PASSWORD_CANCEL 51 -#define BTN_PASSWORD_HELP 52 +#define BTN_PASSWORD_OK 50 +#define BTN_PASSWORD_CANCEL 51 +#define BTN_PASSWORD_HELP 52 #endif // DBAUI_USERADMIN_HRC diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 73458126dbb1..45995bc201d9 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,32 +48,32 @@ namespace dbaui class OUserAdmin : public OGenericAdministrationPage { protected: - FixedLine m_FL_USER; - FixedText m_FT_USER; - ListBox m_LB_USER; - PushButton m_PB_NEWUSER; - PushButton m_PB_CHANGEPWD; - PushButton m_PB_DELETEUSER; - FixedLine m_FL_TABLE_GRANTS; - OTableGrantControl m_TableCtrl; // show the grant rights of one user - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; - ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; - - String m_UserName; + FixedLine m_FL_USER; + FixedText m_FT_USER; + ListBox m_LB_USER; + PushButton m_PB_NEWUSER; + PushButton m_PB_CHANGEPWD; + PushButton m_PB_DELETEUSER; + FixedLine m_FL_TABLE_GRANTS; + OTableGrantControl m_TableCtrl; // show the grant rights of one user + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers; + ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames; + String m_UserName; + // methods DECL_LINK( ListDblClickHdl, ListBox * ); - DECL_LINK( CloseHdl, PushButton * ); - DECL_LINK( UserHdl, PushButton * ); + DECL_LINK( CloseHdl, PushButton * ); + DECL_LINK( UserHdl, PushButton * ); - void FillUserNames(); + void FillUserNames(); OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - + static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + ~OUserAdmin(); String GetUser(); diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index 2cab4f9e89f0..7ec8120b51b1 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,82 +40,82 @@ TabPage TAB_PAGE_USERADMIN { - SVLook = TRUE ; - HelpId = HID_TAB_PAGE_USERADMIN ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + SVLook = TRUE ; + HelpId = HID_TAB_PAGE_USERADMIN ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; Hide = TRUE; FixedLine FL_USER { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; - Text [ en-US ] = "User selection"; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; + Text [ en-US ] = "User selection"; }; FixedText FT_USER { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; - Text [ en-US ] = "Us~er:"; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 90 , 10 ) ; + Text [ en-US ] = "Us~er:"; }; ListBox LB_USER { - Border = TRUE ; - Pos = MAP_APPFONT ( 108 , 13) ; - Size = MAP_APPFONT ( 105 , 97 ) ; - TabStop = TRUE ; - HScroll = TRUE ; - Sort = TRUE ; - DropDown = TRUE ; - HelpId = HID_TAB_PAGE_LBUSER ; + Border = TRUE ; + Pos = MAP_APPFONT ( 108 , 13) ; + Size = MAP_APPFONT ( 105 , 97 ) ; + TabStop = TRUE ; + HScroll = TRUE ; + Sort = TRUE ; + DropDown = TRUE ; + HelpId = HID_TAB_PAGE_LBUSER ; }; PushButton PB_NEWUSER { - Pos = MAP_APPFONT ( 12 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBUSER ; + Pos = MAP_APPFONT ( 12 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBUSER ; Text [ en-US ] = "~Add User..."; }; PushButton PB_CHANGEPWD { - Pos = MAP_APPFONT ( 95 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBCHGPWD ; + Pos = MAP_APPFONT ( 95 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBCHGPWD ; Text [ en-US ] = "Change ~Password..."; }; PushButton PB_DELETEUSER { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ; - Size = MAP_APPFONT ( 70 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - HelpId = HID_TAB_PAGE_PBUSERDELETE ; + Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ; + Size = MAP_APPFONT ( 70 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; + HelpId = HID_TAB_PAGE_PBUSERDELETE ; Text [ en-US ] = "~Delete User..."; }; FixedLine FL_TABLE_GRANTS { - Pos = MAP_APPFONT ( 6 , 52 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; + Pos = MAP_APPFONT ( 6 , 52 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ; Text [ en-US ] = "Access rights for selected user"; }; Control CTRL_TABLE_GRANTS { - Pos = MAP_APPFONT ( 12 , 63 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 ); - Border = TRUE ; - TabStop = TRUE ; - HelpId = HID_TAB_PAGE_TBLGRANTS ; + Pos = MAP_APPFONT ( 12 , 63 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 ); + Border = TRUE ; + TabStop = TRUE ; + HelpId = HID_TAB_PAGE_TBLGRANTS ; }; }; @@ -130,10 +130,10 @@ String STR_USERADMIN_NOT_AVAILABLE Text [ en-US ] = "The database does not support user administration." ; }; -#define EDIT_SIZE_X 50 -#define FT_SIZE_X 90 -#define WIN_X 220 -#define WIN_Y 72 +#define EDIT_SIZE_X 50 +#define FT_SIZE_X 90 +#define WIN_X 220 +#define WIN_Y 72 ModalDialog DLG_PASSWORD { @@ -191,7 +191,7 @@ ModalDialog DLG_PASSWORD Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ; PassWord = TRUE ; }; - + OKButton BTN_PASSWORD_OK { Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ; @@ -207,7 +207,7 @@ ModalDialog DLG_PASSWORD { Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - }; + }; Text [ en-US ] = "Change Password"; }; diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 5e7e28158777..3f731cade662 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -178,7 +178,7 @@ DBG_NAME(OUserAdminDlg) return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const + ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -203,7 +203,7 @@ DBG_NAME(OUserAdminDlg) return PrepareLeaveCurrentPage(); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.hrc b/dbaccess/source/ui/dlg/UserAdminDlg.hrc index c1e023cfc9b7..dd1bdd5b57af 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.hrc +++ b/dbaccess/source/ui/dlg/UserAdminDlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #ifndef DBAUI_USERADMINDLG_HRC #define DBAUI_USERADMINDLG_HRC -#define STR_PAGETITLE_USERADMIN 1 +#define STR_PAGETITLE_USERADMIN 1 #endif // DBAUI_USERADMINDLG_HRC diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src index faa7f33302d7..bed16e575dc1 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.src +++ b/dbaccess/source/ui/dlg/UserAdminDlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ TabDialog DLG_DATABASE_USERADMIN -{ +{ OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE; HelpId = HID_DSADMIN_USERADMIN; - + TabControl 1 { OutputSize = TRUE ; @@ -55,6 +55,6 @@ TabDialog DLG_DATABASE_USERADMIN { Text[ en-US ] = "User Settings"; }; - + Text [ en-US ] = "User administration" ; }; diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index cfdc2dd3842f..5213bda4c8a5 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,18 +152,18 @@ namespace dbaui //-------------------------------------------------------------------- MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( FALSE ) ) - ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) - ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) + ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) + ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) ,m_aHostPortRadio ( this, ModuleRes( RB_MYSQL_HOST_PORT ) ) - ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) ) - ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) ) - ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) ) - ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) ) - ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) ) - ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) ) + ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) ) + ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) ) + ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) ) + ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) ) + ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) ) + ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) ) ,m_aDefaultPort ( this, ModuleRes( FT_COMMON_PORT_DEFAULT ) ) - ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) ) - ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) ) + ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) ) + ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) ) { FreeResource(); diff --git a/dbaccess/source/ui/dlg/admincontrols.hrc b/dbaccess/source/ui/dlg/admincontrols.hrc index 8286bc7f8b25..01eadee58e83 100755 --- a/dbaccess/source/ui/dlg/admincontrols.hrc +++ b/dbaccess/source/ui/dlg/admincontrols.hrc @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index cd3246cdc332..4caa61be5664 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,10 +55,10 @@ namespace dbaui FixedText m_aHostNameLabel; Edit m_aHostName; FixedText m_aPortLabel; - NumericField m_aPort; - FixedText m_aDefaultPort; - Edit m_aSocket; - Edit m_aNamedPipe; + NumericField m_aPort; + FixedText m_aDefaultPort; + Edit m_aSocket; + Edit m_aNamedPipe; ::svt::ControlDependencyManager m_aControlDependencies; diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src index 8ce3bb4030dc..5e5ceda60428 100755 --- a/dbaccess/source/ui/dlg/admincontrols.src +++ b/dbaccess/source/ui/dlg/admincontrols.src @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text[ en-US ] = "~Database name"; }; - + Edit ED_MYSQL_DATABASE_NAME { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, 0 ); @@ -84,7 +84,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Text [ en-US ] = "~Port" ; Group = TRUE; }; - + NumericField NF_COMMON_PORT { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + LINE_HEIGHT ); @@ -93,7 +93,7 @@ Control RID_MYSQL_NATIVE_SETTINGS NoThousandSep = TRUE; Value = 3306; }; - + FixedText FT_COMMON_PORT_DEFAULT { Pos = MAP_APPFONT ( COLUMN_WIDTH_1 + 25 + RELATED_CONTROLS, OPTION_GROUP_START + LINE_HEIGHT + 2 ); @@ -107,7 +107,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text [ en-US ] = "So~cket"; }; - + Edit ED_MYSQL_SOCKET { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT ); @@ -121,7 +121,7 @@ Control RID_MYSQL_NATIVE_SETTINGS Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Named p~ipe"; }; - + Edit ED_MYSQL_NAMED_PIPE { Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index e87ca6a93d45..2e4d3fbee797 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,7 +92,7 @@ namespace dbaui OGenericAdministrationPage::~OGenericAdministrationPage() { DELETEZ(m_pFT_HeaderText); - + DBG_DTOR(OGenericAdministrationPage,NULL); } @@ -186,7 +186,7 @@ namespace dbaui fillControls(aControlList); ::std::for_each(aControlList.begin(),aControlList.end(),TSaveValueWrapperFunctor()); } - + if ( bReadonly ) { fillWindows(aControlList); @@ -264,7 +264,7 @@ namespace dbaui // ----------------------------------------------------------------------- IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/) - { + { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); sal_Bool bSuccess = sal_False; if ( m_pAdminDialog ) @@ -294,7 +294,7 @@ namespace dbaui else { eImage = OSQLMessageBox::Error; - aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); + aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS)); } OSQLMessageBox aMsg( this, sTitle, aMessage, WB_OK, eImage ); aMsg.Execute(); @@ -333,7 +333,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index eba739fec877..9a6775269bf0 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,10 +50,10 @@ namespace dbaui virtual bool SaveValue() = 0; virtual bool Disable() = 0; }; - + template < class T > class OSaveValueWrapper : public ISaveValueWrapper { - T* m_pSaveValue; + T* m_pSaveValue; public: OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } @@ -64,7 +64,7 @@ namespace dbaui template < class T > class ODisableWrapper : public ISaveValueWrapper { - T* m_pSaveValue; + T* m_pSaveValue; public: ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } @@ -75,14 +75,14 @@ namespace dbaui struct TSaveValueWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { return lhs->SaveValue(); } }; struct TDisableWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { return lhs->Disable(); } @@ -90,7 +90,7 @@ namespace dbaui struct TDeleteWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool> { - bool operator() (ISaveValueWrapper* lhs) + bool operator() (ISaveValueWrapper* lhs) { delete lhs; return true; @@ -101,12 +101,12 @@ namespace dbaui //= OGenericAdministrationPage //========================================================================= class IDatabaseSettingsDialog; - class IItemSetHelper; + class IItemSetHelper; class OGenericAdministrationPage :public SfxTabPage ,public ::svt::IWizardPageController { private: - Link m_aModifiedHandler; /// to be called if something on the page has been modified + Link m_aModifiedHandler; /// to be called if something on the page has been modified sal_Bool m_abEnableRoadmap; protected: IDatabaseSettingsDialog* m_pAdminDialog; @@ -123,32 +123,32 @@ namespace dbaui void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; } /** Sets the ParentDialog - @param _pAdminDialog + @param _pAdminDialog the ParentDialog - @param _pItemSetHelper + @param _pItemSetHelper the itemset helper */ - inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) - { + inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper) + { OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!"); - m_pAdminDialog = _pDialog; + m_pAdminDialog = _pDialog; m_pItemSetHelper = _pItemSetHelper; } /** Sets the ServiceFactory - @param _rxORB + @param _rxORB The service factory. */ virtual void SetServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB) - { - m_xORB = _rxORB; + { + m_xORB = _rxORB; } /** opens a dialog filled with all data sources available for this type and returns the selected on. - @param _eType + @param _eType The type for which the data source dialog should be opened. - @param _sReturn + @param _sReturn <OUT/> contains the selected name. @return <FALSE/> if an error occured, otherwise <TRUE/> @@ -168,12 +168,12 @@ namespace dbaui virtual int DeactivatePage(SfxItemSet* pSet); using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False - virtual void Reset(const SfxItemSet& _rCoreAttrs); + virtual void Reset(const SfxItemSet& _rCoreAttrs); /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True virtual void ActivatePage(const SfxItemSet& _rSet); // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage(); protected: void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); } @@ -182,7 +182,7 @@ namespace dbaui virtual sal_Bool prepareLeave() { return sal_True; } /** called from within Reset and ActivatePage, use to initialize the controls with the items from the given set - @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls + @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls */ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -190,28 +190,28 @@ namespace dbaui void getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly); /** will be called inside <method>implInitControls</method> to save the value if necessary - @param _rControlList - The list must be filled with the controls. + @param _rControlList + The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; /** will be called inside <method>implInitControls</method> to disable if necessary - @param _rControlList - The list must be filled with the controls. + @param _rControlList + The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; public: /** fills the Boolean value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pCheckBox + @param _pCheckBox The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> @param _bRevertValue set to <TRUE/> if the display value should be reverted before putting it into the set @@ -219,25 +219,25 @@ namespace dbaui static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, USHORT _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false); /** fills the int value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pEdit + @param _pEdit The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething); /** fills the String value into the item set when the value changed. - @param _rSet + @param _rSet The item set where to put the new value into. - @param _pEdit + @param _pEdit The check box which is checked. - @param _nID + @param _nID The id in the itemset to set whith the new value. - @param _bChangedSomething + @param _bChangedSomething <TRUE/> if something changed otherwise <FALSE/> */ static void fillString(SfxItemSet& _rSet,Edit* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething); @@ -280,7 +280,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ADMINPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index a0f0365fb22b..21f806db613a 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,14 +71,14 @@ BSTR PromptNew(long hWnd) // Initialize COM ::CoInitialize( NULL ); - + // Instantiate DataLinks object. hr = CoCreateInstance( - CLSID_DataLinks, //clsid -- Data Links UI - NULL, //pUnkOuter - CLSCTX_INPROC_SERVER, //dwClsContext - IID_IDataSourceLocator, //riid - (void**)&dlPrompt //ppvObj + CLSID_DataLinks, //clsid -- Data Links UI + NULL, //pUnkOuter + CLSCTX_INPROC_SERVER, //dwClsContext + IID_IDataSourceLocator, //riid + (void**)&dlPrompt //ppvObj ); if( FAILED( hr ) ) { @@ -86,7 +86,7 @@ BSTR PromptNew(long hWnd) dlPrompt->Release( ); return connstr; } - + dlPrompt->put_hWnd(hWnd); if( FAILED( hr ) ) { @@ -98,7 +98,7 @@ BSTR PromptNew(long hWnd) // Prompt for connection information. hr = dlPrompt->PromptNew((IDispatch **)&piTmpConnection); - if( FAILED( hr ) || !piTmpConnection ) + if( FAILED( hr ) || !piTmpConnection ) { dlPrompt->Release( ); return connstr; @@ -128,7 +128,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) // Initialize COM ::CoInitialize( NULL ); - hr = CoCreateInstance(CLSID_CADOConnection, + hr = CoCreateInstance(CLSID_CADOConnection, NULL, CLSCTX_INPROC_SERVER, IID_IADOConnection, @@ -139,21 +139,21 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return connstr; } - + hr = piTmpConnection->put_ConnectionString(connstr); if( FAILED( hr ) ) { piTmpConnection->Release( ); return connstr; } - + // Instantiate DataLinks object. hr = CoCreateInstance( - CLSID_DataLinks, //clsid -- Data Links UI - NULL, //pUnkOuter - CLSCTX_INPROC_SERVER, //dwClsContext - IID_IDataSourceLocator, //riid - (void**)&dlPrompt //ppvObj + CLSID_DataLinks, //clsid -- Data Links UI + NULL, //pUnkOuter + CLSCTX_INPROC_SERVER, //dwClsContext + IID_IDataSourceLocator, //riid + (void**)&dlPrompt //ppvObj ); if( FAILED( hr ) ) { @@ -161,7 +161,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) dlPrompt->Release( ); return connstr; } - + dlPrompt->put_hWnd(hWnd); if( FAILED( hr ) ) { @@ -171,7 +171,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) } VARIANT_BOOL pbSuccess; - + // Prompt for connection information. hr = dlPrompt->PromptEdit((IDispatch **)&piTmpConnection,&pbSuccess); if( SUCCEEDED( hr ) && FALSE == pbSuccess ) //if user press cancel then FALSE == pbSuccess @@ -181,7 +181,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return connstr; } - if( FAILED( hr ) ) + if( FAILED( hr ) ) { // Prompt for new connection information. piTmpConnection->Release( ); diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index e5f299e7a7be..e7c08b3e1b6e 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 68b7d64abd8c..49bc28b34b4c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ class TableListFacade : public ::cppu::BaseMutex { OTableTreeListBox& m_rTableList; Reference< XConnection > m_xConnection; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; bool m_bAllowViews; @@ -94,7 +94,7 @@ public: { } virtual ~TableListFacade(); - + private: virtual void updateTableObjectList( bool _bAllowViews ); @@ -133,8 +133,8 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const try { Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW ); - if ( !aCatalog.getLength() - && aSchema.getLength() + if ( !aCatalog.getLength() + && aSchema.getLength() && xMeta->supportsCatalogsInDataManipulation() && !xMeta->supportsSchemasInDataManipulation() ) { @@ -175,7 +175,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) try { Reference< XTablesSupplier > xTableSupp( m_xConnection, UNO_QUERY_THROW ); - + Reference< XViewsSupplier > xViewSupp; Reference< XNameAccess > xTables, xViews; Sequence< ::rtl::OUString > sTables, sViews; @@ -203,12 +203,12 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) // if no views are allowed remove the views also out the table name filter if ( !_bAllowViews ) { - const ::rtl::OUString* pTableBegin = sTables.getConstArray(); - const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); + const ::rtl::OUString* pTableBegin = sTables.getConstArray(); + const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength(); ::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd); const ::rtl::OUString* pViewBegin = sViews.getConstArray(); - const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); + const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::TStringMixEqualFunctor aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); @@ -249,7 +249,7 @@ class QueryListFacade : public ::cppu::BaseMutex { SvTreeListBox& m_rQueryList; Reference< XConnection > m_xConnection; - ::rtl::Reference< comphelper::OContainerListenerAdapter> + ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; public: @@ -513,7 +513,7 @@ BOOL OAddTableDlg::Close() //------------------------------------------------------------------------------ bool OAddTableDlg::impl_isAddAllowed() { - return m_rContext.allowAddition(); + return m_rContext.allowAddition(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/dlg/adtabdlg.hrc b/dbaccess/source/ui/dlg/adtabdlg.hrc index 3c0e348abfaa..ce0a9ba4f227 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.hrc +++ b/dbaccess/source/ui/dlg/adtabdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,13 +28,13 @@ #define DBAUI_ADTABDLG_HRC #define LB_TABLE_OR_QUERY 1 -#define LB_DATABASE 2 +#define LB_DATABASE 2 -#define FT_DATABASE 1 +#define FT_DATABASE 1 -#define PB_ADDTABLE 1 -#define PB_CLOSE 2 -#define PB_HELP 3 +#define PB_ADDTABLE 1 +#define PB_CLOSE 2 +#define PB_HELP 3 #define RB_CASE_TABLES 1 #define RB_CASE_QUERIES 2 diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index af1d861a0faa..69b202644a6c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 66df4a24c74c..b42aa4843c66 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -447,7 +447,7 @@ namespace dbaui // auto-generated values? if ( rFeatures.supportsGeneratedValues() ) AddTabPage( PAGE_GENERATED_VALUES, String( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); - + // any "special settings"? if ( rFeatures.supportsAnySpecialSetting() ) AddTabPage( PAGE_ADVANCED_SETTINGS_SPECIAL, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateSpecialSettingsPage, NULL ); @@ -532,7 +532,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const + ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hrc b/dbaccess/source/ui/dlg/advancedsettings.hrc index 8abc5d8810d2..8a09c0adcf7a 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hrc +++ b/dbaccess/source/ui/dlg/advancedsettings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #define ADVANCED_CHECKBOX_OPTIONS 15 #define ADVANCED_LISTBOX_OPTIONS 1 -#define ADVANCED_PAGE_X 200 +#define ADVANCED_PAGE_X 200 #define ADVANCED_PAGE_Y \ /* top space */ START_Y + \ /* label */ FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \ @@ -40,23 +40,23 @@ /* bottom space */ START_Y -#define STR_GENERATED_VALUE 1 -#define STR_DS_BEHAVIOUR 2 +#define STR_GENERATED_VALUE 1 +#define STR_DS_BEHAVIOUR 2 -#define FL_SEPARATORAUTO 1 -#define FL_DATAHANDLING 2 +#define FL_SEPARATORAUTO 1 +#define FL_DATAHANDLING 2 -#define CB_SUPPRESVERSIONCL 1 -#define CB_SQL92CHECK 2 -#define CB_RETRIEVE_AUTO 3 -#define CB_APPENDTABLEALIAS 4 +#define CB_SUPPRESVERSIONCL 1 +#define CB_SQL92CHECK 2 +#define CB_RETRIEVE_AUTO 3 +#define CB_APPENDTABLEALIAS 4 #define CB_IGNOREDRIVER_PRIV 5 -#define CB_PARAMETERNAMESUBST 6 -#define CB_ENABLEOUTERJOIN 7 -#define CB_SCHEMA 8 -#define CB_CATALOG 9 -#define CB_IGNOREINDEXAPPENDIX 10 -#define CB_DOSLINEENDS 11 +#define CB_PARAMETERNAMESUBST 6 +#define CB_ENABLEOUTERJOIN 7 +#define CB_SCHEMA 8 +#define CB_CATALOG 9 +#define CB_IGNOREINDEXAPPENDIX 10 +#define CB_DOSLINEENDS 11 #define CB_AS_BEFORE_CORR_NAME 12 #define CB_CHECK_REQUIRED 13 #define CB_IGNORECURRENCY 14 @@ -64,12 +64,12 @@ #define CB_PRIMARY_KEY_SUPPORT 16 #define ET_AUTOINCREMENTVALUE 1 -#define ET_RETRIEVE_AUTO 2 +#define ET_RETRIEVE_AUTO 2 -#define FT_AUTOINCREMENTVALUE 1 -#define FT_RETRIEVE_AUTO 2 -#define FT_BOOLEANCOMPARISON 3 +#define FT_AUTOINCREMENTVALUE 1 +#define FT_RETRIEVE_AUTO 2 +#define FT_BOOLEANCOMPARISON 3 -#define LB_BOOLEANCOMPARISON 1 +#define LB_BOOLEANCOMPARISON 1 #endif // DBAUI_ADVANCEDSETTINGS_HRC diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index f4c6e75e4f3f..b13043ca71b0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace dbaui CheckBox* m_pIndexAppendix; CheckBox* m_pDosLineEnds; CheckBox* m_pCheckRequiredFields; - CheckBox* m_pIgnoreCurrency; + CheckBox* m_pIgnoreCurrency; CheckBox* m_pEscapeDateTime; CheckBox* m_pPrimaryKeySupport; @@ -127,7 +127,7 @@ namespace dbaui GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: - + // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~GeneratedValuesPage(); diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src index 4c5a7d924d33..a4eb47133f63 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.src +++ b/dbaccess/source/ui/dlg/advancedsettings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,14 +174,14 @@ }; //------------------------------------------------------------------------- -#define AUTO_IGNORECURRENCY(AUTO_Y) \ - CheckBox CB_IGNORECURRENCY \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_IGNORECURRENCY; \ - Text [ en-US ] = "Ignore currency field information"; \ +#define AUTO_IGNORECURRENCY(AUTO_Y) \ + CheckBox CB_IGNORECURRENCY \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_IGNORECURRENCY; \ + Text [ en-US ] = "Ignore currency field information"; \ }; //------------------------------------------------------------------------- @@ -227,7 +227,7 @@ < "SQL" ; Default ; > ; \ < "Mixed" ; Default ; > ; \ < "MS Access" ; Default ; > ; \ - }; + }; #define AUTO_BOOLEANCOMPARISON(AUTO_Y) \ @@ -337,30 +337,30 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL //------------------------------------------------------------------------- TabDialog DLG_DATABASE_ADVANCED -{ +{ OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE; HelpId = HID_DSADMIN_ADVANCED; - + TabControl 1 { OutputSize = TRUE ; HelpId = HID_DSADMIN_TABCONTROL; SingleLine=TRUE; }; - + String STR_GENERATED_VALUE { Text [ en-US ] = "Generated Values"; }; - + String STR_DS_BEHAVIOUR { Text [ en-US ] = "Special Settings"; }; - + Text [ en-US ] = "Advanced Properties" ; }; diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 028705d806ea..2783d030b347 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,7 +149,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD { case ::dbaccess::DST_DBASE: addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase); - // bResetPasswordRequired = sal_True; + // bResetPasswordRequired = sal_True; break; case ::dbaccess::DST_ADO: @@ -158,7 +158,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD case ::dbaccess::DST_FLAT: addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText); - // bResetPasswordRequired = sal_True; + // bResetPasswordRequired = sal_True; break; case ::dbaccess::DST_ODBC: @@ -188,7 +188,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD case ::dbaccess::DST_LDAP: addDetailPage(PAGE_LDAP,STR_PAGETITLE_ADVANCED,ODriversSettings::CreateLDAP); break; - case ::dbaccess::DST_USERDEFINE1: /// first user defined driver + case ::dbaccess::DST_USERDEFINE1: /// first user defined driver case ::dbaccess::DST_USERDEFINE2: case ::dbaccess::DST_USERDEFINE3: case ::dbaccess::DST_USERDEFINE4: @@ -228,7 +228,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, // the indirect property values of the first ds are shown in the second ds ...) const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); + for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); aIndirect != rMap.end(); ++aIndirect ) @@ -282,7 +282,7 @@ sal_Bool ODbAdminDialog::saveDatasource() ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() { if (!PrepareLeaveCurrentPage()) - { // the page did not allow us to leave + { // the page did not allow us to leave return AR_KEEP; } @@ -331,7 +331,7 @@ Reference< XDriver > ODbAdminDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -351,7 +351,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US ); // create and initialize the defaults _rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1]; - SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults + SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults *pCounter++ = new SfxStringItem(DSID_NAME, String()); *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String()); *pCounter++ = new SfxStringItem(DSID_CONNECTURL, String()); @@ -509,9 +509,9 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, _rppDefaults = NULL; // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults } - + //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index 88ed5aea8d47..d49537cfdab2 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ #define CB_PASSWORD_REQUIRED 1 #define CB_SHOWDELETEDROWS 2 #define CB_USESSL 3 -#define CB_USECATALOG 4 +#define CB_USECATALOG 4 #define FL_SEPARATOR2 1 @@ -103,9 +103,9 @@ //======================================================================== // menu item ids -#define MID_NEW_DATASOURCE 1 -#define MID_DELETE_DATASOURCE 2 -#define MID_RESTORE_DATASOURCE 3 +#define MID_NEW_DATASOURCE 1 +#define MID_DELETE_DATASOURCE 2 +#define MID_RESTORE_DATASOURCE 3 #endif // _DBAUI_DBADMIN_HRC_ diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index c4457c62eec0..02389611a993 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,55 +48,55 @@ //------------------------------------------------------------------------- #define AUTO_USECATALOG(AUTO_Y) \ - CheckBox CB_USECATALOG \ - { \ - Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \ - Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_USECATALOG; \ - Text[ en-US ] = "Use catalog for file-based databases"; \ + CheckBox CB_USECATALOG \ + { \ + Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \ + Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_USECATALOG; \ + Text[ en-US ] = "Use catalog for file-based databases"; \ }; //------------------------------------------------------------------------- #define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \ - FixedLine FL_SEPARATOR1 \ - { \ - Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "Connection Settings"; \ - }; \ - -#define AUTO_HOST_AND_PORT(AUTO_Y) \ - FixedText FT_HOSTNAME \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "~Host name"; \ - }; \ - Edit ET_HOSTNAME \ - { \ - TabStop = TRUE ; \ - Border = TRUE ; \ - HelpId = HID_DSADMIN_HOSTNAME; \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ - }; \ + FixedLine FL_SEPARATOR1 \ + { \ + Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "Connection Settings"; \ + }; \ + +#define AUTO_HOST_AND_PORT(AUTO_Y) \ + FixedText FT_HOSTNAME \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \ + Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "~Host name"; \ + }; \ + Edit ET_HOSTNAME \ + { \ + TabStop = TRUE ; \ + Border = TRUE ; \ + HelpId = HID_DSADMIN_HOSTNAME; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ + Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ + }; \ \ - FixedText FT_PORTNUMBER \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text[ en-US ] = "~Port number"; \ - }; \ - NumericField NF_PORTNUMBER \ - { \ - TabStop = TRUE ; \ - Border = TRUE ; \ - HelpId = HID_DSADMIN_PORTNUMBER; \ + FixedText FT_PORTNUMBER \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ + Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ + Text[ en-US ] = "~Port number"; \ + }; \ + NumericField NF_PORTNUMBER \ + { \ + TabStop = TRUE ; \ + Border = TRUE ; \ + HelpId = HID_DSADMIN_PORTNUMBER; \ NoThousandSep = TRUE; \ Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \ - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ + Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ }; //------------------------------------------------------------------------- @@ -393,7 +393,7 @@ TabPage PAGE_ODBC HelpId = HID_DSADMIN_ODBC_OPTIONS; }; - AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) + AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) }; TabPage PAGE_ADABAS @@ -434,11 +434,11 @@ TabPage PAGE_ADABAS }; NumericField NF_CACHE_SIZE { - Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; + Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; SpinSize = 1; StrictFormat = TRUE; }; @@ -451,11 +451,11 @@ TabPage PAGE_ADABAS }; NumericField NF_DATA_INCREMENT { - Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; + Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; SpinSize = 1; StrictFormat = TRUE; }; @@ -502,8 +502,8 @@ TabPage PAGE_ADABAS PushButton PB_STAT { - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; + Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; + Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text[ en-US ] = "E~xtended..."; }; @@ -511,9 +511,9 @@ TabPage PAGE_ADABAS }; //......................................................................... -#define MYSQL_YDIST 53 -#define MYSQL_FL_Y 8 -#define MYSQL_DRIVERCLASS_Y 8 +#define MYSQL_YDIST 53 +#define MYSQL_FL_Y 8 +#define MYSQL_DRIVERCLASS_Y 8 TabPage PAGE_MYSQL_ODBC { diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index 50b796541872..2a7c0abb178a 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,10 +102,10 @@ String STR_HINT_CONNECTION_NOT_CAPABLE Text [ en-US ] = "(Not supported by this connection)"; }; -#define EDIT_SIZE_X 50 -#define FT_SIZE_X 90 -#define WIN_X 220 -#define WIN_Y 72 +#define EDIT_SIZE_X 50 +#define FT_SIZE_X 90 +#define WIN_X 220 +#define WIN_Y 72 ModalDialog DLG_DOMAINPASSWORD { @@ -145,7 +145,7 @@ ModalDialog DLG_DOMAINPASSWORD { Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; - }; + }; }; #define PAGE_X_T (PAGE_X -80) @@ -158,7 +158,7 @@ TabPage PAGE_TABLESUBSCRIPTION Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ; HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION; - + Text [ en-US ] = "Tables Filter" ; FixedLine FL_SEPARATOR1 @@ -169,17 +169,17 @@ TabPage PAGE_TABLESUBSCRIPTION }; Control CTL_TABLESUBSCRIPTION { - Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ; - Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ; - Group = TRUE; - Border = TRUE ; + Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ; + Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ; + Group = TRUE; + Border = TRUE ; TabStop = TRUE ; HelpId = HID_DSADMIN_TABLE_SELECTOR; }; FixedText FT_FILTER_EXPLANATION { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ; - Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ; + Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ; HelpId = HID_DSADMIN_FILTER_EXPLANATION; WordBreak = TRUE; Text [ en-US ] = "Mark the tables that should be visible for the applications."; diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index 7d6757951089..282557af2485 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,45 +40,45 @@ #endif -#define STR_DBASE_HELPTEXT 28 -#define STR_MSACCESS_HELPTEXT 29 -#define STR_TEXT_HELPTEXT 30 +#define STR_DBASE_HELPTEXT 28 +#define STR_MSACCESS_HELPTEXT 29 +#define STR_TEXT_HELPTEXT 30 // FREE -#define STR_ADO_HELPTEXT 32 -#define STR_JDBC_HELPTEXT 33 -#define STR_ODBC_HELPTEXT 34 -#define STR_MYSQLJDBC_HELPTEXT 35 -#define STR_SPREADSHEET_HELPTEXT 36 +#define STR_ADO_HELPTEXT 32 +#define STR_JDBC_HELPTEXT 33 +#define STR_ODBC_HELPTEXT 34 +#define STR_MYSQLJDBC_HELPTEXT 35 +#define STR_SPREADSHEET_HELPTEXT 36 // FREE -#define STR_FINAL_HELPTEXT 38 -#define STR_ADABAS_HELPTEXT 39 -#define STR_ORACLE_HELPTEXT 40 -#define STR_DBASE_HEADERTEXT 41 -#define STR_MSACCESS_HEADERTEXT 42 -#define STR_TEXT_HEADERTEXT 43 +#define STR_FINAL_HELPTEXT 38 +#define STR_ADABAS_HELPTEXT 39 +#define STR_ORACLE_HELPTEXT 40 +#define STR_DBASE_HEADERTEXT 41 +#define STR_MSACCESS_HEADERTEXT 42 +#define STR_TEXT_HEADERTEXT 43 // FREE -#define STR_ADO_HEADERTEXT 45 -#define STR_JDBC_HEADERTEXT 46 -#define STR_ODBC_HEADERTEXT 47 +#define STR_ADO_HEADERTEXT 45 +#define STR_JDBC_HEADERTEXT 46 +#define STR_ODBC_HEADERTEXT 47 #define STR_MYSQLJDBC_HEADERTEXT 48 // FREE -#define STR_SPREADSHEET_HEADERTEXT 50 -#define STR_FINAL_HEADERTEXT 52 -#define STR_ADABAS_HEADERTEXT 53 -#define STR_ORACLE_HEADERTEXT 54 +#define STR_SPREADSHEET_HEADERTEXT 50 +#define STR_FINAL_HEADERTEXT 52 +#define STR_ADABAS_HEADERTEXT 53 +#define STR_ORACLE_HEADERTEXT 54 #define STR_GENERAL_HEADERTEXT 55 #define STR_DBWIZARDTITLE 56 -#define STR_DEFAULTLDAPPORTNUMBER 60 +#define STR_DEFAULTLDAPPORTNUMBER 60 -#define STR_ADABASNAME 61 -#define STR_ODBCDATASOURCENAME 63 -#define STR_SPREADSHEETPATH 64 -#define STR_DBLOCATIONLABEL 65 -#define STR_ADMIN_HELPTEXT 66 +#define STR_ADABASNAME 61 +#define STR_ODBCDATASOURCENAME 63 +#define STR_SPREADSHEETPATH 64 +#define STR_DBLOCATIONLABEL 65 +#define STR_ADMIN_HELPTEXT 66 #define STR_ORACLE_DEFAULT 67 -#define STR_PAGETITLE_INTROPAGE 69 +#define STR_PAGETITLE_INTROPAGE 69 #define STR_PAGETITLE_DBASE 70 #define STR_PAGETITLE_TEXT 71 #define STR_PAGETITLE_MSACCESS 72 @@ -100,15 +100,15 @@ #define FT_PORTNUMBERDEFAULT 1 -#define FT_LDAP_HELPTEXT 2 -#define FT_MYSQL_HELPTEXT 3 -#define FT_MYSQL_HEADERTEXT 4 -#define FT_MYSQLCONNECTIONMODE 5 -#define FT_BROWSEURL 6 -#define FT_AUTHENTIFICATIONHELPTEXT 7 +#define FT_LDAP_HELPTEXT 2 +#define FT_MYSQL_HELPTEXT 3 +#define FT_MYSQL_HEADERTEXT 4 +#define FT_MYSQLCONNECTIONMODE 5 +#define FT_BROWSEURL 6 +#define FT_AUTHENTIFICATIONHELPTEXT 7 #define FT_AUTHENTIFICATIONHEADERTEXT 8 -#define FT_LDAP_HEADERTEXT 9 -#define FT_GENERALUSERNAME 10 +#define FT_LDAP_HEADERTEXT 9 +#define FT_GENERALUSERNAME 10 #define FT_FINALHEADER 11 #define FT_FINALTEXT 12 #define FT_FINALHELPTEXT 13 @@ -116,19 +116,19 @@ #define FT_SETUP_WIZARD_HEADER 15 #define FT_SETUP_WIZARD_HELP 16 -#define ET_GENERALUSERNAME 1 +#define ET_GENERALUSERNAME 1 -#define PB_TESTCONNECTION 1 +#define PB_TESTCONNECTION 1 -#define RB_CONNECTVIAODBC 1 -#define RB_CONNECTVIAJDBC 2 +#define RB_CONNECTVIAODBC 1 +#define RB_CONNECTVIAJDBC 2 #define RB_REGISTERDATASOURCE 3 #define RB_DONTREGISTERDATASOURCE 4 #define RB_CONNECTVIANATIVE 5 #define CB_WIZ_USESSL 1 -#define CB_STARTTABLEWIZARD 2 -#define CB_OPENAFTERWARDS 3 +#define CB_STARTTABLEWIZARD 2 +#define CB_OPENAFTERWARDS 3 #define CB_SPREADSHEETPASSWORDREQUIRED 4 #define CB_GENERALPASSWORDREQUIRED 5 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 7b0dbe011342..00fa1b3cd3e5 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,12 +34,12 @@ #endif -#define CHECKBOX_HEIGHT 8 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define EDIT_X 101 +#define CHECKBOX_HEIGHT 8 +#define FIXEDTEXT_HEIGHT 8 +#define RELATED_CONTROLS 4 +#define UNRELATED_CONTROLS 7 +#define EDIT_HEIGHT 12 +#define EDIT_X 101 // ----------------------------------------------------------------------------- @@ -214,7 +214,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - FixedText FT_AUTHENTIFICATIONHEADERTEXT + FixedText FT_AUTHENTIFICATIONHEADERTEXT { Pos = MAP_APPFONT ( START_X , 8 ) ; Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; @@ -387,7 +387,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE Text[ en-US ] = "Set up connection to a MySQL database" ; WordBreak = TRUE; }; - + FixedText FT_SETUP_WIZARD_HELP { Pos = MAP_APPFONT ( START_X , INIT_Y ) ; @@ -492,9 +492,9 @@ TabPage PAGE_DBWIZARD_LDAP Text[ en-US ] = "Please enter the required information to connect to an LDAP directory.\nPlease contact your system administrator if you are unsure about the following settings." ; WordBreak = TRUE ; }; - AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER) - AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN) - AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER) + AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER) + AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN) + AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER) String STR_LDAP_DEFAULT{ Text[ en-US ] = "Default: 389" ; @@ -503,7 +503,7 @@ TabPage PAGE_DBWIZARD_LDAP CheckBox CB_WIZ_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; - Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ; + Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ; Size = MAP_APPFONT ( 212 , 8 ) ; Text[ en-US ] = "Use ~secure connection (SSL)" ; }; diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 809ccddc27eb..23aff6374ead 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,16 +61,16 @@ DBG_NAME(ODbaseIndexDialog) //------------------------------------------------------------------------- ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) : ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ), - aPB_OK( this, ModuleRes( PB_OK ) ), - aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ), - aPB_HELP( this, ModuleRes( PB_HELP ) ), - m_FT_Tables( this, ModuleRes( FT_TABLES ) ), - aCB_Tables( this, ModuleRes( CB_TABLES ) ), + aPB_OK( this, ModuleRes( PB_OK ) ), + aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ), + aPB_HELP( this, ModuleRes( PB_HELP ) ), + m_FT_Tables( this, ModuleRes( FT_TABLES ) ), + aCB_Tables( this, ModuleRes( CB_TABLES ) ), m_FL_Indexes( this, ModuleRes( FL_INDEXES ) ), - m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ), - aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ), - m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ), - aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ), + m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ), + aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ), + m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ), + aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ), aIB_Add( this, ModuleRes( IB_ADD ) ), aIB_Remove( this, ModuleRes( IB_REMOVE ) ), aIB_AddAll( this, ModuleRes( IB_ADDALL ) ), @@ -96,10 +96,10 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) FreeResource(); // set Hi contrast bitmaps - aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST); - aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST); - aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST); - aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST); + aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST); + aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST); + aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST); + aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST); } //------------------------------------------------------------------------- @@ -112,7 +112,7 @@ ODbaseIndexDialog::~ODbaseIndexDialog() //------------------------------------------------------------------------- sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator& _rPosition) { - for ( _rPosition = m_aTableInfoList.begin(); + for ( _rPosition = m_aTableInfoList.begin(); _rPosition != m_aTableInfoList.end(); ++_rPosition ) @@ -149,7 +149,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const String& _rName, TableIndexL sal_Int32 nPos = 0; TableIndexListIterator aSearch; - for ( aSearch = _rList.begin(); + for ( aSearch = _rList.begin(); aSearch != _rList.end(); ++aSearch, ++nPos ) @@ -212,7 +212,7 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ ) { // let all tables write their INF file - for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); + for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); aLoop != m_aTableInfoList.end(); ++aLoop ) @@ -291,7 +291,7 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox ) // fill the listbox for the indexes aLB_TableIndexes.Clear(); - for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin(); + for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin(); aLoop != aTablePos->aIndexList.end(); ++aLoop ) @@ -335,7 +335,7 @@ void ODbaseIndexDialog::Init() aURL.SetSmartURL(m_aDSN); - // String aFileName = aURL.PathToFileName(); + // String aFileName = aURL.PathToFileName(); m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE); ::ucbhelper::Content aFile; sal_Bool bFolder=sal_True; @@ -413,7 +413,7 @@ void ODbaseIndexDialog::Init() } } - for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin(); + for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin(); aUsedIndex != aUsedIndexes.end(); ++aUsedIndex ) @@ -436,7 +436,7 @@ void ODbaseIndexDialog::Init() void ODbaseIndexDialog::SetCtrls() { // ComboBox Tabellen - for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); + for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin(); aLoop != m_aTableInfoList.end(); ++aLoop ) @@ -449,7 +449,7 @@ void ODbaseIndexDialog::SetCtrls() aCB_Tables.SetText( rTabInfo.aTableName ); // ListBox der Tabellenindizes aufbauen - for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin(); + for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin(); aIndex != rTabInfo.aIndexList.end(); ++aIndex ) @@ -461,7 +461,7 @@ void ODbaseIndexDialog::SetCtrls() } // ListBox freie Indizes - for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin(); + for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin(); aFree != m_aFreeIndexList.end(); ++aFree ) @@ -522,13 +522,13 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const // Jetzt alle gespeicherten Indizes hinzufuegen sal_uInt16 nPos = 0; - for ( ConstTableIndexListIterator aIndex = aIndexList.begin(); + for ( ConstTableIndexListIterator aIndex = aIndexList.begin(); aIndex != aIndexList.end(); ++aIndex, ++nPos ) { aKeyName = "NDX"; - if( nPos > 0 ) // Erster Index erhaelt keine Ziffer + if( nPos > 0 ) // Erster Index erhaelt keine Ziffer aKeyName += ByteString::CreateFromInt32( nPos ); aInfFile.WriteKey( aKeyName, ByteString(aIndex->GetIndexFileName(), gsl_getSystemTextEncoding()) ); } @@ -555,7 +555,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.hrc b/dbaccess/source/ui/dlg/dbfindex.hrc index 0d67da065568..988cedbe2a3b 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hrc +++ b/dbaccess/source/ui/dlg/dbfindex.hrc @@ -1,20 +1,20 @@ #ifndef _DBAUI_DBF_INDEXES_HRC_ #define _DBAUI_DBF_INDEXES_HRC_ -#define CB_TABLES 1 +#define CB_TABLES 1 -#define FT_TABLES 1 -#define FT_TABLEINDEXES 2 -#define FT_ALLINDEXES 3 +#define FT_TABLES 1 +#define FT_TABLEINDEXES 2 +#define FT_ALLINDEXES 3 #define FL_INDEXES 1 -#define LB_TABLEINDEXES 1 -#define LB_FREEINDEXES 2 +#define LB_TABLEINDEXES 1 +#define LB_FREEINDEXES 2 -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 #define IB_ADD 1 #define IB_REMOVE 2 diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 59b1f0f66f1e..58318800591d 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: }; //------------------------------------------------------------------------- -typedef ::std::list< OTableIndex > TableIndexList; +typedef ::std::list< OTableIndex > TableIndexList; DECLARE_STL_ITERATORS(TableIndexList); //========================================================================= @@ -87,7 +87,7 @@ public: }; //------------------------------------------------------------------------- -typedef ::std::list< OTableInfo > TableInfoList; +typedef ::std::list< OTableInfo > TableInfoList; DECLARE_STL_ITERATORS(TableInfoList); ////////////////////////////////////////////////////////////////////////// @@ -95,20 +95,20 @@ DECLARE_STL_ITERATORS(TableInfoList); class ODbaseIndexDialog : public ModalDialog { protected: - OKButton aPB_OK; - CancelButton aPB_CANCEL; - HelpButton aPB_HELP; + OKButton aPB_OK; + CancelButton aPB_CANCEL; + HelpButton aPB_HELP; - FixedText m_FT_Tables; - ComboBox aCB_Tables; + FixedText m_FT_Tables; + ComboBox aCB_Tables; FixedLine m_FL_Indexes; - FixedText m_FT_TableIndexes; - ListBox aLB_TableIndexes; + FixedText m_FT_TableIndexes; + ListBox aLB_TableIndexes; - FixedText m_FT_AllIndexes; - ListBox aLB_FreeIndexes; + FixedText m_FT_AllIndexes; + ListBox aLB_FreeIndexes; ImageButton aIB_Add; ImageButton aIB_Remove; @@ -123,22 +123,22 @@ protected: DECL_LINK( OKClickHdl, PushButton* ); DECL_LINK( OnListEntrySelected, ListBox* ); - String m_aDSN; - TableInfoList m_aTableInfoList; - TableIndexList m_aFreeIndexList; - BOOL m_bCaseSensitiv; + String m_aDSN; + TableInfoList m_aTableInfoList; + TableIndexList m_aFreeIndexList; + BOOL m_bCaseSensitiv; - void Init(); - void SetCtrls(); - sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition); + void Init(); + void SetCtrls(); + sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition); - OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); - void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); + OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist); + void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay); - OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); } - void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); } - OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist ); - void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex ); + OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); } + void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); } + OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist ); + void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex ); void checkButtons(); @@ -148,7 +148,7 @@ public: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DBFINDEX_HXX_ diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index ad401102601d..8f6ef6e49697 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,7 +170,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 60 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -189,7 +189,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 77 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -208,7 +208,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94 , 98 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap @@ -227,7 +227,7 @@ ModalDialog DLG_DBASE_INDEXES { Pos = MAP_APPFONT ( 94, 114 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; - TabStop = TRUE ; + TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index cac6a8499601..1355a6556cab 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ using namespace com::sun::star::util; using namespace com::sun::star::beans; using namespace com::sun::star::container; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 -#define ADDITIONAL_PAGE_DBASE 2 +#define START_PAGE 0 +#define CONNECTION_PAGE 1 +#define ADDITIONAL_PAGE_DBASE 2 #define ADDITIONAL_PAGE_FLAT 3 #define ADDITIONAL_PAGE_LDAP 4 #define ADDITIONAL_PAGE_ADABAS 5 #define ADDITIONAL_PAGE_MYSQL_JDBC 6 -#define ADDITIONAL_PAGE_MYSQL_ODBC 7 +#define ADDITIONAL_PAGE_MYSQL_ODBC 7 #define ADDITIONAL_PAGE_ORACLE_JDBC 8 #define ADDITIONAL_PAGE_ADO 9 #define ADDITIONAL_PAGE_ODBC 10 @@ -93,7 +93,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ,m_bApplied(sal_False) ,m_bUIEnabled( sal_True ) { - DBG_CTOR(ODbTypeWizDialog,NULL); + DBG_CTOR(ODbTypeWizDialog,NULL); m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); @@ -125,8 +125,8 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent //------------------------------------------------------------------------- ODbTypeWizDialog::~ODbTypeWizDialog() { - DBG_DTOR(ODbTypeWizDialog,NULL); - delete m_pOutSet; + DBG_DTOR(ODbTypeWizDialog,NULL); + delete m_pOutSet; } //------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage) @@ -245,7 +245,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver() return m_pImpl->getDriver(); } // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } @@ -316,7 +316,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) // register ourself as modified listener if ( pPage ) - { + { static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory(m_pImpl->getORB()); static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); // open our own resource block, as the page titles are strings local to this block @@ -380,7 +380,7 @@ sal_Bool ODbTypeWizDialog::onFinish() return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False; } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index aea15cf0fb8a..56bd08565ac4 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,8 +120,8 @@ using namespace ::com::sun::star::document; using namespace ::comphelper; using namespace ::cppu; -#define START_PAGE 0 -#define CONNECTION_PAGE 1 +#define START_PAGE 0 +#define CONNECTION_PAGE 1 OFinalDBPageSetup* pFinalPage; @@ -181,7 +181,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); m_pImpl->translateProperties(xDatasource, *m_pOutSet); -// eType = m_pImpl->getDatasourceType(*m_pOutSet); +// eType = m_pImpl->getDatasourceType(*m_pOutSet); SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT)); ShowButtonFixedLine(sal_True); @@ -430,7 +430,7 @@ void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatas // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, // the indirect property values of the first ds are shown in the second ds ...) const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); + for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); aIndirect != rMap.end(); ++aIndirect ) @@ -490,7 +490,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() // ----------------------------------------------------------------------------- -::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const +::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) @@ -576,11 +576,11 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) pPage = OConnectionTabPageSetup::CreateAdabasTabPage( this, *m_pOutSet); break; - case PAGE_DBSETUPWIZARD_LDAP : + case PAGE_DBSETUPWIZARD_LDAP : pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(this,*m_pOutSet); break; - case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver + case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver pPage = OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage(this,*m_pOutSet); break; @@ -1135,7 +1135,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index fb3a27decc66..6e53e81d0c77 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ namespace dbaui m_pCharset->SetSelectHdl(getControlModifiedLink()); } - Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine, + Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine, m_pAutoIncrementLabel, m_pAutoIncrement, m_pAutoRetrievingLabel, m_pAutoRetrieving }; @@ -231,10 +231,10 @@ namespace dbaui //------------------------------------------------------------------------ ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) ) - ,m_aIndexes (this, ModuleRes(PB_INDICIES)) + ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) ) + ,m_aIndexes (this, ModuleRes(PB_INDICIES)) { DBG_CTOR(ODbaseDetailsPage,NULL); @@ -255,7 +255,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new ODbaseDetailsPage( pParent, _rAttrSet ) ); } @@ -346,7 +346,7 @@ namespace dbaui DBG_DTOR(OAdoDetailsPage,NULL); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdoDetailsPage( pParent, _rAttrSet ) ); } @@ -357,8 +357,8 @@ namespace dbaui //======================================================================== OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS,false) - ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1)) - ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) + ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1)) + ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) { m_aUseCatalog.SetToggleHdl(getControlModifiedLink()); FreeResource(); @@ -373,7 +373,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); } @@ -417,18 +417,18 @@ namespace dbaui OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG)) { m_aUseCatalog.SetToggleHdl(getControlModifiedLink()); FreeResource(); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); } @@ -492,7 +492,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLODBCDetailsPage( pParent, _rAttrSet ) ); } @@ -502,16 +502,16 @@ namespace dbaui //======================================================================== OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId) :OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) - ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) - ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) - ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) - ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) + ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) + ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) + ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) + ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) ,m_nPortId(_nPortId) ,m_bUseClass(true) { @@ -538,7 +538,7 @@ namespace dbaui m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); m_aEDSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); - + m_aEDHostname.SetModifyHdl(getControlModifiedLink()); m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); m_aEDSocket.SetModifyHdl(getControlModifiedLink()); @@ -750,18 +750,18 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new MySQLNativePage( pParent, _rAttrSet ) ); } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) ); } @@ -772,35 +772,35 @@ namespace dbaui //======================================================================== OAdabasDetailsPage::OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ADABAS, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) - ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) - ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) - ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) - ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) - ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) - ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) - ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) - ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) - ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) - ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) + ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) + ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) + ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) + ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) + ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) + ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) + ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) + ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) + ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) + ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) + ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) + ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) { m_aEDHostname.SetModifyHdl(getControlModifiedLink()); FreeResource(); - m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); + m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); - m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); + m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); - m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); + m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); + m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); m_NF_DATA_INCREMENT.SetMin(20); m_NF_DATA_INCREMENT.SetMax(LONG_MAX); @@ -826,7 +826,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdabasDetailsPage( pParent, _rAttrSet ) ); } @@ -941,14 +941,14 @@ namespace dbaui //======================================================================== OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs,0,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aBaseDN (this, ModuleRes(FT_BASEDN)) - ,m_aETBaseDN (this, ModuleRes(ET_BASEDN)) + ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) + ,m_aBaseDN (this, ModuleRes(FT_BASEDN)) + ,m_aETBaseDN (this, ModuleRes(ET_BASEDN)) ,m_aCBUseSSL (this, ModuleRes(CB_USESSL)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT)) - ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT)) + ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) + ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) + ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT)) + ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT)) { m_aETBaseDN.SetModifyHdl(getControlModifiedLink()); m_aCBUseSSL.SetToggleHdl(getControlModifiedLink()); @@ -963,7 +963,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); } @@ -1065,7 +1065,7 @@ namespace dbaui } // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextDetailsPage( pParent, _rAttrSet ) ); } @@ -1109,20 +1109,20 @@ namespace dbaui } //------------------------------------------------------------------------ - SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { return new GeneratedValuesPage( _pParent, _rAttrSet ); } //------------------------------------------------------------------------ - SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { ::rtl::OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet ); DataSourceMetaData aMetaData( eType ); - return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); + return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 2d304430e865..f2a4cfbc5542 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ namespace dbaui //========================================================================= //= OCommonBehaviourTabPage //========================================================================= - #define CBTP_NONE 0x00000000 - #define CBTP_USE_CHARSET 0x00000002 - #define CBTP_USE_OPTIONS 0x00000004 + #define CBTP_NONE 0x00000000 + #define CBTP_USE_CHARSET 0x00000002 + #define CBTP_USE_OPTIONS 0x00000004 /** eases the implementation of tab pages handling user/password and/or character set and/or generic options input @@ -64,33 +64,33 @@ namespace dbaui { protected: - FixedText* m_pOptionsLabel; - Edit* m_pOptions; + FixedText* m_pOptionsLabel; + Edit* m_pOptions; - FixedLine* m_pDataConvertFixedLine; - FixedText* m_pCharsetLabel; + FixedLine* m_pDataConvertFixedLine; + FixedText* m_pCharsetLabel; CharSetListBox* m_pCharset; - FixedLine* m_pAutoFixedLine; - CheckBox* m_pAutoRetrievingEnabled; - FixedText* m_pAutoIncrementLabel; - Edit* m_pAutoIncrement; - FixedText* m_pAutoRetrievingLabel; - Edit* m_pAutoRetrieving; + FixedLine* m_pAutoFixedLine; + CheckBox* m_pAutoRetrievingEnabled; + FixedText* m_pAutoIncrementLabel; + Edit* m_pAutoIncrement; + FixedText* m_pAutoRetrievingLabel; + Edit* m_pAutoRetrieving; - sal_uInt32 m_nControlFlags; + sal_uInt32 m_nControlFlags; public: - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true); protected: - + // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten virtual ~OCommonBehaviourTabPage(); // must be overloaded by subclasses, but it isn't pure virtual - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); + virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -105,20 +105,20 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); private: // please add new controls also to <method>fillControls</method> or <method>fillWindows</method> - CheckBox m_aShowDeleted; - FixedLine m_aFL_1; - FixedText m_aFT_Message; - PushButton m_aIndexes; + CheckBox m_aShowDeleted; + FixedLine m_aFL_1; + FixedText m_aFT_Message; + PushButton m_aIndexes; - String m_sDsn; + String m_sDsn; protected: - + virtual ~ODbaseDetailsPage(); protected: @@ -148,7 +148,7 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -156,8 +156,8 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedLine m_aFL_1; - CheckBox m_aUseCatalog; + FixedLine m_aFL_1; + CheckBox m_aUseCatalog; }; @@ -167,7 +167,7 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -175,11 +175,11 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - CheckBox m_aUseCatalog; + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + CheckBox m_aUseCatalog; }; //======================================================================== @@ -199,35 +199,35 @@ namespace dbaui public: OGeneralSpecialJDBCDetailsPage( Window* pParent , USHORT _nResId - , const SfxItemSet& _rCoreAttrs + , const SfxItemSet& _rCoreAttrs , USHORT _nPortId ); protected: + - - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - - FixedLine m_aFL_1; - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTSocket; - Edit m_aEDSocket; - - FixedText m_aFTDriverClass; - Edit m_aEDDriverClass; - PushButton m_aTestJavaDriver; - - String m_sDefaultJdbcDriverName; - USHORT m_nPortId; + + FixedLine m_aFL_1; + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTSocket; + Edit m_aEDSocket; + + FixedText m_aFTDriverClass; + Edit m_aEDDriverClass; + PushButton m_aTestJavaDriver; + + String m_sDefaultJdbcDriverName; + USHORT m_nPortId; bool m_bUseClass; }; @@ -241,16 +241,16 @@ namespace dbaui const SfxItemSet& _rCoreAttrs ); private: - FixedLine m_aSeparator1; + FixedLine m_aSeparator1; MySQLNativeSettings m_aMySQLSettings; - FixedLine m_aSeparator2; - FixedText m_aUserNameLabel; - Edit m_aUserName; - CheckBox m_aPasswordRequired; + FixedLine m_aSeparator2; + FixedText m_aUserNameLabel; + Edit m_aUserName; + CheckBox m_aPasswordRequired; protected: - virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -262,7 +262,7 @@ namespace dbaui class OAdabasDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs); OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -271,30 +271,30 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedLine m_aFL_1; - FixedText m_FT_CACHE_SIZE; - NumericField m_NF_CACHE_SIZE; - - FixedText m_FT_DATA_INCREMENT; - NumericField m_NF_DATA_INCREMENT; - - FixedLine m_aFL_2; - FixedText m_FT_CTRLUSERNAME; - Edit m_ET_CTRLUSERNAME; - FixedText m_FT_CTRLPASSWORD; - Edit m_ET_CTRLPASSWORD; - - CheckBox m_CB_SHUTDB; - PushButton m_PB_STAT; - String m_sUser; - BOOL bAttrsChanged; - - DECL_LINK( AttributesChangedHdl, void * ); - DECL_LINK( UserSettingsHdl, void * ); - DECL_LINK( LoseFocusHdl, Edit * ); - DECL_LINK( PBClickHdl, Button *); + FixedText m_aFTHostname; + Edit m_aEDHostname; + FixedLine m_aFL_1; + FixedText m_FT_CACHE_SIZE; + NumericField m_NF_CACHE_SIZE; + + FixedText m_FT_DATA_INCREMENT; + NumericField m_NF_DATA_INCREMENT; + + FixedLine m_aFL_2; + FixedText m_FT_CTRLUSERNAME; + Edit m_ET_CTRLUSERNAME; + FixedText m_FT_CTRLPASSWORD; + Edit m_ET_CTRLPASSWORD; + + CheckBox m_CB_SHUTDB; + PushButton m_PB_STAT; + String m_sUser; + BOOL bAttrsChanged; + + DECL_LINK( AttributesChangedHdl, void * ); + DECL_LINK( UserSettingsHdl, void * ); + DECL_LINK( LoseFocusHdl, Edit * ); + DECL_LINK( PBClickHdl, Button *); }; //======================================================================== @@ -303,7 +303,7 @@ namespace dbaui class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -311,17 +311,17 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); private: - FixedLine m_aFL_1; - FixedText m_aBaseDN; - Edit m_aETBaseDN; - CheckBox m_aCBUseSSL; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTRowCount; - NumericField m_aNFRowCount; - - sal_Int32 m_iSSLPort; - sal_Int32 m_iNormalPort; + FixedLine m_aFL_1; + FixedText m_aBaseDN; + Edit m_aETBaseDN; + CheckBox m_aCBUseSSL; + FixedText m_aPortNumber; + NumericField m_aNFPortNumber; + FixedText m_aFTRowCount; + NumericField m_aNFRowCount; + + sal_Int32 m_iSSLPort; + sal_Int32 m_iNormalPort; DECL_LINK( OnCheckBoxClick, CheckBox * ); }; @@ -343,16 +343,16 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs ); OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: - String m_aFieldSeparatorList; - String m_aTextSeparatorList; - String m_aTextNone; + String m_aFieldSeparatorList; + String m_aTextSeparatorList; + String m_aTextNone; protected: virtual ~OTextDetailsPage(); virtual sal_Bool prepareLeave(); @@ -365,7 +365,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index d964da262c30..90390d488c16 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace dbaui LargeEntryListBox( Window* _pParent, const ResId& _rId ); protected: - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); }; //-------------------------------------------------------------------- @@ -83,17 +83,17 @@ DBG_NAME(DirectSQLDialog) //-------------------------------------------------------------------- DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn ) :ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL)) - ,m_aFrame (this, ModuleRes(FL_SQL)) - ,m_aSQLLabel (this, ModuleRes(FT_SQL)) - ,m_aSQL (this, ModuleRes(ME_SQL)) - ,m_aExecute (this, ModuleRes(PB_EXECUTE)) - ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY)) + ,m_aFrame (this, ModuleRes(FL_SQL)) + ,m_aSQLLabel (this, ModuleRes(FT_SQL)) + ,m_aSQL (this, ModuleRes(ME_SQL)) + ,m_aExecute (this, ModuleRes(PB_EXECUTE)) + ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY)) ,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY))) - ,m_aStatusFrame (this, ModuleRes(FL_STATUS)) - ,m_aStatus (this, ModuleRes(ME_STATUS)) - ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS)) - ,m_aHelp (this, ModuleRes(PB_HELP)) - ,m_aClose (this, ModuleRes(PB_CLOSE)) + ,m_aStatusFrame (this, ModuleRes(FL_STATUS)) + ,m_aStatus (this, ModuleRes(ME_STATUS)) + ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS)) + ,m_aHelp (this, ModuleRes(PB_HELP)) + ,m_aClose (this, ModuleRes(PB_CLOSE)) ,m_nHistoryLimit(20) ,m_nStatusCount(1) ,m_xConnection(_rxConn) @@ -127,7 +127,7 @@ DBG_NAME(DirectSQLDialog) stopAllComponentListening(); } delete m_pSQLHistory; - + DBG_DTOR(DirectSQLDialog,NULL); } @@ -345,7 +345,7 @@ DBG_NAME(DirectSQLDialog) } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/directsql.hrc b/dbaccess/source/ui/dlg/directsql.hrc index 23f19a350ab4..ee09db68e896 100644 --- a/dbaccess/source/ui/dlg/directsql.hrc +++ b/dbaccess/source/ui/dlg/directsql.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,16 +28,16 @@ #ifndef _DBACCESS_UI_DIRECTSQL_HRC_ #define _DBACCESS_UI_DIRECTSQL_HRC_ -#define FL_SQL 1 -#define FT_SQL 2 -#define ME_SQL 3 -#define PB_EXECUTE 4 -#define FT_HISTORY 5 -#define LB_HISTORY 6 -#define FL_STATUS 7 -#define ME_STATUS 8 -#define FL_BUTTONS 9 -#define PB_HELP 10 -#define PB_CLOSE 11 +#define FL_SQL 1 +#define FT_SQL 2 +#define ME_SQL 3 +#define PB_EXECUTE 4 +#define FT_HISTORY 5 +#define LB_HISTORY 6 +#define FL_STATUS 7 +#define ME_STATUS 8 +#define FL_BUTTONS 9 +#define PB_HELP 10 +#define PB_CLOSE 11 #endif // _DBACCESS_UI_DIRECTSQL_HRC_ diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src index 230fe4dac320..1fa897b80da6 100644 --- a/dbaccess/source/ui/dlg/directsql.src +++ b/dbaccess/source/ui/dlg/directsql.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,19 +32,19 @@ #include "dbu_dlg.hrc" #endif -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define WINDOW_SIZE_X 200 -#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y +#define WINDOW_SIZE_X 200 +#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y ModalDialog DLG_DIRECTSQL { - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; + OutputSize = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; FixedLine FL_SQL { @@ -119,7 +119,7 @@ ModalDialog DLG_DIRECTSQL Text [ en-US ] = "Close"; }; - Text [ en-US ] = "Execute SQL Statement" ; + Text [ en-US ] = "Execute SQL Statement" ; }; String STR_COMMAND_EXECUTED_SUCCESSFULLY diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 20537fce089d..6e5d8a9b6a7f 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) case RID_SVXPAGE_CHAR_STD: { - // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem()); + // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem()); } break; diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src index 8dce0835aa69..6c793ac524e1 100644 --- a/dbaccess/source/ui/dlg/dlgattr.src +++ b/dbaccess/source/ui/dlg/dlgattr.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index d9466a39663e..67719b64d8d0 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,34 +62,34 @@ namespace dbaui class OSaveAsDlgImpl { public: - FixedText m_aDescription; - FixedText m_aCatalogLbl; - OSQLNameComboBox m_aCatalog; - FixedText m_aSchemaLbl; - OSQLNameComboBox m_aSchema; - FixedText m_aLabel; - OSQLNameEdit m_aTitle; - OKButton m_aPB_OK; - CancelButton m_aPB_CANCEL; - HelpButton m_aPB_HELP; - String m_aQryLabel; - String m_sTblLabel; + FixedText m_aDescription; + FixedText m_aCatalogLbl; + OSQLNameComboBox m_aCatalog; + FixedText m_aSchemaLbl; + OSQLNameComboBox m_aSchema; + FixedText m_aLabel; + OSQLNameEdit m_aTitle; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_aQryLabel; + String m_sTblLabel; rtl::OUString m_sCatalog; - rtl::OUString m_sSchema; - String m_aName; + rtl::OUString m_sSchema; + String m_aName; const IObjectNameCheck& m_rObjectNameCheck; - String m_sParentURL; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - sal_Int32 m_nType; - sal_Int32 m_nFlags; + String m_sParentURL; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + sal_Int32 m_nType; + sal_Int32 m_nFlags; - OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, + OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); - OSaveAsDlgImpl( Window * pParent, + OSaveAsDlgImpl( Window * pParent, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); @@ -264,15 +264,15 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, m_pImpl->m_aName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); USHORT nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog)); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) m_pImpl->m_aCatalog.SelectEntryPos(nPos); - + if ( sSchema.getLength() ) { nPos = m_pImpl->m_aSchema.GetEntryPos(String(sSchema)); @@ -300,7 +300,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, m_pImpl->m_aTitle.setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_aSchema.setCheck(bCheck); // enable non valid sql chars as well m_pImpl->m_aCatalog.setCheck(bCheck); // enable non valid sql chars as well - + Size aSize = GetSizePixel(); aSize.Height() = aPos.Y() + m_pImpl->m_aPB_OK.GetSizePixel().Height() + m_pImpl->m_aTitle.GetSizePixel().Height() / 2; @@ -326,7 +326,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, { m_pImpl = new OSaveAsDlgImpl(this,rDefault,_rObjectNameCheck,_nFlags); implInitOnlyTitle(_sLabel); - implInit(); + implInit(); } // ----------------------------------------------------------------------------- OSaveAsDlg::~OSaveAsDlg() @@ -408,7 +408,7 @@ void OSaveAsDlg::implInit() sal_Int32 nMoveUp = m_pImpl->m_aCatalog.GetPosPixel().Y() - m_pImpl->m_aDescription.GetPosPixel().Y(); // loop to all controls and move them ... - for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); + for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); pChildControl; pChildControl= pChildControl->GetWindow( WINDOW_NEXT ) ) @@ -434,15 +434,15 @@ void OSaveAsDlg::implInit() SetText( String( ModuleRes( STR_TITLE_RENAME ) ) ); m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME); } - + m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); m_pImpl->m_aTitle.SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); m_pImpl->m_aTitle.GrabFocus(); FreeResource(); } // ----------------------------------------------------------------------------- -String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } -String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } -String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } +String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } +String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } +String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgsave.hrc b/dbaccess/source/ui/dlg/dlgsave.hrc index 7a36319ef4de..7778745d9991 100644 --- a/dbaccess/source/ui/dlg/dlgsave.hrc +++ b/dbaccess/source/ui/dlg/dlgsave.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,24 +30,24 @@ // defines ------------------------------------------------------------------ -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 -#define ET_CATALOG 1 -#define ET_SCHEMA 2 -#define ET_TITLE 3 +#define ET_CATALOG 1 +#define ET_SCHEMA 2 +#define ET_TITLE 3 -#define FT_DESCRIPTION 1 -#define FT_CATALOG 2 -#define FT_SCHEMA 3 -#define FT_TITLE 4 +#define FT_DESCRIPTION 1 +#define FT_CATALOG 2 +#define FT_SCHEMA 3 +#define FT_TITLE 4 -#define STR_TBL_LABEL 1 -#define STR_VW_LABEL 2 -#define STR_QRY_LABEL 3 -#define STR_TITLE_RENAME 4 -#define STR_TITLE_PASTE_AS 6 +#define STR_TBL_LABEL 1 +#define STR_VW_LABEL 2 +#define STR_QRY_LABEL 3 +#define STR_TITLE_RENAME 4 +#define STR_TITLE_PASTE_AS 6 #endif // DBAUI_DLGSAVE_HRC diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src index d550704b85f8..a6c036ec2831 100644 --- a/dbaccess/source/ui/dlg/dlgsave.src +++ b/dbaccess/source/ui/dlg/dlgsave.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,9 +64,9 @@ ModalDialog DLG_SAVE_AS Border = TRUE ; Pos = MAP_APPFONT ( 77 , 25 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; - SVLook = TRUE ; - TabStop = TRUE ; - DropDown = TRUE ; + SVLook = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; AutoHScroll = TRUE ; }; FixedText FT_SCHEMA @@ -80,9 +80,9 @@ ModalDialog DLG_SAVE_AS Border = TRUE ; Pos = MAP_APPFONT ( 77 , 42 ) ; Size = MAP_APPFONT ( 89 , 12 ) ; - SVLook = TRUE ; - TabStop = TRUE ; - DropDown = TRUE ; + SVLook = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; AutoHScroll = TRUE ; }; FixedText FT_TITLE diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index a42122657c23..f70bdac69bb8 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAl :ModalDialog( pParent, ModuleRes(bRow ? DLG_ROWHEIGHT : DLG_COLWIDTH)) ,m_nPrevValue(nVal) ,m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH) - ,aFT_VALUE(this, ModuleRes( FT_VALUE)) - ,aMF_VALUE(this, ModuleRes( MF_VALUE)) + ,aFT_VALUE(this, ModuleRes( FT_VALUE)) + ,aMF_VALUE(this, ModuleRes( MF_VALUE)) ,aCB_STANDARD(this, ModuleRes(CB_STANDARD)) - ,aPB_OK(this, ModuleRes(PB_OK)) - ,aPB_CANCEL(this, ModuleRes(PB_CANCEL)) - ,aPB_HELP(this, ModuleRes(PB_HELP)) + ,aPB_OK(this, ModuleRes(PB_OK)) + ,aPB_CANCEL(this, ModuleRes(PB_CANCEL)) + ,aPB_HELP(this, ModuleRes(PB_HELP)) { DBG_CTOR(DlgSize,NULL); @@ -117,7 +117,7 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... diff --git a/dbaccess/source/ui/dlg/dlgsize.hrc b/dbaccess/source/ui/dlg/dlgsize.hrc index 3eef0951a0dd..2a83edf70e04 100644 --- a/dbaccess/source/ui/dlg/dlgsize.hrc +++ b/dbaccess/source/ui/dlg/dlgsize.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,12 +28,12 @@ #ifndef DBAUI_DLGSIZE_HRC #define DBAUI_DLGSIZE_HRC -#define FT_VALUE 1 -#define MF_VALUE 1 -#define CB_STANDARD 2 -#define PB_OK 1 -#define PB_CANCEL 1 -#define PB_HELP 1 +#define FT_VALUE 1 +#define MF_VALUE 1 +#define CB_STANDARD 2 +#define PB_OK 1 +#define PB_CANCEL 1 +#define PB_HELP 1 #endif //DBAUI_DLGSIZE_HRC diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src index ade6f3ff1222..b690e7e50afd 100644 --- a/dbaccess/source/ui/dlg/dlgsize.src +++ b/dbaccess/source/ui/dlg/dlgsize.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ // (c) Copyright 1996 - 2000 by Star Division GmbH, Hamburg, Germany // // Ersterstellung: - // JN + // JN // // Letzte Aenderung: - // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $ + // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $ // //--------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index a3b542a1d4f6..eb9aa07d791e 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,20 +50,20 @@ namespace dbaui */ class DbuTypeCollectionItem : public SfxPoolItem { - ::dbaccess::ODsnTypeCollection* m_pCollection; + ::dbaccess::ODsnTypeCollection* m_pCollection; public: TYPEINFO(); DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; + virtual int operator==(const SfxPoolItem& _rItem) const; + virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } + ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DSNITEM_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index dc7e5426c1d8..f0dfb02a6be3 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,19 +66,19 @@ using namespace ::comphelper; //================================================================== ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet) :ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) - ,m_aOk (this, ModuleRes(PB_OK)) - ,m_aCancel (this, ModuleRes(PB_CANCEL)) - ,m_aHelp (this, ModuleRes(PB_HELP)) + ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) + ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) + ,m_aOk (this, ModuleRes(PB_OK)) + ,m_aCancel (this, ModuleRes(PB_CANCEL)) + ,m_aHelp (this, ModuleRes(PB_HELP)) #ifdef HAVE_ODBC_ADMINISTRATION - ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) + ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) #endif - ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) + ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) ,m_pOutputSet(_pOutputSet) { if ( _bAdabas ) - { // set a new title (indicating that we're browsing local data sources only) + { // set a new title (indicating that we're browsing local data sources only) SetText(ModuleRes(STR_LOCAL_DATASOURCES)); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION2)); @@ -156,7 +156,7 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ ) xORB->createInstanceWithArguments(SERVICE_SDB_ADABASCREATIONDIALOG, aArgs), UNO_QUERY); if (!xDialog.is()) { - // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); + // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); return 0L; } @@ -249,13 +249,13 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) #endif // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) -{ +{ ::rtl::OUString sSelected; if (m_aDatasource.GetEntryCount()) sSelected = m_aDatasource.GetSelectEntry(); m_aDatasource.Clear(); // fill the list - for ( ConstStringBagIterator aDS = _rDatasources.begin(); + for ( ConstStringBagIterator aDS = _rDatasources.begin(); aDS != _rDatasources.end(); ++aDS ) @@ -267,13 +267,13 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { if (sSelected.getLength()) m_aDatasource.SelectEntry(sSelected); - else // select the first entry + else // select the first entry m_aDatasource.SelectEntryPos(0); } } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsselect.hrc b/dbaccess/source/ui/dlg/dsselect.hrc index 5deffeeef102..47aed265ec26 100644 --- a/dbaccess/source/ui/dlg/dsselect.hrc +++ b/dbaccess/source/ui/dlg/dsselect.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,14 +28,14 @@ #ifndef _DBAUI_DSSELECT_HRC_ #define _DBAUI_DSSELECT_HRC_ -#define LB_DATASOURCE 1 -#define PB_OK 2 -#define PB_CANCEL 3 -#define PB_HELP 4 -#define PB_MANAGE 5 -#define FT_DESCRIPTION 6 -#define STR_LOCAL_DATASOURCES 7 -#define PB_CREATE 9 -#define STR_DESCRIPTION2 10 +#define LB_DATASOURCE 1 +#define PB_OK 2 +#define PB_CANCEL 3 +#define PB_HELP 4 +#define PB_MANAGE 5 +#define FT_DESCRIPTION 6 +#define STR_LOCAL_DATASOURCES 7 +#define PB_CREATE 9 +#define STR_DESCRIPTION2 10 #endif // _DBAUI_DSSELECT_HRC_ diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 555464635b84..2ab0f86db71c 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,16 +54,16 @@ namespace dbaui class ODatasourceSelectDialog : public ModalDialog { protected: - FixedText m_aDescription; - ListBox m_aDatasource; - OKButton m_aOk; - CancelButton m_aCancel; - HelpButton m_aHelp; + FixedText m_aDescription; + ListBox m_aDatasource; + OKButton m_aOk; + CancelButton m_aCancel; + HelpButton m_aHelp; #ifdef HAVE_ODBC_ADMINISTRATION - PushButton m_aManageDatasources; + PushButton m_aManageDatasources; #endif - PushButton m_aCreateAdabasDB; - SfxItemSet* m_pOutputSet; + PushButton m_aCreateAdabasDB; + SfxItemSet* m_pOutputSet; #ifdef HAVE_ODBC_ADMINISTRATION ::std::auto_ptr< OOdbcManagement > m_pODBCManagement; @@ -73,10 +73,10 @@ public: ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet = NULL ); ~ODatasourceSelectDialog(); - inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} - void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } + inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} + void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } - virtual BOOL Close(); + virtual BOOL Close(); protected: DECL_LINK( ListDblClickHdl, ListBox * ); @@ -89,7 +89,7 @@ protected: }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_DSSELECT_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src index 8eff7fffe6c4..4539754e808b 100644 --- a/dbaccess/source/ui/dlg/dsselect.src +++ b/dbaccess/source/ui/dlg/dsselect.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ ModalDialog DLG_DATASOURCE_SELECTION HScroll = TRUE ; Sort = TRUE ; }; - + OKButton PB_OK { Pos = MAP_APPFONT ( 166 , 6 ) ; diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index aee6876e8ebc..cdb919578cd7 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaui } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index bbc837e0b074..4015f2fdcb62 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ namespace dbaui //==================================================================== //= OFilePickerInteractionHandler //==================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler - > OFilePickerInteractionHandler_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler + > OFilePickerInteractionHandler_Base; /** a InteractionHandler implementation which extends another handler with some customizability */ @@ -49,13 +49,13 @@ namespace dbaui { protected: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > - m_xMaster; // our master handler - sal_Bool m_bDoesNotExist; + m_xMaster; // our master handler + sal_Bool m_bDoesNotExist; public: OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster ); - inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } + inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; } protected: // XInteractionHandler @@ -65,7 +65,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_FILEPICKER_INTERACTION_HXX diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 1103a375b636..9c4038dbf89f 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,14 +77,14 @@ namespace dbaui ,m_aFT_DocListLabel (this, ModuleRes(FT_DOCLISTLABEL)) ,m_pLB_DocumentList ( new OpenDocumentListBox( this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes( LB_DOCUMENTLIST ) ) ) ,m_aPB_OpenDocument (this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes(PB_OPENDOCUMENT)) - ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE)) - ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE)) - ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE))) + ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE)) + ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE)) + ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE))) ,m_aFTDataSourceAppendix (this, ModuleRes(FT_DATATYPEAPPENDIX)) - ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST)) - ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE)) + ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST)) + ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE)) ,m_DBWizardMode (_bDBWizardMode) - ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY)) + ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY)) ,m_eOriginalCreationMode (eCreateNew) ,m_pCollection (NULL) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN) @@ -190,16 +190,16 @@ namespace dbaui DisplayedTypes aDisplayedTypes; ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end(); - for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin(); + for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin(); aTypeLoop != aEnd; ++aTypeLoop ) { const ::rtl::OUString sURLPrefix = aTypeLoop.getURLPrefix(); if ( sURLPrefix.getLength() ) - { + { String sDisplayName = aTypeLoop.getDisplayName(); - if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND + if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND && approveDataSourceType( sURLPrefix, sDisplayName ) ) { aDisplayedTypes.push_back( DisplayedTypes::value_type( sURLPrefix, sDisplayName ) ); @@ -383,9 +383,9 @@ namespace dbaui if ( approveDataSourceType( m_eCurrentSelection, sDisplayName ) && ( LISTBOX_ENTRY_NOTFOUND == m_pDatasourceType->GetEntryPos( sDisplayName ) ) ) - { // this indicates it's really a type which is known in general, but not supported on the current platform + { // this indicates it's really a type which is known in general, but not supported on the current platform // show a message saying so - // eSpecialMessage = smUnsupportedType; + // eSpecialMessage = smUnsupportedType; insertDatasourceTypeEntryData(m_eCurrentSelection, sDisplayName); // remember this type so we can show the special message again if the user selects this // type again (without changing the data source) @@ -479,7 +479,7 @@ namespace dbaui } //------------------------------------------------------------------------- - SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode) + SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode) { return ( new OGeneralPage( _pParent, _rAttrSet, _bWizardMode ) ); } @@ -607,7 +607,7 @@ namespace dbaui const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) { -// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); +// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); aFileDlg.SetCurrentFilter(pFilter->GetUIName()); } if ( aFileDlg.Execute() == ERRCODE_NONE ) @@ -632,7 +632,7 @@ namespace dbaui } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index ad28e2dc0692..d67aabc96c5c 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,15 +76,15 @@ namespace dbaui ::std::auto_ptr< OpenDocumentListBox > m_pLB_DocumentList; OpenDocumentButton m_aPB_OpenDocument; - FixedText m_aTypePreLabel; - FixedText m_aDatasourceTypeLabel; + FixedText m_aTypePreLabel; + FixedText m_aDatasourceTypeLabel; ::std::auto_ptr< ListBox > m_pDatasourceType; FixedText m_aFTDataSourceAppendix; - FixedText m_aTypePostLabel; - FixedText m_aSpecialMessage; + FixedText m_aTypePostLabel; + FixedText m_aSpecialMessage; sal_Bool m_DBWizardMode; - String m_sMySQLEntry; + String m_sMySQLEntry; CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; @@ -93,47 +93,47 @@ namespace dbaui ::std::vector< ::rtl::OUString> m_aURLPrefixes; - ::dbaccess::ODsnTypeCollection* - m_pCollection; /// the DSN type collection instance - ::rtl::OUString m_eCurrentSelection; /// currently selected type - ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance + ::rtl::OUString m_eCurrentSelection; /// currently selected type + ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... enum SPECIAL_MESSAGE { smNone, smUnsupportedType }; - SPECIAL_MESSAGE m_eLastMessage; + SPECIAL_MESSAGE m_eLastMessage; - Link m_aTypeSelectHandler; /// to be called if a new type is selected - Link m_aCreationModeHandler; /// to be called if a new type is selected - Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected + Link m_aTypeSelectHandler; /// to be called if a new type is selected + Link m_aCreationModeHandler; /// to be called if a new type is selected + Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen - sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted - sal_Bool m_bUserGrabFocus : 1; - bool m_bInitTypeList : 1; + sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted + sal_Bool m_bUserGrabFocus : 1; + bool m_bInitTypeList : 1; bool approveDataSourceType( const ::rtl::OUString& _sURLPrefix, String& _inout_rDisplayName ); - void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName); + void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName); public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False); + static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False); /// set a handler which gets called every time the user selects a new type - void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; } - void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; } - void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; } - void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; } + void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; } + void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; } + void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; } + void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; } CreationMode GetDatabaseCreationMode() const; DocumentDescriptor GetSelectedDocument() const; /// get the currently selected datasource type - ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; } + ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; } protected: // SfxTabPage overridables - virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); - virtual void Reset(const SfxItemSet& _rCoreAttrs); + virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); + virtual void Reset(const SfxItemSet& _rCoreAttrs); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -163,7 +163,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_GENERALPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 780fe621157f..756d5c1183b3 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS) { - return (_rLHS.sFieldName == _rRHS.sFieldName) - && (_rLHS.bSortAscending == _rRHS.bSortAscending); + return (_rLHS.sFieldName == _rRHS.sFieldName) + && (_rLHS.bSortAscending == _rRHS.bSortAscending); } //------------------------------------------------------------------ @@ -78,7 +78,7 @@ namespace dbaui ConstIndexFieldsIterator aLeft = _rLHS.begin(); ConstIndexFieldsIterator aLeftEnd = _rLHS.end(); ConstIndexFieldsIterator aRight = _rRHS.begin(); - for (; aLeft != aLeftEnd; ++aLeft, ++aRight) + for (; aLeft != aLeftEnd; ++aLeft, ++aRight) { if (*aLeft != *aRight) return sal_False; @@ -116,9 +116,9 @@ namespace dbaui ::rtl::OUString sNewName(_rNewText); ::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters()); if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() ) - ? - sAlias != sNewName - : + ? + sAlias != sNewName + : !sNewName.equalsIgnoreAsciiCase(sAlias)) return sal_False; } @@ -180,23 +180,23 @@ namespace dbaui //================================================================== DBG_NAME(DbaIndexDialog) //------------------------------------------------------------------ - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, - const Reference< XNameAccess >& _rxIndexes, + DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames, + const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex) :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN)) ,m_xConnection(_rxConnection) ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString::createFromAscii("dbaccess.tabledesign.indexdialog")) - ,m_aActions (this, ModuleRes(TLB_ACTIONS)) - ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) - ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) - ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) - ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) - ,m_aUnique (this, ModuleRes(CB_UNIQUE)) - ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) - ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) - ,m_aClose (this, ModuleRes(PB_CLOSE)) - ,m_aHelp (this, ModuleRes(HB_HELP)) + ,m_aActions (this, ModuleRes(TLB_ACTIONS)) + ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST)) + ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS)) + ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL)) + ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) + ,m_aUnique (this, ModuleRes(CB_UNIQUE)) + ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS)) + ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" ))) + ,m_aClose (this, ModuleRes(PB_CLOSE)) + ,m_aHelp (this, ModuleRes(HB_HELP)) ,m_pIndexes(NULL) ,m_pPreviousSelection(NULL) ,m_bEditAgain(sal_False) @@ -240,17 +240,17 @@ DBG_NAME(DbaIndexDialog) m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog)); // get our most recent geometry settings -// if (m_aGeometrySettings.Exists()) -// { -// Point aPos; -// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y()); -// SetPosPixel(aPos); -// } +// if (m_aGeometrySettings.Exists()) +// { +// Point aPos; +// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y()); +// SetPosPixel(aPos); +// } // if all of the indexes have an empty description, we're not interested in displaying it Indexes::const_iterator aCheck; - for ( aCheck = m_pIndexes->begin(); + for ( aCheck = m_pIndexes->begin(); aCheck != m_pIndexes->end(); ++aCheck ) @@ -294,7 +294,7 @@ DBG_NAME(DbaIndexDialog) SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); sal_Bool bSelectedAnything = NULL != pSelected; - + if (pSelected) { @@ -344,9 +344,9 @@ DBG_NAME(DbaIndexDialog) delete m_pFields; // save our geometry settings -// Point aPos = GetPosPixel(); -// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y()); - +// Point aPos = GetPosPixel(); +// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y()); + DBG_DTOR(DbaIndexDialog,NULL); } @@ -552,7 +552,7 @@ DBG_NAME(DbaIndexDialog) OnDropIndex(sal_False); return; } - + SQLExceptionInfo aExceptionInfo; try { @@ -619,7 +619,7 @@ DBG_NAME(DbaIndexDialog) { // the descriptor Indexes::const_iterator aSelected = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(pSelected->GetUserData()); - + if (aSelected->isModified() || aSelected->isNew()) { QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX)); @@ -656,7 +656,7 @@ DBG_NAME(DbaIndexDialog) IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); - + DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(), "DbaIndexDialog::OnEntryEdited: invalid entry!"); @@ -739,7 +739,7 @@ DBG_NAME(DbaIndexDialog) // no double fields DECLARE_STL_STDKEY_SET( String, StringBag ); StringBag aExistentFields; - for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin(); + for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin(); aFieldCheck != _rPos->aFields.end(); ++aFieldCheck ) @@ -830,7 +830,7 @@ DBG_NAME(DbaIndexDialog) // commit the old data if (m_aIndexes.FirstSelected() != m_pPreviousSelection) - { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) + { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing) if (!implCommitPreviouslySelected()) { m_aIndexes.SelectNoHandlerCall(m_pPreviousSelection); @@ -871,7 +871,7 @@ DBG_NAME(DbaIndexDialog) { // The physical toolbar changed its outlook and shows another logical toolbar! // We have to set the correct high contrast mode on the new tbx manager. - // pMgr->SetHiContrast( IsHiContrastMode() ); + // pMgr->SetHiContrast( IsHiContrastMode() ); checkImageList(); } } @@ -880,9 +880,9 @@ DBG_NAME(DbaIndexDialog) { ModalDialog::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode checkImageList(); @@ -893,7 +893,7 @@ DBG_NAME(DbaIndexDialog) { sal_Int16 nN = IMG_INDEX_DLG_SC; sal_Int16 nH = IMG_INDEX_DLG_SCH; - if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) + if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE ) { nN = IMG_INDEX_DLG_LC; nH = IMG_INDEX_DLG_LCH; @@ -910,7 +910,7 @@ DBG_NAME(DbaIndexDialog) Size aDlgSize = GetSizePixel(); // adjust size of dlg SetSizePixel(Size(aDlgSize.Width() + _rDiff.Width(), - aDlgSize.Height() + _rDiff.Height()) + aDlgSize.Height() + _rDiff.Height()) ); Size aIndexSize = m_aIndexes.GetSizePixel(); m_aIndexes.SetPosSizePixel(m_aIndexes.GetPosPixel() + Point(0,_rDiff.Height()), @@ -934,7 +934,7 @@ DBG_NAME(DbaIndexDialog) } //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexdialog.hrc b/dbaccess/source/ui/dlg/indexdialog.hrc index 825e96de2edc..003bcf6a0903 100644 --- a/dbaccess/source/ui/dlg/indexdialog.hrc +++ b/dbaccess/source/ui/dlg/indexdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,21 +29,21 @@ #define _DBAUI_INDEXDIALOG_HRC_ -#define CTR_INDEXLIST 1 -#define CTR_FIELDS 2 +#define CTR_INDEXLIST 1 +#define CTR_FIELDS 2 -#define FL_INDEXDETAILS 1 +#define FL_INDEXDETAILS 1 -#define CB_UNIQUE 1 +#define CB_UNIQUE 1 -#define FT_FIELDS 1 -#define FT_DESC_LABEL 2 -#define FT_DESCRIPTION 3 +#define FT_FIELDS 1 +#define FT_DESC_LABEL 2 +#define FT_DESCRIPTION 3 -#define TLB_ACTIONS 1 +#define TLB_ACTIONS 1 -#define PB_CLOSE 1 +#define PB_CLOSE 1 -#define HB_HELP 1 +#define HB_HELP 1 #endif // _DBAUI_INDEXDIALOG_HRC_ diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index ae8f80d6c616..ead770c40482 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ #include "dbaccess_helpid.hrc" #endif -#define DIALOG_SIZE_X 220 -#define DIALOG_SIZE_Y 140 -#define BUTTON_SIZE_X 50 -#define BUTTON_SIZE_Y 14 +#define DIALOG_SIZE_X 220 +#define DIALOG_SIZE_Y 140 +#define BUTTON_SIZE_X 50 +#define BUTTON_SIZE_Y 14 -#define LIST_WIDTH 70 +#define LIST_WIDTH 70 ModalDialog DLG_INDEXDESIGN { @@ -57,7 +57,7 @@ ModalDialog DLG_INDEXDESIGN ToolBox TLB_ACTIONS { Pos = MAP_APPFONT ( 6 , 6 ) ; - // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; + // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; ButtonType = BUTTON_SYMBOL; Align = BOXALIGN_TOP; HelpId = HID_INDEX_DIALOG_ACTION_TB; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index a617abd6baa6..e4b78625718f 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ namespace dbaui { //...................................................................... -#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ +#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ BROWSER_HIDECURSOR | BROWSER_HIDESELECT | BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL -#define COLUMN_ID_FIELDNAME 1 -#define COLUMN_ID_ORDER 2 +#define COLUMN_ID_FIELDNAME 1 +#define COLUMN_ID_ORDER 2 using namespace ::com::sun::star::uno; using namespace ::svt; @@ -54,8 +54,8 @@ namespace dbaui class DbaMouseDownListBoxController : public ListBoxCellController { protected: - Link m_aOriginalModifyHdl; - Link m_aAdditionalModifyHdl; + Link m_aOriginalModifyHdl; + Link m_aAdditionalModifyHdl; public: DbaMouseDownListBoxController(ListBoxControl* _pParent) @@ -131,7 +131,7 @@ DBG_NAME(IndexFieldsControl) { delete m_pSortingCell; delete m_pFieldNameCell; - + DBG_DTOR(IndexFieldsControl,NULL); } @@ -198,7 +198,7 @@ DBG_NAME(IndexFieldsControl) // insert rows for the the fields RowInserted(GetRowCount(), m_aFields.size(), sal_False); // insert an additional row for a new field for that index -// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex ) +// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex ) RowInserted(GetRowCount(), 1, sal_False); SetUpdateMode(sal_True); @@ -282,7 +282,7 @@ DBG_NAME(IndexFieldsControl) // for the field name cell m_pFieldNameCell = new ListBoxControl(&GetDataWindow()); m_pFieldNameCell->InsertEntry(String()); - m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); + m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); const ::rtl::OUString* pFields = _rAvailableFields.getConstArray(); const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength(); for (;pFields < pFieldsEnd; ++pFields) @@ -363,7 +363,7 @@ DBG_NAME(IndexFieldsControl) { sal_Int32 nRow = GetCurRow(); OSL_ENSURE(nRow < (sal_Int32)m_aFields.size(), "IndexFieldsControl::SaveModified: invalid current row!"); - if (nRow >= 0) // may be -1 in case the control was empty + if (nRow >= 0) // may be -1 in case the control was empty { // remove the field from the selection IndexFieldsIterator aPos = m_aFields.begin() + nRow; @@ -436,9 +436,9 @@ DBG_NAME(IndexFieldsControl) m_aModifyHdl.Call(this); if (_pBox == m_pFieldNameCell) - { // a field has been selected + { // a field has been selected if (GetCurRow() >= GetRowCount() - 2) - { // and we're in one of the last two rows + { // and we're in one of the last two rows String sSelectedEntry = m_pFieldNameCell->GetSelectEntry(); sal_Int32 nCurrentRow = GetCurRow(); sal_Int32 rowCount = GetRowCount(); @@ -446,14 +446,14 @@ DBG_NAME(IndexFieldsControl) OSL_ENSURE(((sal_Int32)(m_aFields.size() + 1)) == rowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!"); if (sSelectedEntry.Len() && (nCurrentRow == rowCount - 1) /*&& (!m_nMaxColumnsInIndex || rowCount < m_nMaxColumnsInIndex )*/ ) - { // in the last row, an non-empty string has been selected + { // in the last row, an non-empty string has been selected // -> insert a new row m_aFields.push_back(OIndexField()); RowInserted(GetRowCount(), 1); Invalidate(GetRowRectPixel(nCurrentRow)); } else if (!sSelectedEntry.Len() && (nCurrentRow == rowCount - 2)) - { // in the (last-1)th row, an empty entry has been selected + { // in the (last-1)th row, an empty entry has been selected // -> remove the last row m_aFields.erase(m_aFields.end() - 1); RowRemoved(GetRowCount() - 1, 1); @@ -504,7 +504,7 @@ DBG_NAME(IndexFieldsControl) //------------------------------------------------------------------ //...................................................................... -} // namespace dbaui +} // namespace dbaui //...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 1f27f2408f17..488be71caad1 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,22 +42,22 @@ #ifdef HAVE_ODBC_SUPPORT #if defined(WIN) || defined(OS2) -#define ODBC_LIBRARY "ODBC.DLL" -#define ODBC_UI_LIBRARY "ODBCINST.DLL" +#define ODBC_LIBRARY "ODBC.DLL" +#define ODBC_UI_LIBRARY "ODBCINST.DLL" #endif #if defined WNT -#define ODBC_LIBRARY "ODBC32.DLL" -#define ODBC_UI_LIBRARY "ODBCCP32.DLL" +#define ODBC_LIBRARY "ODBC32.DLL" +#define ODBC_UI_LIBRARY "ODBCCP32.DLL" #endif #ifdef UNX #ifdef MACOSX -#define ODBC_LIBRARY "libiodbc.dylib" -#define ODBC_UI_LIBRARY "libiodbcinst.dylib" +#define ODBC_LIBRARY "libiodbc.dylib" +#define ODBC_UI_LIBRARY "libiodbcinst.dylib" #else -#define ODBC_LIBRARY_1 "libodbc.so.1" -#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" -#define ODBC_LIBRARY "libodbc.so" -#define ODBC_UI_LIBRARY "libodbcinst.so" +#define ODBC_LIBRARY_1 "libodbc.so.1" +#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" +#define ODBC_LIBRARY "libodbc.so" +#define ODBC_UI_LIBRARY "libodbcinst.so" #endif #endif @@ -101,10 +101,10 @@ #else -#define ODBC_LIBRARY "" -#define ODBC_UI_LIBRARY "" +#define ODBC_LIBRARY "" +#define ODBC_UI_LIBRARY "" -#endif // HAVE_ODBC_SUPPORT +#endif // HAVE_ODBC_SUPPORT //......................................................................... namespace dbaui @@ -114,10 +114,10 @@ namespace dbaui #ifdef HAVE_ODBC_SUPPORT typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); -typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); +typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); typedef SQLRETURN (SQL_API* TSQLFreeHandle) (SQLSMALLINT HandleType, SQLHANDLE Handle); typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGER StringLength); -typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, +typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr); #define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a) @@ -184,10 +184,10 @@ OOdbcLibWrapper::~OOdbcLibWrapper() struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT - SQLHANDLE hEnvironment; + SQLHANDLE hEnvironment; OdbcTypesImpl() : hEnvironment(0) { } #else - void* pDummy; + void* pDummy; #endif }; DBG_NAME(OOdbcEnumeration) @@ -291,7 +291,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) SQLRETURN nResult = SQL_SUCCESS; rtl_TextEncoding nTextEncoding = osl_getThreadTextEncoding(); - for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); + for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); ; nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription) ) @@ -382,7 +382,7 @@ bool OOdbcManagement::isRunning() const #endif // HAVE_ODBC_ADMINISTRATION //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 479c0743953b..e66e0bf21c2c 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ namespace dbaui */ class OOdbcLibWrapper { - oslModule m_pOdbcLib; // the library handle - ::rtl::OUString m_sLibPath; // the path to the library + oslModule m_pOdbcLib; // the library handle + ::rtl::OUString m_sLibPath; // the path to the library public: #ifdef HAVE_ODBC_SUPPORT - sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } + sal_Bool isLoaded() const { return NULL != m_pOdbcLib; } #else - sal_Bool isLoaded() const { return sal_False; } + sal_Bool isLoaded() const { return sal_False; } #endif ::rtl::OUString getLibraryName() const { return m_sLibPath; } @@ -78,9 +78,9 @@ protected: oslGenericFunction loadSymbol(const sal_Char* _pFunctionName); /// load the lib - sal_Bool load(const sal_Char* _pLibPath); + sal_Bool load(const sal_Char* _pLibPath); /// unload the lib - void unload(); + void unload(); }; //========================================================================= @@ -97,7 +97,7 @@ class OOdbcEnumeration : public OOdbcLibWrapper oslGenericFunction m_pDataSources; #endif - OdbcTypesImpl* m_pImpl; + OdbcTypesImpl* m_pImpl; // needed because we can't have a member of type SQLHANDLE: this would require us to include the respective // ODBC file, which would lead to a lot of conflicts with other includes @@ -105,13 +105,13 @@ public: OOdbcEnumeration(); ~OOdbcEnumeration(); - void getDatasourceNames(StringBag& _rNames); + void getDatasourceNames(StringBag& _rNames); protected: /// ensure that an ODBC environment is allocated - sal_Bool allocEnv(); + sal_Bool allocEnv(); /// free any allocated ODBC environment - void freeEnv(); + void freeEnv(); }; //========================================================================= @@ -134,7 +134,7 @@ public: #endif //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_ODBC_CONFIG_HXX_ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 5a271ab4be45..050ab6e6f7cd 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 0fdb2dedf611..6890ac7a2df5 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ namespace dbaui OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); - virtual int operator==( const SfxPoolItem& _rItem ) const; - virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; + virtual int operator==( const SfxPoolItem& _rItem ) const; + virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const; bool HasValue() const { return !!m_aValue; } void ClearValue() { m_aValue.reset(); } diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 21023208a4d7..29d0460eda39 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ #include "localresaccess.hxx" #include <unotools/syslocale.hxx> -#define EF_VISITED 0x0001 -#define EF_DIRTY 0x0002 +#define EF_VISITED 0x0001 +#define EF_DIRTY 0x0002 //......................................................................... namespace dbaui { //......................................................................... - + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -66,19 +66,19 @@ namespace dbaui //================================================================== //------------------------------------------------------------------------------ - #define INIT_MEMBERS() \ - :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ - ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ - ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ - ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ - ,m_aParam (this, ModuleRes(ET_PARAM)) \ - ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ - ,m_aOKBtn (this, ModuleRes(BT_OK)) \ - ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ - ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ - ,m_xConnection(_rxConnection) \ - ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ - ,m_bNeedErrorOnCurrent(sal_True) \ + #define INIT_MEMBERS() \ + :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \ + ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \ + ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \ + ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \ + ,m_aParam (this, ModuleRes(ET_PARAM)) \ + ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \ + ,m_aOKBtn (this, ModuleRes(BT_OK)) \ + ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \ + ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \ + ,m_xConnection(_rxConnection) \ + ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \ + ,m_bNeedErrorOnCurrent(sal_True) \ //------------------------------------------------------------------------------ @@ -136,7 +136,7 @@ DBG_NAME(OParameterDialog) { DBG_UNHANDLED_EXCEPTION(); } - + Construct(); @@ -169,12 +169,12 @@ DBG_NAME(OParameterDialog) m_aAllParams.SelectEntryPos(0); LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams); - if (m_aAllParams.GetEntryCount() == 1) + if (m_aAllParams.GetEntryCount() == 1) { m_aTravelNext.Enable(sal_False); } - if (m_aAllParams.GetEntryCount() > 1) + if (m_aAllParams.GetEntryCount() > 1) { m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() & ~WB_DEFBUTTON); m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() | WB_DEFBUTTON); @@ -216,14 +216,14 @@ DBG_NAME(OParameterDialog) if (!m_bNeedErrorOnCurrent) return 1L; - m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified + m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified ::rtl::OUString sName; - try - { - sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME)); - } - catch(Exception&) + try + { + sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME)); + } + catch(Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -250,8 +250,8 @@ DBG_NAME(OParameterDialog) if (&m_aCancelBtn == pButton) { // no interpreting of the given values anymore .... - m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... - m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message + m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ... + m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message m_aCancelBtn.SetClickHdl(Link()); m_aCancelBtn.Click(); } @@ -259,7 +259,7 @@ DBG_NAME(OParameterDialog) { // transfer the current values into the Any if (LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams) != 0L) - { // there was an error interpreting the current text + { // there was an error interpreting the current text m_bNeedErrorOnCurrent = sal_True; // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now, // so the next time it is called we need an error message, again .... @@ -288,7 +288,7 @@ DBG_NAME(OParameterDialog) { DBG_UNHANDLED_EXCEPTION(); } - + } // to close the dialog (which is more code than a simple EndDialog) m_aOKBtn.SetClickHdl(Link()); @@ -333,7 +333,7 @@ DBG_NAME(OParameterDialog) { // do the transformation of the current text if (LINK(this, OParameterDialog, OnValueLoseFocus).Call(&m_aParam) != 0L) - { // there was an error interpreting the text + { // there was an error interpreting the text m_aAllParams.SelectEntryPos(m_nCurrentlySelected); return 1L; } @@ -369,7 +369,7 @@ DBG_NAME(OParameterDialog) // was it the last "not visited yet" entry ? ConstByteVectorIterator aIter; - for ( aIter = m_aVisitedParams.begin(); + for ( aIter = m_aVisitedParams.begin(); aIter < m_aVisitedParams.end(); ++aIter ) @@ -378,10 +378,10 @@ DBG_NAME(OParameterDialog) break; } if (aIter == m_aVisitedParams.end()) - { // yes, there isn't another one -> change the "default button" + { // yes, there isn't another one -> change the "default button" m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() & ~WB_DEFBUTTON); m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() | WB_DEFBUTTON); - + // set to focus to one of the buttons temporary (with this their "default"-state is really updated) Window* pOldFocus = Application::GetFocusWindow(); @@ -421,7 +421,7 @@ DBG_NAME(OParameterDialog) //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc index 0b834dd3e7eb..c344ef454c65 100644 --- a/dbaccess/source/ui/dlg/paramdialog.hrc +++ b/dbaccess/source/ui/dlg/paramdialog.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,19 +28,19 @@ #ifndef _DBAUI_PARAMDIALOG_HRC_ #define _DBAUI_PARAMDIALOG_HRC_ -#define LB_ALLPARAMS 1 -#define FL_PARAMS 2 -#define FT_VALUE 3 -#define ET_PARAM 4 -#define CB_NULLVAL 5 -#define BT_TRAVELNEXT 6 -#define BT_OK 7 -#define BT_CANCEL 8 -#define AB_PREV 9 -#define AB_NEXT 10 +#define LB_ALLPARAMS 1 +#define FL_PARAMS 2 +#define FT_VALUE 3 +#define ET_PARAM 4 +#define CB_NULLVAL 5 +#define BT_TRAVELNEXT 6 +#define BT_OK 7 +#define BT_CANCEL 8 +#define AB_PREV 9 +#define AB_NEXT 10 -#define STR_COULD_NOT_CONVERT_PARAM 1 +#define STR_COULD_NOT_CONVERT_PARAM 1 #endif // _DBAUI_PARAMDIALOG_HRC_ diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src index 3993096f8847..c35e395c697c 100644 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ b/dbaccess/source/ui/dlg/paramdialog.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ #include "dbu_dlg.hrc" #endif -#define LIST_WIDTH 100 -#define LIST_HEIGHT 50 +#define LIST_WIDTH 100 +#define LIST_HEIGHT 50 ModalDialog DLG_PARAMETERS { diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 6c3a6124f5b4..a6baa7f06439 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,26 +88,26 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, const Reference< XNameAccess>& _rxCols ) :ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) ) - ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) ) - ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) ) - ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) ) - ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) ) - ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) ) - ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) ) - ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) ) - ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) ) - ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) ) - ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) ) - ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) ) - ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) ) - ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) ) - ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) ) - ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) ) + ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) ) + ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) ) + ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) ) + ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) ) + ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) ) + ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) ) + ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) ) + ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) ) + ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) ) + ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) ) + ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) ) + ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) ) + ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) ) + ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) ) + ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) ) ,aFL_FIELDS ( this, ModuleRes( FL_FIELDS ) ) - ,aBT_OK ( this, ModuleRes( BT_OK ) ) - ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) ) - ,aBT_HELP ( this, ModuleRes( BT_HELP ) ) - ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) ) + ,aBT_OK ( this, ModuleRes( BT_OK ) ) + ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) ) + ,aBT_HELP ( this, ModuleRes( BT_HELP ) ) + ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) ) ,aSTR_COMPARE_OPERATORS( ModuleRes( STR_COMPARE_OPERATORS ) ) ,m_xQueryComposer(_rxComposer) ,m_xColumns( _rxCols ) @@ -221,8 +221,8 @@ DlgFilterCrit::~DlgFilterCrit() DBG_DTOR(DlgFilterCrit,NULL); } -#define LbText(x) ((x).GetSelectEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbText(x) ((x).GetSelectEntry()) +#define LbPos(x) ((x).GetSelectEntryPos()) //------------------------------------------------------------------------------ sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const String& _rSelectedPredicate ) const @@ -335,7 +335,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom { if ( xInfo->hasPropertyByName(PROPERTY_TABLENAME) ) { - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; if ( sTableName.getLength() ) { // properly quote all parts of the table name, so e.g. <schema>.<table> becomes "<schema>"."<table>" @@ -344,7 +344,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation ); } } - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name; static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); if ( xInfo->hasPropertyByName(sAgg) ) xColumn->getPropertyValue(sAgg) >>= bHaving; @@ -354,7 +354,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom } if ( !bFunction ) { - const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); _rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name); if ( sTableName.getLength() ) { @@ -394,14 +394,14 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie { Sequence< ::rtl::OUString> aSeq = xColumns->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xProp(xColumns->getByName(*pIter),UNO_QUERY); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { ::rtl::OUString sRealName; - xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; if ( sRealName == _rFieldName ) { if ( m_xColumns.is() && m_xColumns->hasByName( *pIter ) ) @@ -487,7 +487,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField ) void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr ) { DBG_CHKTHIS(DlgFilterCrit,NULL); - ::rtl::OUString aCondition; + ::rtl::OUString aCondition; _rItem.Value >>= aCondition; String aStr = aCondition.getStr(); ::Replace_SQL_PlaceHolder(aStr); @@ -499,7 +499,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo switch(_rItem.Handle) { case SQLFilterOperator::EQUAL: - // aStr.Erase(0,1); + // aStr.Erase(0,1); break; case SQLFilterOperator::NOT_EQUAL: aStr.Erase(0,2); @@ -586,11 +586,11 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const String& rField ) { DBG_CHKTHIS(DlgFilterCrit,NULL); sal_uInt16 nCnt = rBox.GetEntryCount(); - // sal_Bool bCase = m_rIterator.TablesAreSensitive(); + // sal_Bool bCase = m_rIterator.TablesAreSensitive(); for( sal_uInt16 i=0 ; i<nCnt ; i++ ) { - // if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField)) + // if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField)) if(rBox.GetEntry(i) == rField) { rBox.SelectEntryPos(i); @@ -781,7 +781,7 @@ void DlgFilterCrit::BuildWherePart() Sequence<Sequence<PropertyValue> > aFilter,aHaving; aFilter.realloc(1); aHaving.realloc(1); - // ::rtl::OUString aFilter; + // ::rtl::OUString aFilter; if( LbPos(aLB_WHEREFIELD1) != 0 ) { @@ -859,13 +859,13 @@ void DlgFilterCrit::BuildWherePart() void DlgFilterCrit::fillLines(const Sequence<Sequence<PropertyValue > >& _aValues) { const Sequence<PropertyValue >* pOrIter = _aValues.getConstArray(); - const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); + const Sequence<PropertyValue >* pOrEnd = pOrIter + _aValues.getLength(); sal_Bool bOr = sal_True; for(sal_uInt16 i=0;pOrIter != pOrEnd; ++pOrIter) { bOr = sal_True; - const PropertyValue* pAndIter = pOrIter->getConstArray(); - const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); + const PropertyValue* pAndIter = pOrIter->getConstArray(); + const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength(); for(;pAndIter != pAndEnd; ++pAndIter) { SetLine( i++,*pAndIter,bOr); diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc index ff2aaaca30d0..9895f222e274 100644 --- a/dbaccess/source/ui/dlg/queryfilter.hrc +++ b/dbaccess/source/ui/dlg/queryfilter.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,34 +31,34 @@ #include "dbu_dlg.hrc" #endif -#define FT_WHEREFIELD 1 -#define FT_WHERECOMP 2 -#define FT_WHEREVALUE 3 -#define FT_WHEREOPER 4 +#define FT_WHEREFIELD 1 +#define FT_WHERECOMP 2 +#define FT_WHEREVALUE 3 +#define FT_WHEREOPER 4 -#define LB_WHEREFIELD1 1 -#define LB_WHERECOMP1 2 -#define LB_WHEREFIELD2 3 -#define LB_WHERECOMP2 4 -#define LB_WHEREFIELD3 5 -#define LB_WHERECOMP3 6 -#define LB_WHERECOND2 7 -#define LB_WHERECOND3 8 +#define LB_WHEREFIELD1 1 +#define LB_WHERECOMP1 2 +#define LB_WHEREFIELD2 3 +#define LB_WHERECOMP2 4 +#define LB_WHEREFIELD3 5 +#define LB_WHERECOMP3 6 +#define LB_WHERECOND2 7 +#define LB_WHERECOND3 8 #define FL_FIELDS 1 -#define ET_WHEREVALUE1 1 -#define ET_WHEREVALUE2 2 -#define ET_WHEREVALUE3 3 +#define ET_WHEREVALUE1 1 +#define ET_WHEREVALUE2 2 +#define ET_WHEREVALUE3 3 -#define STR_NOENTRY 1 -#define STR_NOENTRY2 2 -#define STR_DEFAULT 3 +#define STR_NOENTRY 1 +#define STR_NOENTRY2 2 +#define STR_DEFAULT 3 #define STR_COMPARE_OPERATORS 4 -#define BT_OK 1 -#define BT_CANCEL 2 -#define BT_HELP 3 +#define BT_OK 1 +#define BT_CANCEL 2 +#define BT_HELP 3 #endif // DBAUI_QUERYFILTER_HRC diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index 2b1ef6e6baf5..fcabfdcb496e 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,11 +84,11 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR +// STRLST_AND_OR StringList [ en-US ] = { - < "AND" ; Default ; > ; - < "OR" ; Default ; > ; + < "AND" ; Default ; > ; + < "OR" ; Default ; > ; }; }; ListBox LB_WHEREFIELD2 @@ -124,11 +124,11 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR +// STRLST_AND_OR StringList [ en-US ] = { - < "AND" ; Default ; > ; - < "OR" ; Default ; > ; + < "AND" ; Default ; > ; + < "OR" ; Default ; > ; }; }; ListBox LB_WHEREFIELD3 diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index d237978ce1ce..527cc15a4deb 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,27 +60,27 @@ using namespace ::com::sun::star::beans; DBG_NAME(DlgOrderCrit) //------------------------------------------------------------------------------ -DlgOrderCrit::DlgOrderCrit( Window * pParent, +DlgOrderCrit::DlgOrderCrit( Window * pParent, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) :ModalDialog( pParent, ModuleRes(DLG_ORDERCRIT) ) - ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) ) - ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) ) - ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) ) - ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) ) - ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) ) - ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) ) - ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) ) - ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) ) - ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) ) - ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) ) - ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) ) - ,aBT_OK( this, ModuleRes( BT_OK ) ) - ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) ) - ,aBT_HELP( this, ModuleRes( BT_HELP ) ) + ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) ) + ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) ) + ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) ) + ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) ) + ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) ) + ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) ) + ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) ) + ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) ) + ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) ) + ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) ) + ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) ) + ,aBT_OK( this, ModuleRes( BT_OK ) ) + ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) ) + ,aBT_HELP( this, ModuleRes( BT_HELP ) ) ,aFL_ORDER( this, ModuleRes( FL_ORDER ) ) - ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) ) + ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) ) ,m_xQueryComposer( _rxComposer ) ,m_xColumns(_rxCols) ,m_xConnection(_rxConnection) @@ -156,8 +156,8 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent, //------------------------------------------------------------------------------ -#define LbText(x) ((x).GetSelectEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbText(x) ((x).GetSelectEntry()) +#define LbPos(x) ((x).GetSelectEntryPos()) //------------------------------------------------------------------------------ DlgOrderCrit::~DlgOrderCrit() @@ -246,7 +246,7 @@ void DlgOrderCrit::EnableLines() { DBG_CHKTHIS(DlgOrderCrit,NULL); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); + ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString(); static const ::rtl::OUString sDESC = ::rtl::OUString::createFromAscii(" DESC "); static const ::rtl::OUString sASC = ::rtl::OUString::createFromAscii(" ASC "); @@ -270,7 +270,7 @@ void DlgOrderCrit::EnableLines() if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) ) { ::rtl::OUString sRealName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; sName = sRealName; static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction")); static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function")); diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc index 059151ba9a8d..fde41dfc39d9 100644 --- a/dbaccess/source/ui/dlg/queryorder.hrc +++ b/dbaccess/source/ui/dlg/queryorder.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,26 +32,26 @@ #endif -#define FT_ORDERFIELD 1 -#define FT_ORDERDIR 3 -#define FT_ORDERAFTER1 4 -#define FT_ORDERAFTER2 5 -#define FT_ORDEROPER 6 +#define FT_ORDERFIELD 1 +#define FT_ORDERDIR 3 +#define FT_ORDERAFTER1 4 +#define FT_ORDERAFTER2 5 +#define FT_ORDEROPER 6 -#define LB_ORDERFIELD1 1 -#define LB_ORDERFIELD2 2 -#define LB_ORDERFIELD3 3 -#define LB_ORDERVALUE1 4 -#define LB_ORDERVALUE2 5 -#define LB_ORDERVALUE3 6 +#define LB_ORDERFIELD1 1 +#define LB_ORDERFIELD2 2 +#define LB_ORDERFIELD3 3 +#define LB_ORDERVALUE1 4 +#define LB_ORDERVALUE2 5 +#define LB_ORDERVALUE3 6 #define FL_ORDER 1 -#define BT_OK 1 -#define BT_CANCEL 2 -#define BT_HELP 3 +#define BT_OK 1 +#define BT_CANCEL 2 +#define BT_HELP 3 -#define STR_NOENTRY 1 +#define STR_NOENTRY 1 #endif // DBAUI_QUERYORDER_HRC diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 2f2f85a797a0..2927be9d838a 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 0220c2691ade..20db037334ef 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include "UITools.hxx" #include "moduledbu.hxx" -#define BUTTONID_MORE BUTTONID_RETRY + 1 +#define BUTTONID_MORE BUTTONID_RETRY + 1 #define DIALOG_WIDTH 220 #define OUTER_MARGIN 6 @@ -126,7 +126,7 @@ namespace :m_label( ModuleRes( _labelResourceID ) ) { } - + virtual String getLabel() const { return m_label; @@ -327,11 +327,11 @@ namespace class OExceptionChainDialog : public ModalDialog { FixedLine m_aFrame; - FixedText m_aListLabel; - SvTreeListBox m_aExceptionList; - FixedText m_aDescLabel; - MultiLineEdit m_aExceptionText; - OKButton m_aOK; + FixedText m_aListLabel; + SvTreeListBox m_aExceptionList; + FixedText m_aDescLabel; + MultiLineEdit m_aExceptionText; + OKButton m_aOK; String m_sStatusLabel; String m_sErrorCodeLabel; @@ -350,12 +350,12 @@ DBG_NAME(OExceptionChainDialog) //------------------------------------------------------------------------------ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ) :ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN)) - ,m_aFrame (this, ModuleRes(FL_DETAILS)) - ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) - ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) - ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) - ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) - ,m_aOK (this, ModuleRes(PB_OK)) + ,m_aFrame (this, ModuleRes(FL_DETAILS)) + ,m_aListLabel (this, ModuleRes(FT_ERRORLIST)) + ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST)) + ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION)) + ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION)) + ,m_aOK (this, ModuleRes(PB_OK)) ,m_aExceptions( _rExceptions ) { DBG_CTOR(OExceptionChainDialog,NULL); @@ -505,11 +505,11 @@ void OSQLMessageBox::impl_positionControls() { OSL_PRECOND( !m_pImpl->aDisplayInfo.empty(), "OSQLMessageBox::impl_positionControls: nothing to display at all?" ); - + if ( m_pImpl->aDisplayInfo.empty() ) return; const ExceptionDisplayInfo* pSecondInfo = NULL; - + const ExceptionDisplayInfo& rFirstInfo = *m_pImpl->aDisplayInfo.begin(); if ( m_pImpl->aDisplayInfo.size() > 1 ) pSecondInfo = &m_pImpl->aDisplayInfo[1]; @@ -781,7 +781,7 @@ OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, Wi } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/sqlmessage.hrc b/dbaccess/source/ui/dlg/sqlmessage.hrc index 76f722a1b08f..b8267bafcb7a 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.hrc +++ b/dbaccess/source/ui/dlg/sqlmessage.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,23 +28,23 @@ #ifndef _DBAUI_SQLMESSAGE_HRC_ #define _DBAUI_SQLMESSAGE_HRC_ -#define FT_ERRORLIST 1 -#define FT_DESCRIPTION 2 +#define FT_ERRORLIST 1 +#define FT_DESCRIPTION 2 -#define ED_TEXT 1 +#define ED_TEXT 1 #define FL_DATA 1 -#define FL_DETAILS 1 +#define FL_DETAILS 1 -#define PB_OK 1 -#define PB_CANCEL 2 +#define PB_OK 1 +#define PB_CANCEL 2 -#define CTL_ERRORLIST 1 +#define CTL_ERRORLIST 1 -#define ME_DESCRIPTION 1 +#define ME_DESCRIPTION 1 -#define STR_EXCEPTION_STATUS 1 -#define STR_EXCEPTION_ERRORCODE 2 +#define STR_EXCEPTION_STATUS 1 +#define STR_EXCEPTION_ERRORCODE 2 #endif // _DBAUI_SQLMESSAGE_HRC_ diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index af3d53f785dd..fe368f1824d5 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 441aa6c6f846..99857a2c8249 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,11 +86,11 @@ DBG_NAME(OTableSubscriptionPage) //------------------------------------------------------------------------ OTableSubscriptionPage::OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs,OTableSubscriptionDialog* _pTablesDlg ) :OGenericAdministrationPage( pParent, ModuleRes(PAGE_TABLESUBSCRIPTION), _rCoreAttrs ) - ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) - ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True) - ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION)) - ,m_bCheckedAll ( sal_False ) - ,m_bCatalogAtStart ( sal_True ) + ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) + ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True) + ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION)) + ,m_bCheckedAll ( sal_False ) + ,m_bCatalogAtStart ( sal_True ) ,m_pTablesDlg(_pTablesDlg) { DBG_CTOR(OTableSubscriptionPage,NULL); @@ -140,9 +140,9 @@ DBG_NAME(OTableSubscriptionPage) { OGenericAdministrationPage::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { // Check if we need to get new images for normal/high contrast mode m_aTablesList.notifyHiContrastChanged(); @@ -233,13 +233,13 @@ DBG_NAME(OTableSubscriptionPage) void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) - { // no tables visible + { // no tables visible CheckAll(sal_False); } else { if ((1 == _rTableFilter.getLength()) && _rTableFilter[0].equalsAsciiL("%", 1)) - { // all tables visible + { // all tables visible CheckAll(sal_True); } else @@ -260,7 +260,7 @@ DBG_NAME(OTableSubscriptionPage) String sDSName = pNameItem->GetValue(); if (bValid && sDSName.Len() && !m_xCurrentConnection.is() ) - { // get the current table list from the connection for the current settings + { // get the current table list from the connection for the current settings // the PropertyValues for the current dialog settings Sequence< PropertyValue > aConnectionParams; @@ -313,7 +313,7 @@ DBG_NAME(OTableSubscriptionPage) Any aTableTypeFilter = xProp->getPropertyValue(PROPERTY_TABLETYPEFILTER); Reference<XModifiable> xModi(getDataSourceOrModel(xProp),UNO_QUERY); - sal_Bool bModified = ( xModi.is() && xModi->isModified() ); + sal_Bool bModified = ( xModi.is() && xModi->isModified() ); Sequence< ::rtl::OUString > aNewTableFilter(1); aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); @@ -330,7 +330,7 @@ DBG_NAME(OTableSubscriptionPage) xModi->setModified(sal_False); } - + if ( m_xCurrentConnection.is() ) { m_aTablesList.UpdateTableList( m_xCurrentConnection ); @@ -362,8 +362,8 @@ DBG_NAME(OTableSubscriptionPage) else { // in addition, we need some infos about the connection used - m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) - m_bCatalogAtStart = sal_True; // (default) + m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default) + m_bCatalogAtStart = sal_True; // (default) try { Reference< XDatabaseMetaData > xMeta; @@ -459,7 +459,7 @@ DBG_NAME(OTableSubscriptionPage) String sLeftText = pLeftTextItem->GetText(); String sRightText = pRightTextItem->GetText(); - sal_Int32 nCompareResult = 0; // equal by default + sal_Int32 nCompareResult = 0; // equal by default if (m_xCollator.is()) { @@ -492,13 +492,13 @@ DBG_NAME(OTableSubscriptionPage) SvLBoxEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast<SvLBoxEntry*>(pAllObjectsEntry)); while(pEntry) { - sal_Bool bCatalogWildcard = sal_False; - sal_Bool bSchemaWildcard = sal_False; + sal_Bool bCatalogWildcard = sal_False; + sal_Bool bSchemaWildcard = sal_False; SvLBoxEntry* pSchema = NULL; SvLBoxEntry* pCatalog = NULL; if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChilds(pEntry)) - { // checked and a leaf, which means it's no catalog, no schema, but a real table + { // checked and a leaf, which means it's no catalog, no schema, but a real table ::rtl::OUString sCatalog; if(m_aTablesList.GetModel()->HasParent(pEntry)) { @@ -508,7 +508,7 @@ DBG_NAME(OTableSubscriptionPage) pSchema = NULL; if (pSchema) - { // it's a real schema entry, not the "all objects" root + { // it's a real schema entry, not the "all objects" root if(m_aTablesList.GetModel()->HasParent(pSchema)) { pCatalog = m_aTablesList.GetModel()->GetParent(pSchema); @@ -517,7 +517,7 @@ DBG_NAME(OTableSubscriptionPage) pCatalog = NULL; if (pCatalog) - { // it's a real catalog entry, not the "all objects" root + { // it's a real catalog entry, not the "all objects" root bCatalogWildcard = m_aTablesList.isWildcardChecked(pCatalog); if (m_bCatalogAtStart) { @@ -598,7 +598,7 @@ DBG_NAME(OTableSubscriptionPage) ///////////////////////////////////////////////////////////////////////// // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) - { // collect the table filter data only if we have a connection - else no tables are displayed at all + { // collect the table filter data only if we have a connection - else no tables are displayed at all Sequence< ::rtl::OUString > aTableFilter; if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry())) { @@ -628,7 +628,7 @@ DBG_NAME(OTableSubscriptionPage) } // ----------------------------------------------------------------------- //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index a15e7e159e53..97d343d6bf3a 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,34 +51,34 @@ namespace dbaui :public OGenericAdministrationPage { private: - FixedLine m_aTables; - OTableTreeListBox m_aTablesList; - FixedText m_aExplanation; + FixedLine m_aTables; + OTableTreeListBox m_aTablesList; + FixedText m_aExplanation; - ::rtl::OUString m_sCatalogSeparator; - sal_Bool m_bCheckedAll : 1; - sal_Bool m_bCatalogAtStart : 1; + ::rtl::OUString m_sCatalogSeparator; + sal_Bool m_bCheckedAll : 1; + sal_Bool m_bCatalogAtStart : 1; - ::osl::Mutex m_aNotifierMutex; + ::osl::Mutex m_aNotifierMutex; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xCurrentConnection; /// valid as long as the page is active + m_xCurrentConnection; /// valid as long as the page is active ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; OTableSubscriptionDialog* m_pTablesDlg; public: - virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); - virtual int DeactivatePage(SfxItemSet* _pSet); + virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs); + virtual int DeactivatePage(SfxItemSet* _pSet); using OGenericAdministrationPage::DeactivatePage; - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** will be called when the controls need to be resized. */ - virtual void resizeControls(const Size& _rDiff); + virtual void resizeControls(const Size& _rDiff); OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); @@ -91,9 +91,9 @@ namespace dbaui DECL_LINK( OnTreeEntryChecked, Control* ); private: + - - /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> + /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables); @@ -115,7 +115,7 @@ namespace dbaui }; //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... #endif // _DBAUI_TABLESPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 2ceefab64a35..6371268a9324 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src index cca76e7f65a3..f285199c54ba 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.src +++ b/dbaccess/source/ui/dlg/textconnectionsettings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |