From 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Sat, 22 Feb 2014 21:20:15 +0100 Subject: Remove unneccessary comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- extensions/source/abpilot/abpfinalpage.cxx | 22 +++---- extensions/source/abpilot/abpservices.cxx | 8 +-- extensions/source/abpilot/abspage.cxx | 12 ++-- extensions/source/abpilot/abspilot.cxx | 32 +++++----- extensions/source/abpilot/admininvokationimpl.cxx | 4 +- extensions/source/abpilot/admininvokationpage.cxx | 12 ++-- extensions/source/abpilot/datasourcehandling.cxx | 72 +++++++++++------------ extensions/source/abpilot/fieldmappingimpl.cxx | 14 ++--- extensions/source/abpilot/fieldmappingpage.cxx | 12 ++-- extensions/source/abpilot/tableselectionpage.cxx | 16 ++--- extensions/source/abpilot/typeselectionpage.cxx | 20 +++---- extensions/source/abpilot/unodialogabp.cxx | 34 +++++------ 12 files changed, 129 insertions(+), 129 deletions(-) (limited to 'extensions/source/abpilot') diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 62cacc19b6df..0006168c34b8 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -44,7 +44,7 @@ namespace abp //===================================================================== //= FinalPage //===================================================================== - //--------------------------------------------------------------------- + FinalPage::FinalPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_FINAL)) ,m_aExplanation ( this, ModuleRes( FT_FINISH_EXPL ) ) @@ -65,7 +65,7 @@ namespace abp m_aRegisterName.Check(true); } - //--------------------------------------------------------------------- + sal_Bool FinalPage::isValidName() const { OUString sCurrentName(m_aName.GetText()); @@ -81,7 +81,7 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + void FinalPage::setFields() { AddressSettings& rSettings = getSettings(); @@ -116,7 +116,7 @@ namespace abp OnRegister(&m_aRegisterName); } - //--------------------------------------------------------------------- + void FinalPage::initializePage() { AddressBookSourcePage::initializePage(); @@ -124,7 +124,7 @@ namespace abp setFields(); } - //--------------------------------------------------------------------- + sal_Bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) @@ -144,7 +144,7 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + void FinalPage::ActivatePage() { AddressBookSourcePage::ActivatePage(); @@ -160,7 +160,7 @@ namespace abp getDialog()->defaultButton( WZB_FINISH ); } - //--------------------------------------------------------------------- + void FinalPage::DeactivatePage() { AddressBookSourcePage::DeactivatePage(); @@ -171,13 +171,13 @@ namespace abp getDialog()->enableButtons( WZB_FINISH, sal_False ); } - //--------------------------------------------------------------------- + bool FinalPage::canAdvance() const { return false; } - //--------------------------------------------------------------------- + void FinalPage::implCheckName() { sal_Bool bValidName = isValidName(); @@ -191,14 +191,14 @@ namespace abp m_aDuplicateNameError.Show( !bValidName && !bEmptyName ); } - //--------------------------------------------------------------------- + IMPL_LINK( FinalPage, OnNameModified, Edit*, /**/ ) { implCheckName(); return 0L; } - // ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(FinalPage, OnRegister) { sal_Bool bEnable = m_aRegisterName.IsChecked(); diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index 14070045a298..4a2ef7fe53c5 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -19,18 +19,18 @@ #include "componentmodule.hxx" -//--------------------------------------------------------------------------------------- + using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -//--------------------------------------------------------------------------------------- + extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno(); -//--------------------------------------------------------------------------------------- + extern "C" void SAL_CALL abp_initializeModule() { @@ -43,7 +43,7 @@ extern "C" void SAL_CALL abp_initializeModule() } } -//--------------------------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index 3b3868402bca..27b41acce69a 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.cxx @@ -36,38 +36,38 @@ namespace abp { } - //--------------------------------------------------------------------- + void AddressBookSourcePage::DeactivatePage() { AddressBookSourcePage_Base::DeactivatePage(); getDialog()->enableButtons(WZB_NEXT, sal_True); } - //--------------------------------------------------------------------- + OAddessBookSourcePilot* AddressBookSourcePage::getDialog() { return static_cast(GetParent()); } - //--------------------------------------------------------------------- + const OAddessBookSourcePilot* AddressBookSourcePage::getDialog() const { return static_cast(GetParent()); } - //--------------------------------------------------------------------- + AddressSettings& AddressBookSourcePage::getSettings() { return getDialog()->getSettings(); } - //--------------------------------------------------------------------- + const AddressSettings& AddressBookSourcePage::getSettings() const { return getDialog()->getSettings(); } - //--------------------------------------------------------------------- + const Reference< XComponentContext > & AddressBookSourcePage::getORB() { return getDialog()->getORB(); diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 0c3a07e2d3be..46893fcf131e 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -57,7 +57,7 @@ namespace abp //===================================================================== //= OAddessBookSourcePilot //===================================================================== - //--------------------------------------------------------------------- + OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB) :OAddessBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS ) @@ -133,7 +133,7 @@ namespace abp FreeResource(); } - //--------------------------------------------------------------------- + OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const { sal_uInt16 nResId = 0; @@ -157,7 +157,7 @@ namespace abp return sDisplayName; } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::implCommitAll() { // in real, the data source already exists in the data source context @@ -179,14 +179,14 @@ namespace abp fieldmapping::writeTemplateAddressFieldMapping( getORB(), m_aSettings.aFieldMapping ); } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::implCleanup() { if ( m_aNewDataSource.isValid() ) m_aNewDataSource.remove(); } - //--------------------------------------------------------------------- + IMPL_LINK( OAddessBookSourcePilot, OnCancelClicked, void*, /*NOTINTERESTEDIN*/ ) { // do cleanups @@ -200,7 +200,7 @@ namespace abp return 0L; } - //--------------------------------------------------------------------- + bool OAddessBookSourcePilot::Close() { implCleanup(); @@ -208,7 +208,7 @@ namespace abp return OAddessBookSourcePilot_Base::Close(); } - //--------------------------------------------------------------------- + sal_Bool OAddessBookSourcePilot::onFinish() { if ( !OAddessBookSourcePilot_Base::onFinish() ) @@ -221,7 +221,7 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::enterState( WizardState _nState ) { switch ( _nState ) @@ -243,7 +243,7 @@ namespace abp OAddessBookSourcePilot_Base::enterState(_nState); } - //--------------------------------------------------------------------- + sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason ) { if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) ) @@ -297,7 +297,7 @@ namespace abp return bAllow; } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::implDefaultTableName() { const StringBag& rTableNames = getDataSource().getTableNames(); @@ -323,7 +323,7 @@ namespace abp getSettings().sSelectedTable = sGuess; } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::implDoAutoFieldMapping() { DBG_ASSERT( !needManualFieldMapping( ), "OAddessBookSourcePilot::implDoAutoFieldMapping: invalid call!" ); @@ -331,7 +331,7 @@ namespace abp fieldmapping::defaultMapping( getORB(), m_aSettings.aFieldMapping ); } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::implCreateDataSource() { if (m_aNewDataSource.isValid()) @@ -400,7 +400,7 @@ namespace abp m_eNewDataSourceType = m_aSettings.eType; } - //--------------------------------------------------------------------- + sal_Bool OAddessBookSourcePilot::connectToDataSource( sal_Bool _bForceReConnect ) { DBG_ASSERT( m_aNewDataSource.isValid(), "OAddessBookSourcePilot::implConnect: invalid current data source!" ); @@ -412,7 +412,7 @@ namespace abp return m_aNewDataSource.connect( this ); } - //--------------------------------------------------------------------- + OWizardPage* OAddessBookSourcePilot::createPage(WizardState _nState) { switch (_nState) @@ -438,7 +438,7 @@ namespace abp } } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType ) { bool bSettingsPage = needAdminInvokationPage( _eType ); @@ -467,7 +467,7 @@ namespace abp ); } - //--------------------------------------------------------------------- + void OAddessBookSourcePilot::typeSelectionChanged( AddressSourceType _eType ) { PathId nCurrentPathID( PATH_COMPLETE ); diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index fb39a208b184..143b567d0128 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -45,7 +45,7 @@ namespace abp //===================================================================== //= OAdminDialogInvokation //===================================================================== - //--------------------------------------------------------------------- + OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource , Window* _pMessageParent) @@ -58,7 +58,7 @@ namespace abp DBG_ASSERT(m_pMessageParent, "OAdminDialogInvokation::OAdminDialogInvokation: invalid message parent!"); } - //--------------------------------------------------------------------- + sal_Bool OAdminDialogInvokation::invokeAdministration( sal_Bool _bFixedType ) { if (!m_xContext.is()) diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index 9ce84904c5a3..543554626322 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -42,21 +42,21 @@ namespace abp m_aInvokeAdminDialog.SetClickHdl( LINK(this, AdminDialogInvokationPage, OnInvokeAdminDialog) ); } - //--------------------------------------------------------------------- + void AdminDialogInvokationPage::ActivatePage() { AddressBookSourcePage::ActivatePage(); m_aInvokeAdminDialog.GrabFocus(); } - //--------------------------------------------------------------------- + void AdminDialogInvokationPage::implUpdateErrorMessage() { const sal_Bool bIsConnected = getDialog()->getDataSource().isConnected(); m_aErrorMessage.Show( !bIsConnected ); } - //--------------------------------------------------------------------- + void AdminDialogInvokationPage::initializePage() { AddressBookSourcePage::initializePage(); @@ -64,7 +64,7 @@ namespace abp // if we're entering this page, we assume we had no connection trial with this data source } - //--------------------------------------------------------------------- + void AdminDialogInvokationPage::implTryConnect() { getDialog()->connectToDataSource( sal_True ); @@ -80,13 +80,13 @@ namespace abp getDialog()->travelNext(); } - //--------------------------------------------------------------------- + bool AdminDialogInvokationPage::canAdvance() const { return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected(); } - //--------------------------------------------------------------------- + IMPL_LINK( AdminDialogInvokationPage, OnInvokeAdminDialog, void*, /*NOTINTERESTEDIN*/ ) { OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() ); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index fde1b3ace120..7945bd293778 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -67,14 +67,14 @@ namespace abp struct PackageAccessControl { }; //===================================================================== - //--------------------------------------------------------------------- + static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext ) SAL_THROW (( Exception )) { Reference xContext = DatabaseContext::create(_rxContext); return xContext; } - //--------------------------------------------------------------------- + /// creates a new data source and inserts it into the context static void lcl_implCreateAndInsert( const Reference< XComponentContext >& _rxContext, const OUString& _rName, @@ -104,7 +104,7 @@ namespace abp } } - //--------------------------------------------------------------------- + /// creates and inserts a data source, and sets it's URL property to the string given static ODataSource lcl_implCreateAndSetURL( const Reference< XComponentContext >& _rxORB, const OUString& _rName, @@ -136,7 +136,7 @@ namespace abp return aReturn; } - //--------------------------------------------------------------------- + void lcl_registerDataSource( const Reference< XComponentContext >& _rxORB, const OUString& _sName, const OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception )) @@ -177,7 +177,7 @@ namespace abp //===================================================================== //= ODataSourceContext //===================================================================== - //--------------------------------------------------------------------- + ODataSourceContext::ODataSourceContext(const Reference< XComponentContext >& _rxORB) :m_pImpl( new ODataSourceContextImpl( _rxORB ) ) { @@ -209,7 +209,7 @@ namespace abp delete(m_pImpl); } - //--------------------------------------------------------------------- + OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName) { OUString sCheck( _rDataSourceName ); @@ -228,71 +228,71 @@ namespace abp return _rDataSourceName; } - //--------------------------------------------------------------------- + void ODataSourceContext::getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( )) { _rNames = m_pImpl->aDataSourceNames; } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewMORK( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName ) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewEvolutionLdap( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewEvolutionGroupwise( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewEvolution( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewKab( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:kab" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewMacab( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:macab" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewOE( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" ); } - //--------------------------------------------------------------------- + ODataSource ODataSourceContext::createNewDBase( const OUString& _rName) SAL_THROW (( )) { return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" ); @@ -321,7 +321,7 @@ namespace abp ODataSourceImpl( const ODataSourceImpl& _rSource ); }; - //--------------------------------------------------------------------- + ODataSourceImpl::ODataSourceImpl( const ODataSourceImpl& _rSource ) :xORB( _rSource.xORB ) ,xDataSource( _rSource.xDataSource ) @@ -335,14 +335,14 @@ namespace abp //===================================================================== //= ODataSource //===================================================================== - //--------------------------------------------------------------------- + ODataSource::ODataSource( const ODataSource& _rSource ) :m_pImpl( NULL ) { *this = _rSource; } - //--------------------------------------------------------------------- + ODataSource& ODataSource::operator=( const ODataSource& _rSource ) { if( this != &_rSource ) @@ -353,19 +353,19 @@ namespace abp return *this; } - //--------------------------------------------------------------------- + ODataSource::ODataSource( const Reference< XComponentContext >& _rxORB ) :m_pImpl(new ODataSourceImpl(_rxORB)) { } - //--------------------------------------------------------------------- + ODataSource::~ODataSource( ) { delete m_pImpl; } - //--------------------------------------------------------------------- + void ODataSource::store() SAL_THROW (( )) { if (!isValid()) @@ -386,7 +386,7 @@ namespace abp OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" ); } } - //--------------------------------------------------------------------- + void ODataSource::registerDataSource( const OUString& _sRegisteredDataSourceName) SAL_THROW (( )) { if (!isValid()) @@ -404,7 +404,7 @@ namespace abp } } - //--------------------------------------------------------------------- + void ODataSource::setDataSource( const Reference< XPropertySet >& _rxDS,const OUString& _sName, PackageAccessControl ) { if (m_pImpl->xDataSource.get() == _rxDS.get()) @@ -418,7 +418,7 @@ namespace abp m_pImpl->xDataSource = _rxDS; } - //--------------------------------------------------------------------- + void ODataSource::remove() SAL_THROW (( )) { if (!isValid()) @@ -436,7 +436,7 @@ namespace abp } } - //--------------------------------------------------------------------- + sal_Bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( )) { if (!isValid()) @@ -447,7 +447,7 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + OUString ODataSource::getName() const SAL_THROW (( )) { if ( !isValid() ) @@ -455,7 +455,7 @@ namespace abp return m_pImpl->sName; } - //--------------------------------------------------------------------- + bool ODataSource::hasTable( const OUString& _rTableName ) const { if ( !isConnected() ) @@ -465,7 +465,7 @@ namespace abp return aTables.find( _rTableName ) != aTables.end(); } - //--------------------------------------------------------------------- + const StringBag& ODataSource::getTableNames() const SAL_THROW (( )) { m_pImpl->aTables.clear(); @@ -505,7 +505,7 @@ namespace abp return m_pImpl->aTables; } - //--------------------------------------------------------------------- + sal_Bool ODataSource::connect( Window* _pMessageParent ) SAL_THROW (( )) { if ( isConnected( ) ) @@ -596,7 +596,7 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + void ODataSource::disconnect( ) SAL_THROW (( )) { m_pImpl->xConnection.clear(); @@ -604,18 +604,18 @@ namespace abp m_pImpl->bTablesUpToDate = sal_False; } - //--------------------------------------------------------------------- + sal_Bool ODataSource::isConnected( ) const SAL_THROW (( )) { return m_pImpl->xConnection.is(); } - //--------------------------------------------------------------------- + sal_Bool ODataSource::isValid() const SAL_THROW (( )) { return m_pImpl && m_pImpl->xDataSource.is(); } - //--------------------------------------------------------------------- + Reference< XPropertySet > ODataSource::getDataSource() const SAL_THROW (( )) { return m_pImpl ? m_pImpl->xDataSource : Reference< XPropertySet >(); diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index db330641d71c..0291d7380948 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -49,14 +49,14 @@ namespace abp using namespace ::com::sun::star::ui; using namespace ::com::sun::star::ui::dialogs; - //--------------------------------------------------------------------- + static const OUString& lcl_getDriverSettingsNodeName() { static const OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); return s_sDriverSettingsNodeName; } - //--------------------------------------------------------------------- + static const OUString& lcl_getAddressBookNodeName() { static const OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" ); @@ -68,7 +68,7 @@ namespace abp { //..................................................................... - //----------------------------------------------------------------- + sal_Bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent, const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) SAL_THROW ( ( ) ) { @@ -124,7 +124,7 @@ namespace abp return sal_False; } - //----------------------------------------------------------------- + void defaultMapping( const Reference< XComponentContext >& _rxContext, MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) ) { _rFieldAssignment.clear(); @@ -217,7 +217,7 @@ namespace abp } } - //----------------------------------------------------------------- + void writeTemplateAddressFieldMapping( const Reference< XComponentContext >& _rxContext, const MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) ) { // want to have a non-const map for easier handling @@ -296,7 +296,7 @@ namespace abp { //..................................................................... - //----------------------------------------------------------------- + void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext, const OUString& _rDataSourceName, const OUString& _rTableName ) SAL_THROW ( ( ) ) { @@ -315,7 +315,7 @@ namespace abp aAddressBookSettings.commit(); } - //----------------------------------------------------------------- + void markPilotSuccess( const Reference< XComponentContext >& _rxContext ) SAL_THROW ( ( ) ) { // access the configuration information which the driver uses for determining it's column names diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index b33c15f53171..ec2b6507e99f 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -31,7 +31,7 @@ namespace abp //===================================================================== //= FieldMappingPage //===================================================================== - //--------------------------------------------------------------------- + FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage( _pParent, ModuleRes( RID_PAGE_FIELDMAPPING ) ) ,m_aExplanation ( this, ModuleRes( FT_FIELDASSIGMENTEXPL ) ) @@ -56,27 +56,27 @@ namespace abp } } - //--------------------------------------------------------------------- + void FieldMappingPage::ActivatePage() { AddressBookSourcePage::ActivatePage(); m_aInvokeDialog.GrabFocus(); } - //--------------------------------------------------------------------- + void FieldMappingPage::DeactivatePage() { AddressBookSourcePage::DeactivatePage(); } - //--------------------------------------------------------------------- + void FieldMappingPage::initializePage() { AddressBookSourcePage::initializePage(); implUpdateHint(); } - //--------------------------------------------------------------------- + void FieldMappingPage::implUpdateHint() { const AddressSettings& rSettings = getSettings(); @@ -86,7 +86,7 @@ namespace abp m_aHint.SetText( sHint ); } - //--------------------------------------------------------------------- + IMPL_LINK( FieldMappingPage, OnInvokeDialog, void*, /*NOTINTERESTEDIN*/ ) { AddressSettings& rSettings = getSettings(); diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 724cbd5571f8..1dcf8b8f19ab 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -31,7 +31,7 @@ namespace abp //===================================================================== //= TableSelectionPage //===================================================================== - //--------------------------------------------------------------------- + TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION_AB)) ,m_aLabel ( this, ModuleRes( FL_TOOMUCHTABLES ) ) @@ -43,7 +43,7 @@ namespace abp m_aTableList.SetDoubleClickHdl( LINK( this, TableSelectionPage, OnTableDoubleClicked ) ); } - //--------------------------------------------------------------------- + void TableSelectionPage::ActivatePage() { AddressBookSourcePage::ActivatePage(); @@ -51,13 +51,13 @@ namespace abp m_aTableList.GrabFocus(); } - //--------------------------------------------------------------------- + void TableSelectionPage::DeactivatePage() { AddressBookSourcePage::DeactivatePage(); } - //--------------------------------------------------------------------- + void TableSelectionPage::initializePage() { AddressBookSourcePage::initializePage(); @@ -82,7 +82,7 @@ namespace abp m_aTableList.SelectEntry( rSettings.sSelectedTable ); } - //--------------------------------------------------------------------- + IMPL_LINK( TableSelectionPage, OnTableDoubleClicked, void*, /*NOTINTERESTEDIN*/ ) { if ( 1 == m_aTableList.GetSelectEntryCount() ) @@ -91,14 +91,14 @@ namespace abp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( TableSelectionPage, OnTableSelected, void*, /*NOTINTERESTEDIN*/ ) { updateDialogTravelUI(); return 0L; } - //--------------------------------------------------------------------- + sal_Bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) @@ -110,7 +110,7 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + bool TableSelectionPage::canAdvance() const { return AddressBookSourcePage::canAdvance() diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 00fba8317f41..e194d35a4089 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -36,7 +36,7 @@ namespace abp //===================================================================== //= TypeSelectionPage //===================================================================== - //--------------------------------------------------------------------- + TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent ) :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE)) ,m_aHint (this, ModuleRes(FT_TYPE_HINTS)) @@ -168,7 +168,7 @@ namespace abp } } - //--------------------------------------------------------------------- + TypeSelectionPage::~TypeSelectionPage() { for ( ::std::vector< ButtonItem >::iterator loop = m_aAllTypes.begin(); @@ -178,7 +178,7 @@ namespace abp } } - //--------------------------------------------------------------------- + void TypeSelectionPage::ActivatePage() { AddressBookSourcePage::ActivatePage(); @@ -197,14 +197,14 @@ namespace abp getDialog()->enableButtons(WZB_PREVIOUS, sal_False); } - //--------------------------------------------------------------------- + void TypeSelectionPage::DeactivatePage() { AddressBookSourcePage::DeactivatePage(); getDialog()->enableButtons(WZB_PREVIOUS, sal_True); } - //--------------------------------------------------------------------- + void TypeSelectionPage::selectType( AddressSourceType _eType ) { for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); @@ -215,7 +215,7 @@ namespace abp } } - //--------------------------------------------------------------------- + AddressSourceType TypeSelectionPage::getSelectedType() const { for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); @@ -229,7 +229,7 @@ namespace abp return AST_INVALID; } - //--------------------------------------------------------------------- + void TypeSelectionPage::initializePage() { AddressBookSourcePage::initializePage(); @@ -238,7 +238,7 @@ namespace abp selectType(rSettings.eType); } - //--------------------------------------------------------------------- + sal_Bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) @@ -257,14 +257,14 @@ namespace abp return sal_True; } - //--------------------------------------------------------------------- + bool TypeSelectionPage::canAdvance() const { return AddressBookSourcePage::canAdvance() && (AST_INVALID != getSelectedType()); } - //--------------------------------------------------------------------- + IMPL_LINK( TypeSelectionPage, OnTypeSelected, void*, /*NOTINTERESTEDIN*/ ) { getDialog()->typeSelectionChanged( getSelectedType() ); diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 1acd41f16bf4..9aee1ea9f20f 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -44,7 +44,7 @@ namespace abp //===================================================================== //= OABSPilotUno //===================================================================== - //--------------------------------------------------------------------- + OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { @@ -52,26 +52,26 @@ namespace abp &m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) ); } - //-------------------------------------------------------------------------- + Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType ) throw (RuntimeException) { Any aReturn = OABSPilotUno_DBase::queryInterface( aType ); return aReturn.hasValue() ? aReturn : OABSPilotUno_JBase::queryInterface( aType ); } - //-------------------------------------------------------------------------- + void SAL_CALL OABSPilotUno::acquire( ) throw () { OABSPilotUno_DBase::acquire(); } - //-------------------------------------------------------------------------- + void SAL_CALL OABSPilotUno::release( ) throw () { OABSPilotUno_DBase::release(); } - //--------------------------------------------------------------------- + Sequence< Type > SAL_CALL OABSPilotUno::getTypes( ) throw (RuntimeException) { return ::comphelper::concatSequences( @@ -80,7 +80,7 @@ namespace abp ); } - //--------------------------------------------------------------------- + Sequence SAL_CALL OABSPilotUno::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId* s_pId; @@ -96,31 +96,31 @@ namespace abp return s_pId->getImplementationId(); } - //--------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OABSPilotUno::Create(const Reference< XMultiServiceFactory >& _rxFactory) { return *(new OABSPilotUno( comphelper::getComponentContext(_rxFactory) )); } - //--------------------------------------------------------------------- + OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } - //--------------------------------------------------------------------- + OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) { return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot"); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence SAL_CALL OABSPilotUno::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -128,20 +128,20 @@ namespace abp return aSupported; } - //--------------------------------------------------------------------- + Reference SAL_CALL OABSPilotUno::getPropertySetInfo() throw(RuntimeException) { Reference xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //--------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& OABSPilotUno::getInfoHelper() { return *const_cast(this)->getArrayHelper(); } - //-------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OABSPilotUno::createArrayHelper( ) const { Sequence< Property > aProps; @@ -161,13 +161,13 @@ namespace abp } } - //-------------------------------------------------------------------------- + Dialog* OABSPilotUno::createDialog(Window* _pParent) { return new OAddessBookSourcePilot(_pParent, m_aContext ); } - //-------------------------------------------------------------------------- + Any SAL_CALL OABSPilotUno::execute( const Sequence< NamedValue >& /*lArgs*/ ) throw (IllegalArgumentException, Exception, RuntimeException) { // not interested in the context, not interested in the args @@ -184,7 +184,7 @@ namespace abp lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } - // ----------------------------------------------------------------------------- + void OABSPilotUno::executedDialog(sal_Int16 _nExecutionResult) { if ( _nExecutionResult == RET_OK ) -- cgit