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/uno | |
| 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/uno')
27 files changed, 63 insertions, 405 deletions
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 2cf9086778fb..b9d1cabf86e3 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -17,24 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unoadmin.hxx" #include "dbu_reghelper.hxx" #include "advancedsettingsdlg.hxx" #include <comphelper/processfactory.hxx> -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - //========================================================================= - //= OAdvancedSettingsDialog - //========================================================================= + // OAdvancedSettingsDialog class OAdvancedSettingsDialog :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< OAdvancedSettingsDialog > @@ -68,44 +63,36 @@ namespace dbaui virtual Dialog* createDialog(Window* _pParent); }; - //========================================================================= - //------------------------------------------------------------------------- OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialog(_rxORB) { } - //------------------------------------------------------------------------- Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } - //------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OAdvancedSettingsDialog( comphelper::getComponentContext(_rxFactory) )); } - //------------------------------------------------------------------------- OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } - //------------------------------------------------------------------------- OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } - //------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } - //------------------------------------------------------------------------- ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -113,36 +100,30 @@ namespace dbaui return aSupported; } - //------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& OAdvancedSettingsDialog::getInfoHelper() { return *const_cast<OAdvancedSettingsDialog*>(this)->getArrayHelper(); } - //------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* OAdvancedSettingsDialog::createArrayHelper( ) const { Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } - //------------------------------------------------------------------------------ Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) { AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; } -//......................................................................... } // namespace dbaui -//......................................................................... extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog() { diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 183c3f228d75..9f1da55ec47c 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -29,10 +29,9 @@ extern "C" void SAL_CALL createRegistryInfo_OColumnControl() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControl> aAutoRegistration; } -//......................................................................... + namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; @@ -43,7 +42,7 @@ OColumnControl::OColumnControl(const Reference<XComponentContext>& rxContext) :UnoControl(), m_xContext(rxContext) { } -// ----------------------------------------------------------------------------- + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT) IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl) IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, "com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl") @@ -52,12 +51,12 @@ Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiS { return static_cast< XServiceInfo* >(new OColumnControl(comphelper::getComponentContext(_rxORB))); } -// ----------------------------------------------------------------------------- + OUString OColumnControl::GetComponentServiceName() { return OUString("com.sun.star.sdb.ColumnDescriptorControl"); } -// ----------------------------------------------------------------------------- + void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit*/, const Reference< XWindowPeer >& rParentPeer) throw( RuntimeException ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -132,8 +131,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit mbCreatingPeer = sal_False; } } -//......................................................................... + } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 2a2e6dafef54..c66fd9e07866 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -40,9 +40,7 @@ namespace dbaui // ::com::sun::star::awt::XControl virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_COLUMNCONTROL_HXX diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 4d8caec6901c..9b4615cd4b01 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ColumnModel.hxx" #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> @@ -35,10 +34,8 @@ extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel() static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OColumnControlModel> aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -48,9 +45,7 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; - DBG_NAME(OColumnControlModel) -//------------------------------------------------------------------ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& _rxFactory) :OPropertyContainer(m_aBHelper) ,OColumnControlModel_BASE(m_aMutex) @@ -63,7 +58,7 @@ OColumnControlModel::OColumnControlModel(const Reference<XMultiServiceFactory>& DBG_CTOR(OColumnControlModel,NULL); registerProperties(); } -// ----------------------------------------------------------------------------- + OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,const Reference<XMultiServiceFactory>& _rxFactory) :OPropertyContainer(m_aBHelper) ,OColumnControlModel_BASE(m_aMutex) @@ -77,7 +72,7 @@ OColumnControlModel::OColumnControlModel(const OColumnControlModel* _pSource,con DBG_CTOR(OColumnControlModel,NULL); registerProperties(); } -// ----------------------------------------------------------------------------- + OColumnControlModel::~OColumnControlModel() { DBG_DTOR(OColumnControlModel,NULL); @@ -87,7 +82,7 @@ OColumnControlModel::~OColumnControlModel() dispose(); } } -// ----------------------------------------------------------------------------- + void OColumnControlModel::registerProperties() { registerProperty( PROPERTY_ACTIVE_CONNECTION, PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND, @@ -108,23 +103,22 @@ void OColumnControlModel::registerProperties() registerProperty( PROPERTY_EDIT_WIDTH, PROPERTY_ID_EDIT_WIDTH, PropertyAttribute::BOUND, &m_nWidth, ::getCppuType( &m_nWidth ) ); } + // XCloneable -//------------------------------------------------------------------------------ Reference< XCloneable > SAL_CALL OColumnControlModel::createClone( ) throw (RuntimeException) { return new OColumnControlModel( this, getORB() ); } -//------------------------------------------------------------------------------ + IMPLEMENT_TYPEPROVIDER2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer) IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OColumnControlModel) IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControlModel,"com.sun.star.comp.dbu.OColumnControlModel","com.sun.star.awt.UnoControlModel","com.sun.star.sdb.ColumnDescriptorControlModel") IMPLEMENT_FORWARD_REFCOUNT( OColumnControlModel, OColumnControlModel_BASE ) -//------------------------------------------------------------------------------ Any SAL_CALL OColumnControlModel::queryInterface( const Type& _rType ) throw (RuntimeException) { return OColumnControlModel_BASE::queryInterface( _rType ); } -// ----------------------------------------------------------------------------- + // com::sun::star::XAggregation Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(RuntimeException) { @@ -133,25 +127,22 @@ Any SAL_CALL OColumnControlModel::queryAggregation( const Type& rType ) throw(Ru aRet = comphelper::OPropertyContainer::queryInterface(rType); return aRet; } -//------------------------------------------------------------------------------ + OUString SAL_CALL OColumnControlModel::getServiceName() throw ( RuntimeException) { return OUString(); } -//------------------------------------------------------------------------------ + void OColumnControlModel::write(const Reference<XObjectOutputStream>& /*_rxOutStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException) { // TODO } -//------------------------------------------------------------------------------ void OColumnControlModel::read(const Reference<XObjectInputStream>& /*_rxInStream*/) throw ( ::com::sun::star::io::IOException, RuntimeException) { // TODO } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 385284094e33..9601f47776ff 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -31,14 +31,10 @@ #include <cppuhelper/compbase4.hxx> #include "apitools.hxx" -//......................................................................... namespace dbaui { -//......................................................................... -//================================================================== // OColumnControlModel -//================================================================== typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::awt::XControlModel , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::util::XCloneable @@ -91,16 +87,13 @@ public: virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - // OPropertyArrayUsageHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_COLUMNMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 62e90f78a822..7bc6f7c443c4 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -23,10 +23,8 @@ #include "dbustrings.hrc" #include "FieldDescriptions.hxx" -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -44,7 +42,7 @@ OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XComponentContext>& _r } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + void OColumnPeer::setEditWidth(sal_Int32 _nWidth) { SolarMutexGuard aGuard; @@ -55,7 +53,7 @@ void OColumnPeer::setEditWidth(sal_Int32 _nWidth) pFieldControl->setEditWidth(_nWidth); } } -// ----------------------------------------------------------------------------- + void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) { SolarMutexGuard aGuard; @@ -103,7 +101,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) pFieldControl->DisplayData(m_pActFieldDescr); } } -// ----------------------------------------------------------------------------- + void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) { SolarMutexGuard aGuard; @@ -111,7 +109,7 @@ void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) if ( pFieldControl ) pFieldControl->setConnection(_xCon); } -//------------------------------------------------------------------------------ + void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -129,7 +127,7 @@ void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value) else VCLXWindow::setProperty(_rPropertyName,Value); } -// ----------------------------------------------------------------------------- + Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { Any aProp; @@ -146,8 +144,7 @@ Any OColumnPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc aProp = VCLXWindow::getProperty(_rPropertyName); return aProp; } -//......................................................................... + } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 45e78ec5ad91..529bff711973 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -24,10 +24,8 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -//......................................................................... namespace dbaui { -//......................................................................... class OFieldDescription; class OColumnPeer : public VCLXWindow { @@ -45,10 +43,7 @@ namespace dbaui virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif //DBAUI_COLUMNPEER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 540f335ab4d6..0e65b1b81e5b 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbu_reghelper.hxx" #include "DBTypeWizDlg.hxx" #include "dbwiz.hxx" @@ -30,53 +29,44 @@ extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialog() static OMultiInstanceAutoRegistration< ODBTypeWizDialog > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//========================================================================= -//------------------------------------------------------------------------- ODBTypeWizDialog::ODBTypeWizDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialog(_rxORB) { } -//------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL ODBTypeWizDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL ODBTypeWizDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new ODBTypeWizDialog( comphelper::getComponentContext(_rxFactory) )); } -//------------------------------------------------------------------------- OUString SAL_CALL ODBTypeWizDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -84,35 +74,30 @@ OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException return aSupported; } -//------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& ODBTypeWizDialog::getInfoHelper() { return *const_cast<ODBTypeWizDialog*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* ODBTypeWizDialog::createArrayHelper( ) const { Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -//------------------------------------------------------------------------------ + Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) { ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 1fe6bb65f393..f9bf52ed23b0 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -24,13 +24,9 @@ #include "unoadmin.hxx" #endif -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODBTypeWizDialog -//========================================================================= +// ODBTypeWizDialog class ODBTypeWizDialog :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialog > @@ -64,9 +60,7 @@ protected: virtual Dialog* createDialog(Window* _pParent); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_DBTYPEWIZDLG_HXX diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index d3bec7582215..ac1281bedd79 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbu_reghelper.hxx" #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/container/XSet.hpp> @@ -35,10 +34,8 @@ extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup() static OMultiInstanceAutoRegistration< ODBTypeWizDialogSetup > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -46,8 +43,6 @@ namespace dbaui using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; -//========================================================================= -//------------------------------------------------------------------------- ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialog(_rxORB) ,m_bOpenDatabase(sal_True) @@ -59,39 +54,34 @@ ODBTypeWizDialogSetup::ODBTypeWizDialogSetup(const Reference< XComponentContext registerProperty(OUString("StartTableWizard"), 4, PropertyAttribute::TRANSIENT, &m_bStartTableWizard, getBooleanCppuType()); } -//------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL ODBTypeWizDialogSetup::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL ODBTypeWizDialogSetup::Create(const Reference< XMultiServiceFactory >& _rxFactory) { Reference < XInterface > xDBWizard = *(new ODBTypeWizDialogSetup( comphelper::getComponentContext(_rxFactory) )); return xDBWizard; } -//------------------------------------------------------------------------- OUString SAL_CALL ODBTypeWizDialogSetup::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -99,31 +89,28 @@ OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeExce return aSupported; } -//------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo() throw(RuntimeException) { return createPropertySetInfo( getInfoHelper() ); } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& ODBTypeWizDialogSetup::getInfoHelper() { return *const_cast<ODBTypeWizDialogSetup*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* ODBTypeWizDialogSetup::createArrayHelper( ) const { Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -//------------------------------------------------------------------------------ + Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) { return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); } -// ----------------------------------------------------------------------------- + void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) { if ( _nExecutionResult == RET_OK ) @@ -134,8 +121,6 @@ void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) } } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index afce6e0a2b7c..4fbaad0c6c5c 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -24,13 +24,9 @@ #include "unoadmin.hxx" #endif -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODBTypeWizDialogSetup -//========================================================================= +// ODBTypeWizDialogSetup class ODBTypeWizDialogSetup :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< ODBTypeWizDialogSetup > @@ -68,9 +64,7 @@ protected: virtual void executedDialog(sal_Int16 _nExecutionResult); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_DBTYPEWIZDLG_HXX diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index c24a1b31f1f9..846c81f8d77d 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbu_reghelper.hxx" #include "TableFilterDlg.hxx" #include "TablesSingleDlg.hxx" #include <comphelper/processfactory.hxx> - using namespace dbaui; extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog() @@ -31,53 +29,44 @@ extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog() static OMultiInstanceAutoRegistration< OTableFilterDialog > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//========================================================================= -//------------------------------------------------------------------------- OTableFilterDialog::OTableFilterDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialog(_rxORB) { } -//------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL OTableFilterDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OTableFilterDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OTableFilterDialog( comphelper::getComponentContext(_rxFactory) )); } -//------------------------------------------------------------------------- OUString SAL_CALL OTableFilterDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -85,35 +74,30 @@ OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeExcepti return aSupported; } -//------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& OTableFilterDialog::getInfoHelper() { return *const_cast<OTableFilterDialog*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* OTableFilterDialog::createArrayHelper( ) const { Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -//------------------------------------------------------------------------------ + Dialog* OTableFilterDialog::createDialog(Window* _pParent) { OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 0e9dd004148b..aca42953941b 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -24,13 +24,9 @@ #include "unoadmin.hxx" #endif -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OTableFilterDialog -//========================================================================= +// OTableFilterDialog class OTableFilterDialog :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< OTableFilterDialog > @@ -64,9 +60,7 @@ protected: virtual Dialog* createDialog(Window* _pParent); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_TABLEFILTERDLG_HXX diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 3bef400319a5..9cae4effd0f5 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbu_reghelper.hxx" #include "UserSettingsDlg.hxx" #include "UserAdminDlg.hxx" #include <comphelper/processfactory.hxx> - using namespace dbaui; extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog() @@ -31,53 +29,44 @@ extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog() static OMultiInstanceAutoRegistration< OUserSettingsDialog > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//========================================================================= -//------------------------------------------------------------------------- OUserSettingsDialog::OUserSettingsDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialog(_rxORB) { } -//------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL OUserSettingsDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OUserSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OUserSettingsDialog( comphelper::getComponentContext(_rxFactory) )); } -//------------------------------------------------------------------------- OUString SAL_CALL OUserSettingsDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -85,35 +74,30 @@ OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeExcept return aSupported; } -//------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& OUserSettingsDialog::getInfoHelper() { return *const_cast<OUserSettingsDialog*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* OUserSettingsDialog::createArrayHelper( ) const { Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -//------------------------------------------------------------------------------ + Dialog* OUserSettingsDialog::createDialog(Window* _pParent) { OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection); return pDlg; } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index da3e82882931..090b13df240f 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -24,13 +24,9 @@ #include "unoadmin.hxx" #endif -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= OUserSettingsDialog -//========================================================================= +// OUserSettingsDialog class OUserSettingsDialog :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< OUserSettingsDialog > @@ -64,9 +60,7 @@ protected: virtual Dialog* createDialog(Window* _pParent); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_USERSETTINGSDLG_HXX diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index b370e3352994..10b1f7252b55 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbu_reghelper.hxx" #include "admindlg.hxx" #include "dbadmin.hxx" #include <comphelper/processfactory.hxx> - using namespace dbaui; extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog() @@ -31,53 +29,44 @@ extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog() static OMultiInstanceAutoRegistration< ODataSourcePropertyDialog > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//========================================================================= -//------------------------------------------------------------------------- ODataSourcePropertyDialog::ODataSourcePropertyDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialog(_rxORB) { } -//------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL ODataSourcePropertyDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL ODataSourcePropertyDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new ODataSourcePropertyDialog( comphelper::getComponentContext(_rxFactory) )); } -//------------------------------------------------------------------------- OUString SAL_CALL ODataSourcePropertyDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -85,27 +74,24 @@ OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(Runtime return aSupported; } -//------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& ODataSourcePropertyDialog::getInfoHelper() { return *const_cast<ODataSourcePropertyDialog*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* ODataSourcePropertyDialog::createArrayHelper( ) const { Sequence< Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } -//------------------------------------------------------------------------------ + Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) { @@ -118,8 +104,6 @@ Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) return pDialog; } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 6d7a6d0375a5..dd200c72ba13 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -24,13 +24,9 @@ #include "unoadmin.hxx" #endif -//......................................................................... namespace dbaui { -//......................................................................... -//========================================================================= -//= ODataSourcePropertyDialog -//========================================================================= +// ODataSourcePropertyDialog class ODataSourcePropertyDialog :public ODatabaseAdministrationDialog ,public ::comphelper::OPropertyArrayUsageHelper< ODataSourcePropertyDialog > @@ -64,9 +60,7 @@ protected: virtual Dialog* createDialog(Window* _pParent); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_ADMINDLG_HXX diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 1b3190605e8d..04d21bd18374 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "composerdialogs.hxx" #include "dbu_reghelper.hxx" @@ -36,10 +35,8 @@ extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs() static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::RowsetFilterDialog > aFilterDialogRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... #define PROPERTY_ID_QUERYCOMPOSER 100 #define PROPERTY_ID_ROWSET 101 @@ -55,11 +52,8 @@ namespace dbaui using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; - //===================================================================== - //= ComposerDialog - //===================================================================== + // ComposerDialog DBG_NAME(ComposerDialog) - //--------------------------------------------------------------------- ComposerDialog::ComposerDialog(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog( _rxORB ) { @@ -71,20 +65,16 @@ namespace dbaui &m_xRowSet, ::getCppuType( &m_xRowSet ) ); } - //--------------------------------------------------------------------- ComposerDialog::~ComposerDialog() { DBG_DTOR(ComposerDialog,NULL); } - //--------------------------------------------------------------------- IMPLEMENT_IMPLEMENTATION_ID( ComposerDialog ) - //--------------------------------------------------------------------- IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog ) - //--------------------------------------------------------------------- Dialog* ComposerDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog @@ -132,16 +122,12 @@ namespace dbaui return createComposerDialog( _pParent, xConnection, xColumns ); } - //===================================================================== - //= RowsetFilterDialog - //===================================================================== - //--------------------------------------------------------------------- + // RowsetFilterDialog RowsetFilterDialog::RowsetFilterDialog( const Reference< XComponentContext >& _rxORB ) :ComposerDialog( _rxORB ) { } - //--------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(RowsetFilterDialog, "com.sun.star.uno.comp.sdb.RowsetFilterDialog") IMPLEMENT_SERVICE_INFO_SUPPORTS(RowsetFilterDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetFilterDialog, "com.sun.star.sdb.FilterDialog") @@ -152,8 +138,6 @@ namespace dbaui return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB))); } - - //--------------------------------------------------------------------- Dialog* RowsetFilterDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { return new DlgFilterCrit( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns ); @@ -178,7 +162,6 @@ namespace dbaui ComposerDialog::initialize(aArguments); } - //--------------------------------------------------------------------- void RowsetFilterDialog::executedDialog( sal_Int16 _nExecutionResult ) { ComposerDialog::executedDialog( _nExecutionResult ); @@ -187,16 +170,12 @@ namespace dbaui static_cast< DlgFilterCrit* >( m_pDialog )->BuildWherePart(); } - //===================================================================== - //= RowsetOrderDialog - //===================================================================== - //--------------------------------------------------------------------- + // RowsetOrderDialog RowsetOrderDialog::RowsetOrderDialog( const Reference< XComponentContext >& _rxORB ) :ComposerDialog( _rxORB ) { } - //--------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(RowsetOrderDialog, "com.sun.star.uno.comp.sdb.RowsetOrderDialog") IMPLEMENT_SERVICE_INFO_SUPPORTS(RowsetOrderDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(RowsetOrderDialog, "com.sun.star.sdb.OrderDialog") @@ -207,13 +186,11 @@ namespace dbaui return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB))); } - //--------------------------------------------------------------------- Dialog* RowsetOrderDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { return new DlgOrderCrit( _pParent, _rxConnection, m_xComposer, _rxColumns ); } - //--------------------------------------------------------------------- void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) { if( aArguments.getLength() == 2 ) @@ -229,7 +206,6 @@ namespace dbaui ComposerDialog::initialize(aArguments); } - //--------------------------------------------------------------------- void RowsetOrderDialog::executedDialog( sal_Int16 _nExecutionResult ) { ComposerDialog::executedDialog( _nExecutionResult ); @@ -243,9 +219,6 @@ namespace dbaui m_xComposer->setOrder( static_cast< DlgOrderCrit* >( m_pDialog )->GetOrignalOrder() ); } -//......................................................................... } // namespace dbaui -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 846ec80275cb..7a8d82bd6c63 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -30,14 +30,10 @@ #include "moduledbu.hxx" #include "apitools.hxx" -//......................................................................... namespace dbaui { -//......................................................................... - //===================================================================== - //= ComposerDialog - //===================================================================== + // ComposerDialog class ComposerDialog; typedef ::comphelper::OPropertyArrayUsageHelper< ComposerDialog > ComposerDialog_PBASE; @@ -76,9 +72,7 @@ namespace dbaui virtual Dialog* createDialog(Window* _pParent); }; - //===================================================================== - //= RowsetFilterDialog - //===================================================================== + // RowsetFilterDialog class RowsetFilterDialog : public ComposerDialog { public: @@ -103,9 +97,7 @@ namespace dbaui }; - //===================================================================== - //= RowsetOrderDialog - //===================================================================== + // RowsetOrderDialog class RowsetOrderDialog : public ComposerDialog { public: @@ -129,11 +121,8 @@ namespace dbaui throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 4aaf66d14709..954c60186d85 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -70,10 +70,8 @@ #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -//........................................................................ namespace dbaui { -//........................................................................ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -140,9 +138,7 @@ namespace dbaui typedef ::utl::SharedUNOComponent< XConnection > SharedConnection; - //========================================================================= - //= CopyTableWizard - //========================================================================= + // CopyTableWizard typedef ::svt::OGenericUnoDialog CopyTableWizard_DialogBase; typedef ::cppu::ImplInheritanceHelper1 < CopyTableWizard_DialogBase , XCopyTableWizard @@ -366,9 +362,7 @@ private: sal_Int16 m_nOverrideExecutionResult; }; -//========================================================================= -//= MethodGuard -//========================================================================= +// MethodGuard class CopyTableAccessGuard { public: @@ -389,8 +383,6 @@ private: CopyTableWizard& m_rWizard; }; -//========================================================================= -//------------------------------------------------------------------------- CopyTableWizard::CopyTableWizard( const Reference< XComponentContext >& _rxORB ) :CopyTableWizard_Base( _rxORB ) ,m_xContext( _rxORB ) @@ -410,7 +402,6 @@ CopyTableWizard::CopyTableWizard( const Reference< XComponentContext >& _rxORB ) { } -//------------------------------------------------------------------------- CopyTableWizard::~CopyTableWizard() { acquire(); @@ -428,31 +419,26 @@ CopyTableWizard::~CopyTableWizard() // some thinking - would it break existing clients which do not call a dispose, then? } -//------------------------------------------------------------------------- Reference< XInterface > CopyTableWizard::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *( new CopyTableWizard( comphelper::getComponentContext(_rxFactory) ) ); } -//------------------------------------------------------------------------- OUString SAL_CALL CopyTableWizard::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString CopyTableWizard::getImplementationName_Static() throw(RuntimeException) { return OUString( "org.openoffice.comp.dbu.CopyTableWizard" ); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL CopyTableWizard::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -460,21 +446,18 @@ OUString CopyTableWizard::getImplementationName_Static() throw(RuntimeException) return aSupported; } -//------------------------------------------------------------------------- Reference< XPropertySetInfo > SAL_CALL CopyTableWizard::getPropertySetInfo() throw(RuntimeException) { Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//-------------------------------------------------------------------- ::sal_Int16 SAL_CALL CopyTableWizard::getOperation() throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); return m_nOperation; } -//-------------------------------------------------------------------- void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) throw (IllegalArgumentException, RuntimeException) { CopyTableAccessGuard aGuard( *this ); @@ -498,28 +481,24 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) throw (Ill m_nOperation = _operation; } -//-------------------------------------------------------------------- OUString SAL_CALL CopyTableWizard::getDestinationTableName() throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); return m_sDestinationTable; } -//-------------------------------------------------------------------- void SAL_CALL CopyTableWizard::setDestinationTableName( const OUString& _destinationTableName ) throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); m_sDestinationTable = _destinationTableName; } -//-------------------------------------------------------------------- Optional< OUString > SAL_CALL CopyTableWizard::getCreatePrimaryKey() throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); return m_aPrimaryKeyName; } -//-------------------------------------------------------------------- void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& _newPrimaryKey ) throw (IllegalArgumentException, RuntimeException) { CopyTableAccessGuard aGuard( *this ); @@ -533,19 +512,19 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& m_aPrimaryKeyName = _newPrimaryKey; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL CopyTableWizard::getUseHeaderLineAsColumnNames() throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); return m_bUseHeaderLineAsColumnNames; } -// ----------------------------------------------------------------------------- + void SAL_CALL CopyTableWizard::setUseHeaderLineAsColumnNames( sal_Bool _bUseHeaderLineAsColumnNames ) throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); m_bUseHeaderLineAsColumnNames = _bUseHeaderLineAsColumnNames; } -//-------------------------------------------------------------------- + void SAL_CALL CopyTableWizard::addCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); @@ -553,7 +532,6 @@ void SAL_CALL CopyTableWizard::addCopyTableListener( const Reference< XCopyTable m_aCopyTableListeners.addInterface( _rxListener ); } -//-------------------------------------------------------------------- void SAL_CALL CopyTableWizard::removeCopyTableListener( const Reference< XCopyTableListener >& _rxListener ) throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); @@ -561,14 +539,12 @@ void SAL_CALL CopyTableWizard::removeCopyTableListener( const Reference< XCopyTa m_aCopyTableListeners.removeInterface( _rxListener ); } -//-------------------------------------------------------------------- void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle ) throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); CopyTableWizard_DialogBase::setTitle( _rTitle ); } -//-------------------------------------------------------------------- ::sal_Int16 SAL_CALL CopyTableWizard::execute( ) throw (RuntimeException) { CopyTableAccessGuard aGuard( *this ); @@ -581,7 +557,6 @@ void SAL_CALL CopyTableWizard::setTitle( const OUString& _rTitle ) throw (Runtim return nExecutionResult; } -//------------------------------------------------------------------------- OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() { OCopyTableWizard* pWizard = dynamic_cast< OCopyTableWizard* >( m_pDialog ); @@ -590,7 +565,6 @@ OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() return *pWizard; } -//------------------------------------------------------------------------- const OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() const { const OCopyTableWizard* pWizard = dynamic_cast< const OCopyTableWizard* >( m_pDialog ); @@ -599,7 +573,6 @@ const OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() const return *pWizard; } -//------------------------------------------------------------------------- void CopyTableWizard::impl_attributesToDialog_nothrow( OCopyTableWizard& _rDialog ) const { // primary key column @@ -609,7 +582,6 @@ void CopyTableWizard::impl_attributesToDialog_nothrow( OCopyTableWizard& _rDialo // everything else was passed at construction time already } -//------------------------------------------------------------------------- void CopyTableWizard::impl_dialogToAttributes_nothrow( const OCopyTableWizard& _rDialog ) { m_aPrimaryKeyName.IsPresent = _rDialog.shouldCreatePrimaryKey(); @@ -624,10 +596,8 @@ void CopyTableWizard::impl_dialogToAttributes_nothrow( const OCopyTableWizard& _ m_bUseHeaderLineAsColumnNames = _rDialog.UseHeaderLine(); } -//------------------------------------------------------------------------- namespace { - //..................................................................... /** tries to obtain the InteractionHandler associated with a given data source If the data source is a sdb-level data source, it will have a DatabaseDocument associated @@ -656,7 +626,6 @@ namespace return xHandler; } - //..................................................................... /** tries to obtain the InteractionHandler associated with a given connection If the connection belongs to a sdb-level data source, then this data source @@ -681,7 +650,6 @@ namespace } } -//------------------------------------------------------------------------- Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw( const Sequence< Any >& _rAllArgs, const sal_Int16 _nArgPos, SharedConnection& _out_rxConnection, Reference< XInteractionHandler >& _out_rxDocInteractionHandler ) const @@ -719,7 +687,6 @@ Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw return xDescriptor; } -//------------------------------------------------------------------------- namespace { bool lcl_hasNonEmptyStringValue_throw( const Reference< XPropertySet >& _rxDescriptor, @@ -734,7 +701,6 @@ namespace } } -//------------------------------------------------------------------------- void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< XPropertySet >& _rxSourceDescriptor ) const { OSL_PRECOND( _rxSourceDescriptor.is(), "CopyTableWizard::impl_checkForUnsupportedSettings_throw: illegal argument!" ); @@ -767,7 +733,6 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X } -//------------------------------------------------------------------------- SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const { @@ -834,9 +799,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH return pSourceObject; } + SAL_WNODEPRECATED_DECLARATIONS_POP -//------------------------------------------------------------------------- void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPropertySet >& i_rDescriptor ) { Reference< XPropertySetInfo > xPSI( i_rDescriptor->getPropertySetInfo(), UNO_SET_THROW ); @@ -872,7 +837,6 @@ void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPrope } } -//------------------------------------------------------------------------- SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference< XPropertySet >& _rxDataSourceDescriptor, Reference< XInteractionHandler >& _out_rxDocInteractionHandler ) const { @@ -968,7 +932,6 @@ SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference< return xConnection; } -//------------------------------------------------------------------------- ::utl::SharedUNOComponent< XPreparedStatement > CopyTableWizard::impl_createSourceStatement_throw() const { OSL_PRECOND( m_xSourceConnection.is(), "CopyTableWizard::impl_createSourceStatement_throw: illegal call!" ); @@ -1025,7 +988,6 @@ SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference< return xStatement; } -//------------------------------------------------------------------------- namespace { class ValueTransfer @@ -1072,7 +1034,6 @@ namespace }; } -//------------------------------------------------------------------------- bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _rEvent ) { Reference< XCopyTableListener > xListener; @@ -1149,7 +1110,6 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r return false; } -//------------------------------------------------------------------------- void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSourceResultSet, const Reference< XPropertySet >& _rxDestTable ) { @@ -1369,7 +1329,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou } while( bContinue ); } -//------------------------------------------------------------------------- + void CopyTableWizard::impl_doCopy_nothrow() { Any aError; @@ -1485,7 +1445,7 @@ void CopyTableWizard::impl_doCopy_nothrow() } } } -// ----------------------------------------------------------------------------- + OUString CopyTableWizard::impl_getServerSideCopyStatement_throw(const Reference< XPropertySet >& _xTable) { const Reference<XColumnsSupplier> xDestColsSup(_xTable,UNO_QUERY_THROW); @@ -1512,7 +1472,7 @@ OUString CopyTableWizard::impl_getServerSideCopyStatement_throw(const Reference< return sSql; } -//------------------------------------------------------------------------- + void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1565,13 +1525,11 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) } } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& CopyTableWizard::getInfoHelper() { return *getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* CopyTableWizard::createArrayHelper( ) const { Sequence< Property > aProps; @@ -1579,7 +1537,6 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) return new ::cppu::OPropertyArrayHelper( aProps ); } -//------------------------------------------------------------------------------ Dialog* CopyTableWizard::createDialog( Window* _pParent ) { OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" ); @@ -1601,7 +1558,6 @@ Dialog* CopyTableWizard::createDialog( Window* _pParent ) return pWizard; } -//------------------------------------------------------------------------------ void CopyTableWizard::executedDialog( sal_Int16 _nExecutionResult ) { CopyTableWizard_DialogBase::executedDialog( _nExecutionResult ); @@ -1614,9 +1570,7 @@ void CopyTableWizard::executedDialog( sal_Int16 _nExecutionResult ) impl_dialogToAttributes_nothrow( impl_getDialog_throw() ); } -//........................................................................ } // namespace dbaui -//........................................................................ extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard() { diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 1b2268ce6fc1..31d84a779cb7 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbinteraction.hxx" #include "dbu_reghelper.hxx" #include <tools/diagnose_ex.h> @@ -41,19 +40,14 @@ #include "UITools.hxx" #include <comphelper/processfactory.hxx> - -//========================================================================== - extern "C" void SAL_CALL createRegistryInfo_OInteractionHandler() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::SQLExceptionInteractionHandler > aSQLExceptionInteractionHandler_AutoRegistration; static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::LegacyInteractionHandler > aLegacyInteractionHandler_AutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::sdb; @@ -62,10 +56,7 @@ namespace dbaui using namespace ::com::sun::star::beans; using namespace ::dbtools; - //========================================================================= - //= BasicInteractionHandler - //========================================================================= - //------------------------------------------------------------------------- + // BasicInteractionHandler BasicInteractionHandler::BasicInteractionHandler( const Reference< XComponentContext >& rxContext, const bool i_bFallbackToGeneric ) :m_xContext( rxContext ) ,m_bFallbackToGeneric( i_bFallbackToGeneric ) @@ -74,19 +65,16 @@ namespace dbaui "BasicInteractionHandler::BasicInteractionHandler: enabling legacy behavior, there should be no clients of this anymore!" ); } - //------------------------------------------------------------------------- ::sal_Bool SAL_CALL BasicInteractionHandler::handleInteractionRequest( const Reference< XInteractionRequest >& i_rRequest ) throw (RuntimeException) { return impl_handle_throw( i_rRequest ); } - //------------------------------------------------------------------------- void SAL_CALL BasicInteractionHandler::handle( const Reference< XInteractionRequest >& i_rRequest ) throw(RuntimeException) { impl_handle_throw( i_rRequest ); } - //------------------------------------------------------------------------- sal_Bool BasicInteractionHandler::impl_handle_throw( const Reference< XInteractionRequest >& i_Request ) { Any aRequest( i_Request->getRequest() ); @@ -125,7 +113,6 @@ namespace dbaui return sal_False; } - //------------------------------------------------------------------------- void BasicInteractionHandler::implHandle(const ParametersRequest& _rParamRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { SolarMutexGuard aGuard; @@ -164,7 +151,6 @@ namespace dbaui } } - //------------------------------------------------------------------------- void BasicInteractionHandler::implHandle(const SQLExceptionInfo& _rSqlInfo, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { SolarMutexGuard aGuard; @@ -238,7 +224,6 @@ namespace dbaui DBG_UNHANDLED_EXCEPTION(); } } - //------------------------------------------------------------------------- void BasicInteractionHandler::implHandle(const DocumentSaveRequest& _rDocuRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { SolarMutexGuard aGuard; @@ -301,7 +286,6 @@ namespace dbaui _rContinuations[nDisApprovePos]->select(); } - //------------------------------------------------------------------------- bool BasicInteractionHandler::implHandleUnknown( const Reference< XInteractionRequest >& _rxRequest ) { if ( m_xContext.is() ) @@ -314,7 +298,6 @@ namespace dbaui return false; } - //------------------------------------------------------------------------- sal_Int32 BasicInteractionHandler::getContinuation(Continuation _eCont, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { const Reference< XInteractionContinuation >* pContinuations = _rContinuations.getConstArray(); @@ -352,9 +335,7 @@ namespace dbaui return -1; } - //========================================================================== - //= SQLExceptionInteractionHandler - //========================================================================== + // SQLExceptionInteractionHandler IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(SQLExceptionInteractionHandler, "com.sun.star.comp.dbaccess.DatabaseInteractionHandler") IMPLEMENT_SERVICE_INFO_SUPPORTS(SQLExceptionInteractionHandler) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(SQLExceptionInteractionHandler, "com.sun.star.sdb.DatabaseInteractionHandler") @@ -365,22 +346,17 @@ namespace dbaui return static_cast< XServiceInfo* >(new SQLExceptionInteractionHandler(comphelper::getComponentContext(_rxORB))); } - //========================================================================== - //= LegacyInteractionHandler - //========================================================================== + // LegacyInteractionHandler IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(LegacyInteractionHandler, "com.sun.star.comp.dbaccess.LegacyInteractionHandler") IMPLEMENT_SERVICE_INFO_SUPPORTS(LegacyInteractionHandler) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LegacyInteractionHandler, "com.sun.star.sdb.LegacyInteractionHandler") - Reference< XInterface > SAL_CALL LegacyInteractionHandler::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new LegacyInteractionHandler(comphelper::getComponentContext(_rxORB))); } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 32018f7b8bab..0a6ffd88cd25 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -37,14 +37,10 @@ namespace dbtools class SQLExceptionInfo; } -//......................................................................... namespace dbaui { -//......................................................................... - //========================================================================= - //= BasicInteractionHandler - //========================================================================= + // BasicInteractionHandler typedef ::cppu::WeakImplHelper2 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::task::XInteractionHandler2 > BasicInteractionHandler_Base; @@ -124,9 +120,7 @@ namespace dbaui const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& _rContinuations); }; - //========================================================================= - //= SQLExceptionInteractionHandler - //========================================================================= + // SQLExceptionInteractionHandler class SQLExceptionInteractionHandler : public BasicInteractionHandler { public: @@ -141,9 +135,7 @@ namespace dbaui DECLARE_SERVICE_INFO_STATIC(); }; - //========================================================================= - //= SQLExceptionInteractionHandler - //========================================================================= + // SQLExceptionInteractionHandler /** an implementation for the legacy css.sdb.InteractionHandler css.sdb.InteractionHandler is deprecated, as it does not only handle database related interactions, @@ -171,9 +163,7 @@ namespace dbaui DECLARE_SERVICE_INFO_STATIC(); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // _DBAUI_INTERACTION_HXX_ diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index bf062f4b2927..e97bc16d80b4 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "textconnectionsettings.hxx" #include "dbu_reghelper.hxx" #include "moduledbu.hxx" @@ -34,10 +33,8 @@ #include <svtools/genericunodialog.hxx> #include <cppuhelper/implbase1.hxx> -//........................................................................ namespace dbaui { -//........................................................................ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -55,9 +52,7 @@ namespace dbaui namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - //==================================================================== - //= OTextConnectionSettingsDialog - //==================================================================== + // OTextConnectionSettingsDialog class OTextConnectionSettingsDialog; typedef ::cppu::ImplInheritanceHelper1 < ODatabaseAdministrationDialog @@ -112,25 +107,19 @@ namespace dbaui using OTextConnectionSettingsDialog_BASE::getFastPropertyValue; }; - //==================================================================== - //= OTextConnectionSettingsDialog - //==================================================================== - //-------------------------------------------------------------------- + // OTextConnectionSettingsDialog OTextConnectionSettingsDialog::OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext ) :OTextConnectionSettingsDialog_BASE( _rContext ) { TextConnectionSettingsDialog::bindItemStorages( *m_pDatasourceItems, m_aPropertyValues ); } - //--------------------------------------------------------------------- OTextConnectionSettingsDialog::~OTextConnectionSettingsDialog() { } - //--------------------------------------------------------------------- IMPLEMENT_IMPLEMENTATION_ID( OTextConnectionSettingsDialog ) - //--------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OTextConnectionSettingsDialog, "com.sun.star.comp.dbaccess.OTextConnectionSettingsDialog") IMPLEMENT_SERVICE_INFO_SUPPORTS(OTextConnectionSettingsDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(OTextConnectionSettingsDialog, "com.sun.star.sdb.TextConnectionSettings") @@ -141,19 +130,16 @@ namespace dbaui return static_cast< XServiceInfo* >(new OTextConnectionSettingsDialog( comphelper::getComponentContext(_rxORB))); } - //--------------------------------------------------------------------- Reference< XPropertySetInfo > SAL_CALL OTextConnectionSettingsDialog::getPropertySetInfo() throw(RuntimeException) { return createPropertySetInfo( getInfoHelper() ); } - //--------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& OTextConnectionSettingsDialog::getInfoHelper() { return *getArrayHelper(); } - //--------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OTextConnectionSettingsDialog::createArrayHelper( ) const { Sequence< Property > aProps; @@ -210,19 +196,16 @@ namespace dbaui return new ::cppu::OPropertyArrayHelper( aProps ); } - //--------------------------------------------------------------------- Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) { return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems ); } - //--------------------------------------------------------------------- void OTextConnectionSettingsDialog::implInitialize(const Any& _rValue) { OTextConnectionSettingsDialog_BASE::implInitialize( _rValue ); } - //-------------------------------------------------------------------- void SAL_CALL OTextConnectionSettingsDialog::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw(Exception) { PropertyValues::const_iterator pos = m_aPropertyValues.find( _nHandle ); @@ -236,7 +219,6 @@ namespace dbaui } } - //-------------------------------------------------------------------- sal_Bool SAL_CALL OTextConnectionSettingsDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) { sal_Bool bModified = sal_False; @@ -257,7 +239,6 @@ namespace dbaui return bModified; } - //-------------------------------------------------------------------- void SAL_CALL OTextConnectionSettingsDialog::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { PropertyValues::const_iterator pos = m_aPropertyValues.find( _nHandle ); @@ -271,9 +252,7 @@ namespace dbaui } } -//........................................................................ } // namespace dbaui -//........................................................................ extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog() { diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index c3e942607af3..47c92fd2ee49 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "unoDirectSql.hxx" #include "dbu_reghelper.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -30,16 +29,13 @@ #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> - extern "C" void SAL_CALL createRegistryInfo_ODirectSQLDialog() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::ODirectSQLDialog > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -49,11 +45,8 @@ namespace dbaui using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; - //===================================================================== - //= ODirectSQLDialog - //===================================================================== + // ODirectSQLDialog DBG_NAME(ODirectSQLDialog) -//--------------------------------------------------------------------- ODirectSQLDialog::ODirectSQLDialog(const Reference< XComponentContext >& _rxORB) :ODirectSQLDialog_BASE( _rxORB ) { @@ -61,17 +54,14 @@ DBG_NAME(ODirectSQLDialog) } - //--------------------------------------------------------------------- ODirectSQLDialog::~ODirectSQLDialog() { DBG_DTOR(ODirectSQLDialog,NULL); } - //--------------------------------------------------------------------- IMPLEMENT_IMPLEMENTATION_ID( ODirectSQLDialog ) - //--------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(ODirectSQLDialog, "com.sun.star.comp.sdb.DirectSQLDialog") IMPLEMENT_SERVICE_INFO_SUPPORTS(ODirectSQLDialog) IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(ODirectSQLDialog, SERVICE_SDB_DIRECTSQLDIALOG) @@ -82,10 +72,8 @@ DBG_NAME(ODirectSQLDialog) return static_cast< XServiceInfo* >(new ODirectSQLDialog( comphelper::getComponentContext(_rxORB))); } - //--------------------------------------------------------------------- IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog ) - //--------------------------------------------------------------------- Dialog* ODirectSQLDialog::createDialog(Window* _pParent) { // obtain all the objects needed for the dialog @@ -109,7 +97,6 @@ DBG_NAME(ODirectSQLDialog) return new DirectSQLDialog( _pParent, xConnection); } - //--------------------------------------------------------------------- void ODirectSQLDialog::implInitialize(const Any& _rValue) { PropertyValue aProperty; @@ -129,8 +116,6 @@ DBG_NAME(ODirectSQLDialog) } ODirectSQLDialog_BASE::implInitialize(_rValue); } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index b57a498e35c1..b9fce9f9aeb8 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -28,14 +28,10 @@ #include "moduledbu.hxx" #include <com/sun/star/sdbc/XConnection.hpp> -//......................................................................... namespace dbaui { -//......................................................................... - //===================================================================== - //= ODirectSQLDialog - //===================================================================== + // ODirectSQLDialog class ODirectSQLDialog; typedef ::svt::OGenericUnoDialog ODirectSQLDialog_BASE; typedef ::comphelper::OPropertyArrayUsageHelper< ODirectSQLDialog > ODirectSQLDialog_PBASE; @@ -64,9 +60,7 @@ namespace dbaui virtual void implInitialize(const com::sun::star::uno::Any& _rValue); }; -//......................................................................... } // namespace dbaui -//......................................................................... #endif // DBAUI_UNODIRECTSQL_HXX diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 115b7c88cef0..53f4f17f6bae 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dbustrings.hrc" #include <toolkit/awt/vclxwindow.hxx> #include "dbu_reghelper.hxx" @@ -37,18 +36,14 @@ #include <vcl/svapp.hxx> // --- -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//========================================================================= DBG_NAME(ODatabaseAdministrationDialog) -//------------------------------------------------------------------------- ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XComponentContext >& _rxORB) :ODatabaseAdministrationDialogBase(_rxORB) ,m_pDatasourceItems(NULL) @@ -62,7 +57,6 @@ ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XC ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection); } -//------------------------------------------------------------------------- ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog() { // we do this here cause the base class' call to destroyDialog won't reach us anymore : we're within an dtor, @@ -79,13 +73,13 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog() DBG_DTOR(ODatabaseAdministrationDialog,NULL); } -//------------------------------------------------------------------------- + void ODatabaseAdministrationDialog::destroyDialog() { ODatabaseAdministrationDialogBase::destroyDialog(); ODbAdminDialog::destroyItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults); } -//------------------------------------------------------------------------------ + void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) { PropertyValue aProperty; @@ -106,8 +100,6 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) ODatabaseAdministrationDialogBase::implInitialize(_rValue); } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 94ceda731275..1ac8838fc52e 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sqlmessage.hxx" #include "unosqlmessage.hxx" #include "dbu_reghelper.hxx" @@ -37,17 +36,13 @@ extern "C" void SAL_CALL createRegistryInfo_OSQLMessageDialog() static OMultiInstanceAutoRegistration< OSQLMessageDialog > aAutoRegistration; } -//......................................................................... namespace dbaui { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//========================================================================= -//------------------------------------------------------------------------- OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxORB) :OSQLMessageDialogBase(_rxORB) { @@ -57,38 +52,32 @@ OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxOR &m_sHelpURL, ::getCppuType( &m_sHelpURL ) ); } -//------------------------------------------------------------------------- Sequence<sal_Int8> SAL_CALL OSQLMessageDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } -//------------------------------------------------------------------------- Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OSQLMessageDialog( comphelper::getComponentContext(_rxFactory) )); } -//------------------------------------------------------------------------- OUString SAL_CALL OSQLMessageDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } -//------------------------------------------------------------------------- OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.dbu.OSQLMessageDialog"); } -//------------------------------------------------------------------------- ::comphelper::StringSequence SAL_CALL OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } -//------------------------------------------------------------------------- ::comphelper::StringSequence OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -96,7 +85,6 @@ OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeExceptio return aSupported; } -//------------------------------------------------------------------------- void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) { OUString title; @@ -114,7 +102,6 @@ void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (com::sun:: } } -//------------------------------------------------------------------------- sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw(IllegalArgumentException) { switch (_nHandle) @@ -136,20 +123,17 @@ sal_Bool SAL_CALL OSQLMessageDialog::convertFastPropertyValue( Any& _rConvertedV } } -//------------------------------------------------------------------------- Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& OSQLMessageDialog::getInfoHelper() { return *const_cast<OSQLMessageDialog*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ ::cppu::IPropertyArrayHelper* OSQLMessageDialog::createArrayHelper( ) const { Sequence< Property > aProps; @@ -157,7 +141,6 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() th return new ::cppu::OPropertyArrayHelper(aProps); } -//------------------------------------------------------------------------------ Dialog* OSQLMessageDialog::createDialog(Window* _pParent) { if ( m_aException.hasValue() ) @@ -167,8 +150,6 @@ Dialog* OSQLMessageDialog::createDialog(Window* _pParent) return new OSQLMessageBox(_pParent, SQLException()); } -//......................................................................... } // namespace dbaui -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |