diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-08-17 23:43:14 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-08-27 16:11:09 +0000 |
| commit | 2ec606730bc95b58390a609df0a88958869a4066 (patch) | |
| tree | 9c530b3f6b200305ba224dda2d02c9bf5aca2233 /dbaccess/source/ui/dlg | |
| parent | 434f3c8e7fac0644cfe1d7a15f97f0c267bac048 (diff) | |
fdo#62475 removed pointless comments
Conflicts:
dbaccess/source/filter/xml/xmlfilter.cxx
dbaccess/source/ui/dlg/ConnectionPage.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/odbcconfig.cxx
dbaccess/source/ui/querydesign/querycontroller.cxx
Change-Id: I3a05649efa3a43dd8d8fb069fc1bce14ca0a6338
Reviewed-on: https://gerrit.libreoffice.org/5484
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'dbaccess/source/ui/dlg')
55 files changed, 198 insertions, 1211 deletions
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index bcf349401f82..e40c32a74a0e 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -45,10 +45,8 @@ #include <osl/thread.h> #include <connectivity/dbexception.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; @@ -58,7 +56,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::task; using namespace ::com::sun::star::sdbc; using namespace comphelper; -// ----------------------------------------------------------------------------- DBG_NAME(OCollectionView) OCollectionView::OCollectionView( Window * pParent ,const Reference< XContent>& _xContent @@ -101,17 +98,17 @@ OCollectionView::OCollectionView( Window * pParent m_aNewFolder.SetClickHdl( LINK( this, OCollectionView, NewFolder_Click ) ); m_aPB_OK.SetClickHdl( LINK( this, OCollectionView, Save_Click ) ); } -// ----------------------------------------------------------------------------- + OCollectionView::~OCollectionView( ) { DBG_DTOR(OCollectionView,NULL); } -// ----------------------------------------------------------------------------- + Reference< XContent> OCollectionView::getSelectedFolder() const { return m_xContent; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(OCollectionView, Save_Click) { OUString sName = m_aName.GetText(); @@ -166,7 +163,6 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) OUString sTemp; InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues); - Reference<XInteractionHandler2> xHandler( InteractionHandler::createWithParent(m_xContext, VCLUnoHelper::GetInterface( this ))); OInteractionRequest* pRequest = new OInteractionRequest(makeAny(aException)); @@ -200,7 +196,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) } return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(OCollectionView, NewFolder_Click) { try @@ -219,7 +215,7 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click) } return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(OCollectionView, Up_Click) { try @@ -244,7 +240,7 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click) } return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) { try @@ -275,7 +271,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) } return 0; } -// ----------------------------------------------------------------------------- + void OCollectionView::initCurrentPath() { sal_Bool bEnable = sal_False; @@ -304,15 +300,12 @@ void OCollectionView::initCurrentPath() } m_aUp.Enable(bEnable); } -// ----------------------------------------------------------------------------- + OUString OCollectionView::getName() const { return m_aName.GetText(); } -// ----------------------------------------------------------------------------- -//......................................................................... -} // namespace dbaui -//......................................................................... +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 52069d2a0a16..3eb5c900bfe9 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dsnItem.hxx" #include "ConnectionHelper.hxx" #include "AutoControls.hrc" @@ -75,12 +74,8 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> - - -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; @@ -93,7 +88,6 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - DBG_NAME(OConnectionHelper) OConnectionHelper::OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs) @@ -113,15 +107,12 @@ DBG_NAME(OConnectionHelper) m_aConnectionURL.SetTypeCollection(m_pCollection); } - OConnectionHelper::~OConnectionHelper() { DBG_DTOR(OConnectionHelper,NULL); } - - // ----------------------------------------------------------------------- void OConnectionHelper::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -150,7 +141,6 @@ DBG_NAME(OConnectionHelper) OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- void OConnectionHelper::implUpdateURLDependentStates() const { OSL_PRECOND( m_pAdminDialog, "OConnectionHelper::implUpdateURLDependentStates: no admin dialog!" ); @@ -161,7 +151,6 @@ DBG_NAME(OConnectionHelper) m_pAdminDialog->enableConfirmSettings( getURLNoPrefix().Len() > 0 ); } - // ----------------------------------------------------------------------- IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -306,7 +295,6 @@ DBG_NAME(OConnectionHelper) for (sal_Int32 index=0; index < count; index++) aProfiles.insert(pArray[index]); - // execute the select dialog ODatasourceSelectDialog aSelector(GetParent(), aProfiles); OUString sOldProfile=getURLNoPrefix(); @@ -329,14 +317,11 @@ DBG_NAME(OConnectionHelper) return 0L; } - //------------------------------------------------------------------------- - bool OConnectionHelper::checkTestConnection() { return true; } - //------------------------------------------------------------------------- void OConnectionHelper::impl_setURL( const String& _rURL, sal_Bool _bPrefix ) { String sURL( comphelper::string::stripEnd(_rURL, '*') ); @@ -380,7 +365,6 @@ DBG_NAME(OConnectionHelper) implUpdateURLDependentStates(); } - //------------------------------------------------------------------------- String OConnectionHelper::impl_getURL( sal_Bool _bPrefix ) const { // get the pure text @@ -419,25 +403,21 @@ DBG_NAME(OConnectionHelper) return sURL; } - //------------------------------------------------------------------------- void OConnectionHelper::setURL( const String& _rURL ) { impl_setURL( _rURL, sal_True ); } - //------------------------------------------------------------------------- String OConnectionHelper::getURLNoPrefix( ) const { return impl_getURL( sal_False ); } - //------------------------------------------------------------------------- void OConnectionHelper::setURLNoPrefix( const String& _rURL ) { impl_setURL( _rURL, sal_False ); } - //------------------------------------------------------------------------- sal_Int32 OConnectionHelper::checkPathExistence(const String& _rURL) { IS_PATH_EXIST e_exists = pathExists(_rURL, sal_False); @@ -504,7 +484,6 @@ DBG_NAME(OConnectionHelper) return RET_OK; } - // ----------------------------------------------------------------------------- IS_PATH_EXIST OConnectionHelper::pathExists(const OUString& _rURL, sal_Bool bIsFile) const { ::ucbhelper::Content aCheckExistence; @@ -528,7 +507,6 @@ DBG_NAME(OConnectionHelper) } return eExists; } - //------------------------------------------------------------------------- long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt ) { if ( m_pCollection->isFileSystemBased(m_eType) ) @@ -555,8 +533,6 @@ DBG_NAME(OConnectionHelper) return OGenericAdministrationPage::PreNotify( _rNEvt ); } - //------------------------------------------------------------------------- - sal_Bool OConnectionHelper::createDirectoryDeep(const String& _rPathURL) { // get an URL object analyzing the URL for us ... @@ -625,22 +601,17 @@ DBG_NAME(OConnectionHelper) return sal_True; } - - // ----------------------------------------------------------------------- void OConnectionHelper::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFT_Connection)); _rControlList.push_back(new ODisableWrapper<PushButton>(&m_aPB_Connection)); } - - // ----------------------------------------------------------------------- void OConnectionHelper::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back( new OSaveValueWrapper<Edit>( &m_aConnectionURL ) ); } - //------------------------------------------------------------------------- sal_Bool OConnectionHelper::commitURL() { String sURL; @@ -694,7 +665,6 @@ DBG_NAME(OConnectionHelper) m_aConnectionURL.SaveValueNoPrefix(); return sal_True; } - //------------------------------------------------------------------------- void OConnectionHelper::askForFileName(::sfx2::FileDialogHelper& _aFileOpen) { String sOldPath = getURLNoPrefix(); @@ -710,8 +680,6 @@ DBG_NAME(OConnectionHelper) } } -//......................................................................... } // 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 2b9e4980f1d5..1e8db0c69528 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -25,10 +25,8 @@ #include "curledit.hxx" #include <sfx2/filedlghelper.hxx> -//......................................................................... namespace dbaui { -//......................................................................... enum IS_PATH_EXIST { @@ -62,7 +60,6 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); - // 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; @@ -77,7 +74,6 @@ namespace dbaui */ sal_Int32 checkPathExistence(const String& _rURL); - IS_PATH_EXIST pathExists(const OUString& _rURL, sal_Bool bIsFile) const; sal_Bool createDirectoryDeep(const String& _rPathNormalized); sal_Bool commitURL(); @@ -99,9 +95,7 @@ namespace dbaui void implUpdateURLDependentStates() const; }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_CONNECTIONHELPER_HXX diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 0f679b908027..2026b51c742e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> - #include "ConnectionPage.hxx" #include "ConnectionPage.hrc" #include "dbu_dlg.hrc" @@ -72,10 +71,8 @@ #include "AutoControls.hrc" -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; @@ -90,9 +87,7 @@ namespace dbaui { return ( new OConnectionTabPage( pParent, _rAttrSet ) ); } - //======================================================================== - //= OConnectionTabPage - //======================================================================== + // OConnectionTabPage DBG_NAME(OConnectionTabPage) OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs) @@ -122,13 +117,11 @@ namespace dbaui LayoutHelper::fitSizeRightAligned( m_aTestConnection ); } - // ----------------------------------------------------------------------- OConnectionTabPage::~OConnectionTabPage() { DBG_DTOR(OConnectionTabPage,NULL); } - // ----------------------------------------------------------------------- void OConnectionTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -266,7 +259,6 @@ namespace dbaui m_aJavaDriver.ClearModifyFlag(); } } - // ----------------------------------------------------------------------- void OConnectionTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL1)); @@ -281,7 +273,6 @@ namespace dbaui OConnectionHelper::fillWindows(_rControlList); } - // ----------------------------------------------------------------------- void OConnectionTabPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aJavaDriver)); @@ -290,7 +281,6 @@ namespace dbaui OConnectionHelper::fillControls(_rControlList); } - // ----------------------------------------------------------------------- sal_Bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; @@ -313,7 +303,6 @@ namespace dbaui return bChangedSomething; } - // ----------------------------------------------------------------------- IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -338,7 +327,6 @@ namespace dbaui aMsg.Execute(); return 0L; } - // ----------------------------------------------------------------------- bool OConnectionTabPage::checkTestConnection() { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -348,7 +336,6 @@ namespace dbaui m_aTestConnection.Enable(bEnableTestConnection); return true; } - // ----------------------------------------------------------------------- IMPL_LINK(OConnectionTabPage, OnEditModified, Edit*, _pEdit) { if ( _pEdit == &m_aJavaDriver ) @@ -359,8 +346,6 @@ namespace dbaui callModifiedHdl(); return 0L; } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 4c81b1d1f6e3..040477107d9f 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -25,14 +25,10 @@ #include <ucbhelper/content.hxx> #include "curledit.hxx" -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= OConnectionTabPage - //========================================================================= + // OConnectionTabPage /** implements the connection page of the data source properties dialog. */ @@ -56,7 +52,6 @@ namespace dbaui // connection test PushButton m_aTestConnection; - // called when the test connection button was clicked DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); @@ -89,9 +84,7 @@ namespace dbaui */ virtual bool checkTestConnection(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 9f966eefef17..d514634ac6b5 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConnectionPageSetup.hxx" #include "AutoControls.hrc" #include "dbadminsetup.hrc" @@ -55,10 +54,8 @@ #include <sfx2/docfilt.hxx> #include <vcl/mnemonic.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; @@ -69,8 +66,6 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - - 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); @@ -78,7 +73,6 @@ namespace dbaui return oDBWizardPage; } - 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); @@ -107,10 +101,7 @@ namespace dbaui return oDBWizardPage; } - - //======================================================================== - //= OConnectionTabPageSetup - //======================================================================== + // OConnectionTabPageSetup DBG_NAME(OConnectionTabPageSetup) OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) :OConnectionHelper(pParent, ModuleRes(_rId), _rCoreAttrs) @@ -127,7 +118,6 @@ namespace dbaui else m_aFT_HelpText.Hide(); - if ( USHRT_MAX != _nHeaderResId ) SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderResId); @@ -158,13 +148,11 @@ namespace dbaui SetRoadmapStateValue(sal_False); } - // ----------------------------------------------------------------------- OConnectionTabPageSetup::~OConnectionTabPageSetup() { DBG_DTOR(OConnectionTabPageSetup,NULL); } - // ----------------------------------------------------------------------- void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { m_eType = m_pAdminDialog->getDatasourceType(_rSet); @@ -189,35 +177,28 @@ namespace dbaui callModifiedHdl(); } - // ----------------------------------------------------------------------- sal_Bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ ) { return commitURL(); } - // ----------------------------------------------------------------------- sal_Bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); return bChangedSomething; } - // ----------------------------------------------------------------------- bool OConnectionTabPageSetup::checkTestConnection() { return !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0); } - // ----------------------------------------------------------------------- IMPL_LINK(OConnectionTabPageSetup, OnEditModified, Edit*, /*_pEdit*/) { SetRoadmapStateValue(checkTestConnection()); callModifiedHdl(); return 0L; } -//......................................................................... } // namespace dbaui -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index b5db0f6417e5..daf2598e3185 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef DBAUI_CONNECTIONPAGESETUP_HXX #define DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionHelper.hxx" @@ -28,15 +27,10 @@ #include <vcl/field.hxx> - -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= OConnectionTabPageSetup - //========================================================================= + // OConnectionTabPageSetup /** implements the connection page of the data source properties dialog. */ @@ -57,13 +51,11 @@ namespace dbaui static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(sal_False); } inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); } @@ -74,7 +66,6 @@ namespace dbaui void changeConnectionURL( const String& _rNewDSN ); String getConnectionURL( ) const; - protected: OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); virtual bool checkTestConnection(); @@ -82,9 +73,7 @@ namespace dbaui virtual ~OConnectionTabPageSetup(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 6564699e3cf8..e822953961cb 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -57,11 +57,8 @@ #include "TextConnectionHelper.hxx" #include <osl/diagnose.h> - -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star; OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) @@ -69,12 +66,8 @@ using namespace ::com::sun::star; return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) ); } - - //======================================================================== - //= OTextConnectionPageSetup - //======================================================================== + // OTextConnectionPageSetup DBG_NAME(OTextConnectionPageSetup) -//------------------------------------------------------------------------ OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_TEXT, _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE) { @@ -86,8 +79,6 @@ DBG_NAME(OTextConnectionPageSetup) FreeResource(); } - - // ----------------------------------------------------------------------- OTextConnectionPageSetup::~OTextConnectionPageSetup() { DELETEZ(m_pTextConnectionHelper); @@ -102,7 +93,6 @@ DBG_NAME(OTextConnectionPageSetup) return sal_True; } - bool OTextConnectionPageSetup::checkTestConnection() { bool bDoEnable = OConnectionTabPageSetup::checkTestConnection(); @@ -110,19 +100,16 @@ DBG_NAME(OTextConnectionPageSetup) return bDoEnable; } - // ----------------------------------------------------------------------- void OTextConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OConnectionTabPageSetup::fillControls(_rControlList); m_pTextConnectionHelper->fillControls(_rControlList); } - // ----------------------------------------------------------------------- void OTextConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OConnectionTabPageSetup::fillWindows(_rControlList); m_pTextConnectionHelper->fillWindows(_rControlList); } - // ----------------------------------------------------------------------- void OTextConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -132,8 +119,6 @@ DBG_NAME(OTextConnectionPageSetup) m_pTextConnectionHelper->implInitControls(_rSet, bValid); } - - // ----------------------------------------------------------------------- sal_Bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); @@ -141,21 +126,16 @@ DBG_NAME(OTextConnectionPageSetup) return bChangedSomething; } - sal_Bool OTextConnectionPageSetup::prepareLeave(){ return m_pTextConnectionHelper->prepareLeave(); } - OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) ); } - - //======================================================================== - //= OLDAPPageSetup - //======================================================================== + // OLDAPPageSetup OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs) ,m_aFTHeaderText (this, ModuleRes(FT_LDAP_HEADERTEXT)) @@ -179,7 +159,6 @@ DBG_NAME(OTextConnectionPageSetup) FreeResource(); } - // ----------------------------------------------------------------------- sal_Bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -203,7 +182,6 @@ DBG_NAME(OTextConnectionPageSetup) fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } - // ----------------------------------------------------------------------- void OLDAPConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostServer)); @@ -211,7 +189,6 @@ DBG_NAME(OTextConnectionPageSetup) _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBUseSSL)); } - // ----------------------------------------------------------------------- void OLDAPConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText)); @@ -220,14 +197,12 @@ DBG_NAME(OTextConnectionPageSetup) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTPortNumber)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDefaultPortNumber)); } - // ----------------------------------------------------------------------- void OLDAPConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) sal_Bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); - SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); @@ -240,7 +215,6 @@ DBG_NAME(OTextConnectionPageSetup) callModifiedHdl(); } - // ----------------------------------------------------------------------- IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/) { sal_Bool bRoadmapState = ((!m_aETHostServer.GetText().isEmpty() ) && ( !m_aETBaseDN.GetText().isEmpty() ) && (!m_aFTPortNumber.GetText().isEmpty() )); @@ -249,8 +223,6 @@ DBG_NAME(OTextConnectionPageSetup) return 0L; } - - // ----------------------------------------------------------------------- //OGenericAdministrationPage* OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) ); @@ -282,15 +254,12 @@ DBG_NAME(OMySQLIntroPageSetup) return true; } - // ----------------------------------------------------------------------- OMySQLIntroPageSetup::~OMySQLIntroPageSetup() { DBG_DTOR(OMySQLIntroPageSetup,NULL); } - - // ----------------------------------------------------------------------- void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/) { // show the "Connect directly" option only if the driver is installed @@ -310,26 +279,20 @@ DBG_NAME(OMySQLIntroPageSetup) m_aRB_JDBCDatabase.Check(); } - - // ----------------------------------------------------------------------- void OMySQLIntroPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - // ----------------------------------------------------------------------- void OMySQLIntroPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - - // ----------------------------------------------------------------------- sal_Bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/) { OSL_FAIL("Who called me?! Please ask oj for more information."); return sal_True; } - OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode() { if (m_aRB_JDBCDatabase.IsChecked()) @@ -340,10 +303,7 @@ DBG_NAME(OMySQLIntroPageSetup) return VIA_ODBC; } - // ======================================================================= - // = MySQLNativeSetupPage - // ======================================================================= - // ----------------------------------------------------------------------- + // MySQLNativeSetupPage MySQLNativeSetupPage::MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage( _pParent, ModuleRes( PAGE_DBWIZARD_MYSQL_NATIVE ), _rCoreAttrs ) ,m_aHeader ( this, ModuleRes( FT_SETUP_WIZARD_HEADER ) ) @@ -359,32 +319,27 @@ DBG_NAME(OMySQLIntroPageSetup) FreeResource(); } - // ----------------------------------------------------------------------- OGenericAdministrationPage* MySQLNativeSetupPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return new MySQLNativeSetupPage( pParent, _rAttrSet ); } - // ----------------------------------------------------------------------- void MySQLNativeSetupPage::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) { m_aMySQLSettings.fillControls( _rControlList ); } - // ----------------------------------------------------------------------- void MySQLNativeSetupPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new ODisableWrapper< FixedText >( &m_aHelpText ) ); m_aMySQLSettings.fillWindows( _rControlList ); } - // ----------------------------------------------------------------------- sal_Bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet ) { return m_aMySQLSettings.FillItemSet( _rSet ); } - // ----------------------------------------------------------------------- void MySQLNativeSetupPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) { m_aMySQLSettings.implInitControls( _rSet ); @@ -394,13 +349,11 @@ DBG_NAME(OMySQLIntroPageSetup) OnModified( NULL ); } - // ----------------------------------------------------------------------- Link MySQLNativeSetupPage::getControlModifiedLink() { return LINK( this, MySQLNativeSetupPage, OnModified ); } - // ----------------------------------------------------------------------- IMPL_LINK( MySQLNativeSetupPage, OnModified, Edit*, _pEdit ) { SetRoadmapStateValue( m_aMySQLSettings.canAdvance() ); @@ -408,9 +361,7 @@ DBG_NAME(OMySQLIntroPageSetup) return OGenericAdministrationPage::getControlModifiedLink().Call( _pEdit ); } - //======================================================================== - //= OMySQLJDBCConnectionPageSetup - //======================================================================== + // OMySQLJDBCConnectionPageSetup OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs) ,m_aFTHelpText (this, ModuleRes(FT_AUTOWIZARDHELPTEXT)) @@ -453,8 +404,6 @@ DBG_NAME(OMySQLIntroPageSetup) FreeResource(); } - - // ----------------------------------------------------------------------- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, @@ -467,7 +416,6 @@ DBG_NAME(OMySQLIntroPageSetup) STR_MYSQL_DRIVERCLASSTEXT) ); } - // ----------------------------------------------------------------------- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, @@ -480,7 +428,6 @@ DBG_NAME(OMySQLIntroPageSetup) STR_ORACLE_DRIVERCLASSTEXT) ); } - // ----------------------------------------------------------------------- void OGeneralSpecialJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDatabasename)); @@ -488,7 +435,6 @@ DBG_NAME(OMySQLIntroPageSetup) _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETHostname)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); } - // ----------------------------------------------------------------------- void OGeneralSpecialJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText)); @@ -499,7 +445,6 @@ DBG_NAME(OMySQLIntroPageSetup) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } - // ----------------------------------------------------------------------- sal_Bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -510,7 +455,6 @@ DBG_NAME(OMySQLIntroPageSetup) return bChangedSomething; } - // ----------------------------------------------------------------------- void OGeneralSpecialJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -550,7 +494,6 @@ DBG_NAME(OMySQLIntroPageSetup) SetRoadmapStateValue(bRoadmapState); } - // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -577,7 +520,6 @@ DBG_NAME(OMySQLIntroPageSetup) return 0L; } - // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit) { if ( _pEdit == &m_aETDriverClass ) @@ -588,16 +530,12 @@ DBG_NAME(OMySQLIntroPageSetup) return 0L; } - // ----------------------------------------------------------------------- OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } - - //======================================================================== - //= OMySQLJDBCConnectionPageSetup - //======================================================================== + // OMySQLJDBCConnectionPageSetup 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)) @@ -609,19 +547,16 @@ DBG_NAME(OMySQLIntroPageSetup) FreeResource(); } - // ----------------------------------------------------------------------- void OJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETDriverClass)); } - // ----------------------------------------------------------------------- void OJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } - // ----------------------------------------------------------------------- sal_Bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); @@ -629,7 +564,6 @@ DBG_NAME(OMySQLIntroPageSetup) return bChangedSomething; } - // ----------------------------------------------------------------------- void OJDBCConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -662,7 +596,6 @@ DBG_NAME(OMySQLIntroPageSetup) SetRoadmapStateValue(checkTestConnection()); } - bool OJDBCConnectionPageSetup::checkTestConnection() { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -671,8 +604,6 @@ DBG_NAME(OMySQLIntroPageSetup) return bEnableTestConnection; } - - // ----------------------------------------------------------------------- IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -697,7 +628,6 @@ DBG_NAME(OMySQLIntroPageSetup) return 0L; } - // ----------------------------------------------------------------------- IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit) { if ( _pEdit == &m_aETDriverClass ) @@ -708,7 +638,6 @@ DBG_NAME(OMySQLIntroPageSetup) return 0L; } - OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); @@ -726,20 +655,16 @@ DBG_NAME(OSpreadSheetConnectionPageSetup) FreeResource(); } - - // ----------------------------------------------------------------------- OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup() { DBG_DTOR(OSpreadSheetConnectionPageSetup,NULL); } - void OSpreadSheetConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - // ----------------------------------------------------------------------- void OSpreadSheetConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OConnectionTabPageSetup::fillControls(_rControlList); @@ -747,13 +672,11 @@ DBG_NAME(OSpreadSheetConnectionPageSetup) } - // ----------------------------------------------------------------------- void OSpreadSheetConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- sal_Bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); @@ -788,15 +711,12 @@ DBG_NAME(OAuthentificationPageSetup) LayoutHelper::fitSizeRightAligned( m_aPBTestConnection ); } - - // ----------------------------------------------------------------------- OAuthentificationPageSetup::~OAuthentificationPageSetup() { DBG_DTOR(OAuthentificationPageSetup,NULL); } - void OAuthentificationPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHelpText)); @@ -804,14 +724,12 @@ DBG_NAME(OAuthentificationPageSetup) _rControlList.push_back(new ODisableWrapper<PushButton>(&m_aPBTestConnection)); } - // ----------------------------------------------------------------------- void OAuthentificationPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aETUserName)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBPasswordRequired)); } - // ----------------------------------------------------------------------- void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -826,7 +744,6 @@ DBG_NAME(OAuthentificationPageSetup) m_aETUserName.ClearModifyFlag(); } - // ----------------------------------------------------------------------- sal_Bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -841,7 +758,6 @@ DBG_NAME(OAuthentificationPageSetup) return bChangedSomething; } - OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) { return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); @@ -897,8 +813,6 @@ DBG_NAME(OFinalDBPageSetup) } } - - // ----------------------------------------------------------------------- OFinalDBPageSetup::~OFinalDBPageSetup() { @@ -920,7 +834,6 @@ DBG_NAME(OFinalDBPageSetup) return m_aCBStartTableWizard.IsChecked() && m_aCBStartTableWizard.IsEnabled(); } - void OFinalDBPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalHeader)); @@ -929,7 +842,6 @@ DBG_NAME(OFinalDBPageSetup) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalText)); } - // ----------------------------------------------------------------------- void OFinalDBPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBOpenAfterwards)); @@ -938,7 +850,6 @@ DBG_NAME(OFinalDBPageSetup) _rControlList.push_back(new OSaveValueWrapper<RadioButton>(&m_aRBDontregisterDataSource)); } - // ----------------------------------------------------------------------- void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/) { m_aCBOpenAfterwards.Check(); @@ -949,12 +860,10 @@ DBG_NAME(OFinalDBPageSetup) m_aCBStartTableWizard.Enable(_bSupportsTableCreation); } - // ----------------------------------------------------------------------- sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ ) { return sal_True; } - // ----------------------------------------------------------------------------- IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox) { m_aCBStartTableWizard.Enable( _pBox->IsEnabled() && _pBox->IsChecked() ); @@ -962,9 +871,8 @@ DBG_NAME(OFinalDBPageSetup) // outta here return 0L; } -//......................................................................... } + // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index b561a3c6507c..f34eaa56e65e 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -31,16 +31,11 @@ #include <ucbhelper/content.hxx> #include <vcl/field.hxx> - -//......................................................................... namespace dbaui { -//......................................................................... - //======================================================================== - //= OSpreadSheetConnectionPageSetup - //======================================================================== + // OSpreadSheetConnectionPageSetup class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: @@ -59,9 +54,7 @@ namespace dbaui }; - //======================================================================== - //= OTextConnectionPage - //======================================================================== + // OTextConnectionPage class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: @@ -83,9 +76,7 @@ namespace dbaui DECL_LINK(ImplGetExtensionHdl, OTextConnectionHelper*); }; - //======================================================================== - //= OLDAPConnectionPageSetup - //======================================================================== + // OLDAPConnectionPageSetup class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: @@ -113,9 +104,7 @@ namespace dbaui CheckBox m_aCBUseSSL; }; - //======================================================================== - //= MySQLNativeSetupPage - //======================================================================== + // MySQLNativeSetupPage class MySQLNativeSetupPage : public OGenericAdministrationPage { private: @@ -141,9 +130,7 @@ namespace dbaui DECL_LINK( OnModified, Edit* ); }; - //======================================================================== - //= OGeneralSpecialJDBCConnectionPageSetup - //======================================================================== + // OGeneralSpecialJDBCConnectionPageSetup class OGeneralSpecialJDBCConnectionPageSetup : public OGenericAdministrationPage { public: @@ -176,7 +163,6 @@ namespace dbaui FixedText m_aFTDefaultPortNumber; NumericField m_aNFPortNumber; - FixedText m_aFTDriverClass; Edit m_aETDriverClass; PushButton m_aPBTestJavaDriver; @@ -185,10 +171,7 @@ namespace dbaui sal_uInt16 m_nPortId; }; - - //======================================================================== - //= OJDBCConnectionPageSetup - //======================================================================== + // OJDBCConnectionPageSetup class OJDBCConnectionPageSetup : public OConnectionTabPageSetup { public: @@ -210,11 +193,7 @@ namespace dbaui PushButton m_aPBTestJavaDriver; }; - - - //======================================================================== - //= OJDBCConnectionPageSetup - //======================================================================== + // OJDBCConnectionPageSetup class OMySQLIntroPageSetup : public OGenericAdministrationPage { public: @@ -234,9 +213,6 @@ namespace dbaui const Link& GetClickHdl() const { return maClickHdl; } DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); - - - protected: virtual sal_Bool FillItemSet(SfxItemSet& _rSet); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); @@ -256,12 +232,7 @@ namespace dbaui }; - - - - //======================================================================== - //= OAuthentificationPageSetup - //======================================================================== + // OAuthentificationPageSetup class OAuthentificationPageSetup : public OGenericAdministrationPage { public: @@ -284,11 +255,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); }; - - - //======================================================================== - //= OFinalDBPageSetup - //======================================================================== + // OFinalDBPageSetup class OFinalDBPageSetup : public OGenericAdministrationPage { public: @@ -323,9 +290,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 3054e182617a..3c3667cbc900 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DbAdminImpl.hxx" #include "dsmeta.hxx" @@ -73,10 +72,8 @@ #include <functional> #include <o3tl/compat_functional.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::dbtools; using namespace com::sun::star::uno; using namespace com::sun::star; @@ -90,7 +87,6 @@ using namespace com::sun::star::util; using namespace com::sun::star::container; using namespace com::sun::star::frame; -//------------------------------------------------------------------------- namespace { sal_Bool implCheckItemType( SfxItemSet& _rSet, const sal_uInt16 _nId, const TypeId _nExpectedItemType ) @@ -142,9 +138,7 @@ namespace } } - //======================================================================== - //= ODbDataSourceAdministrationHelper - //======================================================================== + // ODbDataSourceAdministrationHelper ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper) : m_xContext(_xORB) , m_pParent(_pParent) @@ -215,7 +209,7 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer ShowServiceNotAvailableError(_pParent->GetParent(), OUString("com.sun.star.sdb.DatabaseContext"), sal_True); } } - //------------------------------------------------------------------------- + sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyValue >& _rDriverParam) { OSL_ENSURE(m_pItemSetHelper->getOutputSet(), "ODbDataSourceAdministrationHelper::getCurrentSettings : not to be called without an example set!"); @@ -327,7 +321,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert return sal_True; } -//------------------------------------------------------------------------- + void ODbDataSourceAdministrationHelper::successfullyConnected() { OSL_ENSURE(m_pItemSetHelper->getOutputSet(), "ODbDataSourceAdministrationHelper::successfullyConnected: not to be called without an example set!"); @@ -346,13 +340,13 @@ void ODbDataSourceAdministrationHelper::successfullyConnected() } } } -//------------------------------------------------------------------------- + void ODbDataSourceAdministrationHelper::clearPassword() { if (m_pItemSetHelper->getWriteOutputSet()) m_pItemSetHelper->getWriteOutputSet()->ClearItem(DSID_PASSWORD); } -// ----------------------------------------------------------------------------- + ::std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection() { ::std::pair< Reference<XConnection>,sal_Bool> aRet; @@ -380,12 +374,12 @@ void ODbDataSourceAdministrationHelper::clearPassword() return aRet; } -// ----------------------------------------------------------------------------- + Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver() { return getDriver(getConnectionURL()); } -// ----------------------------------------------------------------------------- + Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString& _sURL) { // get the global DriverManager @@ -405,7 +399,6 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString throw SQLException(sCurrentActionError, getORB(), OUString("S1000"), 0, makeAny(aSQLWrapper)); } - Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL); if (!xDriver.is()) { @@ -417,7 +410,6 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString return xDriver; } -// ----------------------------------------------------------------------------- Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSource() { if ( !m_xDatasource.is() ) @@ -448,11 +440,10 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc } } - OSL_ENSURE(m_xDatasource.is(), "ODbDataSourceAdministrationHelper::getCurrentDataSource: no data source!"); return m_xDatasource; } -//------------------------------------------------------------------------- + OUString ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& _rSet ) { SFX_ITEMSET_GET( _rSet, pConnectURL, SfxStringItem, DSID_CONNECTURL, sal_True ); @@ -463,12 +454,11 @@ OUString ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& return pCollection->getType(pConnectURL->GetValue()); } -//------------------------------------------------------------------------- sal_Bool ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet& _rSet) const { return DataSourceMetaData::getAuthentication( getDatasourceType( _rSet ) ) != AuthNone; } -// ----------------------------------------------------------------------------- + String ODbDataSourceAdministrationHelper::getConnectionURL() const { OUString sNewUrl; @@ -560,15 +550,15 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const return sNewUrl; } -//------------------------------------------------------------------------- + struct PropertyValueLess { bool operator() (const PropertyValue& x, const PropertyValue& y) const { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning }; + DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet); -//........................................................................ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPropertySet >& _rxSource, SfxItemSet& _rDest) { Sequence< OUString > aTableFitler; @@ -655,7 +645,6 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr } } -//------------------------------------------------------------------------- void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _rSource, const Reference< XPropertySet >& _rxDest) { OSL_ENSURE(_rxDest.is(), "ODbDataSourceAdministrationHelper::translateProperties: invalid property set!"); @@ -668,7 +657,6 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r catch(Exception&) { } const OUString sUrlProp("URL"); - // ----------------------------- // transfer the direct properties for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin(); aDirect != m_aDirectPropTranslator.end(); @@ -698,7 +686,6 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r } } - // ------------------------------- // now for the indirect properties Sequence< PropertyValue > aInfo; @@ -715,8 +702,6 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r lcl_putProperty(_rxDest,PROPERTY_INFO, makeAny(aInfo)); } - -//------------------------------------------------------------------------- void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rSource, Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo) { // within the current "Info" sequence, replace the ones we can examine from the item set @@ -850,7 +835,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } } } -//------------------------------------------------------------------------- + Any ODbDataSourceAdministrationHelper::implTranslateProperty(const SfxPoolItem* _pItem) { // translate the SfxPoolItem @@ -893,7 +878,7 @@ Any ODbDataSourceAdministrationHelper::implTranslateProperty(const SfxPoolItem* return aValue; } -//------------------------------------------------------------------------- + void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< XPropertySet >& _rxSet, const OUString& _rName, const SfxPoolItem* _pItem) { Any aValue = implTranslateProperty(_pItem); @@ -901,7 +886,6 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty(const Reference< X } #if OSL_DEBUG_LEVEL > 0 -//------------------------------------------------------------------------- OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) { OUString aString; @@ -921,9 +905,9 @@ OString ODbDataSourceAdministrationHelper::translatePropertyId( sal_Int32 _nId ) OString aReturn( aString.getStr(), aString.getLength(), RTL_TEXTENCODING_ASCII_US ); return aReturn; } + #endif -//------------------------------------------------------------------------- void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet, sal_Int32 _nId, const Any& _rValue ) { switch ( _rValue.getValueType().getTypeClass() ) @@ -1034,7 +1018,6 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet } } - String ODbDataSourceAdministrationHelper::getDocumentUrl(SfxItemSet& _rDest) { SFX_ITEMSET_GET(_rDest, pUrlItem, SfxStringItem, DSID_DOCUMENT_URL, sal_True); @@ -1042,8 +1025,6 @@ String ODbDataSourceAdministrationHelper::getDocumentUrl(SfxItemSet& _rDest) return pUrlItem->GetValue(); } - -// ----------------------------------------------------------------------------- void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) { OUString eType = getDatasourceType(_rDest); @@ -1101,7 +1082,7 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) _rDest.Put(SfxInt32Item(nPortNumberId, nPortNumber)); } -// ----------------------------------------------------------------------------- + sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSource) { // put the remembered settings into the property set @@ -1113,48 +1094,39 @@ sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSour return sal_True; } -// ----------------------------------------------------------------------------- + void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName ) { OSL_ENSURE( !m_aDataSourceOrName.hasValue(), "ODbDataSourceAdministrationHelper::setDataSourceOrName: already have one!" ); // hmm. We could reset m_xDatasource/m_xModel, probably, and continue working m_aDataSourceOrName = _rDataSourceOrName; } -//========================================================================= -//= DbuTypeCollectionItem -//========================================================================= + +// DbuTypeCollectionItem TYPEINIT1(DbuTypeCollectionItem, SfxPoolItem); -//------------------------------------------------------------------------- DbuTypeCollectionItem::DbuTypeCollectionItem(sal_Int16 _nWhich, ::dbaccess::ODsnTypeCollection* _pCollection) :SfxPoolItem(_nWhich) ,m_pCollection(_pCollection) { } -//------------------------------------------------------------------------- DbuTypeCollectionItem::DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource) :SfxPoolItem(_rSource) ,m_pCollection(_rSource.getCollection()) { } -//------------------------------------------------------------------------- int DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const { DbuTypeCollectionItem* pCompare = PTR_CAST(DbuTypeCollectionItem, &_rItem); return pCompare && (pCompare->getCollection() == getCollection()); } -//------------------------------------------------------------------------- SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const { return new DbuTypeCollectionItem(*this); } -//......................................................................... } // namespace dbaui -//......................................................................... - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index e72c40fe9828..391c0cc71e9e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -33,10 +33,8 @@ #include <svl/poolitem.hxx> class Window; -//......................................................................... namespace dbaui { -//......................................................................... namespace DataSourceInfoConverter { void convert(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> & xContext, @@ -46,9 +44,7 @@ namespace dbaui const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource); }; class IItemSetHelper; - //======================================================================== - //= ODbDataSourceAdministrationHelper - //======================================================================== + // ODbDataSourceAdministrationHelper class ODbDataSourceAdministrationHelper { public: @@ -66,7 +62,6 @@ namespace dbaui typedef ::std::set< 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; @@ -172,9 +167,7 @@ namespace dbaui #endif }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DBADMINIMPL_HXX_ diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 0d4c5ec8dd49..d211173ab422 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -47,10 +47,8 @@ using namespace ::com::sun::star::beans; using namespace ::dbaui; using namespace ::dbtools; -//======================================================================== // class ORelationDialog DBG_NAME(ORelationDialog) -//======================================================================== ORelationDialog::ORelationDialog( OJoinTableView* pParent, const TTableConnectionData::value_type& pConnectionData, sal_Bool bAllowTableSelect ) @@ -79,7 +77,6 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, m_xConnection = pParent->getDesignView()->getController().getConnection(); - ////////////////////////////////////////////////////////////////////// // Connection kopieren m_pConnData.reset( static_cast<ORelationTableConnectionData*>(pConnectionData->NewInstance()) ); m_pConnData->CopyFrom( *pConnectionData ); @@ -102,7 +99,6 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, FreeResource(); } -//------------------------------------------------------------------------ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionData) { ORelationTableConnectionData* pConnData = static_cast<ORelationTableConnectionData*>(_pConnectionData.get()); @@ -147,19 +143,13 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD } } -//------------------------------------------------------------------------ ORelationDialog::~ORelationDialog() { DBG_DTOR(ORelationDialog,NULL); } -//------------------------------------------------------------------------ - - -//------------------------------------------------------------------------ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) { - ////////////////////////////////////////////////////////////////////// // RadioButtons auslesen sal_uInt16 nAttrib = 0; @@ -229,8 +219,6 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) return 0; } - -//------------------------------------------------------------------------ short ORelationDialog::Execute() { short nResult = ModalDialog::Execute(); @@ -239,22 +227,20 @@ short ORelationDialog::Execute() return nResult; } -// ----------------------------------------------------------------------------- + TTableConnectionData::value_type ORelationDialog::getConnectionData() const { return m_pConnData; } -// ----------------------------------------------------------------------------- + void ORelationDialog::setValid(sal_Bool _bValid) { aPB_OK.Enable(_bValid); } -// ----------------------------------------------------------------------------- + void ORelationDialog::notifyConnectionChange() { Init(m_pConnData); } -// ----------------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 78f8b60582c3..3332d9600a0c 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TablesSingleDlg.hxx" #include "DbAdminImpl.hxx" #include "tablespage.hxx" @@ -29,10 +28,8 @@ #include "dbu_dlg.hrc" -//......................................................................... namespace dbaui { -//......................................................................... using namespace com::sun::star::uno; using namespace com::sun::star::sdbc; using namespace com::sun::star::lang; @@ -40,9 +37,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; DBG_NAME(OTableSubscriptionDialog) - //======================================================================== - //= OTableSubscriptionDialog - //======================================================================== + // OTableSubscriptionDialog OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB @@ -64,13 +59,13 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent pTabPage->SetServiceFactory(_rxORB); SetTabPage(pTabPage); } -// ----------------------------------------------------------------------------- + OTableSubscriptionDialog::~OTableSubscriptionDialog() { DBG_DTOR(OTableSubscriptionDialog,NULL); delete m_pOutSet; } -// ----------------------------------------------------------------------------- + short OTableSubscriptionDialog::Execute() { short nRet = RET_CANCEL; @@ -85,46 +80,42 @@ short OTableSubscriptionDialog::Execute() } return nRet; } -// ----------------------------------------------------------------------------- + sal_Bool OTableSubscriptionDialog::getCurrentSettings(Sequence< PropertyValue >& _rDriverParams) { return m_pImpl->getCurrentSettings(_rDriverParams); } -// ----------------------------------------------------------------------------- + void OTableSubscriptionDialog::successfullyConnected() { m_pImpl->successfullyConnected(); } -// ----------------------------------------------------------------------------- + void OTableSubscriptionDialog::clearPassword() { m_pImpl->clearPassword(); } -// ----------------------------------------------------------------------------- + String OTableSubscriptionDialog::getConnectionURL() const { return m_pImpl->getConnectionURL(); } -// ----------------------------------------------------------------------------- + Reference< XPropertySet > OTableSubscriptionDialog::getCurrentDataSource() { return m_pImpl->getCurrentDataSource(); } -// ----------------------------------------------------------------------------- + const SfxItemSet* OTableSubscriptionDialog::getOutputSet() const { return m_pOutSet; } -// ----------------------------------------------------------------------------- + SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet() { return m_pOutSet; } -// ----------------------------------------------------------------------------- -//......................................................................... -} // 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 ca3a915e1023..c5342066ac94 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -30,21 +30,16 @@ #include <rtl/ustring.hxx> #include <vcl/lstbox.hxx> - -//......................................................................... namespace dbaui { -//......................................................................... #define TC_EXTENSION ((short)0x01) // a section specifying the extension of the files to connect to #define TC_SEPARATORS ((short)0x02) // a section specifying the various separators #define TC_HEADER ((short)0x04) // a section containing the "Text contains header" check box only #define TC_CHARSET ((short)0x08) // not yet implemented - //======================================================================== - //= OTextConnectionPage - //======================================================================== + // OTextConnectionPage class OTextConnectionHelper : public Control { OTextConnectionHelper(); @@ -95,7 +90,6 @@ namespace dbaui 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); @@ -106,9 +100,7 @@ namespace dbaui sal_Bool prepareLeave(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_DBWIZ2_HXX diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index ad921e5e97e5..a7c45a665f58 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "UserAdmin.hxx" #include "UserAdmin.hrc" #include "UITools.hxx" @@ -51,7 +50,6 @@ using namespace dbaui; using namespace ucbhelper; using namespace comphelper; - class OPasswordDialog : public ModalDialog { FixedLine aFLUser; @@ -65,7 +63,6 @@ class OPasswordDialog : public ModalDialog CancelButton aCancelBtn; HelpButton aHelpBtn; - DECL_LINK( OKHdl_Impl, void * ); DECL_LINK( ModifiedHdl, Edit * ); @@ -103,7 +100,7 @@ OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : aOKBtn.SetClickHdl( LINK( this, OPasswordDialog, OKHdl_Impl ) ); aEDOldPassword.SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) ); } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl) { if( aEDPassword.GetText() == aEDPasswordRepeat.GetText() ) @@ -119,7 +116,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl) } return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit ) { aOKBtn.Enable(!pEdit->GetText().isEmpty()); @@ -127,9 +124,7 @@ IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit ) } DBG_NAME(OUserAdmin); -//================================================================================ // OUserAdmin -//================================================================================ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, ModuleRes(TAB_PAGE_USERADMIN), _rAttrSet) ,m_FL_USER( this , ModuleRes(FL_USER)) @@ -150,13 +145,13 @@ OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) FreeResource(); } -// ----------------------------------------------------------------------- + OUserAdmin::~OUserAdmin() { DBG_DTOR(OUserAdmin,NULL); m_xConnection = NULL; } -// ----------------------------------------------------------------------- + void OUserAdmin::FillUserNames() { if(m_xConnection.is()) @@ -203,12 +198,12 @@ void OUserAdmin::FillUserNames() m_TableCtrl.Enable(m_xUsers.is()); } -// ----------------------------------------------------------------------- + SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserAdmin( pParent, _rAttrSet ) ); } -// ----------------------------------------------------------------------- + IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) { try @@ -281,7 +276,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( OUserAdmin, ListDblClickHdl, ListBox *, /*pListBox*/ ) { m_TableCtrl.setUserName(GetUser()); @@ -291,20 +286,19 @@ IMPL_LINK( OUserAdmin, ListDblClickHdl, ListBox *, /*pListBox*/ ) return 0; } -// ----------------------------------------------------------------------- String OUserAdmin::GetUser() { return m_LB_USER.GetSelectEntry(); } -// ----------------------------------------------------------------------------- + void OUserAdmin::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } -// ----------------------------------------------------------------------- + void OUserAdmin::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } -// ----------------------------------------------------------------------------- + void OUserAdmin::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { m_TableCtrl.setComponentContext(m_xORB); diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 7d80108db023..94adc9a4e17a 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "adminpages.hxx" #include "DbAdminImpl.hxx" #include "dbu_dlg.hrc" @@ -39,20 +38,16 @@ #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; - //======================================================================== - //= OUserAdminDlg + // OUserAdminDlg DBG_NAME(OUserAdminDlg) -//======================================================================== OUserAdminDlg::OUserAdminDlg(Window* _pParent , SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB @@ -81,7 +76,6 @@ DBG_NAME(OUserAdminDlg) FreeResource(); } - // ----------------------------------------------------------------------- OUserAdminDlg::~OUserAdminDlg() { if ( m_bOwnConnection ) @@ -100,7 +94,6 @@ DBG_NAME(OUserAdminDlg) DBG_DTOR(OUserAdminDlg,NULL); } - // ----------------------------------------------------------------------- short OUserAdminDlg::Execute() { try @@ -126,7 +119,6 @@ DBG_NAME(OUserAdminDlg) m_pImpl->saveChanges(*GetOutputItemSet()); return nRet; } - //------------------------------------------------------------------------- void OUserAdminDlg::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) { // register ourself as modified listener @@ -140,17 +132,14 @@ DBG_NAME(OUserAdminDlg) SfxTabDialog::PageCreated(_nId, _rPage); } - // ----------------------------------------------------------------------------- const SfxItemSet* OUserAdminDlg::getOutputSet() const { return m_pItemSet; } - // ----------------------------------------------------------------------------- SfxItemSet* OUserAdminDlg::getWriteOutputSet() { return m_pItemSet; } - // ----------------------------------------------------------------------------- ::std::pair< Reference<XConnection>,sal_Bool> OUserAdminDlg::createConnection() { if ( !m_xConnection.is() ) @@ -160,43 +149,34 @@ DBG_NAME(OUserAdminDlg) } return ::std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,sal_False); } - // ----------------------------------------------------------------------------- Reference< XComponentContext > OUserAdminDlg::getORB() const { return m_pImpl->getORB(); } - // ----------------------------------------------------------------------------- Reference< XDriver > OUserAdminDlg::getDriver() { return m_pImpl->getDriver(); } - // ----------------------------------------------------------------------------- OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } - // ----------------------------------------------------------------------------- void OUserAdminDlg::clearPassword() { m_pImpl->clearPassword(); } - // ----------------------------------------------------------------------------- void OUserAdminDlg::setTitle(const OUString& _sTitle) { SetText(_sTitle); } - //------------------------------------------------------------------------- void OUserAdminDlg::enableConfirmSettings( bool _bEnable ) { (void)_bEnable; } - //------------------------------------------------------------------------- sal_Bool OUserAdminDlg::saveDatasource() { return PrepareLeaveCurrentPage(); } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 425d577fe2b3..5b3f51313721 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "admincontrols.hxx" #include "admincontrols.hrc" #include "dbu_dlg.hrc" @@ -28,14 +27,10 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= TextResetOperatorEventFilter - //==================================================================== + // TextResetOperatorEventFilter class TextResetOperatorEventFilter : public ::svt::IWindowEventFilter { public: @@ -52,9 +47,7 @@ namespace dbaui } }; - //==================================================================== - //= TextResetOperator - //==================================================================== + // TextResetOperator class TextResetOperator :public ::svt::IWindowOperator { public: @@ -71,7 +64,6 @@ namespace dbaui String m_sUserText; }; - //-------------------------------------------------------------------- void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const { OSL_ENSURE( _rTrigger.GetWindow() == &_rOperateOn, "TextResetOperator::operateOn: you're misusing this implementation!" ); @@ -103,9 +95,7 @@ namespace dbaui } } - //==================================================================== - //= TextResetOperatorController - //==================================================================== + // TextResetOperatorController class TextResetOperatorController_Base { protected: @@ -135,10 +125,7 @@ namespace dbaui } }; - //==================================================================== - //= MySQLNativeSettings - //==================================================================== - //-------------------------------------------------------------------- + // MySQLNativeSettings MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( sal_False ) ) ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) @@ -182,12 +169,10 @@ namespace dbaui #endif } - //-------------------------------------------------------------------- MySQLNativeSettings::~MySQLNativeSettings() { } - //-------------------------------------------------------------------- void MySQLNativeSettings::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new OSaveValueWrapper< Edit >( &m_aDatabaseName ) ); @@ -197,7 +182,6 @@ namespace dbaui _rControlList.push_back( new OSaveValueWrapper< Edit >( &m_aNamedPipe ) ); } - //-------------------------------------------------------------------- void MySQLNativeSettings::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new ODisableWrapper< FixedText >( &m_aDatabaseNameLabel ) ); @@ -208,7 +192,6 @@ namespace dbaui _rControlList.push_back( new ODisableWrapper< RadioButton >( &m_aNamedPipeRadio ) ); } - //-------------------------------------------------------------------- sal_Bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -225,7 +208,6 @@ namespace dbaui return bChangedSomething; } - //-------------------------------------------------------------------- void MySQLNativeSettings::implInitControls(const SfxItemSet& _rSet ) { SFX_ITEMSET_GET( _rSet, pInvalid, SfxBoolItem, DSID_INVALID_SELECTION, sal_True ); @@ -270,7 +252,6 @@ namespace dbaui m_aHostPortRadio.Check(); } - //-------------------------------------------------------------------- bool MySQLNativeSettings::canAdvance() const { if ( m_aDatabaseName.GetText().isEmpty() ) @@ -297,8 +278,6 @@ namespace dbaui return true; } -//........................................................................ } // namespace dbaui -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index b3eee71fa204..aafa8c9bd7c9 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -28,14 +28,10 @@ #include <svtools/dialogcontrolling.hxx> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= MySQLNativeSettings - //==================================================================== + // MySQLNativeSettings class MySQLNativeSettings : public Control { private: @@ -68,9 +64,7 @@ namespace dbaui bool canAdvance() const; }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_ADMINCONTROLS_HXX diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 3fbebe0a9cd7..f3fafe8eba8d 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "adminpages.hxx" #include "dbadmin.hrc" #include "dbadmin.hxx" @@ -44,10 +43,8 @@ #include <algorithm> #include <stdlib.h> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -60,11 +57,8 @@ namespace dbaui { } - //========================================================================= - //= OGenericAdministrationPage - //========================================================================= + // OGenericAdministrationPage DBG_NAME(OGenericAdministrationPage) - //------------------------------------------------------------------------- OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rAttrSet) ,m_abEnableRoadmap(sal_False) @@ -77,7 +71,6 @@ namespace dbaui SetExchangeSupport(sal_True); } - //------------------------------------------------------------------------- OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet) ,m_abEnableRoadmap(sal_False) @@ -90,7 +83,6 @@ namespace dbaui SetExchangeSupport(sal_True); } - //------------------------------------------------------------------------- OGenericAdministrationPage::~OGenericAdministrationPage() { DELETEZ(m_pFT_HeaderText); @@ -98,7 +90,6 @@ namespace dbaui DBG_DTOR(OGenericAdministrationPage,NULL); } - //------------------------------------------------------------------------- int OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) @@ -111,12 +102,10 @@ namespace dbaui return LEAVE_PAGE; } - //------------------------------------------------------------------------- void OGenericAdministrationPage::Reset(const SfxItemSet& _rCoreAttrs) { implInitControls(_rCoreAttrs, sal_False); } - //------------------------------------------------------------------------- void OGenericAdministrationPage::ActivatePage() { TabPage::ActivatePage(); @@ -124,13 +113,11 @@ namespace dbaui if ( m_pItemSetHelper ) ActivatePage(*m_pItemSetHelper->getOutputSet()); } - //------------------------------------------------------------------------- void OGenericAdministrationPage::ActivatePage(const SfxItemSet& _rSet) { implInitControls(_rSet, sal_True); } - // ----------------------------------------------------------------------- void OGenericAdministrationPage::getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly) { SFX_ITEMSET_GET(_rSet, pInvalid, SfxBoolItem, DSID_INVALID_SELECTION, sal_True); @@ -139,14 +126,11 @@ namespace dbaui _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue()); } - - // ----------------------------------------------------------------------- IMPL_LINK_NOARG(OGenericAdministrationPage, OnControlModified) { callModifiedHdl(); return 0L; } - // ----------------------------------------------------------------------- sal_Bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn,OUString& _sCurr) { // collect all ODBC data source names @@ -174,7 +158,6 @@ namespace dbaui return sal_True; } - // ----------------------------------------------------------------------- void OGenericAdministrationPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -198,24 +181,20 @@ namespace dbaui aControlList.clear(); } - // ----------------------------------------------------------------------- void OGenericAdministrationPage::initializePage() { OSL_ENSURE(m_pItemSetHelper,"NO ItemSetHelper set!"); if ( m_pItemSetHelper ) Reset(*m_pItemSetHelper->getOutputSet()); } - // ----------------------------------------------------------------------- sal_Bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason ) { return sal_True; } - // ----------------------------------------------------------------------- bool OGenericAdministrationPage::canAdvance() const { return true; } - // ----------------------------------------------------------------------- void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, sal_Bool& _bChangedSomething, bool _bRevertValue ) { if ( (_pCheckBox != NULL ) && ( _pCheckBox->GetState() != _pCheckBox->GetSavedValue() ) ) @@ -237,7 +216,6 @@ namespace dbaui _bChangedSomething = sal_True; } } - // ----------------------------------------------------------------------- void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething) { if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().toInt32()) ) @@ -246,7 +224,6 @@ namespace dbaui _bChangedSomething = sal_True; } } - // ----------------------------------------------------------------------- void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething) { if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) ) @@ -263,7 +240,6 @@ namespace dbaui _pWindow->SetControlFont( aFont ); } - // ----------------------------------------------------------------------- IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -315,10 +291,7 @@ namespace dbaui SetControlFontWeight(m_pFT_HeaderText); } - //========================================================================= - //= LayoutHelper - //========================================================================= - //------------------------------------------------------------------------- + // LayoutHelper void LayoutHelper::positionBelow( const Control& _rReference, Control& _rControl, const ControlRelation _eRelation, const long _nIndentAppFont ) { @@ -332,7 +305,6 @@ namespace dbaui _rControl.SetPosPixel( aControlPos ); } - //------------------------------------------------------------------------- void LayoutHelper::fitSizeRightAligned( PushButton& io_button ) { const Point aOldPos = io_button.GetPosPixel(); @@ -350,8 +322,6 @@ 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 2a9d08c4e741..51920b8af890 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -27,13 +27,10 @@ #include <vcl/field.hxx> #include <vcl/fixed.hxx> - class NumericField; class Edit; -//......................................................................... namespace dbaui { -//......................................................................... /// helper class to wrap the savevalue and disable call class SAL_NO_VTABLE ISaveValueWrapper { @@ -89,9 +86,7 @@ namespace dbaui } }; - //========================================================================= - //= OGenericAdministrationPage - //========================================================================= + // OGenericAdministrationPage class IDatabaseSettingsDialog; class IItemSetHelper; class OGenericAdministrationPage :public SfxTabPage @@ -250,17 +245,13 @@ namespace dbaui virtual Link getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); } }; - //========================================================================= - //= ControlRelation - //========================================================================= + // ControlRelation enum ControlRelation { RelatedControls, UnrelatedControls }; - //========================================================================= - //= LayoutHelper - //========================================================================= + // LayoutHelper class LayoutHelper { public: @@ -276,11 +267,8 @@ namespace dbaui // why is CalcMinimumSize not a virtual method of ::Window? }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_ADMINPAGES_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index a6dcb45b0f97..bab5f57149d6 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -59,6 +59,7 @@ OUString getAdoDatalink(long hWnd,OUString& oldLink) dataLink=reinterpret_cast<sal_Unicode *>(PromptNew(hWnd)); return dataLink; } + BSTR PromptNew(long hWnd) { BSTR connstr=NULL; @@ -205,6 +206,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr) CoUninitialize(); return _result; } + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 68c5c1a6969c..0aac084a2ea8 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -52,12 +52,10 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace dbtools; -// TableObjectListFacade ------------------------------------------------------- TableObjectListFacade::~TableObjectListFacade() { } -// TableListFacade ------------------------------------------------------------- class TableListFacade : public ::cppu::BaseMutex , public TableObjectListFacade , public ::comphelper::OContainerListener @@ -221,7 +219,6 @@ bool TableListFacade::isLeafSelected() const return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry ); } -// QueryListFacade ------------------------------------------------------------- class QueryListFacade : public ::cppu::BaseMutex , public TableObjectListFacade , public ::comphelper::OContainerListener @@ -318,7 +315,6 @@ bool QueryListFacade::isLeafSelected() const return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry ); } -// OAddTableDlg ---------------------------------------------------------------- OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) :ModelessDialog( pParent, ModuleRes(DLG_JOIN_TABADD) ) ,m_aCaseTables( this, ModuleRes( RB_CASE_TABLES ) ) diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 868d8a82119c..5ca65870a78f 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -35,10 +35,8 @@ #include <vcl/msgbox.hxx> -//........................................................................ namespace dbaui { -//........................................................................ using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XMultiServiceFactory; @@ -49,9 +47,7 @@ namespace dbaui using ::com::sun::star::sdbc::XConnection; using ::com::sun::star::sdbc::XDriver; - //======================================================================== - //= SpecialSettingsPage - //======================================================================== + // SpecialSettingsPage struct BooleanSettingDesc { CheckBox** ppControl; // the dialog's control which displays this setting @@ -60,9 +56,7 @@ namespace dbaui bool bInvertedDisplay; // true if and only if the checkbox is checked when the item is sal_False, and vice versa }; - //======================================================================== - //= SpecialSettingsPage - //======================================================================== + // SpecialSettingsPage SpecialSettingsPage::SpecialSettingsPage( Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) :OGenericAdministrationPage( pParent, ModuleRes( PAGE_ADVANCED_SETTINGS_SPECIAL ), _rCoreAttrs ) ,m_aTopLine( this, ModuleRes( FL_DATAHANDLING ) ) @@ -173,7 +167,6 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- SpecialSettingsPage::~SpecialSettingsPage() { m_aControlDependencies.clear(); @@ -200,7 +193,6 @@ namespace dbaui DELETEZ( m_pMaxRowScan ); } - // ----------------------------------------------------------------------- void SpecialSettingsPage::impl_initBooleanSettings() { OSL_PRECOND( m_aBooleanSettings.empty(), "SpecialSettingsPage::impl_initBooleanSettings: called twice!" ); @@ -232,7 +224,6 @@ namespace dbaui } } - // ----------------------------------------------------------------------- void SpecialSettingsPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) { if ( m_bHasBooleanComparisonMode ) @@ -245,7 +236,6 @@ namespace dbaui } } - // ----------------------------------------------------------------------- void SpecialSettingsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { for ( BooleanSettingDescs::const_iterator setting = m_aBooleanSettings.begin(); @@ -265,7 +255,6 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pMaxRowScan)); } - // ----------------------------------------------------------------------- void SpecialSettingsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -331,7 +320,6 @@ namespace dbaui OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- sal_Bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -363,10 +351,7 @@ namespace dbaui return bChangedSomething; } - //======================================================================== - //= GeneratedValuesPage - //======================================================================== - //------------------------------------------------------------------------ + // GeneratedValuesPage GeneratedValuesPage::GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, ModuleRes( PAGE_GENERATED_VALUES ), _rCoreAttrs) ,m_aAutoFixedLine ( this, ModuleRes( FL_SEPARATORAUTO ) ) @@ -386,13 +371,11 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- GeneratedValuesPage::~GeneratedValuesPage() { m_aControlDependencies.clear(); } - // ----------------------------------------------------------------------- void GeneratedValuesPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new ODisableWrapper< FixedLine >( &m_aAutoFixedLine ) ); @@ -400,7 +383,6 @@ namespace dbaui _rControlList.push_back( new ODisableWrapper< FixedText >( &m_aAutoRetrievingLabel ) ); } - // ----------------------------------------------------------------------- void GeneratedValuesPage::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new OSaveValueWrapper< CheckBox >( &m_aAutoRetrievingEnabled ) ); @@ -408,7 +390,6 @@ namespace dbaui _rControlList.push_back( new OSaveValueWrapper< Edit >( &m_aAutoRetrieving ) ); } - // ----------------------------------------------------------------------- void GeneratedValuesPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -434,7 +415,6 @@ namespace dbaui OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue ); } - // ----------------------------------------------------------------------- sal_Bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; @@ -446,10 +426,7 @@ namespace dbaui return bChangedSomething; } - //======================================================================== - //= AdvancedSettingsDialog - //======================================================================== - //------------------------------------------------------------------------ + // AdvancedSettingsDialog AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems, const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName ) :SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems) @@ -481,14 +458,12 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- AdvancedSettingsDialog::~AdvancedSettingsDialog() { SetInputSet(NULL); DELETEZ(pExampleSet); } - // ----------------------------------------------------------------------- bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( const OUString& _sURL ) { DataSourceMetaData aMeta( _sURL ); @@ -498,7 +473,6 @@ namespace dbaui return false; } - // ----------------------------------------------------------------------- short AdvancedSettingsDialog::Execute() { short nRet = SfxTabDialog::Execute(); @@ -510,7 +484,6 @@ namespace dbaui return nRet; } - //------------------------------------------------------------------------- void AdvancedSettingsDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) { // register ourself as modified listener @@ -525,68 +498,56 @@ namespace dbaui SfxTabDialog::PageCreated(_nId, _rPage); } - // ----------------------------------------------------------------------------- const SfxItemSet* AdvancedSettingsDialog::getOutputSet() const { return pExampleSet; } - // ----------------------------------------------------------------------------- SfxItemSet* AdvancedSettingsDialog::getWriteOutputSet() { return pExampleSet; } - // ----------------------------------------------------------------------------- ::std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection() { return m_pImpl->createConnection(); } - // ----------------------------------------------------------------------------- Reference< XComponentContext > AdvancedSettingsDialog::getORB() const { return m_pImpl->getORB(); } - // ----------------------------------------------------------------------------- Reference< XDriver > AdvancedSettingsDialog::getDriver() { return m_pImpl->getDriver(); } - // ----------------------------------------------------------------------------- OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } - // ----------------------------------------------------------------------------- void AdvancedSettingsDialog::clearPassword() { m_pImpl->clearPassword(); } - // ----------------------------------------------------------------------------- void AdvancedSettingsDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } - //------------------------------------------------------------------------- void AdvancedSettingsDialog::enableConfirmSettings( bool _bEnable ) { (void)_bEnable; } - //------------------------------------------------------------------------- sal_Bool AdvancedSettingsDialog::saveDatasource() { return PrepareLeaveCurrentPage(); } -//........................................................................ } // namespace dbaui -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index c980d59d6e4c..b042389196f0 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -30,17 +30,13 @@ #include <vector> -//........................................................................ namespace dbaui { -//........................................................................ struct BooleanSettingDesc; typedef ::std::vector< BooleanSettingDesc > BooleanSettingDescs; - //==================================================================== - //= SpecialSettingsPage - //==================================================================== + // SpecialSettingsPage /** implements the "Special Settings" page of the advanced database settings */ class SpecialSettingsPage : public OGenericAdministrationPage @@ -99,9 +95,7 @@ namespace dbaui void impl_initBooleanSettings(); }; - //==================================================================== - //= GeneratedValuesPage - //==================================================================== + // GeneratedValuesPage class GeneratedValuesPage : public OGenericAdministrationPage { protected: @@ -138,9 +132,7 @@ namespace dbaui DECL_LINK( OnCheckBoxClick, CheckBox * ); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_ADVANCEDSETTINGS_HXX diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 865e2c80565f..f43a0830b1b4 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ConnectionPage.hxx" #include "DbAdminImpl.hxx" #include "DriverSettings.hxx" @@ -39,10 +38,8 @@ #include <unotools/confignode.hxx> #include <vcl/msgbox.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace com::sun::star::uno; using namespace com::sun::star::sdbc; using namespace com::sun::star::lang; @@ -50,11 +47,8 @@ using namespace com::sun::star::util; using namespace com::sun::star::beans; using namespace com::sun::star::container; -//========================================================================= -//= ODbAdminDialog -//========================================================================= +// ODbAdminDialog DBG_NAME(ODbAdminDialog) -//------------------------------------------------------------------------- ODbAdminDialog::ODbAdminDialog(Window* _pParent , SfxItemSet* _pItems , const Reference< XComponentContext >& _rxContext @@ -77,7 +71,6 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent FreeResource(); } -//------------------------------------------------------------------------- ODbAdminDialog::~ODbAdminDialog() { SetInputSet(NULL); @@ -85,7 +78,7 @@ ODbAdminDialog::~ODbAdminDialog() DBG_DTOR(ODbAdminDialog,NULL); } -//------------------------------------------------------------------------- + short ODbAdminDialog::Ok() { SfxTabDialog::Ok(); @@ -94,7 +87,6 @@ short ODbAdminDialog::Ok() // TODO : AR_ERROR is not handled correctly, we always close the dialog here } -//------------------------------------------------------------------------- void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) { // register ourself as modified listener @@ -109,7 +101,6 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SfxTabDialog::PageCreated(_nId, _rPage); } -// ----------------------------------------------------------------------------- void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc) { // open our own resource block, as the page titles are strings local to this block @@ -119,7 +110,6 @@ void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, Cre m_aCurrentDetailPages.push(_nPageId); } -//------------------------------------------------------------------------- void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName) { m_pImpl->setDataSourceOrName(_aDataSourceName); @@ -186,7 +176,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD } } -//------------------------------------------------------------------------- void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasource) { // the selection is valid if and only if we have a datasource now @@ -239,22 +228,22 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou SetUpdateMode(sal_True); } -// ----------------------------------------------------------------------------- + void ODbAdminDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } -//------------------------------------------------------------------------- + void ODbAdminDialog::enableConfirmSettings( bool _bEnable ) { (void)_bEnable; } -//------------------------------------------------------------------------- + sal_Bool ODbAdminDialog::saveDatasource() { return PrepareLeaveCurrentPage(); } -//------------------------------------------------------------------------- + ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() { if (!PrepareLeaveCurrentPage()) @@ -275,48 +264,47 @@ ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges() return AR_LEAVE_MODIFIED; } -//------------------------------------------------------------------------- + void ODbAdminDialog::selectDataSource(const ::com::sun::star::uno::Any& _aDataSourceName) { impl_selectDataSource(_aDataSourceName); } -// ----------------------------------------------------------------------------- const SfxItemSet* ODbAdminDialog::getOutputSet() const { return GetExampleSet(); } -// ----------------------------------------------------------------------------- + SfxItemSet* ODbAdminDialog::getWriteOutputSet() { return pExampleSet; } -// ----------------------------------------------------------------------------- + ::std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection() { return m_pImpl->createConnection(); } -// ----------------------------------------------------------------------------- + Reference< XComponentContext > ODbAdminDialog::getORB() const { return m_pImpl->getORB(); } -// ----------------------------------------------------------------------------- + Reference< XDriver > ODbAdminDialog::getDriver() { return m_pImpl->getDriver(); } -// ----------------------------------------------------------------------------- + OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } -// ----------------------------------------------------------------------------- + void ODbAdminDialog::clearPassword() { m_pImpl->clearPassword(); } -//------------------------------------------------------------------------- + SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection) { // just to be sure .... @@ -466,7 +454,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp return _rpSet; } -//------------------------------------------------------------------------- + void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults) { // _first_ delete the set (refering the pool) @@ -490,8 +478,6 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 2e5f7bfc3ed5..38d513fcd07f 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -40,7 +40,6 @@ using namespace ::svt; const OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III")); -// ODbaseIndexDialog ---------------------------------------------------------- DBG_NAME(ODbaseIndexDialog) ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName ) @@ -426,7 +425,6 @@ void ODbaseIndexDialog::SetCtrls() checkButtons(); } -// OTableInfo ------------------------------------------------------------------ void OTableInfo::WriteInfFile( const String& rDSN ) const { // open INF file diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 9a299e14595e..2ee8a043485c 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -28,14 +28,10 @@ #include <list> #include <comphelper/stl_types.hxx> -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OTableIndex -//========================================================================= +// OTableIndex /// represents a single dbf index class OTableIndex { @@ -51,13 +47,10 @@ public: String GetIndexFileName() const { return aIndexFileName; } }; -//------------------------------------------------------------------------- typedef ::std::list< OTableIndex > TableIndexList; DECLARE_STL_ITERATORS(TableIndexList); -//========================================================================= -//= OTableInfo -//========================================================================= +// OTableInfo class ODbaseIndexDialog; /** holds the INF file of a table */ @@ -75,11 +68,9 @@ public: void WriteInfFile( const String& rDSN ) const; }; -//------------------------------------------------------------------------- typedef ::std::list< OTableInfo > TableInfoList; DECLARE_STL_ITERATORS(TableInfoList); -////////////////////////////////////////////////////////////////////////// // IndexDialog class ODbaseIndexDialog : public ModalDialog { @@ -136,9 +127,7 @@ public: virtual ~ODbaseIndexDialog(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DBFINDEX_HXX_ diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 639febdf98f7..c24b9b23201b 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbwiz.hxx" #include "dbadmin.hrc" #include "dbu_dlg.hrc" @@ -39,10 +38,8 @@ #include "DbAdminImpl.hxx" #include "dbaccess_helpid.hrc" -//......................................................................... namespace dbaui { -//......................................................................... using namespace svt; using namespace com::sun::star::uno; using namespace com::sun::star::sdbc; @@ -65,12 +62,8 @@ using namespace com::sun::star::container; #define ADDITIONAL_USERDEFINED 11 #define ADDITIONAL_PAGE_MYSQL_NATIVE 12 - DBG_NAME(ODbTypeWizDialog) -//========================================================================= -//= ODbTypeWizDialog -//========================================================================= -//------------------------------------------------------------------------- +// ODbTypeWizDialog ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB @@ -111,13 +104,12 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ActivatePage(); } -//------------------------------------------------------------------------- ODbTypeWizDialog::~ODbTypeWizDialog() { DBG_DTOR(ODbTypeWizDialog,NULL); delete m_pOutSet; } -//------------------------------------------------------------------------- + IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage) { m_eType = _pTabPage->GetSelectedType(); @@ -126,7 +118,7 @@ IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage) enableButtons(WZB_FINISH,!bURLRequired); return 1L; } -//------------------------------------------------------------------------- + WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCurrentState ) const { WizardTypes::WizardState nNextState = WZS_INVALID_STATE; @@ -205,43 +197,41 @@ WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCur return nNextState; } -// ----------------------------------------------------------------------------- const SfxItemSet* ODbTypeWizDialog::getOutputSet() const { return m_pOutSet; } -// ----------------------------------------------------------------------------- + SfxItemSet* ODbTypeWizDialog::getWriteOutputSet() { return m_pOutSet; } -// ----------------------------------------------------------------------------- + ::std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialog::createConnection() { return m_pImpl->createConnection(); } -// ----------------------------------------------------------------------------- + Reference< XComponentContext > ODbTypeWizDialog::getORB() const { return m_pImpl->getORB(); } -// ----------------------------------------------------------------------------- + Reference< XDriver > ODbTypeWizDialog::getDriver() { return m_pImpl->getDriver(); } -// ----------------------------------------------------------------------------- + OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const { return m_pImpl->getDatasourceType(_rSet); } -// ----------------------------------------------------------------------------- + void ODbTypeWizDialog::clearPassword() { m_pImpl->clearPassword(); } -// ----------------------------------------------------------------------------- TabPage* ODbTypeWizDialog::createPage(WizardState _nState) { sal_uInt16 nStringId = STR_PAGETITLE_ADVANCED; @@ -311,7 +301,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) } return pPage; } -// ----------------------------------------------------------------------------- + sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState) { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState)); @@ -319,12 +309,12 @@ sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState) pPage->FillItemSet(*m_pOutSet); return sal_True; } -// ----------------------------------------------------------------------------- + void ODbTypeWizDialog::setTitle(const OUString& _sTitle) { SetText(_sTitle); } -//------------------------------------------------------------------------- + void ODbTypeWizDialog::enableConfirmSettings( bool _bEnable ) { enableButtons( WZB_FINISH, _bEnable ); @@ -335,7 +325,7 @@ void ODbTypeWizDialog::enableConfirmSettings( bool _bEnable ) // Plus, the concept must also care for the case where those pages are embedded into // anormal tab dialog. } -//------------------------------------------------------------------------- + sal_Bool ODbTypeWizDialog::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); @@ -348,20 +338,19 @@ sal_Bool ODbTypeWizDialog::saveDatasource() DataSourceInfoConverter::convert( getORB(), m_pCollection,sOldURL,m_eType,m_pImpl->getCurrentDataSource()); return sal_True; } -// ----------------------------------------------------------------------------- + IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPage ) const { OGenericAdministrationPage* pPage = static_cast<OGenericAdministrationPage*>(_pCurrentPage); return pPage; } -// ----------------------------------------------------------------------------- + sal_Bool ODbTypeWizDialog::onFinish() { saveDatasource(); return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False; } -//......................................................................... + } // 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 ed8c3e29fdaf..5f12461e2025 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbwizsetup.hxx" #include "dsmeta.hxx" #include "DBSetupConnectionPages.hxx" @@ -73,8 +72,6 @@ #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> - - #include <svl/filenotation.hxx> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> @@ -86,11 +83,8 @@ #include <memory> - -//......................................................................... namespace dbaui { -//......................................................................... using namespace dbtools; using namespace svt; using namespace com::sun::star; @@ -111,10 +105,7 @@ using namespace ::comphelper; using namespace ::cppu; DBG_NAME(ODbTypeWizDialogSetup) -//========================================================================= -//= ODbTypeWizDialogSetup -//========================================================================= -//------------------------------------------------------------------------- +// ODbTypeWizDialogSetup ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB @@ -284,14 +275,12 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const return sRoadmapItem; } -//------------------------------------------------------------------------- ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup() { delete m_pOutSet; DBG_DTOR(ODbTypeWizDialogSetup,NULL); } -//------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage*, /*_pTabPage*/) { activateDatabasePath(); @@ -312,7 +301,7 @@ void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::co } } } -// ----------------------------------------------------------------------------- + void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xContext, const ::dbaccess::ODsnTypeCollection* _pCollection,const OUString& _sOldURLPrefix,const OUString& _sNewURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDatasource) { if ( _pCollection->getPrefix(_sOldURLPrefix) == _pCollection->getPrefix(_sNewURLPrefix) ) @@ -330,7 +319,7 @@ void DataSourceInfoConverter::convert(const Reference<XComponentContext> & xCont aDS >>= aInfo; _xDatasource->setPropertyValue(PROPERTY_INFO,uno::makeAny(aInfo)); } -//------------------------------------------------------------------------- + void ODbTypeWizDialogSetup::activateDatabasePath() { switch ( m_pGeneralPage->GetDatabaseCreationMode() ) @@ -376,7 +365,6 @@ void ODbTypeWizDialogSetup::activateDatabasePath() // the Next button in such a case. However, not for this patch ... } -//------------------------------------------------------------------------- void ODbTypeWizDialogSetup::updateTypeDependentStates() { sal_Bool bDoEnable = sal_False; @@ -394,14 +382,11 @@ void ODbTypeWizDialogSetup::updateTypeDependentStates() enableButtons( WZB_FINISH, bDoEnable); } - -//------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::IsConnectionUrlRequired() { return m_pCollection->isConnectionUrlRequired(m_sURL); } -//------------------------------------------------------------------------- void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatasource) { // remove all items which relate to indirect properties from the input set @@ -418,33 +403,32 @@ void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatas // extract all relevant data from the property set of the data source m_pImpl->translateProperties(_rxDatasource, *getWriteOutputSet()); } -// ----------------------------------------------------------------------------- + const SfxItemSet* ODbTypeWizDialogSetup::getOutputSet() const { return m_pOutSet; } -// ----------------------------------------------------------------------------- + SfxItemSet* ODbTypeWizDialogSetup::getWriteOutputSet() { return m_pOutSet; } -// ----------------------------------------------------------------------------- + ::std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialogSetup::createConnection() { return m_pImpl->createConnection(); } -// ----------------------------------------------------------------------------- + Reference< XComponentContext > ODbTypeWizDialogSetup::getORB() const { return m_pImpl->getORB(); } -// ----------------------------------------------------------------------------- + Reference< XDriver > ODbTypeWizDialogSetup::getDriver() { return m_pImpl->getDriver(); } - ::dbaccess::DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const { ::dbaccess::DATASOURCE_TYPE LocDatabaseType = _DatabaseType; @@ -466,9 +450,6 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() return LocDatabaseType; } - - -// ----------------------------------------------------------------------------- OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const { OUString sRet = m_pImpl->getDatasourceType(_rSet); @@ -490,13 +471,11 @@ OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const return sRet; } -// ----------------------------------------------------------------------------- void ODbTypeWizDialogSetup::clearPassword() { m_pImpl->clearPassword(); } -// ----------------------------------------------------------------------------- TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) { SfxTabPage* pFirstPage; @@ -600,7 +579,6 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) return pPage; } - IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _pConnectionPageSetup) { m_bIsConnectable = _pConnectionPageSetup->GetRoadmapStateValue( ); @@ -614,8 +592,6 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _ return sal_True; } - -// ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) { OUString sURLPrefix; @@ -635,21 +611,18 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt return sal_True; } -// ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPageWizard*, /*_pGeneralPage*/) { activateDatabasePath(); return sal_True; } -// ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPageWizard*, /*_pGeneralPage*/) { enableButtons( WZB_FINISH, m_pGeneralPage->GetSelectedDocument().sURL.Len() != 0 ); return 0L; } -// ----------------------------------------------------------------------------- IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard*, /*_pGeneralPage*/) { if ( prepareLeaveCurrentState( eFinish ) ) @@ -657,7 +630,6 @@ IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPageWizard*, /* return 0L; } -// ----------------------------------------------------------------------------- void ODbTypeWizDialogSetup::enterState(WizardState _nState) { m_sURL = m_pImpl->getDatasourceType(*m_pOutSet); @@ -675,7 +647,6 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState) } } -//------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); @@ -684,8 +655,6 @@ sal_Bool ODbTypeWizDialogSetup::saveDatasource() return sal_True; } - -// ----------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) { if (_nState == PAGE_DBSETUPWIZARD_MYSQL_INTRO) @@ -698,20 +667,17 @@ sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState) return pPage && pPage->DeactivatePage(m_pOutSet) != 0; } -// ----------------------------------------------------------------------------- void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/) { OSL_FAIL( "ODbTypeWizDialogSetup::setTitle: not implemented!" ); // why? } -//------------------------------------------------------------------------- void ODbTypeWizDialogSetup::enableConfirmSettings( bool _bEnable ) { (void)_bEnable; } -//------------------------------------------------------------------------- namespace { bool lcl_handle( const Reference< XInteractionHandler2 >& _rxHandler, const Any& _rRequest ) @@ -725,7 +691,6 @@ namespace } } -//------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), 0) ); @@ -777,7 +742,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } return sal_False; } - // ------------------------------------------------------------------------ + sal_Bool ODbTypeWizDialogSetup::IsDatabaseDocumentToBeOpened() const { if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting ) @@ -789,7 +754,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() return sal_True; } - // ------------------------------------------------------------------------ sal_Bool ODbTypeWizDialogSetup::IsTableWizardToBeStarted() const { if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting ) @@ -801,7 +765,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() return sal_False; } - //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::CreateDatabase() { OUString sUrl; @@ -830,7 +793,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() m_pImpl->saveChanges(*m_pOutSet); } - //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const OUString& _sPath) { Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); @@ -841,8 +803,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() xDatabaseContext->registerObject(sDatabaseName, xDatasource); } - - //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::callSaveAsDialog() { sal_Bool bRet = sal_False; @@ -881,7 +841,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() return bRet; } - //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); @@ -899,7 +858,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } } - //------------------------------------------------------------------------- String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); @@ -919,17 +877,14 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } return aExistenceCheck.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); } - // ----------------------------------------------------------------------------- IWizardPageController* ODbTypeWizDialogSetup::getPageController( TabPage* _pCurrentPage ) const { OGenericAdministrationPage* pPage = static_cast<OGenericAdministrationPage*>(_pCurrentPage); return pPage; } - // ----------------------------------------------------------------------------- namespace { - // ............................................................................. typedef ::cppu::WeakImplHelper1 < XTerminateListener > AsyncLoader_Base; class AsyncLoader : public AsyncLoader_Base @@ -956,7 +911,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() DECL_LINK( OnOpenDocument, void* ); }; - // ............................................................................. AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const OUString& _rURL ) :m_sURL( _rURL ) ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) ) @@ -973,7 +927,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } } - // ............................................................................. void AsyncLoader::doLoadAsync() { OSL_ENSURE( !m_aAsyncCaller.IsRunning(), "AsyncLoader:doLoadAsync: already running!" ); @@ -989,7 +942,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() m_aAsyncCaller.Call( NULL ); } - // ............................................................................. IMPL_LINK( AsyncLoader, OnOpenDocument, void*, /*_pEmptyArg*/ ) { try @@ -1027,23 +979,19 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() return 0L; } - // ............................................................................. void SAL_CALL AsyncLoader::queryTermination( const com::sun::star::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) { throw TerminationVetoException(); } - // ............................................................................. void SAL_CALL AsyncLoader::notifyTermination( const com::sun::star::lang::EventObject& /*Event*/ ) throw (RuntimeException) { } - // ............................................................................. void SAL_CALL AsyncLoader::disposing( const com::sun::star::lang::EventObject& /*Source*/ ) throw (RuntimeException) { } } - // ----------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::onFinish() { if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting ) @@ -1082,8 +1030,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } } -//......................................................................... } // 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 c822b6de009e..379cc306b342 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> - #include "detailpages.hxx" #include "sqlmessage.hxx" #include "dsmeta.hxx" @@ -49,10 +48,8 @@ #include <comphelper/types.hxx> #include "AutoControls.hrc" -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -61,11 +58,8 @@ namespace dbaui using namespace ::com::sun::star::container; using namespace ::dbtools; - //======================================================================== - //= OCommonBehaviourTabPage - //======================================================================== + // OCommonBehaviourTabPage DBG_NAME(OCommonBehaviourTabPage) - //------------------------------------------------------------------------ OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource) @@ -123,7 +117,6 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- OCommonBehaviourTabPage::~OCommonBehaviourTabPage() { DELETEZ(m_pOptionsLabel); @@ -144,7 +137,6 @@ namespace dbaui DBG_DTOR(OCommonBehaviourTabPage,NULL); } - // ----------------------------------------------------------------------- void OCommonBehaviourTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS) @@ -158,7 +150,6 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharsetLabel)); } } - // ----------------------------------------------------------------------- void OCommonBehaviourTabPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS) @@ -168,7 +159,6 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharset)); } - // ----------------------------------------------------------------------- void OCommonBehaviourTabPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -195,7 +185,6 @@ namespace dbaui } OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- sal_Bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; @@ -214,11 +203,8 @@ namespace dbaui return bChangedSomething; } - //======================================================================== - //= ODbaseDetailsPage - //======================================================================== + // ODbaseDetailsPage DBG_NAME(ODbaseDetailsPage) - //------------------------------------------------------------------------ ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false) ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS)) @@ -237,26 +223,22 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- ODbaseDetailsPage::~ODbaseDetailsPage() { DBG_DTOR(ODbaseDetailsPage,NULL); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new ODbaseDetailsPage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- void ODbaseDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aShowDeleted)); } - // ----------------------------------------------------------------------- void ODbaseDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); @@ -264,7 +246,6 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFT_Message)); _rControlList.push_back(new ODisableWrapper<PushButton>(&m_aIndexes)); } - // ----------------------------------------------------------------------- void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -290,7 +271,6 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- sal_Bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -299,7 +279,6 @@ namespace dbaui return bChangedSomething; } - //------------------------------------------------------------------------ IMPL_LINK( ODbaseDetailsPage, OnButtonClicked, Button*, pButton ) { if (&m_aIndexes == pButton) @@ -317,11 +296,8 @@ namespace dbaui return 0; } - //======================================================================== - //= OAdoDetailsPage - //======================================================================== + // OAdoDetailsPage DBG_NAME(OAdoDetailsPage) - // ----------------------------------------------------------------------- OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs, CBTP_USE_CHARSET ) { @@ -329,22 +305,17 @@ namespace dbaui } - // ----------------------------------------------------------------------- OAdoDetailsPage::~OAdoDetailsPage() { DBG_DTOR(OAdoDetailsPage,NULL); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAdoDetailsPage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- - //======================================================================== - //= OOdbcDetailsPage - //======================================================================== + // OOdbcDetailsPage 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)) @@ -362,32 +333,27 @@ namespace dbaui pWindows[i]->SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- sal_Bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); return bChangedSomething; } - // ----------------------------------------------------------------------- void OOdbcDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aUseCatalog)); } - // ----------------------------------------------------------------------- void OOdbcDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - // ----------------------------------------------------------------------- void OOdbcDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -401,9 +367,7 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - //======================================================================== - //= OOdbcDetailsPage - //======================================================================== + // OOdbcDetailsPage OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS ,false) @@ -417,13 +381,11 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- sal_Bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -434,7 +396,6 @@ namespace dbaui return bChangedSomething; } - // ----------------------------------------------------------------------- void OUserDriverDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); @@ -442,14 +403,12 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aUseCatalog)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); } - // ----------------------------------------------------------------------- void OUserDriverDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aPortNumber)); } - // ----------------------------------------------------------------------- void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -473,23 +432,18 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - //======================================================================== - //= OMySQLODBCDetailsPage - //======================================================================== + // OMySQLODBCDetailsPage OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_MYSQL_ODBC, _rCoreAttrs, CBTP_USE_CHARSET ) { } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLODBCDetailsPage( pParent, _rAttrSet ) ); } - //======================================================================== - //= OMySQLJDBCDetailsPage - //======================================================================== + // OMySQLJDBCDetailsPage OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId) :OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false) ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) @@ -545,7 +499,6 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- void OGeneralSpecialJDBCDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); @@ -555,7 +508,6 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDSocket)); } - // ----------------------------------------------------------------------- void OGeneralSpecialJDBCDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); @@ -567,7 +519,6 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - // ----------------------------------------------------------------------- sal_Bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -579,7 +530,6 @@ namespace dbaui return bChangedSomething; } - // ----------------------------------------------------------------------- void OGeneralSpecialJDBCDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -618,7 +568,6 @@ namespace dbaui m_aEDDriverClass.SetModifyFlag(); } } - // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -645,7 +594,6 @@ namespace dbaui aMsg.Execute(); return 0L; } - // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit) { if ( m_bUseClass && _pEdit == &m_aEDDriverClass ) @@ -656,9 +604,7 @@ namespace dbaui return 0L; } - //======================================================================== - //= MySQLNativePage - //======================================================================== + // MySQLNativePage MySQLNativePage::MySQLNativePage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_MYSQL_NATIVE, _rCoreAttrs, CBTP_USE_CHARSET, false ) ,m_aSeparator1 ( this, ModuleRes( FL_SEPARATOR1) ) @@ -682,7 +628,6 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- void MySQLNativePage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls( _rControlList ); @@ -691,7 +636,6 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aUserName)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aPasswordRequired)); } - // ----------------------------------------------------------------------- void MySQLNativePage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows( _rControlList ); @@ -702,7 +646,6 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aUserNameLabel)); } - // ----------------------------------------------------------------------- sal_Bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet ); @@ -719,7 +662,6 @@ namespace dbaui return bChangedSomething; } - // ----------------------------------------------------------------------- void MySQLNativePage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -741,26 +683,21 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- 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 ) { return ( new MySQLNativePage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) ); } - //======================================================================== - //= OLDAPDetailsPage - //======================================================================== + // OLDAPDetailsPage OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs,0,false) ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) @@ -784,13 +721,11 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- sal_Bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -801,7 +736,6 @@ namespace dbaui fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } - //------------------------------------------------------------------------ IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, CheckBox*, pCheckBox ) { callModifiedHdl(); @@ -821,7 +755,6 @@ namespace dbaui return 0; } - // ----------------------------------------------------------------------- void OLDAPDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); @@ -830,7 +763,6 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFRowCount)); } - // ----------------------------------------------------------------------- void OLDAPDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); @@ -839,14 +771,12 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTRowCount)); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - // ----------------------------------------------------------------------- void OLDAPDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) sal_Bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); - SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, sal_True); SFX_ITEMSET_GET(_rSet, pUseSSL, SfxBoolItem, DSID_CONN_LDAP_USESSL, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); @@ -863,12 +793,8 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - - //======================================================================== - //= OTextDetailsPage - //======================================================================== + // OTextDetailsPage DBG_NAME(OTextDetailsPage) - //------------------------------------------------------------------------ OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, PAGE_TEXT, _rCoreAttrs, 0, false ) { @@ -878,7 +804,6 @@ namespace dbaui FreeResource(); } - // ----------------------------------------------------------------------- OTextDetailsPage::~OTextDetailsPage() { DELETEZ(m_pTextConnectionHelper); @@ -886,26 +811,22 @@ namespace dbaui DBG_DTOR(OTextDetailsPage,NULL); } - // ----------------------------------------------------------------------- SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextDetailsPage( pParent, _rAttrSet ) ); } - // ----------------------------------------------------------------------- void OTextDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); m_pTextConnectionHelper->fillControls(_rControlList); } - // ----------------------------------------------------------------------- void OTextDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); m_pTextConnectionHelper->fillWindows(_rControlList); } - // ----------------------------------------------------------------------- void OTextDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -916,7 +837,6 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - // ----------------------------------------------------------------------- sal_Bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet); @@ -924,27 +844,22 @@ namespace dbaui return bChangedSomething; } - // ----------------------------------------------------------------------- sal_Bool OTextDetailsPage::prepareLeave() { return m_pTextConnectionHelper->prepareLeave(); } - //------------------------------------------------------------------------ SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { return new GeneratedValuesPage( _pParent, _rAttrSet ); } - //------------------------------------------------------------------------ SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) { OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet ); DataSourceMetaData aMetaData( eType ); return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); } -//......................................................................... } // 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 9e1a3e792e7a..bf04af7a25c3 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -33,14 +33,9 @@ #include <svtools/dialogcontrolling.hxx> - -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= OCommonBehaviourTabPage - //========================================================================= + // OCommonBehaviourTabPage #define CBTP_NONE 0x00000000 #define CBTP_USE_CHARSET 0x00000002 #define CBTP_USE_OPTIONS 0x00000004 @@ -90,9 +85,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); }; - //======================================================================== - //= ODbaseDetailsPage - //======================================================================== + // ODbaseDetailsPage class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: @@ -121,9 +114,7 @@ namespace dbaui DECL_LINK( OnButtonClicked, Button * ); }; - //======================================================================== - //= OAdoDetailsPage - //======================================================================== + // OAdoDetailsPage class OAdoDetailsPage : public OCommonBehaviourTabPage { protected: @@ -133,9 +124,7 @@ namespace dbaui OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); }; - //======================================================================== - //= OOdbcDetailsPage - //======================================================================== + // OOdbcDetailsPage class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: @@ -151,10 +140,7 @@ namespace dbaui CheckBox m_aUseCatalog; }; - - //======================================================================== - //= OUserDriverDetailsPage - //======================================================================== + // OUserDriverDetailsPage class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: @@ -173,18 +159,14 @@ namespace dbaui CheckBox m_aUseCatalog; }; - //======================================================================== - //= OMySQLODBCDetailsPage - //======================================================================== + // OMySQLODBCDetailsPage class OMySQLODBCDetailsPage : public OCommonBehaviourTabPage { public: OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); }; - //======================================================================== - //= OGeneralSpecialJDBCDetailsPage - //======================================================================== + // OGeneralSpecialJDBCDetailsPage class OGeneralSpecialJDBCDetailsPage : public OCommonBehaviourTabPage { public: @@ -196,7 +178,6 @@ namespace dbaui protected: - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -222,9 +203,7 @@ namespace dbaui bool m_bUseClass; }; - //======================================================================== - //= MySQLNativePage - //======================================================================== + // MySQLNativePage class MySQLNativePage : public OCommonBehaviourTabPage { public: @@ -247,9 +226,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); }; - //======================================================================== - //= OOdbcDetailsPage - //======================================================================== + // OOdbcDetailsPage class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: @@ -275,9 +252,7 @@ namespace dbaui DECL_LINK( OnCheckBoxClick, CheckBox * ); }; - //======================================================================== - //= OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook - //======================================================================== + // OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook class OMozillaDetailsPage : public OCommonBehaviourTabPage { protected: @@ -287,9 +262,7 @@ namespace dbaui OMozillaDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); }; - //======================================================================== - //= OTextDetailsPage - //======================================================================== + // OTextDetailsPage class OTextDetailsPage : public OCommonBehaviourTabPage { public: @@ -314,9 +287,7 @@ namespace dbaui private: }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 8393306ec1b3..5568a1fa1a72 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "directsql.hxx" #include "dbu_dlg.hrc" #include <vcl/msgbox.hxx> @@ -28,20 +27,15 @@ #include <rtl/strbuf.hxx> #include <com/sun/star/sdbc/XRow.hpp> -//........................................................................ namespace dbaui { -//........................................................................ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - //==================================================================== - //= DirectSQLDialog - //==================================================================== + // DirectSQLDialog DBG_NAME(DirectSQLDialog) -//-------------------------------------------------------------------- DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn ) :ModalDialog(_pParent, "DirectSQLDialog" , "dbaccess/ui/directsqldialog.ui") ,m_nHistoryLimit(20) @@ -82,7 +76,6 @@ DBG_NAME(DirectSQLDialog) OnStatementModified(m_pSQL); } - //-------------------------------------------------------------------- DirectSQLDialog::~DirectSQLDialog() { { @@ -93,7 +86,6 @@ DBG_NAME(DirectSQLDialog) DBG_DTOR(DirectSQLDialog,NULL); } - //-------------------------------------------------------------------- void DirectSQLDialog::_disposing( const EventObject& _rSource ) { SolarMutexGuard aSolarGuard; @@ -112,14 +104,12 @@ DBG_NAME(DirectSQLDialog) PostUserEvent(LINK(this, DirectSQLDialog, OnClose)); } - //-------------------------------------------------------------------- sal_Int32 DirectSQLDialog::getHistorySize() const { CHECK_INVARIANTS("DirectSQLDialog::getHistorySize"); return m_aStatementHistory.size(); } - //-------------------------------------------------------------------- void DirectSQLDialog::implEnsureHistoryLimit() { CHECK_INVARIANTS("DirectSQLDialog::implEnsureHistoryLimit"); @@ -137,7 +127,6 @@ DBG_NAME(DirectSQLDialog) } } - //-------------------------------------------------------------------- void DirectSQLDialog::implAddToStatementHistory(const String& _rStatement) { CHECK_INVARIANTS("DirectSQLDialog::implAddToStatementHistory"); @@ -158,7 +147,6 @@ DBG_NAME(DirectSQLDialog) } #ifdef DBG_UTIL - //-------------------------------------------------------------------- const sal_Char* DirectSQLDialog::impl_CheckInvariants() const { if (m_aStatementHistory.size() != m_aNormalizedHistory.size()) @@ -177,7 +165,6 @@ DBG_NAME(DirectSQLDialog) } #endif - //-------------------------------------------------------------------- void DirectSQLDialog::implExecuteStatement(const String& _rStatement) { CHECK_INVARIANTS("DirectSQLDialog::implExecuteStatement"); @@ -250,7 +237,6 @@ DBG_NAME(DirectSQLDialog) addStatusText(sStatus); } - //-------------------------------------------------------------------- void DirectSQLDialog::addStatusText(const String& _rMessage) { OUString sAppendMessage = OUString::number(m_nStatusCount++) + ": " + _rMessage + "\n\n"; @@ -261,7 +247,6 @@ DBG_NAME(DirectSQLDialog) m_pStatus->SetSelection(Selection(sCompleteMessage.getLength(), sCompleteMessage.getLength())); } - //-------------------------------------------------------------------- void DirectSQLDialog::addOutputText(const String& _rMessage) { String sAppendMessage = _rMessage; @@ -272,7 +257,6 @@ DBG_NAME(DirectSQLDialog) m_pOutput->SetText(sCompleteMessage); } - //-------------------------------------------------------------------- void DirectSQLDialog::executeCurrent() { CHECK_INVARIANTS("DirectSQLDialog::executeCurrent"); @@ -289,7 +273,6 @@ DBG_NAME(DirectSQLDialog) m_pSQL->GrabFocus(); } - //-------------------------------------------------------------------- void DirectSQLDialog::switchToHistory(sal_Int32 _nHistoryPos, sal_Bool _bUpdateListBox) { CHECK_INVARIANTS("DirectSQLDialog::switchToHistory"); @@ -316,28 +299,24 @@ DBG_NAME(DirectSQLDialog) OSL_FAIL("DirectSQLDialog::switchToHistory: invalid position!"); } - //-------------------------------------------------------------------- IMPL_LINK( DirectSQLDialog, OnStatementModified, void*, /*NOTINTERESTEDIN*/ ) { m_pExecute->Enable(!m_pSQL->GetText().isEmpty()); return 0L; } - //-------------------------------------------------------------------- IMPL_LINK( DirectSQLDialog, OnClose, void*, /*NOTINTERESTEDIN*/ ) { EndDialog( RET_OK ); return 0L; } - //-------------------------------------------------------------------- IMPL_LINK( DirectSQLDialog, OnExecute, void*, /*NOTINTERESTEDIN*/ ) { executeCurrent(); return 0L; } - //-------------------------------------------------------------------- IMPL_LINK( DirectSQLDialog, OnListEntrySelected, void*, /*NOTINTERESTEDIN*/ ) { if (!m_pSQLHistory->IsTravelSelect()) @@ -349,8 +328,6 @@ DBG_NAME(DirectSQLDialog) return 0L; } -//........................................................................ } // namespace dbaui -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index e4d6da3151b3..708cf96ea6a5 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -34,7 +34,6 @@ using namespace dbaui; DBG_NAME(SbaSbAttrDlg) -//================================================================== SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumberFormatter* pFormatter, sal_uInt16 nFlags, sal_Bool bRow) : SfxTabDialog(pParent, ModuleRes( DLG_ATTR ), pCellAttrs ) ,aTitle(ModuleRes(ST_ROW)) @@ -56,7 +55,6 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumb FreeResource(); } -// ----------------------------------------------------------------------- SbaSbAttrDlg::~SbaSbAttrDlg() { delete pNumberInfoItem; @@ -64,7 +62,6 @@ SbaSbAttrDlg::~SbaSbAttrDlg() DBG_DTOR(SbaSbAttrDlg,NULL); } -// ----------------------------------------------------------------------- void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); @@ -82,5 +79,4 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 18d934094ccc..09cd05a08091 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dlgsave.hxx" #include "dlgsave.hrc" #include <vcl/msgbox.hxx> @@ -39,7 +38,6 @@ #include "objectnamecheck.hxx" #include <tools/diagnose_ex.h> - using namespace dbaui; using namespace dbtools; using namespace ::com::sun::star::uno; @@ -81,9 +79,9 @@ public: const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags); }; -// ----------------------------------------------------------------------------- + } // dbaui -// ----------------------------------------------------------------------------- + OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, const sal_Int32& _rType, const Reference< XConnection>& _xConnection, @@ -121,7 +119,7 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, m_aCatalog.SetDropDownLineCount( 10 ); m_aSchema.SetDropDownLineCount( 10 ); } -// ----------------------------------------------------------------------------- + OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, @@ -147,10 +145,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, m_aSchema.SetDropDownLineCount( 10 ); } -// ----------------------------------------------------------------------------- using namespace ::com::sun::star::lang; -//================================================================== namespace { typedef Reference< XResultSet > (SAL_CALL XDatabaseMetaData::*FGetMetaStrings)(); @@ -185,7 +181,6 @@ namespace } } -//================================================================== OSaveAsDlg::OSaveAsDlg( Window * pParent, const sal_Int32& _rType, const Reference< XComponentContext >& _rxContext, @@ -301,7 +296,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, implInit(); } -// ----------------------------------------------------------------------------- + OSaveAsDlg::OSaveAsDlg( Window * pParent, const Reference< XComponentContext >& _rxContext, const String& rDefault, @@ -315,12 +310,12 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, implInitOnlyTitle(_sLabel); implInit(); } -// ----------------------------------------------------------------------------- + OSaveAsDlg::~OSaveAsDlg() { DELETEZ(m_pImpl); } -// ----------------------------------------------------------------------------- + IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) { if (pButton == &m_pImpl->m_aPB_OK) @@ -350,7 +345,6 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) } return 0; } -// ----------------------------------------------------------------------------- IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit ) { @@ -358,7 +352,7 @@ IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit ) m_pImpl->m_aPB_OK.Enable(!m_pImpl->m_aTitle.GetText().isEmpty()); return 0; } -// ----------------------------------------------------------------------------- + void OSaveAsDlg::implInitOnlyTitle(const String& _rLabel) { m_pImpl->m_aLabel.SetText(_rLabel); @@ -383,7 +377,7 @@ void OSaveAsDlg::implInitOnlyTitle(const String& _rLabel) m_pImpl->m_aTitle.SetText(m_pImpl->m_aName); m_pImpl->m_aTitle.setCheck(sal_False); // enable non valid sql chars as well } -// ----------------------------------------------------------------------------- + void OSaveAsDlg::implInit() { if ( 0 == ( m_pImpl->m_nFlags & SAD_ADDITIONAL_DESCRIPTION ) ) @@ -427,7 +421,7 @@ void OSaveAsDlg::implInit() 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() : OUString(); } String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : OUString(); } diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 01cb05f759dd..c60d0f10aa71 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -22,17 +22,13 @@ #include "dbu_dlg.hrc" #include "moduledbu.hxx" -//......................................................................... namespace dbaui { -//......................................................................... - #define DEF_ROW_HEIGHT 45 #define DEF_COL_WIDTH 227 DBG_NAME(DlgSize) -//================================================================== DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAlternativeStandard ) :ModalDialog( pParent, ModuleRes(bRow ? DLG_ROWHEIGHT : DLG_COLWIDTH)) ,m_nPrevValue(nVal) @@ -63,20 +59,17 @@ DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAl FreeResource(); } -//------------------------------------------------------------------------------ DlgSize::~DlgSize() { DBG_DTOR(DlgSize,NULL); } -//------------------------------------------------------------------------------ void DlgSize::SetValue( sal_Int32 nVal ) { aMF_VALUE.SetValue(nVal, FUNIT_CM ); } -//------------------------------------------------------------------------------ sal_Int32 DlgSize::GetValue() { if (aCB_STANDARD.IsChecked()) @@ -84,7 +77,6 @@ sal_Int32 DlgSize::GetValue() return (sal_Int32)aMF_VALUE.GetValue( FUNIT_CM ); } -//------------------------------------------------------------------------------ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) { @@ -104,10 +96,7 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) } return 0; } -// ----------------------------------------------------------------------------- -//......................................................................... -} // namespace dbaui -//......................................................................... +} // namespace dbaui /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 9ac247394b62..8f1b636f8f3f 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -22,21 +22,13 @@ #include <svl/poolitem.hxx> -//......................................................................... namespace dbaccess { -//......................................................................... class ODsnTypeCollection; -//......................................................................... } -//......................................................................... -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= DbuTypeCollectionItem - //========================================================================= + // DbuTypeCollectionItem /** allows an ODsnTypeCollection to be transported in an SfxItemSet */ class DbuTypeCollectionItem : public SfxPoolItem @@ -53,9 +45,7 @@ namespace dbaui ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; } }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DSNITEM_HXX_ diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 3fe579f10139..fea904bcdeac 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dsselect.hxx" #include "dsselect.hrc" #include "dbu_dlg.hrc" @@ -41,17 +40,14 @@ #include <svl/eitem.hxx> #include <svl/itemset.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::ui::dialogs; using namespace ::comphelper; -//================================================================== ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet) :ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION)) ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) @@ -75,12 +71,10 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringB FreeResource(); } -// ----------------------------------------------------------------------- ODatasourceSelectDialog::~ODatasourceSelectDialog() { } -// ----------------------------------------------------------------------- IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox *, pListBox ) { if (pListBox->GetSelectEntryCount()) @@ -88,7 +82,6 @@ IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox *, pListBox ) return 0; } -// ----------------------------------------------------------------------- sal_Bool ODatasourceSelectDialog::Close() { #ifdef HAVE_ODBC_ADMINISTRATION @@ -99,7 +92,6 @@ sal_Bool ODatasourceSelectDialog::Close() return ModalDialog::Close(); } -// ----------------------------------------------------------------------- #ifdef HAVE_ODBC_ADMINISTRATION IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) { @@ -139,7 +131,6 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) } #endif -// ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { OUString sSelected; @@ -164,8 +155,6 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) } } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 8828f45b6b6f..2c332cbc865d 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -34,14 +34,10 @@ #include <memory> class SfxItemSet; -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODatasourceSelector -//========================================================================= +// ODatasourceSelector class ODatasourceSelectDialog : public ModalDialog { protected: @@ -77,9 +73,7 @@ protected: void fillListBox(const StringBag& _rDatasources); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_DSSELECT_HXX_ diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index 3b08159b58b9..ba4adf9f3881 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -17,25 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "finteraction.hxx" #include <tools/debug.hxx> #include <osl/diagnose.h> #include <com/sun/star/ucb/InteractiveIOException.hpp> -//........................................................................ namespace dbaui { -//........................................................................ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::ucb; - //==================================================================== - //= OFilePickerInteractionHandler - //==================================================================== + // OFilePickerInteractionHandler DBG_NAME( OFilePickerInteractionHandler ) - //-------------------------------------------------------------------- OFilePickerInteractionHandler::OFilePickerInteractionHandler( const Reference< XInteractionHandler >& _rxMaster ) :m_xMaster( _rxMaster ) ,m_bDoesNotExist(sal_False) @@ -44,13 +38,11 @@ namespace dbaui OSL_ENSURE( m_xMaster.is(), "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!" ); } - //-------------------------------------------------------------------- OFilePickerInteractionHandler::~OFilePickerInteractionHandler( ) { DBG_DTOR( OFilePickerInteractionHandler, NULL ); } - //-------------------------------------------------------------------- void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException) { InteractiveIOException aIoException; @@ -67,8 +59,6 @@ namespace dbaui m_xMaster->handle( _rxRequest ); } -//........................................................................ } // 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 90bacd2bd28f..1df4220745d2 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -23,14 +23,10 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= OFilePickerInteractionHandler - //==================================================================== + // OFilePickerInteractionHandler typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler > OFilePickerInteractionHandler_Base; @@ -55,9 +51,7 @@ namespace dbaui virtual ~OFilePickerInteractionHandler(); }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBAUI_FILEPICKER_INTERACTION_HXX diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index f0562ec3220b..f9aac8f358e0 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dsnItem.hxx" #include "generalpage.hxx" #include <connectivity/dbexception.hxx> @@ -44,20 +43,15 @@ #include <unotools/confignode.hxx> #include <osl/diagnose.h> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; - //========================================================================= - //= OGeneralPage - //========================================================================= - //------------------------------------------------------------------------- + // OGeneralPage OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_pSpecialMessage ( NULL ) @@ -85,12 +79,10 @@ namespace dbaui m_pEmbeddedDBType->SetSelectHdl(LINK(this, OGeneralPage, OnEmbeddedDBTypeSelected)); } - //------------------------------------------------------------------------- OGeneralPage::~OGeneralPage() { } - //------------------------------------------------------------------------- namespace { struct DisplayedType @@ -111,7 +103,6 @@ namespace dbaui }; } - //------------------------------------------------------------------------- void OGeneralPage::initializeTypeList() { if ( m_bInitTypeList ) @@ -151,7 +142,6 @@ namespace dbaui } } - //------------------------------------------------------------------------- void OGeneralPage::initializeEmbeddedDBList() { if ( m_bInitEmbeddedDBList ) @@ -191,12 +181,10 @@ namespace dbaui } } - //------------------------------------------------------------------------- void OGeneralPage::setParentTitle(const OUString&) { } - //------------------------------------------------------------------------- void OGeneralPage::switchMessage(const OUString& _sURLPrefix) { SPECIAL_MESSAGE eMessage = smNone; @@ -205,7 +193,6 @@ namespace dbaui eMessage = smUnsupportedType; } - if ( eMessage != m_eLastMessage ) { sal_uInt16 nResId = 0; @@ -220,7 +207,6 @@ namespace dbaui } } - //------------------------------------------------------------------------- void OGeneralPage::onTypeSelected(const OUString& _sURLPrefix) { // the new URL text as indicated by the selection history @@ -232,7 +218,6 @@ namespace dbaui m_aTypeSelectHandler.Call(this); } - //------------------------------------------------------------------------- void OGeneralPage::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) { initializeTypeList(); @@ -252,7 +237,6 @@ namespace dbaui OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue ); } - //------------------------------------------------------------------------- OUString OGeneralPage::getEmbeddedDBName( const SfxItemSet& _rSet ) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -301,7 +285,6 @@ namespace dbaui return sDisplayName; } - //------------------------------------------------------------------------- OUString OGeneralPage::getDatasourceName( const SfxItemSet& _rSet ) { // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -378,8 +361,6 @@ namespace dbaui return _inout_rDisplayName.getLength() > 0; } - - // ----------------------------------------------------------------------- void OGeneralPage::insertDatasourceTypeEntryData(const OUString& _sType, String sDisplayName) { // insert a (temporary) entry @@ -389,7 +370,6 @@ namespace dbaui m_aURLPrefixes[nPos] = _sType; } - // ----------------------------------------------------------------------- void OGeneralPage::insertEmbeddedDBTypeEntryData(const OUString& _sType, String sDisplayName) { // insert a (temporary) entry @@ -399,19 +379,16 @@ namespace dbaui m_aEmbeddedURLPrefixes[nPos] = _sType; } - // ----------------------------------------------------------------------- void OGeneralPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back( new ODisableWrapper<FixedText>( m_pSpecialMessage ) ); } - // ----------------------------------------------------------------------- void OGeneralPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back( new OSaveValueWrapper<ListBox>( m_pDatasourceType ) ); } - //------------------------------------------------------------------------- void OGeneralPage::implSetCurrentType( const OUString& _eType ) { if ( _eType == m_eCurrentSelection ) @@ -420,7 +397,6 @@ namespace dbaui m_eCurrentSelection = _eType; } - //------------------------------------------------------------------------- void OGeneralPage::Reset(const SfxItemSet& _rCoreAttrs) { // reset all locale data @@ -430,7 +406,6 @@ namespace dbaui OGenericAdministrationPage::Reset(_rCoreAttrs); } - //------------------------------------------------------------------------- IMPL_LINK( OGeneralPage, OnEmbeddedDBTypeSelected, ListBox*, _pBox ) { // get the type from the entry data @@ -451,7 +426,6 @@ namespace dbaui return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox*, _pBox ) { // get the type from the entry data @@ -472,16 +446,12 @@ namespace dbaui return 0L; } - //========================================================================= - //= OGeneralPageDialog - //========================================================================= - //------------------------------------------------------------------------- + // OGeneralPageDialog OGeneralPageDialog::OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagedialog.ui", _rItems ) { } - //------------------------------------------------------------------------- void OGeneralPageDialog::setParentTitle( const OUString& _sURLPrefix ) { const OUString sName = m_pCollection->getTypeDisplayName( _sURLPrefix ); @@ -492,7 +462,6 @@ namespace dbaui } } - //------------------------------------------------------------------------- void OGeneralPageDialog::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) { OGeneralPage::implInitControls( _rSet, _bSaveValue ); @@ -504,7 +473,6 @@ namespace dbaui m_pDatasourceType->Enable( bValid ); } - //------------------------------------------------------------------------- sal_Bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs ) { sal_Bool bChangedSomething = sal_False; @@ -521,10 +489,7 @@ namespace dbaui return bChangedSomething; } - //========================================================================= - //= OGeneralPageWizard - //========================================================================= - //------------------------------------------------------------------------- + // OGeneralPageWizard OGeneralPageWizard::OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems ) ,m_pFT_HeaderText ( NULL ) @@ -580,7 +545,6 @@ namespace dbaui m_pPB_OpenDatabase->SetClickHdl( LINK( this, OGeneralPageWizard, OnOpenDocument ) ); } - //------------------------------------------------------------------------- OGeneralPageWizard::CreationMode OGeneralPageWizard::GetDatabaseCreationMode() const { if ( m_pRB_CreateDatabase->IsChecked() ) @@ -590,7 +554,6 @@ namespace dbaui return eOpenExisting; } - //------------------------------------------------------------------------- void OGeneralPageWizard::GetFocus() { OGeneralPage::GetFocus(); @@ -600,7 +563,6 @@ namespace dbaui m_pDatasourceType->GrabFocus(); } - //------------------------------------------------------------------------- void OGeneralPageWizard::implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ) { OGeneralPage::implInitControls( _rSet, _bSaveValue ); @@ -635,7 +597,6 @@ namespace dbaui m_eOriginalCreationMode = GetDatabaseCreationMode(); } - //------------------------------------------------------------------------- OUString OGeneralPageWizard::getDatasourceName(const SfxItemSet& _rSet) { // Sets jdbc as the default selected databse on startup. @@ -645,7 +606,6 @@ namespace dbaui return OGeneralPage::getDatasourceName( _rSet ); } - //------------------------------------------------------------------------- bool OGeneralPageWizard::approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) { switch ( eType ) @@ -666,7 +626,6 @@ namespace dbaui return OGeneralPage::approveDatasourceType( eType, _inout_rDisplayName ); } - //------------------------------------------------------------------------- sal_Bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs) { sal_Bool bChangedSomething = sal_False; @@ -706,7 +665,6 @@ namespace dbaui return bChangedSomething; } - //------------------------------------------------------------------------- OGeneralPageWizard::DocumentDescriptor OGeneralPageWizard::GetSelectedDocument() const { DocumentDescriptor aDocument; @@ -720,7 +678,6 @@ namespace dbaui return aDocument; } - //------------------------------------------------------------------------- IMPL_LINK( OGeneralPageWizard, OnCreateDatabaseModeSelected, RadioButton*, /*_pBox*/ ) { if ( m_aCreationModeHandler.IsSet() ) @@ -729,7 +686,6 @@ namespace dbaui return 1L; } - //------------------------------------------------------------------------- IMPL_LINK( OGeneralPageWizard, OnSetupModeSelected, RadioButton*, /*_pBox*/ ) { if ( m_aCreationModeHandler.IsSet() ) @@ -738,14 +694,12 @@ namespace dbaui return 1L; } - //------------------------------------------------------------------------- IMPL_LINK( OGeneralPageWizard, OnDocumentSelected, ListBox*, /*_pBox*/ ) { m_aDocumentSelectionHandler.Call( this ); return 0L; } - //------------------------------------------------------------------------- IMPL_LINK( OGeneralPageWizard, OnOpenDocument, PushButton*, /*_pBox*/ ) { ::sfx2::FileDialogHelper aFileDlg( @@ -777,8 +731,6 @@ namespace dbaui return 0L; } -//......................................................................... } // 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 719aa471f298..2510cb3a9cd0 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -28,13 +28,9 @@ #include <svtools/dialogcontrolling.hxx> #include <memory> -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= OGeneralPage - //========================================================================= + // OGeneralPage class OGeneralPage : public OGenericAdministrationPage { protected: @@ -111,9 +107,7 @@ namespace dbaui DECL_LINK(OnEmbeddedDBTypeSelected, ListBox*); }; - //========================================================================= - //= OGeneralPageDialog - //========================================================================= + // OGeneralPageDialog class OGeneralPageDialog : public OGeneralPage { public: @@ -126,9 +120,7 @@ namespace dbaui virtual void setParentTitle( const OUString& _sURLPrefix ); }; - //========================================================================= - //= OGeneralPageWizard - //========================================================================= + // OGeneralPageWizard class OGeneralPageWizard : public OGeneralPage { public: @@ -197,9 +189,7 @@ namespace dbaui DECL_LINK( OnOpenDocument, PushButton* ); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_GENERALPAGE_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 0530b1f9cb1e..7595e63b3fe6 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -35,10 +35,8 @@ #include "browserids.hxx" #include <connectivity/dbtools.hxx> #include <osl/diagnose.h> -//...................................................................... namespace dbaui { -//...................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; @@ -47,23 +45,18 @@ namespace dbaui using namespace ::com::sun::star::lang; using namespace ::dbtools; - //================================================================== - //= helper - //================================================================== - //------------------------------------------------------------------ + // helper sal_Bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS) { return (_rLHS.sFieldName == _rRHS.sFieldName) && (_rLHS.bSortAscending == _rRHS.bSortAscending); } - //------------------------------------------------------------------ sal_Bool operator !=(const OIndexField& _rLHS, const OIndexField& _rRHS) { return !(_rLHS == _rRHS); } - //------------------------------------------------------------------ sal_Bool operator ==(const IndexFields& _rLHS, const IndexFields& _rRHS) { if (_rLHS.size() != _rRHS.size()) @@ -81,16 +74,12 @@ namespace dbaui return sal_True; } - //------------------------------------------------------------------ sal_Bool operator !=(const IndexFields& _rLHS, const IndexFields& _rRHS) { return !(_rLHS == _rRHS); } - //================================================================== - //= DbaIndexList - //================================================================== - //------------------------------------------------------------------ + // DbaIndexList DbaIndexList::DbaIndexList(Window* _pParent, const ResId& _rId) :SvTreeListBox(_pParent, _rId) ,m_bSuspendSelectHdl(sal_False) @@ -98,7 +87,6 @@ namespace dbaui } extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars); - //------------------------------------------------------------------ sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) { // first check if this is valid SQL92 name @@ -135,21 +123,18 @@ namespace dbaui return sal_False; } - //------------------------------------------------------------------ void DbaIndexList::enableSelectHandler() { OSL_ENSURE(m_bSuspendSelectHdl, "DbaIndexList::enableSelectHandler: invalid call (this is not cumulative)!"); m_bSuspendSelectHdl = sal_False; } - //------------------------------------------------------------------ void DbaIndexList::disableSelectHandler() { OSL_ENSURE(!m_bSuspendSelectHdl, "DbaIndexList::enableSelectHandler: invalid call (this is not cumulative)!"); m_bSuspendSelectHdl = sal_True; } - //------------------------------------------------------------------ void DbaIndexList::SelectNoHandlerCall( SvTreeListEntry* _pEntry ) { disableSelectHandler(); @@ -157,7 +142,6 @@ namespace dbaui enableSelectHandler(); } - //------------------------------------------------------------------ sal_Bool DbaIndexList::Select( SvTreeListEntry* pEntry, sal_Bool _bSelect ) { sal_Bool bReturn = SvTreeListBox::Select(pEntry, _bSelect); @@ -168,11 +152,8 @@ namespace dbaui return bReturn; } - //================================================================== - //= DbaIndexDialog - //================================================================== + // DbaIndexDialog DBG_NAME(DbaIndexDialog) -//------------------------------------------------------------------ DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, @@ -272,7 +253,6 @@ DBG_NAME(DbaIndexDialog) } } - //------------------------------------------------------------------ void DbaIndexDialog::updateToolbox() { m_aActions.EnableItem(ID_INDEX_NEW, !m_aIndexes.IsEditingActive()); @@ -280,7 +260,6 @@ DBG_NAME(DbaIndexDialog) SvTreeListEntry* pSelected = m_aIndexes.FirstSelected(); sal_Bool bSelectedAnything = NULL != pSelected; - if (pSelected) { // is the current entry modified? @@ -298,7 +277,6 @@ DBG_NAME(DbaIndexDialog) m_aActions.EnableItem(ID_INDEX_RENAME, bSelectedAnything); } - //------------------------------------------------------------------ void DbaIndexDialog::fillIndexList() { Image aPKeyIcon(ModuleRes( IMG_PKEYICON )); @@ -320,7 +298,6 @@ DBG_NAME(DbaIndexDialog) OnIndexSelected(&m_aIndexes); } - //------------------------------------------------------------------ DbaIndexDialog::~DbaIndexDialog( ) { setToolBox(NULL); @@ -330,7 +307,6 @@ DBG_NAME(DbaIndexDialog) DBG_DTOR(DbaIndexDialog,NULL); } - //------------------------------------------------------------------ sal_Bool DbaIndexDialog::implCommit(SvTreeListEntry* _pEntry) { OSL_ENSURE(_pEntry, "DbaIndexDialog::implCommit: invalid entry!"); @@ -367,7 +343,6 @@ DBG_NAME(DbaIndexDialog) return !aExceptionInfo.isValid(); } - //------------------------------------------------------------------ void DbaIndexDialog::OnNewIndex() { // commit the current entry, if necessary @@ -412,7 +387,6 @@ DBG_NAME(DbaIndexDialog) updateToolbox(); } - //------------------------------------------------------------------ void DbaIndexDialog::OnDropIndex(sal_Bool _bConfirm) { // the selected index @@ -438,7 +412,6 @@ DBG_NAME(DbaIndexDialog) } } - //------------------------------------------------------------------ sal_Bool DbaIndexDialog::implDropIndex(SvTreeListEntry* _pEntry, sal_Bool _bRemoveFromCollection) { // do the drop @@ -489,7 +462,6 @@ DBG_NAME(DbaIndexDialog) return !aExceptionInfo.isValid(); } - //------------------------------------------------------------------ void DbaIndexDialog::OnRenameIndex() { // the selected index @@ -505,7 +477,6 @@ DBG_NAME(DbaIndexDialog) updateToolbox(); } - //------------------------------------------------------------------ void DbaIndexDialog::OnSaveIndex() { // the selected index @@ -518,7 +489,6 @@ DBG_NAME(DbaIndexDialog) updateToolbox(); } - //------------------------------------------------------------------ void DbaIndexDialog::OnResetIndex() { // the selected index @@ -551,7 +521,6 @@ DBG_NAME(DbaIndexDialog) updateToolbox(); } - //------------------------------------------------------------------ IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { sal_uInt16 nClicked = m_aActions.GetCurItemId(); @@ -576,7 +545,6 @@ DBG_NAME(DbaIndexDialog) return 0L; } - //------------------------------------------------------------------ IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ ) { if (m_aIndexes.IsEditingActive()) @@ -624,7 +592,6 @@ DBG_NAME(DbaIndexDialog) return 0L; } - //------------------------------------------------------------------ IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) { m_bEditAgain = sal_False; @@ -632,7 +599,6 @@ DBG_NAME(DbaIndexDialog) return 0L; } - //------------------------------------------------------------------ IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry ) { Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()); @@ -675,7 +641,6 @@ DBG_NAME(DbaIndexDialog) return 1L; } - //------------------------------------------------------------------ sal_Bool DbaIndexDialog::implSaveModified(sal_Bool _bPlausibility) { if (m_pPreviousSelection) @@ -704,7 +669,6 @@ DBG_NAME(DbaIndexDialog) return sal_True; } - //------------------------------------------------------------------ sal_Bool DbaIndexDialog::implCheckPlausibility(const ConstIndexesIterator& _rPos) { // need at least one field @@ -739,7 +703,6 @@ DBG_NAME(DbaIndexDialog) return sal_True; } - //------------------------------------------------------------------ sal_Bool DbaIndexDialog::implCommitPreviouslySelected() { if (m_pPreviousSelection) @@ -757,7 +720,6 @@ DBG_NAME(DbaIndexDialog) return sal_True; } - //------------------------------------------------------------------ IMPL_LINK( DbaIndexDialog, OnModified, void*, /*NOTINTERESTEDIN*/ ) { OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); @@ -769,7 +731,6 @@ DBG_NAME(DbaIndexDialog) return 1L; } - //------------------------------------------------------------------ void DbaIndexDialog::updateControls(const SvTreeListEntry* _pEntry) { if (_pEntry) @@ -799,7 +760,6 @@ DBG_NAME(DbaIndexDialog) } } - //------------------------------------------------------------------ IMPL_LINK( DbaIndexDialog, OnIndexSelected, DbaIndexList*, /*NOTINTERESTEDIN*/ ) { m_aIndexes.EndSelection(); @@ -836,7 +796,6 @@ DBG_NAME(DbaIndexDialog) updateToolbox(); return 0L; } - // ----------------------------------------------------------------------------- void DbaIndexDialog::StateChanged( StateChangedType nType ) { ModalDialog::StateChanged( nType ); @@ -854,7 +813,6 @@ DBG_NAME(DbaIndexDialog) checkImageList(); } } - // ----------------------------------------------------------------------------- void DbaIndexDialog::DataChanged( const DataChangedEvent& rDCEvt ) { ModalDialog::DataChanged( rDCEvt ); @@ -867,7 +825,6 @@ DBG_NAME(DbaIndexDialog) checkImageList(); } } - //------------------------------------------------------------------ ImageList DbaIndexDialog::getImageList(sal_Int16 _eBitmapSet) const { sal_Int16 nN = IMG_INDEX_DLG_SC; @@ -877,7 +834,6 @@ DBG_NAME(DbaIndexDialog) } return ImageList(ModuleRes(nN)); } - //------------------------------------------------------------------ void DbaIndexDialog::resizeControls(const Size& _rDiff) { // we use large images so we must change them @@ -909,8 +865,6 @@ DBG_NAME(DbaIndexDialog) } } -//...................................................................... } // namespace dbaui -//...................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index b0c2eb8f797d..4b68d3e3b949 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "indexfieldscontrol.hxx" #include "dbu_dlg.hrc" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" -//...................................................................... namespace dbaui { -//...................................................................... #define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \ BROWSER_HIDECURSOR | BROWSER_HIDESELECT | BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL @@ -37,9 +34,7 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::svt; - //================================================================== - //= DbaMouseDownListBoxController - //================================================================== + // DbaMouseDownListBoxController class DbaMouseDownListBoxController : public ListBoxCellController { protected: @@ -63,21 +58,18 @@ namespace dbaui DECL_LINK( OnMultiplexModify, void* ); }; - //------------------------------------------------------------------ void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link& _rHdl) { m_aAdditionalModifyHdl = _rHdl; implCheckLinks(); } - //------------------------------------------------------------------ void DbaMouseDownListBoxController::SetModifyHdl(const Link& _rHdl) { m_aOriginalModifyHdl = _rHdl; implCheckLinks(); } - //------------------------------------------------------------------ IMPL_LINK( DbaMouseDownListBoxController, OnMultiplexModify, void*, _pArg ) { if (m_aAdditionalModifyHdl.IsSet()) @@ -87,7 +79,6 @@ namespace dbaui return 0L; } - //------------------------------------------------------------------ void DbaMouseDownListBoxController::implCheckLinks() { if (m_aAdditionalModifyHdl.IsSet() || m_aOriginalModifyHdl.IsSet()) @@ -96,11 +87,8 @@ namespace dbaui ListBoxCellController::SetModifyHdl(Link()); } - //================================================================== - //= IndexFieldsControl - //================================================================== + // IndexFieldsControl DBG_NAME(IndexFieldsControl) -//------------------------------------------------------------------ IndexFieldsControl::IndexFieldsControl( Window* _pParent, const ResId& _rId ,sal_Int32 _nMaxColumnsInIndex,sal_Bool _bAddIndexAppendix) :EditBrowseBox(_pParent, _rId, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, BROWSER_STANDARD_FLAGS) ,m_aSeekRow(m_aFields.end()) @@ -115,7 +103,6 @@ DBG_NAME(IndexFieldsControl) GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN ); } - //------------------------------------------------------------------ IndexFieldsControl::~IndexFieldsControl() { delete m_pSortingCell; @@ -124,7 +111,6 @@ DBG_NAME(IndexFieldsControl) DBG_DTOR(IndexFieldsControl,NULL); } - //------------------------------------------------------------------ sal_Bool IndexFieldsControl::SeekRow(long nRow) { if (!EditBrowseBox::SeekRow(nRow)) @@ -143,7 +129,6 @@ DBG_NAME(IndexFieldsControl) return sal_True; } - //------------------------------------------------------------------ void IndexFieldsControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const { Point aPos(_rRect.TopLeft()); @@ -174,7 +159,6 @@ DBG_NAME(IndexFieldsControl) _rDev.SetClipRegion(); } - //------------------------------------------------------------------ void IndexFieldsControl::initializeFrom(const IndexFields& _rFields) { // copy the field descriptions @@ -193,7 +177,6 @@ DBG_NAME(IndexFieldsControl) GoToRowColumnId(0, COLUMN_ID_FIELDNAME); } - //------------------------------------------------------------------ void IndexFieldsControl::commitTo(IndexFields& _rFields) { // do not just copy the array, we may have empty field names (which should not be copied) @@ -211,7 +194,6 @@ DBG_NAME(IndexFieldsControl) _rFields.resize(aDest - _rFields.begin()); } - //------------------------------------------------------------------ sal_uInt32 IndexFieldsControl::GetTotalCellWidth(long _nRow, sal_uInt16 _nColId) { if (COLUMN_ID_ORDER == _nColId) @@ -224,7 +206,6 @@ DBG_NAME(IndexFieldsControl) return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId); } - //------------------------------------------------------------------ void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields) { RemoveColumns(); @@ -277,7 +258,6 @@ DBG_NAME(IndexFieldsControl) m_pFieldNameCell->InsertEntry(*pFields); } - //------------------------------------------------------------------ CellController* IndexFieldsControl::GetController(long _nRow, sal_uInt16 _nColumnId) { if (!IsEnabled()) @@ -308,7 +288,6 @@ DBG_NAME(IndexFieldsControl) return pReturn; } - //------------------------------------------------------------------ sal_Bool IndexFieldsControl::implGetFieldDesc(long _nRow, ConstIndexFieldsIterator& _rPos) { _rPos = m_aFields.end(); @@ -318,13 +297,11 @@ DBG_NAME(IndexFieldsControl) return sal_True; } - //------------------------------------------------------------------ sal_Bool IndexFieldsControl::IsModified() const { return EditBrowseBox::IsModified(); } - //------------------------------------------------------------------ sal_Bool IndexFieldsControl::SaveModified() { if (!IsModified()) @@ -394,7 +371,6 @@ DBG_NAME(IndexFieldsControl) return sal_True; } - //------------------------------------------------------------------ void IndexFieldsControl::InitController(CellControllerRef& /*_rController*/, long _nRow, sal_uInt16 _nColumnId) { ConstIndexFieldsIterator aFieldDescription; @@ -417,7 +393,6 @@ DBG_NAME(IndexFieldsControl) } } - //------------------------------------------------------------------ IMPL_LINK( IndexFieldsControl, OnListEntrySelected, ListBox*, _pBox ) { if (!_pBox->IsTravelSelect() && m_aModifyHdl.IsSet()) @@ -453,7 +428,6 @@ DBG_NAME(IndexFieldsControl) } return 0L; } - //------------------------------------------------------------------ OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const { ConstIndexFieldsIterator aRow = m_aFields.end(); @@ -464,7 +438,6 @@ DBG_NAME(IndexFieldsControl) } return GetRowCellText(aRow,nColId); } - //------------------------------------------------------------------ String IndexFieldsControl::GetRowCellText(const ConstIndexFieldsIterator& _rRow,sal_uInt16 nColId) const { if (_rRow < m_aFields.end()) @@ -484,15 +457,11 @@ DBG_NAME(IndexFieldsControl) } return String(); } - //------------------------------------------------------------------ sal_Bool IndexFieldsControl::IsTabAllowed(sal_Bool /*bForward*/) const { return sal_False; } - //------------------------------------------------------------------ -//...................................................................... } // 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 24d47a6721cb..e462ff45bfad 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -18,7 +18,6 @@ */ #include <config_folders.h> - #include "odbcconfig.hxx" #ifdef SYSTEM_ODBC_HEADERS @@ -86,11 +85,8 @@ #endif // HAVE_ODBC_SUPPORT -//......................................................................... namespace dbaui { -//......................................................................... - #ifdef HAVE_ODBC_SUPPORT typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); @@ -106,11 +102,8 @@ typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMA #define NSQLDataSources(a,b,c,d,e,f,g,h) (*(TSQLDataSources)(m_pDataSources))(a,b,c,d,e,f,g,h) #endif -//========================================================================= -//= OOdbcLibWrapper -//========================================================================= +// OOdbcLibWrapper DBG_NAME(OOdbcLibWrapper) -//------------------------------------------------------------------------- #ifdef HAVE_ODBC_SUPPORT OOdbcLibWrapper::OOdbcLibWrapper() :m_pOdbcLib(NULL) @@ -118,9 +111,9 @@ OOdbcLibWrapper::OOdbcLibWrapper() DBG_CTOR(OOdbcLibWrapper,NULL); } + #endif -//------------------------------------------------------------------------- sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) { m_sLibPath = OUString::createFromAscii(_pLibPath); @@ -133,7 +126,6 @@ sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) #endif } -//------------------------------------------------------------------------- void OOdbcLibWrapper::unload() { #ifdef HAVE_ODBC_SUPPORT @@ -145,13 +137,11 @@ void OOdbcLibWrapper::unload() #endif } -//------------------------------------------------------------------------- oslGenericFunction OOdbcLibWrapper::loadSymbol(const sal_Char* _pFunctionName) { return osl_getFunctionSymbol(m_pOdbcLib, OUString::createFromAscii(_pFunctionName).pData); } -//------------------------------------------------------------------------- OOdbcLibWrapper::~OOdbcLibWrapper() { unload(); @@ -159,9 +149,7 @@ OOdbcLibWrapper::~OOdbcLibWrapper() DBG_DTOR(OOdbcLibWrapper,NULL); } -//========================================================================= -//= OOdbcEnumeration -//========================================================================= +// OOdbcEnumeration struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT @@ -171,8 +159,8 @@ struct OdbcTypesImpl void* pDummy; #endif }; + DBG_NAME(OOdbcEnumeration) -//------------------------------------------------------------------------- OOdbcEnumeration::OOdbcEnumeration() #ifdef HAVE_ODBC_SUPPORT :m_pAllocHandle(NULL) @@ -208,7 +196,6 @@ OOdbcEnumeration::OOdbcEnumeration() } } -//------------------------------------------------------------------------- OOdbcEnumeration::~OOdbcEnumeration() { freeEnv(); @@ -217,7 +204,6 @@ OOdbcEnumeration::~OOdbcEnumeration() DBG_DTOR(OOdbcEnumeration,NULL); } -//------------------------------------------------------------------------- sal_Bool OOdbcEnumeration::allocEnv() { OSL_ENSURE(isLoaded(), "OOdbcEnumeration::allocEnv: not loaded!"); @@ -240,7 +226,6 @@ sal_Bool OOdbcEnumeration::allocEnv() #endif } -//------------------------------------------------------------------------- void OOdbcEnumeration::freeEnv() { #ifdef HAVE_ODBC_SUPPORT @@ -250,7 +235,6 @@ void OOdbcEnumeration::freeEnv() #endif } -//------------------------------------------------------------------------- void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) { OSL_ENSURE(isLoaded(), "OOdbcEnumeration::getDatasourceNames: not loaded!"); @@ -293,9 +277,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) #ifdef HAVE_ODBC_ADMINISTRATION -//========================================================================= -//= ProcessTerminationWait -//========================================================================= +// ProcessTerminationWait class ProcessTerminationWait : public ::osl::Thread { oslProcess m_hProcessHandle; @@ -317,17 +299,13 @@ protected: } }; -//========================================================================= -//= OOdbcManagement -//========================================================================= -//------------------------------------------------------------------------- +// OOdbcManagement OOdbcManagement::OOdbcManagement( const Link& _rAsyncFinishCallback ) :m_pProcessWait( NULL ) ,m_aAsyncFinishCallback( _rAsyncFinishCallback ) { } -//------------------------------------------------------------------------- OOdbcManagement::~OOdbcManagement() { // wait for our thread to be finished @@ -335,7 +313,6 @@ OOdbcManagement::~OOdbcManagement() m_pProcessWait->join(); } -//------------------------------------------------------------------------- bool OOdbcManagement::manageDataSources_async() { OSL_PRECOND( !isRunning(), "OOdbcManagement::manageDataSources_async: still running from the previous call!" ); @@ -356,7 +333,6 @@ bool OOdbcManagement::manageDataSources_async() return true; } -//------------------------------------------------------------------------- bool OOdbcManagement::isRunning() const { return ( m_pProcessWait.get() && m_pProcessWait->isRunning() ); @@ -364,8 +340,6 @@ bool OOdbcManagement::isRunning() const #endif // HAVE_ODBC_ADMINISTRATION -//......................................................................... } // 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 1feeab014c40..8db6771e6bfa 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -35,14 +35,10 @@ #include <memory> -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OOdbcLibWrapper -//========================================================================= +// OOdbcLibWrapper /** base for helper classes wrapping functionality from an ODBC library */ class OOdbcLibWrapper @@ -74,9 +70,7 @@ protected: void unload(); }; -//========================================================================= -//= OOdbcEnumeration -//========================================================================= +// OOdbcEnumeration struct OdbcTypesImpl; class OOdbcEnumeration : public OOdbcLibWrapper { @@ -105,9 +99,7 @@ protected: void freeEnv(); }; -//========================================================================= -//= OOdbcManagement -//========================================================================= +// OOdbcManagement #ifdef HAVE_ODBC_ADMINISTRATION class ProcessTerminationWait; class OOdbcManagement @@ -124,9 +116,7 @@ public: }; #endif -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_ODBC_CONFIG_HXX_ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index dde4342b56c2..301896d5e57a 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -17,33 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "optionalboolitem.hxx" -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= OptionalBoolItem - //==================================================================== + // OptionalBoolItem TYPEINIT1( OptionalBoolItem, SfxPoolItem ); - //-------------------------------------------------------------------- OptionalBoolItem::OptionalBoolItem( sal_Int16 _nWhich ) :SfxPoolItem( _nWhich ) ,m_aValue() { } - //-------------------------------------------------------------------- OptionalBoolItem::OptionalBoolItem( const OptionalBoolItem& _rSource ) :SfxPoolItem( _rSource ) ,m_aValue( _rSource.m_aValue ) { } - //-------------------------------------------------------------------- int OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const { const OptionalBoolItem* pCompare = PTR_CAST( OptionalBoolItem, &_rItem ); @@ -56,14 +48,11 @@ namespace dbaui return 0; } - //-------------------------------------------------------------------- SfxPoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const { return new OptionalBoolItem( *this ); } -//........................................................................ } // namespace dbaui -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 274432126dbe..ebe466342e46 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -24,14 +24,10 @@ #include <boost/optional.hpp> -//........................................................................ namespace dbaui { -//........................................................................ - //==================================================================== - //= OptionalBoolItem - //==================================================================== + // OptionalBoolItem class OptionalBoolItem : public SfxPoolItem { ::boost::optional< bool > m_aValue; @@ -53,9 +49,7 @@ namespace dbaui GetFullValue() const { return m_aValue; } }; -//........................................................................ } // namespace dbaui -//........................................................................ #endif // DBACCESS_OPTIONALBOOLITEM_HXX diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 2191c8b02d70..fe1ae459d6aa 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "paramdialog.hxx" #include "paramdialog.hrc" #include "dbu_dlg.hrc" @@ -38,10 +37,8 @@ #define EF_VISITED 0x0001 #define EF_DIRTY 0x0002 -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -51,14 +48,8 @@ namespace dbaui using namespace ::com::sun::star::util; using namespace ::connectivity; - //================================================================== - //= OParameterDialog - //================================================================== - - //------------------------------------------------------------------------------ - + // OParameterDialog - //------------------------------------------------------------------------------ DBG_NAME(OParameterDialog) OParameterDialog::OParameterDialog( @@ -124,7 +115,6 @@ DBG_NAME(OParameterDialog) DBG_UNHANDLED_EXCEPTION(); } - Construct(); m_aResetVisitFlag.SetTimeoutHdl(LINK(this, OParameterDialog, OnVisitedTimeout)); @@ -132,7 +122,6 @@ DBG_NAME(OParameterDialog) FreeResource(); } - //------------------------------------------------------------------------------ OParameterDialog::~OParameterDialog() { if (m_aResetVisitFlag.IsActive()) @@ -141,7 +130,6 @@ DBG_NAME(OParameterDialog) DBG_DTOR(OParameterDialog,NULL); } - //------------------------------------------------------------------------------ void OParameterDialog::Construct() { m_aAllParams.SetSelectHdl(LINK(this, OParameterDialog, OnEntrySelected)); @@ -171,7 +159,6 @@ DBG_NAME(OParameterDialog) m_aParam.GrabFocus(); } - //------------------------------------------------------------------------------ IMPL_LINK(OParameterDialog, OnValueLoseFocus, Control*, /*pSource*/) { if (m_nCurrentlySelected != LISTBOX_ENTRY_NOTFOUND) @@ -229,7 +216,6 @@ DBG_NAME(OParameterDialog) return 0L; } - //------------------------------------------------------------------------------ IMPL_LINK(OParameterDialog, OnButtonClicked, PushButton*, pButton) { if (&m_aCancelBtn == pButton) @@ -304,7 +290,6 @@ DBG_NAME(OParameterDialog) return 0L; } - //------------------------------------------------------------------------------ IMPL_LINK(OParameterDialog, OnEntrySelected, ListBox*, /*pList*/) { if (m_aResetVisitFlag.IsActive()) @@ -342,7 +327,6 @@ DBG_NAME(OParameterDialog) return 0L; } - //------------------------------------------------------------------------------ IMPL_LINK(OParameterDialog, OnVisitedTimeout, Timer*, /*pTimer*/) { OSL_ENSURE(m_nCurrentlySelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnVisitedTimeout : invalid call !"); @@ -391,7 +375,6 @@ DBG_NAME(OParameterDialog) return 0L; } - //------------------------------------------------------------------------------ IMPL_LINK(OParameterDialog, OnValueModified, Control*, /*pBox*/) { // mark the currently selected entry as dirty @@ -403,9 +386,6 @@ DBG_NAME(OParameterDialog) return 0L; } - -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 381291e661f8..48dd475f6b18 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -744,6 +744,7 @@ IMPL_LINK_INLINE_START( DlgFilterCrit, ListSelectCompHdl, ListBox *, /*pListBox* EnableLines(); return 0; } + IMPL_LINK_INLINE_END( DlgFilterCrit, ListSelectCompHdl, ListBox *, pListBox ) void DlgFilterCrit::BuildWherePart() diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index c241c77076b6..d7d4ba33edf4 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -148,6 +148,7 @@ IMPL_LINK_INLINE_START( DlgOrderCrit, FieldListSelectHdl, ListBox *, /*pListBox* EnableLines(); return 0; } + IMPL_LINK_INLINE_END( DlgOrderCrit, FieldListSelectHdl, ListBox *, pListBox ) void DlgOrderCrit::impl_initializeOrderList_nothrow() diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index c35fba5f4568..214a1d3ed3a3 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sqlmessage.hxx" #include "dbu_dlg.hrc" #include "sqlmessage.hrc" @@ -52,14 +51,11 @@ using namespace com::sun::star::uno; using namespace com::sun::star::sdb; using namespace com::sun::star::sdbc; -//......................................................................... namespace dbaui { -//......................................................................... namespace { - //------------------------------------------------------------------------------ class IImageProvider { public: @@ -68,7 +64,6 @@ namespace virtual ~IImageProvider() { } }; - //------------------------------------------------------------------------------ class ILabelProvider { public: @@ -77,7 +72,6 @@ namespace virtual ~ILabelProvider() { }; }; - //------------------------------------------------------------------------------ class ImageProvider : public IImageProvider { private: @@ -99,7 +93,6 @@ namespace } }; - //------------------------------------------------------------------------------ class LabelProvider : public ILabelProvider { private: @@ -116,7 +109,6 @@ namespace } }; - //------------------------------------------------------------------------------ class ProviderFactory { private: @@ -185,7 +177,6 @@ namespace }; - //------------------------------------------------------------------------------ /// a stripped version of the SQLException, packed for displaying struct ExceptionDisplayInfo { @@ -214,7 +205,6 @@ namespace typedef ::std::vector< ExceptionDisplayInfo > ExceptionDisplayChain; - //------------------------------------------------------------------------------ /// strips the [OOoBase] vendor identifier from the given error message, if applicable OUString lcl_stripOOoBaseVendor( const OUString& _rErrorMessage ) { @@ -236,7 +226,6 @@ namespace return sErrorMessage; } - //------------------------------------------------------------------------------ void lcl_buildExceptionChain( const SQLExceptionInfo& _rErrorInfo, const ProviderFactory& _rFactory, ExceptionDisplayChain& _out_rChain ) { { @@ -293,7 +282,6 @@ namespace } } - //------------------------------------------------------------------------------ void lcl_insertExceptionEntry( SvTreeListBox& _rList, size_t _nElementPos, const ExceptionDisplayInfo& _rEntry ) { Image aEntryImage( _rEntry.pImageProvider->getImage() ); @@ -303,7 +291,6 @@ namespace } } -//============================================================================== class OExceptionChainDialog : public ModalDialog { FixedLine m_aFrame; @@ -327,7 +314,6 @@ protected: }; DBG_NAME(OExceptionChainDialog) -//------------------------------------------------------------------------------ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ) :ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN)) ,m_aFrame (this, ModuleRes(FL_DETAILS)) @@ -382,13 +368,11 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi } } -//------------------------------------------------------------------------------ OExceptionChainDialog::~OExceptionChainDialog() { DBG_DTOR(OExceptionChainDialog,NULL); } -//------------------------------------------------------------------------------ IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) { SvTreeListEntry* pSelected = m_aExceptionList.FirstSelected(); @@ -428,9 +412,7 @@ IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) return 0L; } -//============================================================================== -//= SQLMessageBox_Impl -//============================================================================== +// SQLMessageBox_Impl struct SQLMessageBox_Impl { ExceptionDisplayChain aDisplayInfo; @@ -443,7 +425,6 @@ struct SQLMessageBox_Impl } }; -//------------------------------------------------------------------------------ namespace { void lcl_positionInAppFont( const Window& _rParent, Window& _rChild, long _nX, long _nY, long _Width, long _Height ) @@ -472,12 +453,10 @@ namespace } } -//------------------------------------------------------------------------------ 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; @@ -573,7 +552,6 @@ void OSQLMessageBox::impl_positionControls() SetPageSizePixel( aDialogSize ); } -//------------------------------------------------------------------------------ void OSQLMessageBox::impl_initImage( MessageType _eImage ) { switch (_eImage) @@ -596,7 +574,6 @@ void OSQLMessageBox::impl_initImage( MessageType _eImage ) } } -//------------------------------------------------------------------------------ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { if ( _nStyle & WB_YES_NO_CANCEL ) @@ -641,7 +618,6 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) } } -//------------------------------------------------------------------------------ void OSQLMessageBox::impl_addDetailsButton() { size_t nFirstPageVisible = m_aMessage.IsVisible() ? 2 : 1; @@ -674,7 +650,6 @@ void OSQLMessageBox::impl_addDetailsButton() } } -//------------------------------------------------------------------------------ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) { SetText( @@ -703,7 +678,6 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) impl_addDetailsButton(); } -//------------------------------------------------------------------------------ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) @@ -715,7 +689,6 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rExcep Construct( _nStyle, AUTO ); } -//------------------------------------------------------------------------------ OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) @@ -733,12 +706,10 @@ OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString& _rTitle, const Construct( _nStyle, _eType ); } -//-------------------------------------------------------------------------- OSQLMessageBox::~OSQLMessageBox() { } -//-------------------------------------------------------------------------- IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) { OExceptionChainDialog aDlg( this, m_pImpl->aDisplayInfo ); @@ -746,26 +717,20 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) return 0; } -//================================================================== // OSQLWarningBox -//================================================================== OSQLWarningBox::OSQLWarningBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :OSQLMessageBox( _pParent, String( ModuleRes( STR_EXCEPTION_WARNING ) ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) { } -//================================================================== // OSQLErrorBox -//================================================================== OSQLErrorBox::OSQLErrorBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :OSQLMessageBox( _pParent, String( ModuleRes( STR_EXCEPTION_ERROR ) ), _rMessage, _nStyle, OSQLMessageBox::Error, _pAdditionalErrorInfo ) { } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index d8996a85045f..84ac954342ce 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tablespage.hxx" #include "dbu_dlg.hrc" #include "dbadmin.hrc" @@ -54,10 +53,8 @@ #include <cppuhelper/exc_hlp.hxx> #include "AutoControls.hrc" -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -72,11 +69,8 @@ namespace dbaui using namespace ::dbtools; using namespace ::comphelper; - //======================================================================== - //= OTableSubscriptionPage - //======================================================================== + // OTableSubscriptionPage DBG_NAME(OTableSubscriptionPage) -//------------------------------------------------------------------------ OTableSubscriptionPage::OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs,OTableSubscriptionDialog* _pTablesDlg ) :OGenericAdministrationPage( pParent, ModuleRes(PAGE_TABLESUBSCRIPTION), _rCoreAttrs ) ,m_aTables (this, ModuleRes(FL_SEPARATOR1)) @@ -103,7 +97,6 @@ DBG_NAME(OTableSubscriptionPage) m_aTablesList.SetCheckHandler(LINK(this, OTableSubscriptionPage, OnTreeEntryChecked)); } - //------------------------------------------------------------------------ OTableSubscriptionPage::~OTableSubscriptionPage() { // just to make sure that our connection will be removed @@ -116,7 +109,6 @@ DBG_NAME(OTableSubscriptionPage) DBG_DTOR(OTableSubscriptionPage,NULL); } - // ----------------------------------------------------------------------------- void OTableSubscriptionPage::StateChanged( StateChangedType nType ) { OGenericAdministrationPage::StateChanged( nType ); @@ -127,7 +119,6 @@ DBG_NAME(OTableSubscriptionPage) m_aTablesList.notifyHiContrastChanged(); } } - // ----------------------------------------------------------------------------- void OTableSubscriptionPage::DataChanged( const DataChangedEvent& rDCEvt ) { OGenericAdministrationPage::DataChanged( rDCEvt ); @@ -140,7 +131,6 @@ DBG_NAME(OTableSubscriptionPage) m_aTablesList.notifyHiContrastChanged(); } } - //------------------------------------------------------------------ void OTableSubscriptionPage::resizeControls(const Size& _rDiff) { if ( _rDiff.Height() ) @@ -153,7 +143,6 @@ DBG_NAME(OTableSubscriptionPage) ); } } - //------------------------------------------------------------------------ void OTableSubscriptionPage::implCheckTables(const Sequence< OUString >& _rTables) { // the meta data for the current connection, used for splitting up table names @@ -220,7 +209,6 @@ DBG_NAME(OTableSubscriptionPage) m_aTablesList.CheckButtons(); } - //------------------------------------------------------------------------ void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ) { if (!_rTableFilter.getLength()) @@ -238,7 +226,6 @@ DBG_NAME(OTableSubscriptionPage) } } - //------------------------------------------------------------------------- void OTableSubscriptionPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) @@ -396,7 +383,6 @@ DBG_NAME(OTableSubscriptionPage) OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - //------------------------------------------------------------------------ void OTableSubscriptionPage::CheckAll( sal_Bool _bCheck ) { SvButtonState eState = _bCheck ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; @@ -411,7 +397,6 @@ DBG_NAME(OTableSubscriptionPage) m_aTablesList.checkWildcard(m_aTablesList.getAllObjectsEntry()); } - //------------------------------------------------------------------------ int OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet) { int nResult = OGenericAdministrationPage::DeactivatePage(_pSet); @@ -425,12 +410,10 @@ DBG_NAME(OTableSubscriptionPage) return nResult; } - //------------------------------------------------------------------------ IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl ) { return OnControlModified(_pControl); } - //------------------------------------------------------------------------ IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData ) { const SvTreeListEntry* pLHS = static_cast<const SvTreeListEntry*>(_pSortData->pLeft); @@ -463,7 +446,6 @@ DBG_NAME(OTableSubscriptionPage) return nCompareResult; } - //------------------------------------------------------------------------ Sequence< OUString > OTableSubscriptionPage::collectDetailedSelection() const { Sequence< OUString > aTableFilter; @@ -557,7 +539,6 @@ DBG_NAME(OTableSubscriptionPage) return aTableFilter; } - //------------------------------------------------------------------------ SvTreeListEntry* OTableSubscriptionPage::implNextSibling(SvTreeListEntry* _pEntry) const { SvTreeListEntry* pReturn = NULL; @@ -570,7 +551,6 @@ DBG_NAME(OTableSubscriptionPage) return pReturn; } - //------------------------------------------------------------------------ sal_Bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs ) { sal_Bool bValid, bReadonly; @@ -580,7 +560,6 @@ DBG_NAME(OTableSubscriptionPage) // don't store anything if the data we're working with is invalid or readonly return sal_True; - ///////////////////////////////////////////////////////////////////////// // 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 @@ -600,20 +579,15 @@ DBG_NAME(OTableSubscriptionPage) return sal_True; } - // ----------------------------------------------------------------------- void OTableSubscriptionPage::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - // ----------------------------------------------------------------------- void OTableSubscriptionPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<OTableTreeListBox>(&m_aTablesList)); _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aTables)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aExplanation)); } - // ----------------------------------------------------------------------- -//......................................................................... } // 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 9bc084b1e12f..876e6078ac14 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -28,15 +28,10 @@ #include "tabletree.hxx" #include <com/sun/star/sdbc/XConnection.hpp> - -//......................................................................... namespace dbaui { -//......................................................................... - //======================================================================== - //= OTableSubscriptionPage - //======================================================================== + // OTableSubscriptionPage class OTableSubscriptionDialog; class OTableSubscriptionPage :public OGenericAdministrationPage @@ -65,7 +60,6 @@ namespace dbaui 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); @@ -82,7 +76,6 @@ namespace dbaui private: - /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ void implCheckTables(const ::com::sun::star::uno::Sequence< OUString >& _rTables); @@ -104,9 +97,7 @@ namespace dbaui void implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter ); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_TABLESPAGE_HXX_ diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 2841341aa019..c4ca7ca2e410 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -26,13 +26,9 @@ #include <vcl/msgbox.hxx> -//........................................................................ namespace dbaui { - //==================================================================== - //= TextConnectionSettingsDialog - //==================================================================== - //-------------------------------------------------------------------- + // TextConnectionSettingsDialog TextConnectionSettingsDialog::TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems ) :ModalDialog( _pParent, ModuleRes( DLG_TEXT_CONNECTION_SETTINGS ) ) ,m_aOK( this, ModuleRes( 1 ) ) @@ -45,12 +41,10 @@ namespace dbaui m_aOK.SetClickHdl( LINK( this, TextConnectionSettingsDialog, OnOK ) ); } - //-------------------------------------------------------------------- TextConnectionSettingsDialog::~TextConnectionSettingsDialog() { } - //-------------------------------------------------------------------- void TextConnectionSettingsDialog::bindItemStorages( SfxItemSet& _rSet, PropertyValues& _rValues ) { _rValues[ PROPERTY_ID_HEADER_LINE ].reset( new SetItemPropertyStorage( _rSet, DSID_TEXTFILEHEADER ) ); @@ -61,14 +55,12 @@ namespace dbaui _rValues[ PROPERTY_ID_ENCODING ].reset( new SetItemPropertyStorage( _rSet, DSID_CHARSET ) ); } - //-------------------------------------------------------------------- short TextConnectionSettingsDialog::Execute() { m_pTextConnectionHelper->implInitControls( m_rItems, sal_True ); return ModalDialog::Execute(); } - //-------------------------------------------------------------------- IMPL_LINK( TextConnectionSettingsDialog, OnOK, PushButton*, /*_pButton*/ ) { if ( m_pTextConnectionHelper->prepareLeave() ) @@ -82,8 +74,6 @@ namespace dbaui return 0L; } -//........................................................................ } // namespace dbaui -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |