diff options
Diffstat (limited to 'extensions')
114 files changed, 1792 insertions, 1792 deletions
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<OAddessBookSourcePilot*>(GetParent()); } - //--------------------------------------------------------------------- + const OAddessBookSourcePilot* AddressBookSourcePage::getDialog() const { return static_cast<const OAddessBookSourcePilot*>(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<XDatabaseContext> 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_Int8> 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<XPropertySetInfo> SAL_CALL OABSPilotUno::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //--------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& OABSPilotUno::getInfoHelper() { return *const_cast<OABSPilotUno*>(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 ) diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 2a7794311fbf..ee80ba44e009 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -1166,6 +1166,6 @@ HRESULT CSOActiveX::GetURL( const OLECHAR* url, } -// --------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 64ada453564c..590cc5107641 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -213,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) nTblOrQuery = rDesc.nCommandType; SetModified(); }; -//--------------------------------------------------------------------------- + void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& ) { } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index ef47bb9a2d9c..d8a81342183c 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -213,7 +213,7 @@ extern "C" } } -// ----------------------------------------------------------------------- + void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeException) { //! @@ -244,7 +244,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString } } -// ----------------------------------------------------------------------- + void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUString& /*rURL*/, const Sequence< PropertyValue >& /*rArgs*/, const Reference< XLoadEventListener > & rListener) @@ -440,7 +440,7 @@ static OUString lcl_AddProperty(Reference< XNameAccess > xColumns, uRet = xCol->getString(); return uRet; } -//----------------------------------------------------------------------------- + Any BibliographyLoader::getByName(const OUString& rName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException ) { diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index d642e2620f42..cf66d7c7d92b 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -79,7 +79,7 @@ BibDataManager* BibModul::createDataManager() { return new BibDataManager(); } -//----------------------------------------------------------------------------- + BibConfig* BibModul::GetConfig() { if(! pBibConfig) diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 30023e2e36be..82cf14141c66 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -47,7 +47,7 @@ namespace bib { //......................................................................... - // ----------------------------------------------------------------------- + BibView::BibView( Window* _pParent, BibDataManager* _pManager, WinBits _nStyle ) :BibWindow( _pParent, _nStyle ) ,m_pDatMan( _pManager ) @@ -58,7 +58,7 @@ namespace bib connectForm( m_xDatMan ); } - // ----------------------------------------------------------------------- + BibView::~BibView() { BibGeneralPage* pGeneralPage = m_pGeneralPage; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 49f020190c38..1beb2517a642 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -288,7 +288,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , } return USHRT_MAX; } -//----------------------------------------------------------------------------- + MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : ModalDialog(pParent, BibResId(RID_DLG_MAPPING) ), pDatMan(pMan), @@ -661,7 +661,7 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun: xMasterDispatchProvider = xNewMasterDispatchProvider; } -//----------------------------------------------------------------------------- + #define STR_UID "uid" OUString gGridName("theGrid"); OUString gViewName("theView"); @@ -704,7 +704,7 @@ BibDataManager::~BibDataManager() m_pInterceptorHelper = NULL; } } -//------------------------------------------------------------------------ + void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) { if ( !_rxGrid.is() ) @@ -906,7 +906,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) return xResult; } -//------------------------------------------------------------------------ + Sequence< OUString > BibDataManager::getDataSources() { Sequence< OUString > aTableNameSeq; @@ -927,12 +927,12 @@ Sequence< OUString > BibDataManager::getDataSources() return aTableNameSeq; } -//------------------------------------------------------------------------ + OUString BibDataManager::getActiveDataTable() { return aActiveDataTable; } -//------------------------------------------------------------------------ + void BibDataManager::setFilter(const OUString& rQuery) { if(!m_xParser.is()) @@ -953,7 +953,7 @@ void BibDataManager::setFilter(const OUString& rQuery) } -//------------------------------------------------------------------------ + OUString BibDataManager::getFilter() { @@ -972,7 +972,7 @@ OUString BibDataManager::getFilter() return aQueryString; } -//------------------------------------------------------------------------ + Sequence< OUString > BibDataManager::getQueryFields() { Sequence< OUString > aFieldSeq; @@ -981,7 +981,7 @@ Sequence< OUString > BibDataManager::getQueryFields() aFieldSeq = xFields->getElementNames(); return aFieldSeq; } -//------------------------------------------------------------------------ + OUString BibDataManager::getQueryField() { BibConfig* pConfig = BibModul::GetConfig(); @@ -997,7 +997,7 @@ OUString BibDataManager::getQueryField() } return aFieldString; } -//------------------------------------------------------------------------ + void BibDataManager::startQueryWith(const OUString& rQuery) { BibConfig* pConfig = BibModul::GetConfig(); @@ -1163,7 +1163,7 @@ void BibDataManager::setActiveDataTable(const OUString& rTable) } } -//------------------------------------------------------------------------ + void SAL_CALL BibDataManager::load( ) throw (RuntimeException) { if ( isLoaded() ) @@ -1182,7 +1182,7 @@ void SAL_CALL BibDataManager::load( ) throw (RuntimeException) } } -//------------------------------------------------------------------------ + void SAL_CALL BibDataManager::unload( ) throw (RuntimeException) { if ( !isLoaded() ) @@ -1208,7 +1208,7 @@ void SAL_CALL BibDataManager::unload( ) throw (RuntimeException) } } -//------------------------------------------------------------------------ + void SAL_CALL BibDataManager::reload( ) throw (RuntimeException) { if ( !isLoaded() ) @@ -1233,7 +1233,7 @@ void SAL_CALL BibDataManager::reload( ) throw (RuntimeException) } } -//------------------------------------------------------------------------ + sal_Bool SAL_CALL BibDataManager::isLoaded( ) throw (RuntimeException) { Reference< XLoadable >xFormAsLoadable( m_xForm, UNO_QUERY ); @@ -1245,19 +1245,19 @@ sal_Bool SAL_CALL BibDataManager::isLoaded( ) throw (RuntimeException) return bLoaded; } -//------------------------------------------------------------------------ + void SAL_CALL BibDataManager::addLoadListener( const Reference< XLoadListener >& aListener ) throw (RuntimeException) { m_aLoadListeners.addInterface( aListener ); } -//------------------------------------------------------------------------ + void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener >& aListener ) throw (RuntimeException) { m_aLoadListeners.removeInterface( aListener ); } -//------------------------------------------------------------------------ + Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& rName) { Reference< awt::XControlModel > xModel; @@ -1295,7 +1295,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& return xModel; } -//------------------------------------------------------------------------ + OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) { OUString aResStr; @@ -1334,7 +1334,7 @@ OUString BibDataManager::getControlName(sal_Int32 nFormatKey ) } return aResStr; } -//------------------------------------------------------------------------ + Reference< awt::XControlModel > BibDataManager::loadControlModel( const OUString& rName, sal_Bool bForceListBox) { @@ -1413,19 +1413,19 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( } return xModel; } -//------------------------------------------------------------------------ + void SAL_CALL BibDataManager::disposing() { BibDataManager_Base::WeakComponentImplHelperBase::disposing(); } -//------------------------------------------------------------------------ + void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( ::com::sun::star::uno::RuntimeException ) { // not interested in } -//------------------------------------------------------------------------ + void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw( RuntimeException ) { try @@ -1452,7 +1452,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw } } -//------------------------------------------------------------------------ + void BibDataManager::SetMeAsUidListener() { try @@ -1495,7 +1495,7 @@ void BibDataManager::SetMeAsUidListener() } } -//------------------------------------------------------------------------ + void BibDataManager::RemoveMeAsUidListener() { try diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index 13a792303c43..e388f9124aa0 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -36,7 +36,7 @@ namespace bib //===================================================================== //= FormControlContainer //===================================================================== - //--------------------------------------------------------------------- + FormControlContainer::FormControlContainer( ) :OLoadListener( m_aMutex ) ,m_pFormAdapter( NULL ) diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx index 825b8b4a2d5c..c830c4396f48 100644 --- a/extensions/source/bibliography/loadlisteneradapter.cxx +++ b/extensions/source/bibliography/loadlisteneradapter.cxx @@ -33,7 +33,7 @@ namespace bib //===================================================================== //= OComponentListener //===================================================================== - //--------------------------------------------------------------------- + OComponentListener::~OComponentListener() { { @@ -43,13 +43,13 @@ namespace bib } } - //--------------------------------------------------------------------- + void OComponentListener::_disposing( const EventObject& /*_rSource*/ ) throw( RuntimeException) { // nothing to do here, overrride if you're interested in } - //--------------------------------------------------------------------- + void OComponentListener::setAdapter( OComponentAdapterBase* pAdapter ) { { @@ -72,7 +72,7 @@ namespace bib //===================================================================== //= OComponentAdapterBase //===================================================================== - //--------------------------------------------------------------------- + OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp, sal_Bool _bAutoRelease ) :m_xComponent( _rxComp ) ,m_pListener( NULL ) @@ -83,7 +83,7 @@ namespace bib OSL_ENSURE( m_xComponent.is(), "OComponentAdapterBase::OComponentAdapterBase: invalid component!" ); } - //--------------------------------------------------------------------- + void OComponentAdapterBase::Init( OComponentListener* _pListener ) { OSL_ENSURE( !m_pListener, "OComponentAdapterBase::Init: already initialized!" ); @@ -97,12 +97,12 @@ namespace bib m_bListening = sal_True; } - //--------------------------------------------------------------------- + OComponentAdapterBase::~OComponentAdapterBase() { } - //--------------------------------------------------------------------- + void OComponentAdapterBase::dispose() { if ( m_bListening ) @@ -123,7 +123,7 @@ namespace bib // XEventListener - //--------------------------------------------------------------------- + void SAL_CALL OComponentAdapterBase::disposing( const EventObject& _rSource ) throw( RuntimeException ) { if ( m_pListener ) @@ -147,13 +147,13 @@ namespace bib //===================================================================== //= OLoadListenerAdapter //===================================================================== - //--------------------------------------------------------------------- + OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable, sal_Bool _bAutoRelease ) :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), _bAutoRelease ) { } - //--------------------------------------------------------------------- + void OLoadListenerAdapter::startComponentListening() { Reference< XLoadable > xLoadable( getComponent(), UNO_QUERY ); @@ -162,25 +162,25 @@ namespace bib xLoadable->addLoadListener( this ); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::acquire( ) throw () { OLoadListenerAdapter_Base::acquire(); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::release( ) throw () { OLoadListenerAdapter_Base::release(); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::disposing( const EventObject& _rSource ) throw( RuntimeException) { OComponentAdapterBase::disposing( _rSource ); } - //--------------------------------------------------------------------- + void OLoadListenerAdapter::disposing() { Reference< XLoadable > xLoadable( getComponent(), UNO_QUERY ); @@ -188,35 +188,35 @@ namespace bib xLoadable->removeLoadListener( this ); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::loaded( const EventObject& _rEvent ) throw (RuntimeException) { if ( !locked() && getLoadListener( ) ) getLoadListener( )->_loaded( _rEvent ); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::unloading( const EventObject& _rEvent ) throw (RuntimeException) { if ( !locked() && getLoadListener( ) ) getLoadListener( )->_unloading( _rEvent ); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& _rEvent ) throw (RuntimeException) { if ( !locked() && getLoadListener( ) ) getLoadListener( )->_unloaded( _rEvent ); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::reloading( const EventObject& _rEvent ) throw (RuntimeException) { if ( !locked() && getLoadListener( ) ) getLoadListener( )->_reloading( _rEvent ); } - //--------------------------------------------------------------------- + void SAL_CALL OLoadListenerAdapter::reloaded( const EventObject& _rEvent ) throw (RuntimeException) { if ( !locked() && getLoadListener( ) ) diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 0d524c60fb16..c6f2df26bf4f 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -476,7 +476,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/) return 0; } -//----------------------------------------------------------------------------- + IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) { sal_uInt16 nId=GetCurItemId(); @@ -513,7 +513,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) } return 0; } -//----------------------------------------------------------------------------- + void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) throw( uno::RuntimeException ) { @@ -554,7 +554,7 @@ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ ) return 0L; } -//----------------------------------------------------------------------------- + IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ ) { @@ -569,7 +569,7 @@ IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ ) return 0L; } -//----------------------------------------------------------------------------- + void BibToolBar::RebuildToolbar() { ApplyImageList(); @@ -577,7 +577,7 @@ void BibToolBar::RebuildToolbar() Application::PostUserEvent( aLayoutManager, 0 ); } -//----------------------------------------------------------------------------- + void BibToolBar::ApplyImageList() { diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index 32dcbd05ead3..d8a27496090c 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -29,7 +29,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe( const uno::Reference<uno::XComponentContext>& aContext) { return * new LdapUserProfileBe(aContext) ; } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -43,7 +43,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = }, { NULL, NULL, NULL, NULL, NULL, 0 } } ; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName, void *aServiceManager, @@ -53,6 +53,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(con aRegistryKey, kImplementations_entries) ; } -//------------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 4b634acb41d1..984bdc88e956 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -26,9 +26,9 @@ namespace extensions { namespace config { namespace ldap { -//------------------------------------------------------------------------------ + typedef int LdapErrCode; -//------------------------------------------------------------------------------ + struct LdapMessageHolder { LdapMessageHolder() : msg(0) {} @@ -44,12 +44,12 @@ private: LdapMessageHolder(LdapMessageHolder const&); void operator=(LdapMessageHolder const&); }; -//------------------------------------------------------------------------------ + LdapConnection::~LdapConnection() { if (isValid()) disconnect(); } -//------------------------------------------------------------------------------ + void LdapConnection::disconnect() { @@ -59,7 +59,7 @@ void LdapConnection::disconnect() mConnection = NULL; } } -//------------------------------------------------------------------------------ + static void checkLdapReturnCode(const sal_Char *aOperation, LdapErrCode aRetCode, @@ -95,7 +95,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation, throw ldap::LdapGenericException(message.makeStringAndClear(), NULL, aRetCode) ; } -//------------------------------------------------------------------------------ + void LdapConnection::connectSimple(const LdapDefinition& aDefinition) throw (ldap::LdapConnectionException, ldap::LdapGenericException) { @@ -105,7 +105,7 @@ void LdapConnection::connectSimple(const LdapDefinition& aDefinition) mLdapDefinition = aDefinition; connectSimple(); } -//------------------------------------------------------------------------------ + void LdapConnection::connectSimple() throw (ldap::LdapConnectionException, ldap::LdapGenericException) { @@ -147,7 +147,7 @@ void LdapConnection::connectSimple() checkLdapReturnCode("SimpleBind", retCode, mConnection) ; } } -//------------------------------------------------------------------------------ + void LdapConnection::initConnection() throw (ldap::LdapConnectionException) { @@ -180,7 +180,7 @@ void LdapConnection::initConnection() NULL) ; } } -//------------------------------------------------------------------------------ + void LdapConnection::getUserProfile( const OUString& aUser, LdapData * data) throw (lang::IllegalArgumentException, @@ -239,7 +239,7 @@ void LdapConnection::initConnection() #endif } } -//------------------------------------------------------------------------------ + OUString LdapConnection::findUserDn(const OUString& aUser) throw (lang::IllegalArgumentException, ldap::LdapConnectionException, ldap::LdapGenericException) @@ -300,7 +300,7 @@ void LdapConnection::initConnection() return userDn ; } -//------------------------------------------------------------------------------ + } } } // extensions.config.ldap diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index e6d4eb8616a7..817110246157 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -80,11 +80,11 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex connection.connectSimple(aDefinition); connection.getUserProfile(loggedOnUser, &data_); } -//------------------------------------------------------------------------------ + LdapUserProfileBe::~LdapUserProfileBe() { } -//------------------------------------------------------------------------------ + bool LdapUserProfileBe::readLdapConfiguration( css::uno::Reference< css::uno::XComponentContext > const & context, @@ -159,7 +159,7 @@ bool LdapUserProfileBe::readLdapConfiguration( return true; } -//------------------------------------------------------------------------------ + bool LdapUserProfileBe::getLdapStringParam( uno::Reference<container::XNameAccess>& xAccess, const OUString& aLdapSetting, @@ -169,7 +169,7 @@ bool LdapUserProfileBe::getLdapStringParam( return !aServerParameter.isEmpty(); } -//------------------------------------------------------------------------------ + void LdapUserProfileBe::setPropertyValue( OUString const &, css::uno::Any const &) throw ( @@ -211,18 +211,18 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); } -//------------------------------------------------------------------------------ + OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); } -//------------------------------------------------------------------------------ + OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) throw (uno::RuntimeException) { return getLdapUserProfileBeName() ; } -//------------------------------------------------------------------------------ + uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) { @@ -243,8 +243,8 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) { return getLdapUserProfileBeServiceNames() ; } -// --------------------------------------------------------------------------------------- + }}} -// --------------------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 4f22bb08a27f..c620a1a95c16 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -57,7 +57,7 @@ namespace dbp //===================================================================== //= OTableSelectionPage //===================================================================== - //--------------------------------------------------------------------- + OTableSelectionPage::OTableSelectionPage(OControlWizard* _pParent) :OControlWizardPage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION)) ,m_aData (this, ModuleRes(FL_DATA)) @@ -80,14 +80,14 @@ namespace dbp m_aDatasource.SetDropDownLineCount(10); } - //--------------------------------------------------------------------- + void OTableSelectionPage::ActivatePage() { OControlWizardPage::ActivatePage(); m_aDatasource.GrabFocus(); } - //--------------------------------------------------------------------- + bool OTableSelectionPage::canAdvance() const { if (!OControlWizardPage::canAdvance()) @@ -102,7 +102,7 @@ namespace dbp return true; } - //--------------------------------------------------------------------- + void OTableSelectionPage::initializePage() { OControlWizardPage::initializePage(); @@ -152,7 +152,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OControlWizardPage::commitPage(_eReason)) @@ -189,7 +189,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + IMPL_LINK( OTableSelectionPage, OnSearchClicked, PushButton*, /*_pButton*/ ) { ::sfx2::FileDialogHelper aFileDlg( @@ -214,7 +214,7 @@ namespace dbp } return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox*, _pBox ) { if (_pBox->GetSelectEntryCount()) @@ -222,7 +222,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox*, _pBox ) { if (&m_aDatasource == _pBox) @@ -238,7 +238,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + namespace { void lcl_fillEntries( ListBox& _rListBox, const Sequence< OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType ) @@ -254,7 +254,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OTableSelectionPage::implFillTables(const Reference< XConnection >& _rxConn) { m_aTable.Clear(); @@ -369,7 +369,7 @@ namespace dbp lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY ); } - //--------------------------------------------------------------------- + void OTableSelectionPage::implCollectDatasource() { try @@ -387,7 +387,7 @@ namespace dbp //===================================================================== //= OMaybeListSelectionPage //===================================================================== - //--------------------------------------------------------------------- + OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId ) :OControlWizardPage(_pParent, _rId) ,m_pYes(NULL) @@ -396,7 +396,7 @@ namespace dbp { } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::announceControls(RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection) { m_pYes = &_rYesButton; @@ -408,14 +408,14 @@ namespace dbp implEnableWindows(); } - //--------------------------------------------------------------------- + IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, /*NOTINTERESTEDIN*/ ) { implEnableWindows(); return 0L; } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::implInitialize(const OUString& _rSelection) { DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::implInitialize: no controls announced!"); @@ -427,19 +427,19 @@ namespace dbp m_pList->SelectEntry(bIsSelection ? _rSelection : OUString()); } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::implCommit(OUString& _rSelection) { _rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : OUString(); } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::implEnableWindows() { m_pList->Enable(m_pYes->IsChecked()); } - //--------------------------------------------------------------------- + void OMaybeListSelectionPage::ActivatePage() { OControlWizardPage::ActivatePage(); @@ -454,7 +454,7 @@ namespace dbp //===================================================================== //= ODBFieldPage //===================================================================== - //--------------------------------------------------------------------- + ODBFieldPage::ODBFieldPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD)) ,m_aFrame (this, ModuleRes(FL_DATABASEFIELD_EXPL)) @@ -469,7 +469,7 @@ namespace dbp m_aStoreWhere.SetDropDownLineCount(10); } - //--------------------------------------------------------------------- + void ODBFieldPage::initializePage() { OMaybeListSelectionPage::initializePage(); @@ -480,7 +480,7 @@ namespace dbp implInitialize(getDBFieldSetting()); } - //--------------------------------------------------------------------- + sal_Bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OMaybeListSelectionPage::commitPage(_eReason)) diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 1b7b1d6c0248..68eb40f83366 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -81,7 +81,7 @@ namespace dbp //===================================================================== //= OControlWizardPage //===================================================================== - //--------------------------------------------------------------------- + OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId ) :OControlWizardPage_Base( _pParent, _rResId ) ,m_pFormSettingsSeparator(NULL) @@ -94,7 +94,7 @@ namespace dbp { } - //--------------------------------------------------------------------- + OControlWizardPage::~OControlWizardPage() { delete m_pFormSettingsSeparator; @@ -106,43 +106,43 @@ namespace dbp delete m_pFormTable; } - //--------------------------------------------------------------------- + OControlWizard* OControlWizardPage::getDialog() { return static_cast< OControlWizard* >(GetParent()); } - //--------------------------------------------------------------------- + const OControlWizard* OControlWizardPage::getDialog() const { return static_cast< OControlWizard* >(GetParent()); } - //--------------------------------------------------------------------- + sal_Bool OControlWizardPage::updateContext() { return getDialog()->updateContext(OAccessRegulator()); } - //--------------------------------------------------------------------- + Reference< XConnection > OControlWizardPage::getFormConnection() const { return getDialog()->getFormConnection(OAccessRegulator()); } - //--------------------------------------------------------------------- + void OControlWizardPage::setFormConnection( const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose ) { getDialog()->setFormConnection( OAccessRegulator(), _rxConn, _bAutoDispose ); } - //--------------------------------------------------------------------- + const OControlWizardContext& OControlWizardPage::getContext() { return getDialog()->getContext(); } - //--------------------------------------------------------------------- + void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) @@ -158,7 +158,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear) { if (_bClear) @@ -174,7 +174,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::enableFormDatasourceDisplay() { if (m_pFormSettingsSeparator) @@ -204,7 +204,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::adjustControlForNoDSDisplay(Control* _pControl, sal_Bool _bConstLowerDistance) { ::Size aDistanceToMove = LogicToPixel( ::Size( 0, 37 ), MAP_APPFONT ); @@ -221,7 +221,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizardPage::initializePage() { if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable) @@ -271,7 +271,7 @@ namespace dbp //===================================================================== //= OControlWizard //===================================================================== - //--------------------------------------------------------------------- + OControlWizard::OControlWizard( Window* _pParent, const ResId& _rId, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OWizardMachine(_pParent, _rId, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH) @@ -286,12 +286,12 @@ namespace dbp enableButtons(WZB_FINISH, sal_False); } - //--------------------------------------------------------------------- + OControlWizard::~OControlWizard() { } - //--------------------------------------------------------------------- + short OControlWizard::Execute() { // get the class id of the control we're dealing with @@ -315,13 +315,13 @@ namespace dbp return OControlWizard_Base::Execute(); } - //--------------------------------------------------------------------- + void OControlWizard::ActivatePage() { OControlWizard_Base::ActivatePage(); } - //--------------------------------------------------------------------- + void OControlWizard::implDetermineShape() { Reference< XIndexAccess > xPageObjects(m_aContext.xDrawPage, UNO_QUERY); @@ -352,7 +352,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizard::implDetermineForm() { Reference< XChild > xModelAsChild(m_aContext.xObjectModel, UNO_QUERY); @@ -367,7 +367,7 @@ namespace dbp } - //--------------------------------------------------------------------- + void OControlWizard::implDeterminePage() { try @@ -430,7 +430,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizard::implGetDSContext() { try @@ -445,12 +445,12 @@ namespace dbp } } - //--------------------------------------------------------------------- + Reference< XConnection > OControlWizard::getFormConnection(const OAccessRegulator&) const { return getFormConnection(); } - //--------------------------------------------------------------------- + Reference< XConnection > OControlWizard::getFormConnection() const { Reference< XConnection > xConn; @@ -466,7 +466,7 @@ namespace dbp return xConn; } - //--------------------------------------------------------------------- + void OControlWizard::setFormConnection( const OAccessRegulator& _rAccess, const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose ) { try @@ -496,12 +496,12 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OControlWizard::updateContext(const OAccessRegulator&) { return initContext(); } - //--------------------------------------------------------------------- + Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const { Reference< XInteractionHandler > xHandler; @@ -517,7 +517,7 @@ namespace dbp } return xHandler; } - //--------------------------------------------------------------------- + sal_Bool OControlWizard::initContext() { DBG_ASSERT(m_aContext.xObjectModel.is(), "OGroupBoxWizard::initContext: have no control model to work with!"); @@ -673,7 +673,7 @@ namespace dbp return 0 != m_aContext.aFieldNames.getLength(); } - //--------------------------------------------------------------------- + void OControlWizard::commitControlSettings(OControlWizardSettings* _pSettings) { DBG_ASSERT(m_aContext.xObjectModel.is(), "OControlWizard::commitControlSettings: have no control model to work with!"); @@ -700,7 +700,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OControlWizard::initControlSettings(OControlWizardSettings* _pSettings) { DBG_ASSERT(m_aContext.xObjectModel.is(), "OControlWizard::initControlSettings: have no control model to work with!"); @@ -725,7 +725,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OControlWizard::needDatasourceSelection() { // lemme see ... diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 7446afc84901..ea8841218874 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -19,20 +19,20 @@ #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_OGroupBoxWizard(); extern "C" void SAL_CALL createRegistryInfo_OListComboWizard(); extern "C" void SAL_CALL createRegistryInfo_OGridWizard(); -//--------------------------------------------------------------------------------------- + extern "C" void SAL_CALL dbp_initializeModule() { @@ -47,7 +47,7 @@ extern "C" void SAL_CALL dbp_initializeModule() } } -//--------------------------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index c6dafd944dd1..b19f6fc8916a 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.cxx @@ -28,7 +28,7 @@ namespace dbp using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; - //--------------------------------------------------------------------- + void disambiguateName(const Reference< XNameAccess >& _rxContainer, OUString& _rElementsName) { DBG_ASSERT(_rxContainer.is(), "::dbp::disambiguateName: invalid container!"); diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index a0be0271591b..dbddd51b2e28 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -51,7 +51,7 @@ namespace dbp //===================================================================== //= OGridWizard //===================================================================== - //--------------------------------------------------------------------- + OGridWizard::OGridWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_GRIDWIZARD), _rxObjectModel, _rxContext) @@ -72,7 +72,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OGridWizard::approveControl(sal_Int16 _nClassId) { if (FormComponentType::GRIDCONTROL != _nClassId) @@ -85,7 +85,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + void OGridWizard::implApplySettings() { const OControlWizardContext& rContext = getContext(); @@ -225,7 +225,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + OWizardPage* OGridWizard::createPage(WizardState _nState) { switch (_nState) @@ -239,7 +239,7 @@ namespace dbp return NULL; } - //--------------------------------------------------------------------- + WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) const { switch (_nCurrentState) @@ -253,7 +253,7 @@ namespace dbp return WZS_INVALID_STATE; } - //--------------------------------------------------------------------- + void OGridWizard::enterState(WizardState _nState) { OControlWizard::enterState(_nState); @@ -267,7 +267,7 @@ namespace dbp defaultButton(WZB_FINISH); } - //--------------------------------------------------------------------- + sal_Bool OGridWizard::leaveState(WizardState _nState) { if (!OControlWizard::leaveState(_nState)) @@ -279,7 +279,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OGridWizard::onFinish() { if ( !OControlWizard::onFinish() ) @@ -293,7 +293,7 @@ namespace dbp //===================================================================== //= OGridFieldsSelection //===================================================================== - //--------------------------------------------------------------------- + OGridFieldsSelection::OGridFieldsSelection( OGridWizard* _pParent ) :OGridPage(_pParent, ModuleRes(RID_PAGE_GW_FIELDSELECTION)) ,m_aFrame (this, ModuleRes(FL_FRAME)) @@ -321,21 +321,21 @@ namespace dbp m_aSelFields.SetDoubleClickHdl(LINK(this, OGridFieldsSelection, OnEntryDoubleClicked)); } - //--------------------------------------------------------------------- + void OGridFieldsSelection::ActivatePage() { OGridPage::ActivatePage(); m_aExistFields.GrabFocus(); } - //--------------------------------------------------------------------- + bool OGridFieldsSelection::canAdvance() const { return false; // we're the last page in our wizard } - //--------------------------------------------------------------------- + void OGridFieldsSelection::initializePage() { OGridPage::initializePage(); @@ -356,7 +356,7 @@ namespace dbp implCheckButtons(); } - //--------------------------------------------------------------------- + sal_Bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGridPage::commitPage(_eReason)) @@ -374,7 +374,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + void OGridFieldsSelection::implCheckButtons() { m_aSelectOne.Enable(m_aExistFields.GetSelectEntryCount() != 0); @@ -386,7 +386,7 @@ namespace dbp getDialog()->enableButtons(WZB_FINISH, 0 != m_aSelFields.GetEntryCount()); } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, ListBox*, _pList) { PushButton* pSimulateButton = &m_aExistFields == _pList ? &m_aSelectOne : &m_aDeselectOne; @@ -396,14 +396,14 @@ namespace dbp return 1L; } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnEntrySelected, ListBox*, /*NOTINTERESTEDIN*/) { implCheckButtons(); return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, PushButton*, _pButton) { sal_Bool bMoveRight = (&m_aSelectOne == _pButton); @@ -458,7 +458,7 @@ namespace dbp return 0; } - //--------------------------------------------------------------------- + IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, PushButton*, _pButton) { sal_Bool bMoveRight = (&m_aSelectAll == _pButton); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 9f108883050e..7c142f81525b 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -46,7 +46,7 @@ namespace dbp //===================================================================== //= OGroupBoxWizard //===================================================================== - //--------------------------------------------------------------------- + OGroupBoxWizard::OGroupBoxWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_GROUPBOXWIZARD), _rxObjectModel, _rxContext) @@ -61,13 +61,13 @@ namespace dbp m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); } - //--------------------------------------------------------------------- + sal_Bool OGroupBoxWizard::approveControl(sal_Int16 _nClassId) { return FormComponentType::GROUPBOX == _nClassId; } - //--------------------------------------------------------------------- + OWizardPage* OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState) { switch (_nState) @@ -91,7 +91,7 @@ namespace dbp return NULL; } - //--------------------------------------------------------------------- + WizardTypes::WizardState OGroupBoxWizard::determineNextState( ::svt::WizardTypes::WizardState _nCurrentState ) const { switch (_nCurrentState) @@ -115,7 +115,7 @@ namespace dbp return WZS_INVALID_STATE; } - //--------------------------------------------------------------------- + void OGroupBoxWizard::enterState(::svt::WizardTypes::WizardState _nState) { // some stuff to do before calling the base class (modifying our settings) @@ -155,7 +155,7 @@ namespace dbp OControlWizard::enterState(_nState); } - //--------------------------------------------------------------------- + void OGroupBoxWizard::createRadios() { try @@ -169,7 +169,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OGroupBoxWizard::onFinish() { // commit the basic control setttings @@ -184,7 +184,7 @@ namespace dbp //===================================================================== //= ORadioSelectionPage //===================================================================== - //--------------------------------------------------------------------- + ORadioSelectionPage::ORadioSelectionPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_GROUPRADIOSELECTION)) ,m_aFrame (this, ModuleRes(FL_DATA)) @@ -226,14 +226,14 @@ namespace dbp m_aExistingRadios.SetAccessibleRelationLabeledBy(&m_aExistingRadiosLabel); } - //--------------------------------------------------------------------- + void ORadioSelectionPage::ActivatePage() { OGBWPage::ActivatePage(); m_aRadioName.GrabFocus(); } - //--------------------------------------------------------------------- + void ORadioSelectionPage::initializePage() { OGBWPage::initializePage(); @@ -247,7 +247,7 @@ namespace dbp implCheckMoveButtons(); } - //--------------------------------------------------------------------- + sal_Bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGBWPage::commitPage(_eReason)) @@ -269,7 +269,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + IMPL_LINK( ORadioSelectionPage, OnMoveEntry, PushButton*, _pButton ) { sal_Bool bMoveLeft = (&m_aMoveLeft == _pButton); @@ -294,27 +294,27 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( ORadioSelectionPage, OnEntrySelected, ListBox*, /*_pList*/ ) { implCheckMoveButtons(); return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( ORadioSelectionPage, OnNameModified, Edit*, /*_pList*/ ) { implCheckMoveButtons(); return 0L; } - //--------------------------------------------------------------------- + bool ORadioSelectionPage::canAdvance() const { return 0 != m_aExistingRadios.GetEntryCount(); } - //--------------------------------------------------------------------- + void ORadioSelectionPage::implCheckMoveButtons() { sal_Bool bHaveSome = (0 != m_aExistingRadios.GetEntryCount()); @@ -341,7 +341,7 @@ namespace dbp //===================================================================== //= ODefaultFieldSelectionPage //===================================================================== - //--------------------------------------------------------------------- + ODefaultFieldSelectionPage::ODefaultFieldSelectionPage( OControlWizard* _pParent ) :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_DEFAULTFIELDSELECTION)) ,m_aFrame (this, ModuleRes(FL_DEFAULTSELECTION)) @@ -358,7 +358,7 @@ namespace dbp m_aDefSelection.SetAccessibleRelationMemberOf(&m_aDefaultSelectionLabel); } - //--------------------------------------------------------------------- + void ODefaultFieldSelectionPage::initializePage() { OMaybeListSelectionPage::initializePage(); @@ -377,7 +377,7 @@ namespace dbp implInitialize(rSettings.sDefaultField); } - //--------------------------------------------------------------------- + sal_Bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OMaybeListSelectionPage::commitPage(_eReason)) @@ -392,7 +392,7 @@ namespace dbp //===================================================================== //= OOptionValuesPage //===================================================================== - //--------------------------------------------------------------------- + OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONVALUES)) ,m_aFrame (this, ModuleRes(FL_OPTIONVALUES)) @@ -411,21 +411,21 @@ namespace dbp m_aOptions.SetAccessibleRelationLabeledBy(&m_aOptionsLabel); } - //--------------------------------------------------------------------- + IMPL_LINK( OOptionValuesPage, OnOptionSelected, ListBox*, /*NOTINTERESTEDIN*/ ) { implTraveledOptions(); return 0L; } - //--------------------------------------------------------------------- + void OOptionValuesPage::ActivatePage() { OGBWPage::ActivatePage(); m_aValue.GrabFocus(); } - //--------------------------------------------------------------------- + void OOptionValuesPage::implTraveledOptions() { if ((::svt::WizardTypes::WizardState)-1 != m_nLastSelection) @@ -440,7 +440,7 @@ namespace dbp m_aValue.SetText(m_aUncommittedValues[m_nLastSelection]); } - //--------------------------------------------------------------------- + void OOptionValuesPage::initializePage() { OGBWPage::initializePage(); @@ -467,7 +467,7 @@ namespace dbp implTraveledOptions(); } - //--------------------------------------------------------------------- + sal_Bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGBWPage::commitPage(_eReason)) @@ -486,14 +486,14 @@ namespace dbp //===================================================================== //= OOptionDBFieldPage //===================================================================== - //--------------------------------------------------------------------- + OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString()); } - //--------------------------------------------------------------------- + OUString& OOptionDBFieldPage::getDBFieldSetting() { return getSettings().sDBField; @@ -502,7 +502,7 @@ namespace dbp //===================================================================== //= OFinalizeGBWPage //===================================================================== - //--------------------------------------------------------------------- + OFinalizeGBWPage::OFinalizeGBWPage( OControlWizard* _pParent ) :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONS_FINAL)) ,m_aFrame (this, ModuleRes(FL_NAMEIT)) @@ -513,20 +513,20 @@ namespace dbp FreeResource(); } - //--------------------------------------------------------------------- + void OFinalizeGBWPage::ActivatePage() { OGBWPage::ActivatePage(); m_aName.GrabFocus(); } - //--------------------------------------------------------------------- + bool OFinalizeGBWPage::canAdvance() const { return false; } - //--------------------------------------------------------------------- + void OFinalizeGBWPage::initializePage() { OGBWPage::initializePage(); @@ -535,7 +535,7 @@ namespace dbp m_aName.SetText(rSettings.sControlLabel); } - //--------------------------------------------------------------------- + sal_Bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OGBWPage::commitPage(_eReason)) diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 9f42d6b7b855..d132c7651cfb 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -48,7 +48,7 @@ namespace dbp //===================================================================== //= OListComboWizard //===================================================================== - //--------------------------------------------------------------------- + OListComboWizard::OListComboWizard( Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, ModuleRes(RID_DLG_LISTCOMBOWIZARD), _rxObjectModel, _rxContext) @@ -70,7 +70,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OListComboWizard::approveControl(sal_Int16 _nClassId) { switch (_nClassId) @@ -87,7 +87,7 @@ namespace dbp return sal_False; } - //--------------------------------------------------------------------- + OWizardPage* OListComboWizard::createPage(WizardState _nState) { switch (_nState) @@ -107,7 +107,7 @@ namespace dbp return NULL; } - //--------------------------------------------------------------------- + WizardTypes::WizardState OListComboWizard::determineNextState( WizardState _nCurrentState ) const { switch (_nCurrentState) @@ -123,7 +123,7 @@ namespace dbp return WZS_INVALID_STATE; } - //--------------------------------------------------------------------- + void OListComboWizard::enterState(WizardState _nState) { OControlWizard::enterState(_nState); @@ -137,7 +137,7 @@ namespace dbp defaultButton(WZB_FINISH); } - //--------------------------------------------------------------------- + sal_Bool OListComboWizard::leaveState(WizardState _nState) { if (!OControlWizard::leaveState(_nState)) @@ -149,7 +149,7 @@ namespace dbp return sal_True; } - //--------------------------------------------------------------------- + void OListComboWizard::implApplySettings() { try @@ -209,7 +209,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + sal_Bool OListComboWizard::onFinish() { if ( !OControlWizard::onFinish() ) @@ -222,7 +222,7 @@ namespace dbp //===================================================================== //= OLCPage //===================================================================== - //--------------------------------------------------------------------- + Reference< XNameAccess > OLCPage::getTables(sal_Bool _bNeedIt) { Reference< XConnection > xConn = getFormConnection(); @@ -239,7 +239,7 @@ namespace dbp return xTables; } - //--------------------------------------------------------------------- + Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt) { Reference< XNameAccess > xTables = getTables(_bNeedIt); @@ -273,7 +273,7 @@ namespace dbp //===================================================================== //= OContentTableSelection //===================================================================== - //--------------------------------------------------------------------- + OContentTableSelection::OContentTableSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_TABLE)) ,m_aFrame (this, ModuleRes(FL_FRAME)) @@ -288,14 +288,14 @@ namespace dbp m_aSelectTable.SetSelectHdl(LINK(this, OContentTableSelection, OnTableSelected)); } - //--------------------------------------------------------------------- + void OContentTableSelection::ActivatePage() { OLCPage::ActivatePage(); m_aSelectTable.GrabFocus(); } - //--------------------------------------------------------------------- + bool OContentTableSelection::canAdvance() const { if (!OLCPage::canAdvance()) @@ -304,14 +304,14 @@ namespace dbp return 0 != m_aSelectTable.GetSelectEntryCount(); } - //--------------------------------------------------------------------- + IMPL_LINK( OContentTableSelection, OnTableSelected, ListBox*, /*_pListBox*/ ) { updateDialogTravelUI(); return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox*, _pListBox ) { if (_pListBox->GetSelectEntryCount()) @@ -319,7 +319,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + void OContentTableSelection::initializePage() { OLCPage::initializePage(); @@ -342,7 +342,7 @@ namespace dbp m_aSelectTable.SelectEntry(getSettings().sListContentTable); } - //--------------------------------------------------------------------- + sal_Bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) @@ -360,7 +360,7 @@ namespace dbp //===================================================================== //= OContentFieldSelection //===================================================================== - //--------------------------------------------------------------------- + OContentFieldSelection::OContentFieldSelection( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_FIELD)) ,m_aFrame (this, ModuleRes(FL_FRAME)) @@ -376,14 +376,14 @@ namespace dbp m_aSelectTableField.SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); } - //--------------------------------------------------------------------- + void OContentFieldSelection::ActivatePage() { OLCPage::ActivatePage(); m_aTableFields.GrabFocus(); } - //--------------------------------------------------------------------- + void OContentFieldSelection::initializePage() { OLCPage::initializePage(); @@ -395,7 +395,7 @@ namespace dbp m_aDisplayedField.SetText(getSettings().sListContentField); } - //--------------------------------------------------------------------- + bool OContentFieldSelection::canAdvance() const { if (!OLCPage::canAdvance()) @@ -404,7 +404,7 @@ namespace dbp return 0 != m_aSelectTableField.GetSelectEntryCount(); } - //--------------------------------------------------------------------- + IMPL_LINK( OContentFieldSelection, OnTableDoubleClicked, ListBox*, /*NOTINTERESTEDIN*/ ) { if (m_aSelectTableField.GetSelectEntryCount()) @@ -412,7 +412,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + IMPL_LINK( OContentFieldSelection, OnFieldSelected, ListBox*, /*NOTINTERESTEDIN*/ ) { updateDialogTravelUI(); @@ -420,7 +420,7 @@ namespace dbp return 0L; } - //--------------------------------------------------------------------- + sal_Bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) @@ -434,7 +434,7 @@ namespace dbp //===================================================================== //= OLinkFieldsPage //===================================================================== - //--------------------------------------------------------------------- + OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent ) :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK)) ,m_aDescription (this, ModuleRes(FT_FIELDLINK_DESC)) @@ -452,14 +452,14 @@ namespace dbp m_aTableField.SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified)); } - //--------------------------------------------------------------------- + void OLinkFieldsPage::ActivatePage() { OLCPage::ActivatePage(); m_aValueListField.GrabFocus(); } - //--------------------------------------------------------------------- + void OLinkFieldsPage::initializePage() { OLCPage::initializePage(); @@ -476,14 +476,14 @@ namespace dbp implCheckFinish(); } - //--------------------------------------------------------------------- + bool OLinkFieldsPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... return false; } - //--------------------------------------------------------------------- + void OLinkFieldsPage::implCheckFinish() { bool bInvalidSelection = (COMBOBOX_ENTRY_NOTFOUND == m_aValueListField.GetEntryPos(m_aValueListField.GetText())); @@ -491,14 +491,14 @@ namespace dbp getDialog()->enableButtons(WZB_FINISH, !bInvalidSelection); } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified) { implCheckFinish(); return 0L; } - //--------------------------------------------------------------------- + sal_Bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) @@ -513,27 +513,27 @@ namespace dbp //===================================================================== //= OComboDBFieldPage //===================================================================== - //--------------------------------------------------------------------- + OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) :ODBFieldPage(_pParent) { setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString()); } - //--------------------------------------------------------------------- + OUString& OComboDBFieldPage::getDBFieldSetting() { return getSettings().sLinkedFormField; } - //--------------------------------------------------------------------- + void OComboDBFieldPage::ActivatePage() { ODBFieldPage::ActivatePage(); getDialog()->enableButtons(WZB_FINISH, sal_True); } - //--------------------------------------------------------------------- + bool OComboDBFieldPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 34c3260daf81..91e929351b17 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -53,13 +53,13 @@ namespace dbp //===================================================================== //= OOptionGroupLayouter //===================================================================== - //--------------------------------------------------------------------- + OOptionGroupLayouter::OOptionGroupLayouter(const Reference< XComponentContext >& _rxContext) :mxContext(_rxContext) { } - //--------------------------------------------------------------------- + void OOptionGroupLayouter::doLayout(const OControlWizardContext& _rContext, const OOptionGroupSettings& _rSettings) { Reference< XShapes > xPageShapes(_rContext.xDrawPage, UNO_QUERY); @@ -185,7 +185,7 @@ namespace dbp } } - //--------------------------------------------------------------------- + void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { static const OUString s_sAnchorPropertyName("AnchorType"); diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index abb0dcd94496..12e706d78cf6 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -56,13 +56,13 @@ namespace dbp //===================================================================== //= OGroupBoxSI //===================================================================== - //--------------------------------------------------------------------- + OUString OGroupBoxSI::getImplementationName() const { return OUString("org.openoffice.comp.dbp.OGroupBoxWizard"); } - //--------------------------------------------------------------------- + Sequence< OUString > OGroupBoxSI::getServiceNames() const { Sequence< OUString > aReturn(1); @@ -73,13 +73,13 @@ namespace dbp //===================================================================== //= OListComboSI //===================================================================== - //--------------------------------------------------------------------- + OUString OListComboSI::getImplementationName() const { return OUString("org.openoffice.comp.dbp.OListComboWizard"); } - //--------------------------------------------------------------------- + Sequence< OUString > OListComboSI::getServiceNames() const { Sequence< OUString > aReturn(1); @@ -90,13 +90,13 @@ namespace dbp //===================================================================== //= OGridSI //===================================================================== - //--------------------------------------------------------------------- + OUString OGridSI::getImplementationName() const { return OUString("org.openoffice.comp.dbp.OGridWizard"); } - //--------------------------------------------------------------------- + Sequence< OUString > OGridSI::getServiceNames() const { Sequence< OUString > aReturn(1); diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 44ac1c8a6ae3..57c29dc34b58 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -60,21 +60,21 @@ namespace COMPMOD_NAMESPACE void setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; } }; - //------------------------------------------------------------------------- + OModuleImpl::OModuleImpl() :m_pResources(NULL) ,m_bInitialized(sal_False) { } - //------------------------------------------------------------------------- + OModuleImpl::~OModuleImpl() { if (m_pResources) delete m_pResources; } - //------------------------------------------------------------------------- + ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -100,14 +100,14 @@ namespace COMPMOD_NAMESPACE sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = NULL; OString OModule::s_sResPrefix; - //------------------------------------------------------------------------- + ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); } - //------------------------------------------------------------------------- + void OModule::setResourceFilePrefix(const OString& _rPrefix) { ::osl::MutexGuard aGuard(s_aMutex); @@ -116,14 +116,14 @@ namespace COMPMOD_NAMESPACE s_pImpl->setResourceFilePrefix(_rPrefix); } - //------------------------------------------------------------------------- + void OModule::registerClient() { ::osl::MutexGuard aGuard(s_aMutex); ++s_nClients; } - //------------------------------------------------------------------------- + void OModule::revokeClient() { ::osl::MutexGuard aGuard(s_aMutex); @@ -134,7 +134,7 @@ namespace COMPMOD_NAMESPACE } } - //------------------------------------------------------------------------- + void OModule::ensureImpl() { if (s_pImpl) @@ -143,16 +143,16 @@ namespace COMPMOD_NAMESPACE s_pImpl->setResourceFilePrefix(s_sResPrefix); } - //-------------------------------------------------------------------------- + //- registration helper - //-------------------------------------------------------------------------- + Sequence< OUString >* OModule::s_pImplementationNames = NULL; Sequence< Sequence< OUString > >* OModule::s_pSupportedServices = NULL; Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; - //-------------------------------------------------------------------------- + void OModule::registerComponent( const OUString& _rImplementationName, const Sequence< OUString >& _rServiceNames, @@ -188,7 +188,7 @@ namespace COMPMOD_NAMESPACE s_pFactoryFunctionPointers->getArray()[nOldLen] = reinterpret_cast<sal_Int64>(_pFactoryFunction); } - //-------------------------------------------------------------------------- + void OModule::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) @@ -226,7 +226,7 @@ namespace COMPMOD_NAMESPACE } } - //-------------------------------------------------------------------------- + Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index 637a3a2a2f92..df3c11249e5b 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -63,7 +63,7 @@ namespace logging //==================================================================== //= ConsoleHandler - declaration //==================================================================== - //-------------------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper3 < XConsoleHandler , XServiceInfo , XInitialization @@ -119,7 +119,7 @@ namespace logging //==================================================================== //= ConsoleHandler - implementation //==================================================================== - //-------------------------------------------------------------------- + ConsoleHandler::ConsoleHandler( const Reference< XComponentContext >& _rxContext ) :ConsoleHandler_Base( m_aMutex ) ,m_aHandlerHelper( _rxContext, m_aMutex, rBHelper ) @@ -127,7 +127,7 @@ namespace logging { } - //-------------------------------------------------------------------- + ConsoleHandler::~ConsoleHandler() { if ( !rBHelper.bDisposed ) @@ -137,39 +137,39 @@ namespace logging } } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::disposing() { m_aHandlerHelper.setFormatter( NULL ); } - //-------------------------------------------------------------------- + void ConsoleHandler::enterMethod( MethodGuard::Access ) { m_aHandlerHelper.enterMethod(); } - //-------------------------------------------------------------------- + void ConsoleHandler::leaveMethod( MethodGuard::Access ) { m_aMutex.release(); } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL ConsoleHandler::getThreshold() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_nThreshold; } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_nThreshold = _threshold; } - //-------------------------------------------------------------------- + OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -178,42 +178,42 @@ namespace logging return sEncoding; } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException) { MethodGuard aGuard( *this ); OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) ); } - //-------------------------------------------------------------------- + Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_aHandlerHelper.getFormatter(); } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aHandlerHelper.setFormatter( _rxFormatter ); } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL ConsoleHandler::getLevel() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_aHandlerHelper.getLevel(); } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aHandlerHelper.setLevel( _nLevel ); } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::flush( ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -221,7 +221,7 @@ namespace logging fflush( stderr ); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -238,7 +238,7 @@ namespace logging return sal_True; } - //-------------------------------------------------------------------- + void SAL_CALL ConsoleHandler::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -268,31 +268,31 @@ namespace logging m_aHandlerHelper.setIsInitialized(); } - //-------------------------------------------------------------------- + OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return cppu::supportsService(this, _rServiceName); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - //-------------------------------------------------------------------- + OUString SAL_CALL ConsoleHandler::getImplementationName_static() { return OUString( "com.sun.star.comp.extensions.ConsoleHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); @@ -300,13 +300,13 @@ namespace logging return aServiceNames; } - //-------------------------------------------------------------------- + Reference< XInterface > ConsoleHandler::Create( const Reference< XComponentContext >& _rxContext ) { return *( new ConsoleHandler( _rxContext ) ); } - //-------------------------------------------------------------------- + void createRegistryInfo_ConsoleHandler() { static OAutoRegistration< ConsoleHandler > aAutoRegistration; diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index d2dc622dcf1a..61a2353f3e80 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -147,7 +147,7 @@ namespace logging //==================================================================== //= FileHandler - implementation //==================================================================== - //-------------------------------------------------------------------- + FileHandler::FileHandler( const Reference< XComponentContext >& _rxContext ) :FileHandler_Base( m_aMutex ) ,m_xContext( _rxContext ) @@ -158,7 +158,7 @@ namespace logging { } - //-------------------------------------------------------------------- + FileHandler::~FileHandler() { if ( !rBHelper.bDisposed ) @@ -168,7 +168,7 @@ namespace logging } } - //-------------------------------------------------------------------- + bool FileHandler::impl_prepareFile_nothrow() { if ( m_eFileValidity == eUnknown ) @@ -208,7 +208,7 @@ namespace logging return m_eFileValidity == eValid; } - //-------------------------------------------------------------------- + void FileHandler::impl_writeString_nothrow( const OString& _rEntry ) { OSL_PRECOND( m_pFile.get(), "FileHandler::impl_writeString_nothrow: no file!" ); @@ -223,7 +223,7 @@ namespace logging "FileHandler::impl_writeString_nothrow: could not write the log entry!" ); } - //-------------------------------------------------------------------- + void FileHandler::impl_doStringsubstitution_nothrow( OUString& _inout_rURL ) { try @@ -237,7 +237,7 @@ namespace logging } } - //-------------------------------------------------------------------- + void SAL_CALL FileHandler::disposing() { if ( m_eFileValidity == eValid ) @@ -251,19 +251,19 @@ namespace logging m_aHandlerHelper.setFormatter( NULL ); } - //-------------------------------------------------------------------- + void FileHandler::enterMethod( MethodGuard::Access ) { m_aHandlerHelper.enterMethod(); } - //-------------------------------------------------------------------- + void FileHandler::leaveMethod( MethodGuard::Access ) { m_aMutex.release(); } - //-------------------------------------------------------------------- + OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -272,42 +272,42 @@ namespace logging return sEncoding; } - //-------------------------------------------------------------------- + void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException) { MethodGuard aGuard( *this ); OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) ); } - //-------------------------------------------------------------------- + Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_aHandlerHelper.getFormatter(); } - //-------------------------------------------------------------------- + void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aHandlerHelper.setFormatter( _rxFormatter ); } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL FileHandler::getLevel() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_aHandlerHelper.getLevel(); } - //-------------------------------------------------------------------- + void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aHandlerHelper.setLevel( _nLevel ); } - //-------------------------------------------------------------------- + void SAL_CALL FileHandler::flush( ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -323,7 +323,7 @@ namespace logging OSL_ENSURE(res == ::osl::FileBase::E_None, "FileHandler::flush: Could not sync logfile to filesystem."); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -339,7 +339,7 @@ namespace logging return sal_True; } - //-------------------------------------------------------------------- + void SAL_CALL FileHandler::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -371,7 +371,7 @@ namespace logging m_aHandlerHelper.setIsInitialized(); } - //-------------------------------------------------------------------- + OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); @@ -382,19 +382,19 @@ namespace logging return cppu::supportsService(this, _rServiceName); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - //-------------------------------------------------------------------- + OUString SAL_CALL FileHandler::getImplementationName_static() { return OUString( "com.sun.star.comp.extensions.FileHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); @@ -402,13 +402,13 @@ namespace logging return aServiceNames; } - //-------------------------------------------------------------------- + Reference< XInterface > FileHandler::Create( const Reference< XComponentContext >& _rxContext ) { return *( new FileHandler( _rxContext ) ); } - //-------------------------------------------------------------------- + void createRegistryInfo_FileHandler() { static OAutoRegistration< FileHandler > aAutoRegistration; diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx index da0376b6e667..35eb937f0e0c 100644 --- a/extensions/source/logging/log_services.cxx +++ b/extensions/source/logging/log_services.cxx @@ -24,7 +24,7 @@ namespace logging { //........................................................................ - //-------------------------------------------------------------------- + extern void createRegistryInfo_LoggerPool(); extern void createRegistryInfo_FileHandler(); extern void createRegistryInfo_ConsoleHandler(); diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index 0e3d19b553e7..dac25367497d 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -71,10 +71,10 @@ namespace logging namespace { - //---------------------------------------------------------------- + typedef void (*SettingTranslation)( const Reference< XLogger >&, const OUString&, Any& ); - //---------------------------------------------------------------- + void lcl_substituteFileHandlerURLVariables_nothrow( const Reference< XLogger >& _rxLogger, OUString& _inout_rFileURL ) { struct Variable @@ -157,7 +157,7 @@ namespace logging } } - //---------------------------------------------------------------- + void lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const OUString& _rSettingName, Any& _inout_rSettingValue ) { if ( _rSettingName != "FileURL" ) @@ -170,7 +170,7 @@ namespace logging _inout_rSettingValue <<= sURL; } - //---------------------------------------------------------------- + Reference< XInterface > lcl_createInstanceFromSetting_throw( const Reference<XComponentContext>& _rContext, const Reference< XLogger >& _rxLogger, @@ -234,7 +234,7 @@ namespace logging } } - //-------------------------------------------------------------------- + void initializeLoggerFromConfiguration( const Reference<XComponentContext>& _rContext, const Reference< XLogger >& _rxLogger ) { try diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 4184718f4532..eac7d59eda18 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -49,7 +49,7 @@ namespace logging //==================================================================== //= LogHandlerHelper //==================================================================== - //-------------------------------------------------------------------- + LogHandlerHelper::LogHandlerHelper( const Reference< XComponentContext >& _rxContext, ::osl::Mutex& _rMutex, ::cppu::OBroadcastHelper& _rBHelper ) :m_eEncoding( RTL_TEXTENCODING_UTF8 ) ,m_nLevel( LogLevel::SEVERE ) @@ -61,7 +61,7 @@ namespace logging { } - //-------------------------------------------------------------------- + void LogHandlerHelper::initFromSettings( const ::comphelper::NamedValueCollection& _rSettings ) { OUString sEncoding; @@ -75,7 +75,7 @@ namespace logging _rSettings.get_ensureType( "Level", m_nLevel ); } - //-------------------------------------------------------------------- + void LogHandlerHelper::enterMethod() { m_rMutex.acquire(); @@ -101,7 +101,7 @@ namespace logging } } - //-------------------------------------------------------------------- + bool LogHandlerHelper::getEncoding( OUString& _out_rEncoding ) const { const char* pMimeCharset = rtl_getMimeCharsetFromTextEncoding( m_eEncoding ); @@ -114,7 +114,7 @@ namespace logging return false; } - //-------------------------------------------------------------------- + bool LogHandlerHelper::setEncoding( const OUString& _rEncoding ) { OString sAsciiEncoding( OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) ); @@ -127,7 +127,7 @@ namespace logging return false; } - //-------------------------------------------------------------------- + bool LogHandlerHelper::formatForPublishing( const LogRecord& _rRecord, OString& _out_rEntry ) const { if ( _rRecord.Level < getLevel() ) @@ -148,7 +148,7 @@ namespace logging return false; } - //-------------------------------------------------------------------- + bool LogHandlerHelper::getEncodedHead( OString& _out_rHead ) const { try @@ -165,7 +165,7 @@ namespace logging return false; } - //-------------------------------------------------------------------- + bool LogHandlerHelper::getEncodedTail( OString& _out_rTail ) const { try diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx index a4a95ced4d08..b7ee720452e9 100644 --- a/extensions/source/logging/logrecord.cxx +++ b/extensions/source/logging/logrecord.cxx @@ -35,7 +35,7 @@ namespace logging //==================================================================== //= helper //==================================================================== - //-------------------------------------------------------------------- + namespace { /** returns a string representation of the current thread @@ -51,7 +51,7 @@ namespace logging } } - //-------------------------------------------------------------------- + LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rClassName, const OUString& _rMethodName, const OUString& _rMessage, sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber ) diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index 2f4e0a6eb381..7333c064d9df 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -79,17 +79,17 @@ namespace logging //==================================================================== //= PlainTextFormatter - implementation //==================================================================== - //-------------------------------------------------------------------- + PlainTextFormatter::PlainTextFormatter() { } - //-------------------------------------------------------------------- + PlainTextFormatter::~PlainTextFormatter() { } - //-------------------------------------------------------------------- + OUString SAL_CALL PlainTextFormatter::getHead( ) throw (RuntimeException) { OUStringBuffer aHeader; @@ -106,7 +106,7 @@ namespace logging return aHeader.makeStringAndClear(); } - //-------------------------------------------------------------------- + OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException) { char buffer[ 30 ]; @@ -144,7 +144,7 @@ namespace logging return aLogEntry.makeStringAndClear(); } - //-------------------------------------------------------------------- + OUString SAL_CALL PlainTextFormatter::getTail( ) throw (RuntimeException) { // no tail @@ -156,25 +156,25 @@ namespace logging return cppu::supportsService(this, _rServiceName); } - //-------------------------------------------------------------------- + OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - //-------------------------------------------------------------------- + OUString SAL_CALL PlainTextFormatter::getImplementationName_static() { return OUString( "com.sun.star.comp.extensions.PlainTextFormatter" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static() { Sequence< OUString > aServiceNames(1); @@ -182,13 +182,13 @@ namespace logging return aServiceNames; } - //-------------------------------------------------------------------- + Reference< XInterface > PlainTextFormatter::Create( const Reference< XComponentContext >& ) { return *( new PlainTextFormatter ); } - //-------------------------------------------------------------------- + void createRegistryInfo_PlainTextFormatter() { static OAutoRegistration< PlainTextFormatter > aAutoRegistration; diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 1118f43eb659..f94dba01b8a8 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -1226,7 +1226,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, -// -------------------------- + // XInitialization void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) { @@ -1309,7 +1309,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument } } -// -------------------------- + // XDirectInvocation uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, const uno::Sequence< uno::Any >& aParams ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 0689773d0a97..7769b1a6d6bf 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -301,7 +301,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, // by either using type information or by help of a specialized ValueObject object. // A. Type Information -// ----------------------------------------------------------------------------- + // With the help of type information the kind of parameter can be exactly determined // and an appropriate conversion can be choosen. A problem arises if a method expects // an Any. Then the type info does not tell what the type of the value, that is kept @@ -311,7 +311,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/, // the JScript value objects within a JScript script on such an occasion. // B. JavaScript Value Object ( class JScriptValue ) -// ----------------------------------------------------------------------------- + // A JScriptValue (ValueObject) object is a COM object in that it implements IDispatch and the // IJScriptValue object interface. Such objects are provided by all UNO wrapper // objects used within a JScript script. To obtain an instance one has to call @@ -1069,7 +1069,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s ret= S_OK; } } -// --------- + // function: _GetValueObject else if( dispidMember == DISPID_JSCRIPT_VALUE_FUNC) { diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index 022e1265acef..04d03bbce4cf 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -38,7 +38,7 @@ #include <toolkit/helper/vclunohelper.hxx> -//-------------------------------------------------------------------------------------------------- + PluginControl_Impl::PluginControl_Impl() : _pMultiplexer( NULL ) , _nX( 0 ) @@ -52,7 +52,7 @@ PluginControl_Impl::PluginControl_Impl() : { } -//-------------------------------------------------------------------------------------------------- + PluginControl_Impl::~PluginControl_Impl() { } @@ -140,7 +140,7 @@ void PluginControl_Impl::setFocus(void) throw( RuntimeException ) } -//-------------------------------------------------------------------------------------------------- + void PluginControl_Impl::releasePeer() { if (_xPeer.is()) diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx index 4f41e5289322..beae3b4119c3 100644 --- a/extensions/source/plugin/win/sysplug.cxx +++ b/extensions/source/plugin/win/sysplug.cxx @@ -69,7 +69,7 @@ void TRACEN( char const * s, long n ); return ::boost::shared_ptr<SysPlugData>(); } -//-------------------------------------------------------------------------------------------------- + PluginComm_Impl::PluginComm_Impl( const OUString& /*rMIME*/, const OUString& rName, HWND /*hWnd*/ ) : PluginComm( OUStringToOString( rName, RTL_TEXTENCODING_MS_1252 ) ) { @@ -100,7 +100,7 @@ PluginComm_Impl::PluginComm_Impl( const OUString& /*rMIME*/, const OUString& rNa execute(); } -//-------------------------------------------------------------------------------------------------- + PluginComm_Impl::~PluginComm_Impl() { if (_plDLL) @@ -120,7 +120,7 @@ PluginComm_Impl::~PluginComm_Impl() } } -//-------------------------------------------------------------------------------------------------- + BOOL PluginComm_Impl::retrieveFunction( TCHAR const * pName, void** ppFunc ) const { if( ! _plDLL ) @@ -131,7 +131,7 @@ BOOL PluginComm_Impl::retrieveFunction( TCHAR const * pName, void** ppFunc ) con return (*ppFunc != NULL); } -//-------------------------------------------------------------------------------------------------- + long PluginComm_Impl::doIt() { @@ -287,7 +287,7 @@ long PluginComm_Impl::doIt() return nRet; } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_Destroy( NPP instance, NPSavedData** save ) { DBG_ASSERT( _NPPfuncs.destroy, "### NPP_Destroy(): null pointer in NPP functions table!" ); @@ -297,7 +297,7 @@ NPError PluginComm_Impl::NPP_Destroy( NPP instance, NPSavedData** save ) return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason ) { DBG_ASSERT( _NPPfuncs.destroystream, "### NPP_DestroyStream(): null pointer in NPP functions table!" ); @@ -308,7 +308,7 @@ NPError PluginComm_Impl::NPP_DestroyStream( NPP instance, NPStream* stream, NPEr return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData *saved ) { @@ -324,7 +324,7 @@ NPError PluginComm_Impl::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype ) { @@ -339,7 +339,7 @@ NPError PluginComm_Impl::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + void PluginComm_Impl::NPP_Print( NPP instance, NPPrint* platformPrint ) { DBG_ASSERT( _NPPfuncs.print, "### NPP_Print(): null pointer in NPP functions table!" ); @@ -349,7 +349,7 @@ void PluginComm_Impl::NPP_Print( NPP instance, NPPrint* platformPrint ) execute(); } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_SetWindow( NPP instance, NPWindow* window ) { DBG_ASSERT( _NPPfuncs.setwindow, "### NPP_SetWindow(): null pointer in NPP functions table!" ); @@ -359,7 +359,7 @@ NPError PluginComm_Impl::NPP_SetWindow( NPP instance, NPWindow* window ) return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + void PluginComm_Impl::NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname ) { DBG_ASSERT( _NPPfuncs.asfile, "### NPP_StreamAsFile(): null pointer in NPP functions table!" ); @@ -370,7 +370,7 @@ void PluginComm_Impl::NPP_StreamAsFile( NPP instance, NPStream* stream, const ch execute(); } -//-------------------------------------------------------------------------------------------------- + void PluginComm_Impl::NPP_URLNotify( NPP instance, const char* url, NPReason reason, void* notifyData ) { DBG_ASSERT( _NPPfuncs.urlnotify, "### NPP_URLNotify(): null pointer in NPP functions table!" ); @@ -382,7 +382,7 @@ void PluginComm_Impl::NPP_URLNotify( NPP instance, const char* url, NPReason rea execute(); } -//-------------------------------------------------------------------------------------------------- + int32_t PluginComm_Impl::NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer ) { DBG_ASSERT( _NPPfuncs.write, "### NPP_Write(): null pointer in NPP functions table!" ); @@ -395,7 +395,7 @@ int32_t PluginComm_Impl::NPP_Write( NPP instance, NPStream* stream, int32_t offs return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + int32_t PluginComm_Impl::NPP_WriteReady( NPP instance, NPStream* stream ) { DBG_ASSERT( _NPPfuncs.writeready, "### NPP_WriteReady(): null pointer in NPP functions table!" ); @@ -405,7 +405,7 @@ int32_t PluginComm_Impl::NPP_WriteReady( NPP instance, NPStream* stream ) return execute(); } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value ) { DBG_ASSERT( _NPPfuncs.getvalue, "### NPP_GetValue(): null pointer in NPP functions table!" ); @@ -416,7 +416,7 @@ NPError PluginComm_Impl::NPP_GetValue( NPP instance, NPPVariable variable, void return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value ) { DBG_ASSERT( _NPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" ); @@ -427,20 +427,20 @@ NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void return (NPError)execute(); } -//-------------------------------------------------------------------------------------------------- + void * PluginComm_Impl::NPP_GetJavaClass() { OSL_FAIL( "no java class available!" ); return 0; } -//-------------------------------------------------------------------------------------------------- + NPError PluginComm_Impl::NPP_Initialize() { return NPERR_NO_ERROR; } -//-------------------------------------------------------------------------------------------------- + void PluginComm_Impl::NPP_Shutdown() { m_eCall = eNPP_Shutdown; diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index a5535dec0c6d..11aa92f31d0c 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -67,7 +67,7 @@ using namespace com::sun::star::plugin; typedef map< OString, OUString, less< OString > > PluginLocationMap; -//__________________________________________________________________________________________________ + static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap & rPlugins ) { // append dll name pattern we are looking for @@ -118,7 +118,7 @@ static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap & if (hFind != INVALID_HANDLE_VALUE) ::FindClose( hFind ); } -//__________________________________________________________________________________________________ + static void addPluginsFromPath( const OUString & rPath, PluginLocationMap & rPlugins ) { TCHAR arPluginsPath[MAX_PATH]; @@ -132,7 +132,7 @@ static void addPluginsFromPath( const OUString & rPath, PluginLocationMap & rPlu } -//__________________________________________________________________________________________________ + static void add_IE_Plugins( PluginLocationMap & rPlugins ) { HKEY hKey; @@ -155,7 +155,7 @@ static void add_IE_Plugins( PluginLocationMap & rPlugins ) } } -//-------------------------------------------------------------------------------------------------- + static void add_NS_keys( HKEY hKey, PluginLocationMap & rPlugins ) { TCHAR value[MAX_PATH]; @@ -194,7 +194,7 @@ static void add_NS_keys( HKEY hKey, PluginLocationMap & rPlugins ) addPluginsFromPath( value, rPlugins ); } } -//-------------------------------------------------------------------------------------------------- + static void add_NS_lookupRecursive( HKEY hKey, PluginLocationMap & rPlugins ) { add_NS_keys( hKey, rPlugins ); @@ -214,7 +214,7 @@ static void add_NS_lookupRecursive( HKEY hKey, PluginLocationMap & rPlugins ) ++dwIndex; } } -//__________________________________________________________________________________________________ + static void add_MozPlugin( HKEY hKey, PluginLocationMap & rPlugins ) { TCHAR value[MAX_PATH]; @@ -257,7 +257,7 @@ static void add_MozillaPlugin( HKEY hKey, PluginLocationMap & rPlugins ) ++dwIndex; } } -//__________________________________________________________________________________________________ + static void add_NS_Plugins( PluginLocationMap & rPlugins ) { HKEY hKey; @@ -287,7 +287,7 @@ static void add_NS_Plugins( PluginLocationMap & rPlugins ) } } -//__________________________________________________________________________________________________ + static void add_SO_Plugins( PluginLocationMap & rPlugins ) { const Sequence< OUString > & rPaths = PluginManager::getAdditionalSearchPaths(); @@ -299,7 +299,7 @@ static void add_SO_Plugins( PluginLocationMap & rPlugins ) } } -//__________________________________________________________________________________________________ + Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(void) throw() { Guard< Mutex > aGuard( Mutex::getGlobalMutex() ); diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index a664a61f4405..dcbd50edca3e 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -37,43 +37,43 @@ namespace pcr //==================================================================== //= MasterDetailLinkDialog //==================================================================== - //--------------------------------------------------------------------- + MasterDetailLinkDialog::MasterDetailLinkDialog(const Reference< XComponentContext >& _rxContext ) :OGenericUnoDialog( _rxContext ) { } -//--------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } - //--------------------------------------------------------------------- + Reference< XInterface > SAL_CALL MasterDetailLinkDialog::Create( const Reference< XComponentContext >& _rxContext ) { return *( new MasterDetailLinkDialog( _rxContext ) ); } - //--------------------------------------------------------------------- + OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - //--------------------------------------------------------------------- + OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -81,20 +81,20 @@ namespace pcr return aSupported; } - //--------------------------------------------------------------------- + Reference<XPropertySetInfo> SAL_CALL MasterDetailLinkDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //--------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& MasterDetailLinkDialog::getInfoHelper() { return *const_cast<MasterDetailLinkDialog*>(this)->getArrayHelper(); } - //-------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* MasterDetailLinkDialog::createArrayHelper( ) const { Sequence< Property > aProps; @@ -102,13 +102,13 @@ namespace pcr return new ::cppu::OPropertyArrayHelper(aProps); } - //-------------------------------------------------------------------------- + Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent) { return new FormLinkDialog(_pParent,m_xDetail,m_xMaster, m_aContext ,m_sExplanation,m_sDetailLabel,m_sMasterLabel); } - //--------------------------------------------------------------------- + void MasterDetailLinkDialog::implInitialize(const Any& _rValue) { PropertyValue aProperty; diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 5ebeac6e2a3d..e44f1493c2b9 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -55,7 +55,7 @@ namespace pcr //= OBrowserLine //================================================================== DBG_NAME(OBrowserLine) - //------------------------------------------------------------------ + OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent ) :m_sEntryName( _rEntryName ) @@ -74,7 +74,7 @@ namespace pcr m_aFtTitle.Show(); } - //------------------------------------------------------------------ + OBrowserLine::~OBrowserLine() { implHideBrowseButton( true, false ); @@ -83,7 +83,7 @@ namespace pcr DBG_DTOR(OBrowserLine,NULL); } - //------------------------------------------------------------------ + void OBrowserLine::IndentTitle( bool _bIndent ) { if ( m_bIndentTitle != _bIndent ) @@ -93,7 +93,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserLine::SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ) { if ( m_pControlWindow ) @@ -112,7 +112,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserLine::setControl( const Reference< XPropertyControl >& _rxControl ) { m_xControl = _rxControl; @@ -127,7 +127,7 @@ namespace pcr impl_layoutComponents(); } - //------------------------------------------------------------------ + Window* OBrowserLine::GetRefWindow() { Window* pRefWindow=&m_aFtTitle; @@ -143,7 +143,7 @@ namespace pcr return pRefWindow; } - //------------------------------------------------------------------ + void OBrowserLine::SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ) { m_aFtTitle.SetZOrder(pRefWindow,nFlags); @@ -157,7 +157,7 @@ namespace pcr m_pAdditionalBrowseButton->SetZOrder( m_pBrowseButton, WINDOW_ZORDER_BEHIND ); } - //------------------------------------------------------------------ + sal_Bool OBrowserLine::GrabFocus() { sal_Bool bRes=sal_False; @@ -180,7 +180,7 @@ namespace pcr return bRes; } - //------------------------------------------------------------------ + void OBrowserLine::SetPosSizePixel( Point _rPos, Size _rSize ) { m_aLinePos = _rPos; @@ -189,7 +189,7 @@ namespace pcr impl_layoutComponents(); } - //------------------------------------------------------------------ + void OBrowserLine::Show(sal_Bool bFlag) { m_aFtTitle.Show(bFlag); @@ -201,19 +201,19 @@ namespace pcr m_pAdditionalBrowseButton->Show( bFlag ); } - //------------------------------------------------------------------ + void OBrowserLine::Hide() { Show(sal_False); } - //------------------------------------------------------------------ + sal_Bool OBrowserLine::IsVisible() { return m_aFtTitle.IsVisible(); } - //------------------------------------------------------------------ + void OBrowserLine::impl_layoutComponents() { { @@ -256,7 +256,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserLine::SetTitle(const OUString& _rNewTtile ) { if ( GetTitle() == _rNewTtile ) @@ -291,7 +291,7 @@ namespace pcr } } - //------------------------------------------------------------------ + OUString OBrowserLine::GetTitle() const { OUString sDisplayName = m_aFtTitle.GetText(); @@ -308,7 +308,7 @@ namespace pcr return sDisplayName; } - //------------------------------------------------------------------ + void OBrowserLine::SetReadOnly( bool _bReadOnly ) { if ( m_bReadOnly != _bReadOnly ) @@ -318,7 +318,7 @@ namespace pcr } } - //------------------------------------------------------------------ + namespace { void implSetBitIfAffected( sal_uInt16& _nEnabledBits, sal_Int16 _nAffectedMask, sal_Int16 _nTestBit, bool _bSet ) @@ -345,7 +345,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserLine::implUpdateEnabledDisabled() { implEnable( &m_aFtTitle, m_nEnableFlags, PropertyLineElement::CompleteLine ); @@ -364,14 +364,14 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserLine::EnablePropertyLine( bool _bEnable ) { implSetBitIfAffected( m_nEnableFlags, PropertyLineElement::CompleteLine, PropertyLineElement::CompleteLine, _bEnable ); implUpdateEnabledDisabled(); } - //------------------------------------------------------------------ + void OBrowserLine::EnablePropertyControls( sal_Int16 _nControls, bool _bEnable ) { implSetBitIfAffected( m_nEnableFlags, _nControls, PropertyLineElement::InputControl, _bEnable ); @@ -380,7 +380,7 @@ namespace pcr implUpdateEnabledDisabled(); } - //------------------------------------------------------------------ + PushButton& OBrowserLine::impl_ensureButton( bool _bPrimary ) { PushButton*& rpButton = _bPrimary ? m_pBrowseButton : m_pAdditionalBrowseButton; @@ -400,7 +400,7 @@ namespace pcr return *rpButton; } - //------------------------------------------------------------------ + void OBrowserLine::impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage ) { try @@ -421,7 +421,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserLine::ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary ) { PushButton& rButton( impl_ensureButton( _bPrimary ) ); @@ -433,7 +433,7 @@ namespace pcr rButton.SetModeImage( aImage ); } - //------------------------------------------------------------------ + void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ) { PushButton& rButton( impl_ensureButton( _bPrimary ) ); @@ -441,13 +441,13 @@ namespace pcr rButton.SetModeImage( _rImage ); } - //------------------------------------------------------------------ + void OBrowserLine::ShowBrowseButton( sal_Bool _bPrimary ) { impl_ensureButton( _bPrimary ); } - //------------------------------------------------------------------ + void OBrowserLine::implHideBrowseButton( sal_Bool _bPrimary, bool _bReLayout ) { PushButton*& rpButton = _bPrimary ? m_pBrowseButton : m_pAdditionalBrowseButton; @@ -463,13 +463,13 @@ namespace pcr impl_layoutComponents(); } - //------------------------------------------------------------------ + void OBrowserLine::HideBrowseButton( sal_Bool _bPrimary ) { implHideBrowseButton( _bPrimary, true ); } - //------------------------------------------------------------------ + void OBrowserLine::SetTitleWidth(sal_uInt16 nWidth) { if (m_nNameWidth != nWidth+10) @@ -481,13 +481,13 @@ namespace pcr FullFillTitleString(); } - //------------------------------------------------------------------ + void OBrowserLine::SetClickListener( IButtonClickListener* _pListener ) { m_pClickListener = _pListener; } - //------------------------------------------------------------------ + IMPL_LINK( OBrowserLine, OnButtonClicked, PushButton*, _pButton ) { if ( m_pClickListener ) @@ -496,7 +496,7 @@ namespace pcr return 0L; } - //------------------------------------------------------------------ + IMPL_LINK( OBrowserLine, OnButtonFocus, PushButton*, /*pPB*/ ) { if ( m_xControl.is() ) diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 3841a6430f80..5e5e3e5e05f4 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -98,17 +98,17 @@ namespace pcr SharedNotifier& operator=( const SharedNotifier& ); // never implemented }; - //------------------------------------------------------------------ + ::rtl::Reference< ::comphelper::AsyncEventNotifier > SharedNotifier::s_pNotifier; - //------------------------------------------------------------------ + ::osl::Mutex& SharedNotifier::getMutex() { static ::osl::Mutex s_aMutex; return s_aMutex; } - //------------------------------------------------------------------ + const ::rtl::Reference< ::comphelper::AsyncEventNotifier >& SharedNotifier::getNotifier() { ::osl::MutexGuard aGuard( getMutex() ); @@ -211,28 +211,28 @@ namespace pcr void impl_notify_throw( const Reference< XPropertyControl >& _rxControl, ControlEventType _eType ); }; - //-------------------------------------------------------------------- + PropertyControlContext_Impl::PropertyControlContext_Impl( IControlContext& _rContextImpl ) :m_pContext( &_rContextImpl ) ,m_eMode( eAsynchronously ) { } - //-------------------------------------------------------------------- + PropertyControlContext_Impl::~PropertyControlContext_Impl() { if ( !impl_isDisposed_nothrow() ) dispose(); } - //-------------------------------------------------------------------- + void PropertyControlContext_Impl::impl_checkAlive_throw() const { if ( impl_isDisposed_nothrow() ) throw DisposedException( OUString(), *const_cast< PropertyControlContext_Impl* >( this ) ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlContext_Impl::dispose() { SolarMutexGuard aGuard; @@ -243,14 +243,14 @@ namespace pcr m_pContext = NULL; } - //-------------------------------------------------------------------- + void PropertyControlContext_Impl::setNotificationMode( NotifcationMode _eMode ) { SolarMutexGuard aGuard; m_eMode = _eMode; } - //-------------------------------------------------------------------- + void PropertyControlContext_Impl::impl_notify_throw( const Reference< XPropertyControl >& _rxControl, ControlEventType _eType ) { ::comphelper::AnyEventRef pEvent; @@ -270,40 +270,40 @@ namespace pcr SharedNotifier::getNotifier()->addEvent( pEvent, this ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException) { OSL_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" ); impl_notify_throw( Control, FOCUS_GAINED ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException) { OSL_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" ); impl_notify_throw( Control, VALUE_CHANGED ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException) { OSL_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" ); impl_notify_throw( CurrentControl, ACTIVATE_NEXT ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlContext_Impl::acquire() throw() { PropertyControlContext_Impl_Base::acquire(); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlContext_Impl::release() throw() { PropertyControlContext_Impl_Base::release(); } - //-------------------------------------------------------------------- + void PropertyControlContext_Impl::processEvent( const ::comphelper::AnyEvent& _rEvent ) { SolarMutexGuard aGuard; @@ -322,7 +322,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void PropertyControlContext_Impl::impl_processEvent_throw( const ::comphelper::AnyEvent& _rEvent ) { const ControlEvent& rControlEvent = static_cast< const ControlEvent& >( _rEvent ); @@ -347,7 +347,7 @@ namespace pcr //= OBrowserListBox //================================================================== DBG_NAME(OBrowserListBox) - //------------------------------------------------------------------ + OBrowserListBox::OBrowserListBox( Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle| WB_CLIPCHILDREN) ,m_aLinesPlayground(this,WB_DIALOGCONTROL | WB_CLIPCHILDREN) @@ -377,7 +377,7 @@ namespace pcr m_aVScroll.SetScrollHdl(LINK(this, OBrowserListBox, ScrollHdl)); } - //------------------------------------------------------------------ + OBrowserListBox::~OBrowserListBox() { OSL_ENSURE( !IsModified(), "OBrowserListBox::~OBrowserListBox: still modified - should have been committed before!" ); @@ -394,7 +394,7 @@ namespace pcr DBG_DTOR(OBrowserListBox,NULL); } - //------------------------------------------------------------------ + sal_Bool OBrowserListBox::IsModified( ) const { sal_Bool bModified = sal_False; @@ -405,7 +405,7 @@ namespace pcr return bModified; } - //------------------------------------------------------------------ + void OBrowserListBox::CommitModified( ) { if ( IsModified() && m_xActiveControl.is() ) @@ -425,7 +425,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::ActivateListBox(sal_Bool _bActive) { m_bIsActive = _bActive; @@ -438,13 +438,13 @@ namespace pcr } } - //------------------------------------------------------------------ + long OBrowserListBox::impl_getPrefererredHelpHeight() { return HasHelpSection() ? m_pHelpWindow->GetOptimalHeightPixel() : 0; } - //------------------------------------------------------------------ + void OBrowserListBox::Resize() { Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() ); @@ -507,32 +507,32 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::SetListener( IPropertyLineListener* _pListener ) { m_pLineListener = _pListener; } - //------------------------------------------------------------------ + void OBrowserListBox::SetObserver( IPropertyControlObserver* _pObserver ) { m_pControlObserver = _pObserver; } - //------------------------------------------------------------------ + void OBrowserListBox::EnableHelpSection( bool _bEnable ) { m_pHelpWindow->Show( _bEnable ); Resize(); } - //------------------------------------------------------------------ + bool OBrowserListBox::HasHelpSection() const { return m_pHelpWindow->IsVisible(); } - //------------------------------------------------------------------ + void OBrowserListBox::SetHelpText( const OUString& _rHelpText ) { OSL_ENSURE( HasHelpSection(), "OBrowserListBox::SetHelpText: help section not visible!" ); @@ -541,13 +541,13 @@ namespace pcr Resize(); } - //------------------------------------------------------------------ + void OBrowserListBox::SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ) { m_pHelpWindow->SetLimits( _nMinLines, _nMaxLines ); } - //------------------------------------------------------------------ + sal_uInt16 OBrowserListBox::CalcVisibleLines() { Size aSize(m_aLinesPlayground.GetOutputSizePixel()); @@ -558,7 +558,7 @@ namespace pcr return nResult; } - //------------------------------------------------------------------ + void OBrowserListBox::UpdateVScroll() { sal_uInt16 nLines = CalcVisibleLines(); @@ -578,7 +578,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::PositionLine( sal_uInt16 _nIndex ) { Size aSize(m_aLinesPlayground.GetOutputSizePixel()); @@ -601,7 +601,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::UpdatePosNSize() { for ( ::std::set< sal_uInt16 >::const_iterator aLoop = m_aOutOfDateLines.begin(); @@ -616,7 +616,7 @@ namespace pcr m_aOutOfDateLines.clear(); } - //------------------------------------------------------------------ + void OBrowserListBox::UpdatePlayGround() { sal_Int32 nThumbPos = m_aVScroll.GetThumbPos(); @@ -634,26 +634,26 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::UpdateAll() { Resize(); } - //------------------------------------------------------------------ + void OBrowserListBox::DisableUpdate() { m_bUpdate = sal_False; } - //------------------------------------------------------------------ + void OBrowserListBox::EnableUpdate() { m_bUpdate = sal_True; UpdateAll(); } - //------------------------------------------------------------------ + void OBrowserListBox::SetPropertyValue(const OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue ) { ListBoxLines::iterator line = m_aLines.begin(); @@ -674,7 +674,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + sal_uInt16 OBrowserListBox::GetPropertyPos( const OUString& _rEntryName ) const { sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND; @@ -693,7 +693,7 @@ namespace pcr return nRet; } - //------------------------------------------------------------------------ + bool OBrowserListBox::impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const { ListBoxLines::const_iterator line = m_aLines.begin(); @@ -707,7 +707,7 @@ namespace pcr return ( NULL != _out_rpLine.get() ); } - //------------------------------------------------------------------------ + void OBrowserListBox::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { BrowserLinePointer pLine; @@ -715,7 +715,7 @@ namespace pcr pLine->EnablePropertyControls( _nControls, _bEnable ); } - //------------------------------------------------------------------------ + void OBrowserListBox::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { BrowserLinePointer pLine; @@ -723,7 +723,7 @@ namespace pcr pLine->EnablePropertyLine( _bEnable ); } - //------------------------------------------------------------------------ + Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const OUString& _rEntryName ) { BrowserLinePointer pLine; @@ -732,7 +732,7 @@ namespace pcr return NULL; } - //------------------------------------------------------------------ + sal_uInt16 OBrowserListBox::InsertEntry(const OLineDescriptor& _rPropertyData, sal_uInt16 _nPos) { // create a new line @@ -773,13 +773,13 @@ namespace pcr return nInsertPos; } - //------------------------------------------------------------------ + sal_Int32 OBrowserListBox::GetMinimumWidth() { return m_nTheNameSize + 2 * FRAME_OFFSET + (m_nRowHeight - 4) * 8; } - //------------------------------------------------------------------ + sal_Int32 OBrowserListBox::GetMinimumHeight() { // assume that we want to display 5 rows, at least @@ -796,7 +796,7 @@ namespace pcr return nMinHeight; } - //------------------------------------------------------------------ + void OBrowserListBox::ShowEntry(sal_uInt16 _nPos) { if ( _nPos < m_aLines.size() ) @@ -815,7 +815,7 @@ namespace pcr } - //------------------------------------------------------------------ + void OBrowserListBox::MoveThumbTo(sal_Int32 _nNewThumbPos) { // disable painting to prevent flicker @@ -852,7 +852,7 @@ namespace pcr m_aLinesPlayground.Invalidate(INVALIDATE_CHILDREN); } - //------------------------------------------------------------------ + IMPL_LINK(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar ) { DBG_ASSERT(_pScrollBar == &m_aVScroll, "OBrowserListBox::ScrollHdl: where does this come from?"); @@ -888,7 +888,7 @@ namespace pcr return 0; } - //------------------------------------------------------------------ + void OBrowserListBox::buttonClicked( OBrowserLine* _pLine, sal_Bool _bPrimary ) { DBG_ASSERT( _pLine, "OBrowserListBox::buttonClicked: invalid browser line!" ); @@ -898,7 +898,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::impl_setControlAsPropertyValue( const ListBoxLine& _rLine, const Any& _rPropertyValue ) { Reference< XPropertyControl > xControl( _rLine.pLine->getControl() ); @@ -934,7 +934,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Any OBrowserListBox::impl_getControlAsPropertyValue( const ListBoxLine& _rLine ) const { Reference< XPropertyControl > xControl( _rLine.pLine->getControl() ); @@ -963,7 +963,7 @@ namespace pcr return aPropertyValue; } - //------------------------------------------------------------------ + sal_uInt16 OBrowserListBox::impl_getControlPos( const Reference< XPropertyControl >& _rxControl ) const { for ( ListBoxLines::const_iterator search = m_aLines.begin(); search != m_aLines.end(); ++search ) @@ -974,7 +974,7 @@ namespace pcr return (sal_uInt16)-1; } - //-------------------------------------------------------------------- + void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException) { DBG_TESTSOLARMUTEX(); @@ -990,7 +990,7 @@ namespace pcr ShowEntry( impl_getControlPos( m_xActiveControl ) ); } - //-------------------------------------------------------------------- + void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException) { DBG_TESTSOLARMUTEX(); @@ -1012,7 +1012,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) throw (RuntimeException) { DBG_TESTSOLARMUTEX(); @@ -1033,7 +1033,7 @@ namespace pcr m_aLines[0].pLine->GrabFocus(); } - //------------------------------------------------------------------ + namespace { //.............................................................. @@ -1055,7 +1055,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OBrowserListBox::Clear() { for ( ListBoxLines::iterator loop = m_aLines.begin(); loop != m_aLines.end(); ++loop ) @@ -1069,7 +1069,7 @@ namespace pcr clearContainer( m_aLines ); } - //------------------------------------------------------------------ + sal_Bool OBrowserListBox::RemoveEntry( const OUString& _rName ) { sal_uInt16 nPos = 0; @@ -1091,7 +1091,7 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------ + void OBrowserListBox::ChangeEntry( const OLineDescriptor& _rPropertyData, sal_uInt16 nPos ) { OSL_PRECOND( _rPropertyData.Control.is(), "OBrowserListBox::ChangeEntry: invalid control!" ); @@ -1206,7 +1206,7 @@ namespace pcr } } - //------------------------------------------------------------------ + bool OBrowserListBox::PreNotify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) @@ -1264,7 +1264,7 @@ namespace pcr return Control::PreNotify( _rNEvt ); } - //------------------------------------------------------------------ + bool OBrowserListBox::Notify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index a46c97c3b78f..f30b4af85b45 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -32,7 +32,7 @@ namespace pcr //================================================================== // class OBrowserPage //================================================================== - //------------------------------------------------------------------ + OBrowserPage::OBrowserPage(Window* pParent,WinBits nWinStyle) :TabPage(pParent,nWinStyle) ,m_aListBox(this) @@ -42,12 +42,12 @@ namespace pcr m_aListBox.Show(); } - //------------------------------------------------------------------ + OBrowserPage::~OBrowserPage() { } - //------------------------------------------------------------------ + void OBrowserPage::Resize() { Size aSize( GetOutputSizePixel() ); @@ -56,19 +56,19 @@ namespace pcr m_aListBox.SetPosSizePixel( Point( LAYOUT_BORDER_LEFT, LAYOUT_BORDER_TOP ), aSize ); } - //------------------------------------------------------------------ + OBrowserListBox& OBrowserPage::getListBox() { return m_aListBox; } - //------------------------------------------------------------------ + const OBrowserListBox& OBrowserPage::getListBox() const { return m_aListBox; } - //------------------------------------------------------------------ + void OBrowserPage::StateChanged(StateChangedType nType) { Window::StateChanged( nType); @@ -76,13 +76,13 @@ namespace pcr m_aListBox.ActivateListBox(IsVisible()); } - //------------------------------------------------------------------ + sal_Int32 OBrowserPage::getMinimumWidth() { return m_aListBox.GetMinimumWidth() + LAYOUT_BORDER_LEFT + LAYOUT_BORDER_RIGHT; } - //------------------------------------------------------------------ + sal_Int32 OBrowserPage::getMinimumHeight() { return m_aListBox.GetMinimumHeight() + LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM; diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index cec411bb3273..070092c478fb 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -36,7 +36,7 @@ namespace pcr //= class OPropertyBrowserView //======================================================================== DBG_NAME(OPropertyBrowserView) - //------------------------------------------------------------------------ + OPropertyBrowserView::OPropertyBrowserView(Window* _pParent, WinBits nBits) :Window(_pParent, nBits | WB_3DLOOK) ,m_nActivePage(0) @@ -50,7 +50,7 @@ namespace pcr m_pPropBox->Show(); } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation) { m_nActivePage = m_pPropBox->GetCurPage(); @@ -59,7 +59,7 @@ namespace pcr return 0L; } - //------------------------------------------------------------------------ + OPropertyBrowserView::~OPropertyBrowserView() { if(m_pPropBox) @@ -74,14 +74,14 @@ namespace pcr DBG_DTOR(OPropertyBrowserView, NULL); } - //------------------------------------------------------------------------ + void OPropertyBrowserView::activatePage(sal_uInt16 _nPage) { m_nActivePage = _nPage; getPropertyBox().SetPage(m_nActivePage); } - //------------------------------------------------------------------------ + void OPropertyBrowserView::GetFocus() { if (m_pPropBox) @@ -90,7 +90,7 @@ namespace pcr Window::GetFocus(); } - //------------------------------------------------------------------------ + bool OPropertyBrowserView::Notify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) @@ -106,7 +106,7 @@ namespace pcr return Window::Notify( _rNEvt ); } - //------------------------------------------------------------------------ + void OPropertyBrowserView::Resize() { Size aSize = GetOutputSizePixel(); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 4f7446bcde69..9717aa30ca24 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp> #include <tools/debug.hxx> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_ButtonNavigationHandler() { ::pcr::ButtonNavigationHandler::registerImplementation(); @@ -47,7 +47,7 @@ namespace pcr //= ButtonNavigationHandler //==================================================================== DBG_NAME( ButtonNavigationHandler ) - //-------------------------------------------------------------------- + ButtonNavigationHandler::ButtonNavigationHandler( const Reference< XComponentContext >& _rxContext ) :ButtonNavigationHandler_Base( _rxContext ) { @@ -56,19 +56,19 @@ namespace pcr m_xSlaveHandler = css::form::inspection::FormComponentPropertyHandler::create( m_xContext ); } - //-------------------------------------------------------------------- + ButtonNavigationHandler::~ButtonNavigationHandler( ) { DBG_DTOR( ButtonNavigationHandler, NULL ); } - //-------------------------------------------------------------------- + OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -76,14 +76,14 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + void SAL_CALL ButtonNavigationHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException) { ButtonNavigationHandler_Base::inspect( _rxIntrospectee ); m_xSlaveHandler->inspect( _rxIntrospectee ); } - //-------------------------------------------------------------------- + PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -112,7 +112,7 @@ namespace pcr return eState; } - //-------------------------------------------------------------------- + Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -143,7 +143,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -169,7 +169,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + bool ButtonNavigationHandler::isNavigationCapableButton( const Reference< XPropertySet >& _rxComponent ) { Reference< XPropertySetInfo > xPSI; @@ -181,7 +181,7 @@ namespace pcr && xPSI->hasPropertyByName( PROPERTY_BUTTONTYPE ); } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL ButtonNavigationHandler::doDescribeSupportedProperties() const { ::std::vector< Property > aProperties; @@ -197,7 +197,7 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException) { Sequence< OUString > aActuating( 2 ); @@ -206,7 +206,7 @@ namespace pcr return aActuating; } - //-------------------------------------------------------------------- + InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -227,7 +227,7 @@ namespace pcr return eReturn; } - //-------------------------------------------------------------------- + void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -253,7 +253,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 5aa52a448578..aad30a032594 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/inspection/XObjectInspectorUI.hpp> #include <tools/debug.hxx> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_CellBindingPropertyHandler() { ::pcr::CellBindingPropertyHandler::registerImplementation(); @@ -52,7 +52,7 @@ namespace pcr //= CellBindingPropertyHandler //==================================================================== DBG_NAME( CellBindingPropertyHandler ) - //-------------------------------------------------------------------- + CellBindingPropertyHandler::CellBindingPropertyHandler( const Reference< XComponentContext >& _rxContext ) :CellBindingPropertyHandler_Base( _rxContext ) ,m_pCellExchangeConverter( new DefaultEnumRepresentation( *m_pInfoService, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), PROPERTY_ID_CELL_EXCHANGE_TYPE ) ) @@ -60,13 +60,13 @@ namespace pcr DBG_CTOR( CellBindingPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -74,7 +74,7 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + void CellBindingPropertyHandler::onNewComponent() { PropertyHandlerComponent::onNewComponent(); @@ -85,13 +85,13 @@ namespace pcr m_pHelper.reset( new CellBindingHelper( m_xComponent, xDocument ) ); } - //-------------------------------------------------------------------- + CellBindingPropertyHandler::~CellBindingPropertyHandler( ) { DBG_DTOR( CellBindingPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { Sequence< OUString > aInterestingProperties( 3 ); @@ -101,7 +101,7 @@ namespace pcr return aInterestingProperties; } - //-------------------------------------------------------------------- + void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void CellBindingPropertyHandler::impl_updateDependentProperty_nothrow( PropertyId _nPropId, const Reference< XObjectInspectorUI >& _rxInspectorUI ) const { try @@ -229,7 +229,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -275,7 +275,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -347,7 +347,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -395,7 +395,7 @@ namespace pcr return aPropertyValue; } - //-------------------------------------------------------------------- + Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException) { @@ -450,7 +450,7 @@ namespace pcr return aControlValue; } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL CellBindingPropertyHandler::doDescribeSupportedProperties() const { ::std::vector< Property > aProperties; diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 8339951fe390..07a0ccb9865a 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -78,7 +78,7 @@ namespace pcr //======================================================================== //= CellBindingHelper //======================================================================== - //------------------------------------------------------------------------ + CellBindingHelper::CellBindingHelper( const Reference< XPropertySet >& _rxControlModel, const Reference< XModel >& _rxContextDocument ) :m_xControlModel( _rxControlModel ) { @@ -91,13 +91,13 @@ namespace pcr "CellBindingHelper::CellBindingHelper: the document cannot convert address representations!" ); } - //------------------------------------------------------------------------ + sal_Bool CellBindingHelper::isSpreadsheetDocument( const Reference< XModel >& _rxContextDocument ) { return Reference< XSpreadsheetDocument >::query( _rxContextDocument ).is(); } - //------------------------------------------------------------------------ + sal_Int16 CellBindingHelper::getControlSheetIndex( Reference< XSpreadsheet >& _out_rxSheet ) const { sal_Int16 nSheetIndex = -1; @@ -146,7 +146,7 @@ namespace pcr return nSheetIndex; } - //------------------------------------------------------------------------ + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -160,7 +160,7 @@ namespace pcr && ( aAddress >>= _rAddress ); } - //------------------------------------------------------------------------ + bool CellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { @@ -194,7 +194,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { @@ -209,7 +209,7 @@ namespace pcr && ( aAddress >>= _rAddress ); } - //------------------------------------------------------------------------ + Reference< XValueBinding > CellBindingHelper::createCellBindingFromAddress( const CellAddress& _rAddress, bool _bSupportIntegerExchange ) const { Reference< XValueBinding > xBinding( createDocumentDependentInstance( @@ -221,7 +221,7 @@ namespace pcr return xBinding; } - //------------------------------------------------------------------------ + Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bSupportIntegerExchange ) const { Reference< XValueBinding > xBinding; @@ -237,7 +237,7 @@ namespace pcr return createCellBindingFromAddress( aAddress, _bSupportIntegerExchange ); } - //------------------------------------------------------------------------ + Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -256,7 +256,7 @@ namespace pcr return xSource; } - //------------------------------------------------------------------------ + Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { @@ -292,7 +292,7 @@ namespace pcr return xReturn; } - //------------------------------------------------------------------------ + bool CellBindingHelper::getAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding, CellAddress& _rAddress ) const { @@ -321,7 +321,7 @@ namespace pcr return bReturn; } - //------------------------------------------------------------------------ + OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { CellAddress aAddress; @@ -338,7 +338,7 @@ namespace pcr return sAddress; } - //------------------------------------------------------------------------ + OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "CellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); @@ -371,7 +371,7 @@ namespace pcr return sAddress; } - //------------------------------------------------------------------------ + bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const { bool bYesItIs = false; @@ -400,7 +400,7 @@ namespace pcr return bYesItIs; } - //------------------------------------------------------------------------ + bool CellBindingHelper::isListCellRangeAllowed( ) const { bool bAllow( false ); @@ -414,7 +414,7 @@ namespace pcr return bAllow; } - //------------------------------------------------------------------------ + bool CellBindingHelper::isCellIntegerBindingAllowed( ) const { bool bAllow( true ); @@ -451,7 +451,7 @@ namespace pcr return bAllow; } - //------------------------------------------------------------------------ + bool CellBindingHelper::isCellBindingAllowed( ) const { bool bAllow( false ); @@ -485,25 +485,25 @@ namespace pcr return bAllow; } - //------------------------------------------------------------------------ + bool CellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const { return doesComponentSupport( _rxBinding.get(), SERVICE_SHEET_CELL_BINDING ); } - //------------------------------------------------------------------------ + bool CellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const { return doesComponentSupport( _rxBinding.get(), SERVICE_SHEET_CELL_INT_BINDING ); } - //------------------------------------------------------------------------ + bool CellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const { return doesComponentSupport( _rxSource.get(), SERVICE_SHEET_CELLRANGE_LISTSOURCE ); } - //------------------------------------------------------------------------ + bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); @@ -511,7 +511,7 @@ namespace pcr return bDoes; } - //------------------------------------------------------------------------ + Reference< XValueBinding > CellBindingHelper::getCurrentBinding( ) const { Reference< XValueBinding > xBinding; @@ -521,7 +521,7 @@ namespace pcr return xBinding; } - //------------------------------------------------------------------------ + Reference< XListEntrySource > CellBindingHelper::getCurrentListSource( ) const { Reference< XListEntrySource > xSource; @@ -531,7 +531,7 @@ namespace pcr return xSource; } - //------------------------------------------------------------------------ + void CellBindingHelper::setBinding( const Reference< XValueBinding >& _rxBinding ) { Reference< XBindableValue > xBindable( m_xControlModel, UNO_QUERY ); @@ -540,7 +540,7 @@ namespace pcr xBindable->setValueBinding( _rxBinding ); } - //------------------------------------------------------------------------ + void CellBindingHelper::setListSource( const Reference< XListEntrySource >& _rxSource ) { Reference< XListEntrySink > xSink( m_xControlModel, UNO_QUERY ); diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 49be61875ef7..218348fb8862 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -39,7 +39,7 @@ namespace pcr //================================================================== //= ControlHelper //================================================================== - //------------------------------------------------------------------ + ControlHelper::ControlHelper( Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) :m_pControlWindow( _pControlWindow ) ,m_nControlType( _nControlType ) @@ -50,42 +50,42 @@ namespace pcr DBG_ASSERT( m_pControlWindow != NULL, "ControlHelper::ControlHelper: invalid window!" ); } - //------------------------------------------------------------------ + ControlHelper::~ControlHelper() { } - //-------------------------------------------------------------------- + ::sal_Int16 SAL_CALL ControlHelper::getControlType() throw (RuntimeException) { return m_nControlType; } - //-------------------------------------------------------------------- + Reference< XPropertyControlContext > SAL_CALL ControlHelper::getControlContext() throw (RuntimeException) { return m_xContext; } - //-------------------------------------------------------------------- + void SAL_CALL ControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException) { m_xContext = _controlcontext; } - //-------------------------------------------------------------------- + Reference< XWindow > SAL_CALL ControlHelper::getControlWindow() throw (RuntimeException) { return VCLUnoHelper::GetInterface( m_pControlWindow ); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL ControlHelper::isModified( ) throw (RuntimeException) { return m_bModified; } - //-------------------------------------------------------------------- + void SAL_CALL ControlHelper::notifyModifiedValue( ) throw (RuntimeException) { if ( isModified() && m_xContext.is() ) @@ -102,13 +102,13 @@ namespace pcr } } - //------------------------------------------------------------------ + void SAL_CALL ControlHelper::dispose() { DELETEZ( m_pControlWindow ); } - //------------------------------------------------------------------ + void ControlHelper::autoSizeWindow() { OSL_PRECOND( m_pControlWindow, "ControlHelper::autoSizeWindow: no window!" ); @@ -123,7 +123,7 @@ namespace pcr // of the browser listbox/line? } - //------------------------------------------------------------------ + void ControlHelper::impl_activateNextControl_nothrow() const { try @@ -137,7 +137,7 @@ namespace pcr } } - //------------------------------------------------------------------ + bool ControlHelper::handlePreNotify(NotifyEvent& rNEvt) { if (EVENT_KEYINPUT == rNEvt.GetType()) @@ -155,7 +155,7 @@ namespace pcr return false; } - //------------------------------------------------------------------ + IMPL_LINK( ControlHelper, ModifiedHdl, Window*, /*_pWin*/ ) { if ( m_pModifyListener ) @@ -163,7 +163,7 @@ namespace pcr return 0; } - //------------------------------------------------------------------ + IMPL_LINK( ControlHelper, GetFocusHdl, Window*, /*_pWin*/ ) { try @@ -178,7 +178,7 @@ namespace pcr return 0; } - //------------------------------------------------------------------ + IMPL_LINK( ControlHelper, LoseFocusHdl, Window*, /*_pWin*/ ) { // TODO/UNOize: should this be outside the default control's implementations? If somebody diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 1a32827c1e76..be598abf53f3 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -187,7 +187,7 @@ namespace pcr }; }; - //---------------------------------------------------------------- + CachedInspectorUI::CachedInspectorUI( ComposedPropertyUIUpdate& _rMaster, FNotifySingleUIChange _pUIChangeNotification ) :m_refCount( 0 ) ,m_bDisposed( false ) @@ -196,12 +196,12 @@ namespace pcr { } - //---------------------------------------------------------------- + CachedInspectorUI::~CachedInspectorUI() { } - //---------------------------------------------------------------- + void CachedInspectorUI::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -218,13 +218,13 @@ namespace pcr clearContainer( aDisabledElements ); } - //---------------------------------------------------------------- + void SAL_CALL CachedInspectorUI::acquire() throw() { osl_atomic_increment( &m_refCount ); } - //---------------------------------------------------------------- + void SAL_CALL CachedInspectorUI::release() throw() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) @@ -232,14 +232,14 @@ namespace pcr } - //---------------------------------------------------------------- + void CachedInspectorUI::checkDisposed() const { if ( isDisposed() ) throw DisposedException(); } - //---------------------------------------------------------------- + namespace { void lcl_markStringKeyPositiveOrNegative( const OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive ) @@ -255,7 +255,7 @@ namespace pcr } } - //---------------------------------------------------------------- + void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -266,7 +266,7 @@ namespace pcr impl_notifySingleUIChange(); } - //---------------------------------------------------------------- + void CachedInspectorUI::impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable ) { if ( _nElementIdOrZero == 0 ) @@ -280,13 +280,13 @@ namespace pcr ); } - //---------------------------------------------------------------- + void CachedInspectorUI::impl_notifySingleUIChange() const { (m_rMaster.*m_pUIChangeNotification)(); } - //---------------------------------------------------------------- + void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -300,7 +300,7 @@ namespace pcr impl_notifySingleUIChange(); } - //---------------------------------------------------------------- + void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -312,7 +312,7 @@ namespace pcr impl_notifySingleUIChange(); } - //---------------------------------------------------------------- + void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -326,7 +326,7 @@ namespace pcr impl_notifySingleUIChange(); } - //---------------------------------------------------------------- + void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -337,7 +337,7 @@ namespace pcr impl_notifySingleUIChange(); } - //---------------------------------------------------------------- + void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -346,7 +346,7 @@ namespace pcr impl_notifySingleUIChange(); } - //---------------------------------------------------------------- + Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -356,7 +356,7 @@ namespace pcr return m_rMaster.getDelegatorUI()->getPropertyControl( _rPropertyName ); } - //-------------------------------------------------------------------- + void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" ); @@ -365,7 +365,7 @@ namespace pcr m_rMaster.getDelegatorUI()->registerControlObserver( _Observer ); } - //-------------------------------------------------------------------- + void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" ); @@ -374,7 +374,7 @@ namespace pcr m_rMaster.getDelegatorUI()->revokeControlObserver( _Observer ); } - //---------------------------------------------------------------- + void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException) { m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText ); @@ -395,7 +395,7 @@ namespace pcr //==================================================================== //= ComposedPropertyUIUpdate //==================================================================== - //---------------------------------------------------------------- + ComposedPropertyUIUpdate::ComposedPropertyUIUpdate( const Reference< XObjectInspectorUI >& _rxDelegatorUI, IPropertyExistenceCheck* _pPropertyCheck ) :m_pCollectedUIs( new MapHandlerToUI ) @@ -407,12 +407,12 @@ namespace pcr throw NullPointerException(); } - //---------------------------------------------------------------- + ComposedPropertyUIUpdate::~ComposedPropertyUIUpdate( ) { } - //---------------------------------------------------------------- + Reference< XObjectInspectorUI > ComposedPropertyUIUpdate::getUIForPropertyHandler( const Reference< XPropertyHandler >& _rxHandler ) { impl_checkDisposed(); @@ -423,7 +423,7 @@ namespace pcr return rUI.get(); } - //---------------------------------------------------------------- + namespace { //============================================================ @@ -681,7 +681,7 @@ namespace pcr } } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_fireEnablePropertyUI_throw() { lcl_fireUIStateFlag( @@ -692,7 +692,7 @@ namespace pcr ); } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_fireRebuildPropertyUI_throw() { // collect all properties for which a rebuild request has been made @@ -706,7 +706,7 @@ namespace pcr StringBagClearer::clearAll( m_pCollectedUIs->aHandlers, &CachedInspectorUI::getRebuiltProperties ); } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_fireShowHidePropertyUI_throw() { // all properties which have been shown by at least one handler @@ -726,7 +726,7 @@ namespace pcr PropertyUIOperator::forEach( aAllShown, m_xDelegatorUI, &XObjectInspectorUI::showPropertyUI ); } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_fireShowCategory_throw() { lcl_fireUIStateFlag( @@ -737,7 +737,7 @@ namespace pcr ); } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_fireEnablePropertyUIElements_throw() { lcl_fireUIStateFlag( @@ -762,7 +762,7 @@ namespace pcr ); } - //-------------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_fireAll_throw() { OSL_PRECOND( !impl_isDisposed(), "ComposedPropertyUIUpdate::impl_fireAll_throw: already disposed, this will crash!" ); @@ -774,14 +774,14 @@ namespace pcr impl_fireEnablePropertyUIElements_throw(); } - //-------------------------------------------------------------------- + void SAL_CALL ComposedPropertyUIUpdate::suspendAutoFire() { impl_checkDisposed(); osl_atomic_increment( &m_nSuspendCounter ); } - //-------------------------------------------------------------------- + void SAL_CALL ComposedPropertyUIUpdate::resumeAutoFire() { impl_checkDisposed(); @@ -789,28 +789,28 @@ namespace pcr impl_fireAll_throw(); } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::impl_checkDisposed() const { if ( impl_isDisposed() ) throw DisposedException(); } - //---------------------------------------------------------------- + void ComposedPropertyUIUpdate::callback_inspectorUIChanged_throw() { if ( 0 == m_nSuspendCounter ) impl_fireAll_throw(); } - //---------------------------------------------------------------- + Reference< XObjectInspectorUI > ComposedPropertyUIUpdate::getDelegatorUI() const { impl_checkDisposed(); return m_xDelegatorUI; } - //---------------------------------------------------------------- + void SAL_CALL ComposedPropertyUIUpdate::dispose() { if ( impl_isDisposed() ) @@ -829,7 +829,7 @@ namespace pcr m_xDelegatorUI.set( NULL ); } - //---------------------------------------------------------------- + bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const OUString& _rName ) const { if ( !m_pPropertyCheck ) diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index ff6c2985a200..7b3b602ea1c3 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -41,7 +41,7 @@ namespace pcr //==================================================================== //= OControlFontDialog //==================================================================== - //--------------------------------------------------------------------- + OControlFontDialog::OControlFontDialog(const Reference< XComponentContext >& _rxContext ) :OGenericUnoDialog( _rxContext ) ,m_pFontItems(NULL) @@ -53,7 +53,7 @@ namespace pcr &m_xControlModel, ::getCppuType(&m_xControlModel)); } - //--------------------------------------------------------------------- + OControlFontDialog::~OControlFontDialog() { if (m_pDialog) @@ -64,38 +64,38 @@ namespace pcr } } - //--------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } - //--------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OControlFontDialog::Create( const Reference< XComponentContext >& _rxContext ) { return *( new OControlFontDialog( _rxContext ) ); } - //--------------------------------------------------------------------- + OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - //--------------------------------------------------------------------- + OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { return OUString("org.openoffice.comp.form.ui.OControlFontDialog"); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence SAL_CALL OControlFontDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -119,20 +119,20 @@ namespace pcr OControlFontDialog_DBase::initialize(aArguments); } - //--------------------------------------------------------------------- + Reference<XPropertySetInfo> SAL_CALL OControlFontDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //--------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& OControlFontDialog::getInfoHelper() { return *const_cast<OControlFontDialog*>(this)->getArrayHelper(); } - //-------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OControlFontDialog::createArrayHelper( ) const { Sequence< Property > aProps; @@ -140,7 +140,7 @@ namespace pcr return new ::cppu::OPropertyArrayHelper(aProps); } - //-------------------------------------------------------------------------- + Dialog* OControlFontDialog::createDialog(Window* _pParent) { ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults); @@ -156,14 +156,14 @@ namespace pcr return pDialog; } - //------------------------------------------------------------------------- + void OControlFontDialog::destroyDialog() { OGenericUnoDialog::destroyDialog(); ControlCharacterDialog::destroyItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults); } - //------------------------------------------------------------------------- + void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult) { OSL_ENSURE(m_pDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!"); diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 3169ea678234..897162231f37 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -31,7 +31,7 @@ #include <osl/diagnose.h> #include <sal/macros.h> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel() { ::pcr::OAutoRegistration< ::pcr::DefaultFormComponentInspectorModel > aAutoRegistration; @@ -58,7 +58,7 @@ namespace pcr //==================================================================== //= DefaultFormComponentInspectorModel //==================================================================== - //-------------------------------------------------------------------- + DefaultFormComponentInspectorModel::DefaultFormComponentInspectorModel( bool _bUseFormFormComponentHandlers ) :ImplInspectorModel() ,m_bUseFormComponentHandlers( _bUseFormFormComponentHandlers ) @@ -67,30 +67,30 @@ namespace pcr { } - //------------------------------------------------------------------------ + DefaultFormComponentInspectorModel::~DefaultFormComponentInspectorModel() { } - //------------------------------------------------------------------------ + OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } - //------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } - //------------------------------------------------------------------------ + OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); } - //------------------------------------------------------------------------ + Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -98,13 +98,13 @@ namespace pcr return aSupported; } - //------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL DefaultFormComponentInspectorModel::Create( const Reference< XComponentContext >& ) { return *new DefaultFormComponentInspectorModel(); } - //-------------------------------------------------------------------- + Sequence< Any > SAL_CALL DefaultFormComponentInspectorModel::getHandlerFactories() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -159,7 +159,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -188,7 +188,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -204,7 +204,7 @@ namespace pcr return m_pInfoService->getPropertyPos( nPropertyId ); } - //-------------------------------------------------------------------- + void SAL_CALL DefaultFormComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) { if ( m_bConstructed ) @@ -229,13 +229,13 @@ namespace pcr throw IllegalArgumentException( OUString(), *this, 0 ); } - //-------------------------------------------------------------------- + void DefaultFormComponentInspectorModel::createDefault() { m_bConstructed = true; } - //-------------------------------------------------------------------- + void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index f9257ddf95fe..cdb74d3ec235 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -30,7 +30,7 @@ #include <vcl/window.hxx> #include <tools/diagnose_ex.h> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_DefaultHelpProvider() { ::pcr::OAutoRegistration< ::pcr::DefaultHelpProvider > aAutoRegistration; @@ -60,24 +60,24 @@ namespace pcr //==================================================================== //= DefaultHelpProvider //==================================================================== - //-------------------------------------------------------------------- + DefaultHelpProvider::DefaultHelpProvider() :m_bConstructed( false ) { } - //-------------------------------------------------------------------- + DefaultHelpProvider::~DefaultHelpProvider() { } - //------------------------------------------------------------------------ + OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { return OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); } - //------------------------------------------------------------------------ + Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -85,13 +85,13 @@ namespace pcr return aSupported; } - //------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL DefaultHelpProvider::Create( const Reference< XComponentContext >& ) { return *new DefaultHelpProvider; } - //-------------------------------------------------------------------- + void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& _Control ) throw (RuntimeException) { if ( !m_xInspectorUI.is() ) @@ -107,13 +107,13 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& /*_Control*/ ) throw (RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL DefaultHelpProvider::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) { if ( m_bConstructed ) @@ -130,7 +130,7 @@ namespace pcr throw IllegalArgumentException( OUString(), *this, 0 ); } - //-------------------------------------------------------------------- + void DefaultHelpProvider::create( const Reference< XObjectInspectorUI >& _rxUI ) { if ( !_rxUI.is() ) @@ -149,7 +149,7 @@ namespace pcr m_bConstructed = true; } - //-------------------------------------------------------------------- + Window* DefaultHelpProvider::impl_getVclControlWindow_nothrow( const Reference< XPropertyControl >& _rxControl ) { Window* pControlWindow = NULL; @@ -170,7 +170,7 @@ namespace pcr return pControlWindow; } - //-------------------------------------------------------------------- + OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl ) { OUString sHelpText; diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 7e00aac66e20..16a555f388c2 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -28,7 +28,7 @@ #define TEXTTYPE_MULTILINE 1 #define TEXTTYPE_RICHTEXT 2 -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_EditPropertyHandler() { ::pcr::EditPropertyHandler::registerImplementation(); @@ -50,26 +50,26 @@ namespace pcr //= EditPropertyHandler //==================================================================== DBG_NAME( EditPropertyHandler ) - //-------------------------------------------------------------------- + EditPropertyHandler::EditPropertyHandler( const Reference< XComponentContext >& _rxContext ) :EditPropertyHandler_Base( _rxContext ) { DBG_CTOR( EditPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + EditPropertyHandler::~EditPropertyHandler( ) { DBG_DTOR( EditPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -77,7 +77,7 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -133,7 +133,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -186,7 +186,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + bool EditPropertyHandler::implHaveBothScrollBarProperties() const { // have a "Scrollbars" property if the object supports both "HScroll" and "VScroll" @@ -199,7 +199,7 @@ namespace pcr && xPSI->hasPropertyByName( PROPERTY_VSCROLL ); } - //-------------------------------------------------------------------- + bool EditPropertyHandler::implHaveTextTypeProperty() const { // have a "Scrollbars" property if the object supports both "HScroll" and "VScroll" @@ -212,7 +212,7 @@ namespace pcr && xPSI->hasPropertyByName( PROPERTY_MULTILINE ); } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL EditPropertyHandler::doDescribeSupportedProperties() const { ::std::vector< Property > aProperties; @@ -228,7 +228,7 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -248,7 +248,7 @@ namespace pcr return Sequence< OUString >( &(*aSuperseded.begin()), aSuperseded.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -259,7 +259,7 @@ namespace pcr return Sequence< OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() ); } - //-------------------------------------------------------------------- + void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 101ee1a40c42..aaef4080ccb1 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -55,7 +55,7 @@ namespace pcr //==================================================================== namespace { - //-------------------------------------------------------------------- + OUString composeModelElementUIName( const OUString& _rModelName, const OUString& _rElementName ) { OUStringBuffer aBuffer; @@ -70,7 +70,7 @@ namespace pcr //==================================================================== //= EFormsHelper //==================================================================== - //-------------------------------------------------------------------- + EFormsHelper::EFormsHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxControlModel, const Reference< frame::XModel >& _rxContextDocument ) :m_xControlModel( _rxControlModel ) ,m_aPropertyListeners( _rMutex ) @@ -83,7 +83,7 @@ namespace pcr } - //-------------------------------------------------------------------- + bool EFormsHelper::isEForm( const Reference< frame::XModel >& _rxContextDocument ) { try @@ -101,7 +101,7 @@ namespace pcr return false; } - //-------------------------------------------------------------------- + bool EFormsHelper::canBindToDataType( sal_Int32 _nDataType ) const SAL_THROW(()) { if ( !m_xBindableControl.is() ) @@ -195,7 +195,7 @@ namespace pcr return bCan; } - //-------------------------------------------------------------------- + bool EFormsHelper::isListEntrySink() const SAL_THROW(()) { bool bIs = false; @@ -211,7 +211,7 @@ namespace pcr return bIs; } - //-------------------------------------------------------------------- + void EFormsHelper::impl_switchBindingListening_throw( bool _bDoListening, const Reference< XPropertyChangeListener >& _rxListener ) { Reference< XPropertySet > xBindingProps; @@ -230,7 +230,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void EFormsHelper::registerBindingListener( const Reference< XPropertyChangeListener >& _rxBindingListener ) { if ( !_rxBindingListener.is() ) @@ -238,7 +238,7 @@ namespace pcr impl_toggleBindingPropertyListening_throw( true, _rxBindingListener ); } - //-------------------------------------------------------------------- + void EFormsHelper::impl_toggleBindingPropertyListening_throw( bool _bDoListen, const Reference< XPropertyChangeListener >& _rxConcreteListenerOrNull ) { if ( !_bDoListen ) @@ -291,13 +291,13 @@ namespace pcr } } - //-------------------------------------------------------------------- + void EFormsHelper::revokeBindingListener( const Reference< XPropertyChangeListener >& _rxBindingListener ) { impl_toggleBindingPropertyListening_throw( false, _rxBindingListener ); } - //-------------------------------------------------------------------- + void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(()) { if ( m_xDocument.is() ) @@ -324,7 +324,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(()) { _rBindingNames.resize( 0 ); @@ -349,7 +349,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const SAL_THROW(()) { Reference< xforms::XModel > xReturn; @@ -367,7 +367,7 @@ namespace pcr return xReturn; } - //-------------------------------------------------------------------- + Reference< xforms::XModel > EFormsHelper::getCurrentFormModel() const SAL_THROW(()) { Reference< xforms::XModel > xModel; @@ -386,7 +386,7 @@ namespace pcr return xModel; } - //-------------------------------------------------------------------- + OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(()) { OUString sModelName; @@ -403,7 +403,7 @@ namespace pcr return sModelName; } - //-------------------------------------------------------------------- + Reference< XPropertySet > EFormsHelper::getCurrentBinding() const SAL_THROW(()) { Reference< XPropertySet > xBinding; @@ -421,7 +421,7 @@ namespace pcr return xBinding; } - //-------------------------------------------------------------------- + OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(()) { OUString sBindingName; @@ -438,7 +438,7 @@ namespace pcr return sBindingName; } - //-------------------------------------------------------------------- + Reference< XListEntrySource > EFormsHelper::getCurrentListSourceBinding() const SAL_THROW(()) { Reference< XListEntrySource > xReturn; @@ -456,7 +456,7 @@ namespace pcr return xReturn; } - //-------------------------------------------------------------------- + void EFormsHelper::setListSourceBinding( const Reference< XListEntrySource >& _rxListSource ) SAL_THROW(()) { try @@ -472,7 +472,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void EFormsHelper::setBinding( const Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding ) SAL_THROW(()) { if ( !m_xBindableControl.is() ) @@ -498,14 +498,14 @@ namespace pcr } } - //-------------------------------------------------------------------- + Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" ); return implGetOrCreateBinding( _rTargetModel, _rBindingName ); } - //-------------------------------------------------------------------- + Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(()) { OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" ); @@ -573,7 +573,7 @@ namespace pcr return xBinding; } - //-------------------------------------------------------------------- + namespace { //................................................................ @@ -608,7 +608,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(()) { OUString sUIName; @@ -634,7 +634,7 @@ namespace pcr return sUIName; } - //-------------------------------------------------------------------- + Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const SAL_THROW(()) { const MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); @@ -644,7 +644,7 @@ namespace pcr return ( pos != rMapUINameToElement.end() ) ? pos->second : Reference< XPropertySet >(); } - //-------------------------------------------------------------------- + void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry ) { MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames ); @@ -710,7 +710,7 @@ namespace pcr ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() ); } - //-------------------------------------------------------------------- + void EFormsHelper::firePropertyChange( const OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const { if ( m_aPropertyListeners.empty() ) @@ -736,7 +736,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const { if ( m_aPropertyListeners.empty() ) diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 4eb799677624..e6d55943009b 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -32,7 +32,7 @@ #include <functional> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_EFormsPropertyHandler() { ::pcr::EFormsPropertyHandler::registerImplementation(); @@ -57,7 +57,7 @@ namespace pcr //= EFormsPropertyHandler //==================================================================== DBG_NAME( EFormsPropertyHandler ) - //-------------------------------------------------------------------- + EFormsPropertyHandler::EFormsPropertyHandler( const Reference< XComponentContext >& _rxContext ) :EFormsPropertyHandler_Base( _rxContext ) ,m_bSimulatingModelChange( false ) @@ -65,19 +65,19 @@ namespace pcr DBG_CTOR( EFormsPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + EFormsPropertyHandler::~EFormsPropertyHandler( ) { DBG_DTOR( EFormsPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -85,7 +85,7 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + OUString EFormsPropertyHandler::getModelNamePropertyValue() const { OUString sModelName = m_pHelper->getCurrentFormModelName(); @@ -94,7 +94,7 @@ namespace pcr return sModelName; } - //-------------------------------------------------------------------- + Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -157,7 +157,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -271,7 +271,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void EFormsPropertyHandler::onNewComponent() { EFormsPropertyHandler_Base::onNewComponent(); @@ -284,7 +284,7 @@ namespace pcr m_pHelper.reset(); } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL EFormsPropertyHandler::doDescribeSupportedProperties() const { ::std::vector< Property > aProperties; @@ -315,7 +315,7 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -348,7 +348,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -394,7 +394,7 @@ namespace pcr return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -406,7 +406,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) @@ -473,7 +473,7 @@ namespace pcr return aDescriptor; } - //-------------------------------------------------------------------- + InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -532,7 +532,7 @@ namespace pcr return InteractiveSelectionResult_Cancelled; } - //-------------------------------------------------------------------- + void SAL_CALL EFormsPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -541,7 +541,7 @@ namespace pcr m_pHelper->registerBindingListener( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -550,7 +550,7 @@ namespace pcr EFormsPropertyHandler_Base::removePropertyChangeListener( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 1692ab554fff..59fb8a8ddf93 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -94,7 +94,7 @@ namespace pcr sal_Bool _bForceInvalidation = sal_False); }; - //------------------------------------------------------------------------ + OFontPropertyExtractor::OFontPropertyExtractor(const Reference< XPropertySet >& _rxProps) :m_xPropValueAccess(_rxProps) ,m_xPropStateAccess(_rxProps, UNO_QUERY) @@ -102,7 +102,7 @@ namespace pcr OSL_ENSURE(m_xPropValueAccess.is(), "OFontPropertyExtractor::OFontPropertyExtractor: invalid property set!"); } - //------------------------------------------------------------------------ + sal_Bool OFontPropertyExtractor::getCheckFontProperty(const OUString& _rPropName, Any& _rValue) { _rValue = m_xPropValueAccess->getPropertyValue(_rPropName); @@ -112,7 +112,7 @@ namespace pcr return sal_False; } - //------------------------------------------------------------------------ + OUString OFontPropertyExtractor::getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault) { Any aValue; @@ -122,7 +122,7 @@ namespace pcr return ::comphelper::getString(aValue); } - //------------------------------------------------------------------------ + sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault) { Any aValue; @@ -134,7 +134,7 @@ namespace pcr return (sal_Int16)nValue; } - //------------------------------------------------------------------------ + sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault) { Any aValue; @@ -146,7 +146,7 @@ namespace pcr return nValue; } - //------------------------------------------------------------------------ + float OFontPropertyExtractor::getFloatFontProperty(const OUString& _rPropName, const float _nDefault) { Any aValue; @@ -156,7 +156,7 @@ namespace pcr return ::comphelper::getFloat(aValue); } - //------------------------------------------------------------------------ + void OFontPropertyExtractor::invalidateItem(const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation) { if ( _bForceInvalidation @@ -170,7 +170,7 @@ namespace pcr //======================================================================== //= ControlCharacterDialog //======================================================================== - //------------------------------------------------------------------------ + ControlCharacterDialog::ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet) : SfxTabDialog(_pParent, "ControlFontDialog", "modules/spropctrlr/ui/controlfontdialog.ui", &_rCoreSet) @@ -182,12 +182,12 @@ namespace pcr AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0 ); } - //------------------------------------------------------------------------ + ControlCharacterDialog::~ControlCharacterDialog() { } - //------------------------------------------------------------------------ + void ControlCharacterDialog::translatePropertiesToItems(const Reference< XPropertySet >& _rxModel, SfxItemSet* _pSet) { OSL_ENSURE(_pSet && _rxModel.is(), "ControlCharacterDialog::translatePropertiesToItems: invalid arguments!"); @@ -288,7 +288,7 @@ namespace pcr } - //------------------------------------------------------------------------ + namespace { void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const OUString& _name, const Any& _value ) @@ -298,7 +298,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void ControlCharacterDialog::translateItemsToProperties( const SfxItemSet& _rSet, Sequence< NamedValue >& _out_properties ) { _out_properties.realloc( 0 ); @@ -457,7 +457,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void ControlCharacterDialog::translateItemsToProperties( const SfxItemSet& _rSet, const Reference< XPropertySet >& _rxModel) { OSL_ENSURE( _rxModel.is(), "ControlCharacterDialog::translateItemsToProperties: invalid arguments!" ); @@ -479,7 +479,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + SfxItemSet* ControlCharacterDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults) { // just to be sure .... @@ -552,7 +552,7 @@ namespace pcr return _rpSet; } - //------------------------------------------------------------------------- + void ControlCharacterDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults) { // from the pool, get and remember the font list (needs to be deleted) @@ -579,7 +579,7 @@ namespace pcr delete pFontList; } - //------------------------------------------------------------------------ + void ControlCharacterDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index 10193bc456ef..d03a7946af90 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -35,7 +35,7 @@ namespace pcr using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - //------------------------------------------------------------------------ + OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { PcrClient aResourceAccess; @@ -113,7 +113,7 @@ namespace pcr return sClassName; } - //------------------------------------------------------------------------ + sal_Int16 classifyComponent( const Reference< XInterface >& _rxComponent ) { Reference< XPropertySet > xComponentProps( _rxComponent, UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 5fe9417e8be5..19a277bcc3b0 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -102,7 +102,7 @@ #include <limits> #define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:" -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_FormComponentPropertyHandler() { ::pcr::FormComponentPropertyHandler::registerImplementation(); @@ -137,7 +137,7 @@ namespace pcr //==================================================================== DBG_NAME( FormComponentPropertyHandler ) #define PROPERTY_ID_ROWSET 1 - //-------------------------------------------------------------------- + FormComponentPropertyHandler::FormComponentPropertyHandler( const Reference< XComponentContext >& _rxContext ) :FormComponentPropertyHandler_Base( _rxContext ) ,::comphelper::OPropertyContainer(FormComponentPropertyHandler_Base::rBHelper) @@ -152,20 +152,20 @@ namespace pcr registerProperty(PROPERTY_ROWSET,PROPERTY_ID_ROWSET,0,&m_xRowSet,::getCppuType(&m_xRowSet)); } - //-------------------------------------------------------------------- + FormComponentPropertyHandler::~FormComponentPropertyHandler() { DBG_DTOR( FormComponentPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(FormComponentPropertyHandler,FormComponentPropertyHandler_Base,::comphelper::OPropertyContainer) - //-------------------------------------------------------------------- + OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.FormComponentPropertyHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -242,7 +242,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Any FormComponentPropertyHandler::impl_getPropertyValue_throw( const OUString& _rPropertyName ) const { const PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); @@ -303,7 +303,7 @@ namespace pcr return aPropertyValue; } - //-------------------------------------------------------------------- + Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { if( _rPropertyName == PROPERTY_ROWSET ) @@ -313,7 +313,7 @@ namespace pcr return impl_getPropertyValue_throw( _rPropertyName ); } - //-------------------------------------------------------------------- + void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { if( _rPropertyName == PROPERTY_ROWSET ) @@ -490,7 +490,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -625,7 +625,7 @@ namespace pcr return aPropertyValue; } - //-------------------------------------------------------------------- + Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -806,7 +806,7 @@ namespace pcr return aControlValue; } - //-------------------------------------------------------------------- + PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -815,7 +815,7 @@ namespace pcr return PropertyState_DIRECT_VALUE; } - //-------------------------------------------------------------------- + void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -824,7 +824,7 @@ namespace pcr m_xComponent->addPropertyChangeListener( OUString(), _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL FormComponentPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -833,7 +833,7 @@ namespace pcr FormComponentPropertyHandler_Base::removePropertyChangeListener( _rxListener ); } - //-------------------------------------------------------------------- + void FormComponentPropertyHandler::onNewComponent() { FormComponentPropertyHandler_Base::onNewComponent(); @@ -848,7 +848,7 @@ namespace pcr impl_initComponentMetaData_throw(); } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL FormComponentPropertyHandler::doDescribeSupportedProperties() const { if ( !m_xComponentPropertyInfo.is() ) @@ -925,13 +925,13 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { return Sequence< OUString >( ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -961,7 +961,7 @@ namespace pcr return Sequence< OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() ); } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL FormComponentPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) @@ -1413,7 +1413,7 @@ namespace pcr return aDescriptor; } - //-------------------------------------------------------------------- + InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -1504,7 +1504,7 @@ namespace pcr return eResult; } - //-------------------------------------------------------------------- + namespace { void lcl_rebuildAndResetCommand( const Reference< XObjectInspectorUI >& _rxInspectorUI, const Reference< XPropertyHandler >& _rxHandler ) @@ -1516,7 +1516,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -1800,7 +1800,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_updateDependentProperty_nothrow( PropertyId _nPropId, const Reference< XObjectInspectorUI >& _rxInspectorUI ) const { try @@ -2006,7 +2006,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void SAL_CALL FormComponentPropertyHandler::disposing() { FormComponentPropertyHandler_Base::disposing(); @@ -2014,7 +2014,7 @@ namespace pcr m_xCommandDesigner->dispose(); } - //------------------------------------------------------------------------ + sal_Bool SAL_CALL FormComponentPropertyHandler::suspend( sal_Bool _bSuspend ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2024,7 +2024,7 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_initComponentMetaData_throw() { try @@ -2078,7 +2078,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_classifyControlModel_throw( ) { if ( impl_componentHasProperty_throw( PROPERTY_CLASSID ) ) @@ -2162,7 +2162,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_normalizePropertyValue_nothrow( Any& _rValue, PropertyId _nPropId ) const { switch ( _nPropId ) @@ -2196,7 +2196,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_shouldExcludeProperty_nothrow( const Property& _rProperty ) const { OSL_ENSURE( _rProperty.Handle == m_pInfoService->getPropertyId( _rProperty.Name ), @@ -2289,7 +2289,7 @@ namespace pcr return false; } - //------------------------------------------------------------------------ + Reference< XRowSet > FormComponentPropertyHandler::impl_getRowSet_throw( ) const { Reference< XRowSet > xRowSet = m_xRowSet; @@ -2317,7 +2317,7 @@ namespace pcr return xRowSet; } - //------------------------------------------------------------------------ + Reference< XRowSet > FormComponentPropertyHandler::impl_getRowSet_nothrow( ) const { Reference< XRowSet > xReturn; @@ -2333,7 +2333,7 @@ namespace pcr return xReturn; } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_initFieldList_nothrow( ::std::vector< OUString >& _rFieldNames ) const { clearContainer( _rFieldNames ); @@ -2372,19 +2372,19 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_clearRowsetConnection_nothrow() { m_xRowSetConnection.clear(); } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_displaySQLError_nothrow( const ::dbtools::SQLExceptionInfo& _rErrorDescriptor ) const { ::dbtools::showError( _rErrorDescriptor, VCLUnoHelper::GetInterface( impl_getDefaultDialogParent_nothrow() ), m_xContext ); } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow() const { if ( !m_xRowSetConnection.is() ) @@ -2441,7 +2441,7 @@ namespace pcr return m_xRowSetConnection.is(); } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_describeCursorSource_nothrow( LineDescriptor& _out_rProperty, const Reference< XPropertyControlFactory >& _rxControlFactory ) const { try @@ -2488,7 +2488,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const { OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillTableNames_throw: need a connection!" ); @@ -2510,7 +2510,7 @@ namespace pcr _out_rNames.push_back( *pTableNames ); } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const { OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: need a connection!" ); @@ -2524,7 +2524,7 @@ namespace pcr impl_fillQueryNames_throw(xQueryNames,_out_rNames); } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,::std::vector< OUString >& _out_rNames,const OUString& _sName ) const { DBG_ASSERT( _xQueryNames.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: no way to obtain the queries of the connection!" ); @@ -2553,7 +2553,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormComponentPropertyHandler::impl_describeListSourceUI_throw( LineDescriptor& _out_rDescriptor, const Reference< XPropertyControlFactory >& _rxControlFactory ) const { OSL_PRECOND( m_xComponent.is(), "FormComponentPropertyHandler::impl_describeListSourceUI_throw: no component!" ); @@ -2599,7 +2599,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogListSelection_nothrow( const OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { OSL_PRECOND( m_pInfoService.get(), "FormComponentPropertyHandler::impl_dialogListSelection_nothrow: no property meta data!" ); @@ -2610,7 +2610,7 @@ namespace pcr return ( RET_OK == aDialog.Execute() ); } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { OSL_PRECOND( Reference< XRowSet >( m_xComponent, UNO_QUERY ).is(), @@ -2671,7 +2671,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogLinkedFormFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { Reference< XForm > xDetailForm( m_xComponent, UNO_QUERY ); @@ -2687,7 +2687,7 @@ namespace pcr return ( RET_OK == aDialog.Execute() ); } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogFormatting_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { bool bChanged = false; @@ -2762,7 +2762,7 @@ namespace pcr return bChanged; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_browseForImage_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { OUString aStrTrans = m_pInfoService->getPropertyTranslation( PROPERTY_ID_IMAGE_URL ); @@ -2805,7 +2805,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_browseForTargetURL_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { ::sfx2::FileDialogHelper aFileDlg( @@ -2826,7 +2826,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_executeFontDialog_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { bool bSuccess = false; @@ -2859,7 +2859,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_browseForDatabaseDocument_throw( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { ::sfx2::FileDialogHelper aFileDlg( @@ -2889,7 +2889,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogColorChooser_throw( sal_Int32 _nColorPropertyId, Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { sal_Int32 nColor = 0; @@ -2908,7 +2908,7 @@ namespace pcr return true; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogChooseLabelControl_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { OSelectLabelDialog dlgSelectLabel( impl_getDefaultDialogParent_nothrow(), m_xComponent ); @@ -2919,7 +2919,7 @@ namespace pcr return bSuccess; } - //------------------------------------------------------------------------ + Reference< XControlContainer > FormComponentPropertyHandler::impl_getContextControlContainer_nothrow() const { Reference< XControlContainer > xControlContext; @@ -2928,7 +2928,7 @@ namespace pcr return xControlContext; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_dialogChangeTabOrder_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { OSL_PRECOND( impl_getContextControlContainer_nothrow().is(), "FormComponentPropertyHandler::impl_dialogChangeTabOrder_nothrow: invalid control context!" ); @@ -2944,12 +2944,12 @@ namespace pcr return ( RET_OK == aDialog.Execute() ); } - //------------------------------------------------------------------------ + namespace { - //-------------------------------------------------------------------- + //- ISQLCommandPropertyUI - //-------------------------------------------------------------------- + class ISQLCommandPropertyUI : public ISQLCommandAdapter { public: @@ -2960,9 +2960,9 @@ namespace pcr virtual OUString* getPropertiesToDisable() = 0; }; - //-------------------------------------------------------------------- + //- SQLCommandPropertyUI - //-------------------------------------------------------------------- + class SQLCommandPropertyUI : public ISQLCommandPropertyUI { protected: @@ -2996,9 +2996,9 @@ namespace pcr oslInterlockedCount m_refCount; }; - //-------------------------------------------------------------------- + //- FormSQLCommandUI - declaration - //-------------------------------------------------------------------- + class FormSQLCommandUI : public SQLCommandPropertyUI { public: @@ -3014,9 +3014,9 @@ namespace pcr virtual OUString* getPropertiesToDisable(); }; - //-------------------------------------------------------------------- + //- FormSQLCommandUI - implementation - //-------------------------------------------------------------------- + //.................................................................... FormSQLCommandUI::FormSQLCommandUI( const Reference< XPropertySet >& _rxForm ) :SQLCommandPropertyUI( _rxForm ) @@ -3063,9 +3063,9 @@ namespace pcr }; return s_aCommandProps; } - //-------------------------------------------------------------------- + //- ValueListCommandUI - declaration - //-------------------------------------------------------------------- + class ValueListCommandUI : public SQLCommandPropertyUI { public: @@ -3083,9 +3083,9 @@ namespace pcr mutable bool m_bPropertyValueIsList; }; - //-------------------------------------------------------------------- + //- ValueListCommandUI - implementation - //-------------------------------------------------------------------- + //.................................................................... ValueListCommandUI::ValueListCommandUI( const Reference< XPropertySet >& _rxListOrCombo ) :SQLCommandPropertyUI( _rxListOrCombo ) @@ -3157,7 +3157,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_doDesignSQLCommand_nothrow( const Reference< XObjectInspectorUI >& _rxInspectorUI, PropertyId _nDesignForProperty ) { try @@ -3217,7 +3217,7 @@ namespace pcr return m_xCommandDesigner.is(); } - //------------------------------------------------------------------------ + IMPL_LINK( FormComponentPropertyHandler, OnDesignerClosed, void*, /*NOTINTERESTEDIN*/ ) { OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" ); @@ -3245,7 +3245,7 @@ namespace pcr return 0L; } - //------------------------------------------------------------------------ + bool FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow( const Reference< XPropertySet >& _xFormProperties, bool _bAllowEmptyDataSourceName ) SAL_THROW(()) { bool bHas = false; @@ -3275,7 +3275,7 @@ namespace pcr } return bHas; } - //------------------------------------------------------------------------ + OUString FormComponentPropertyHandler::impl_getDocumentURL_nothrow() const { OUString sURL; @@ -3291,7 +3291,7 @@ namespace pcr } return sURL; } - // ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* FormComponentPropertyHandler::createArrayHelper( ) const { uno::Sequence< beans::Property > aProps; @@ -3299,12 +3299,12 @@ namespace pcr return new ::cppu::OPropertyArrayHelper(aProps); } - // ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper & FormComponentPropertyHandler::getInfoHelper() { return *const_cast<FormComponentPropertyHandler*>(this)->getArrayHelper(); } - // ----------------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > SAL_CALL FormComponentPropertyHandler::getPropertySetInfo( ) throw(uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 0cf7fd5bb1ac..c3e2b6b45393 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -30,7 +30,7 @@ #include <cppuhelper/typeprovider.hxx> #include <toolkit/helper/vclunohelper.hxx> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_FormController() { ::pcr::OAutoRegistration< ::pcr::FormController > aFormControllerRegistration; @@ -72,7 +72,7 @@ namespace pcr //==================================================================== //= FormController //==================================================================== - //-------------------------------------------------------------------- + FormController::FormController( const Reference< XComponentContext >& _rxContext, ServiceDescriptor _aServiceDescriptor, bool _bUseFormFormComponentHandlers ) :OPropertyBrowserController( _rxContext ) @@ -90,15 +90,15 @@ namespace pcr osl_atomic_decrement( &m_refCount ); } - //------------------------------------------------------------------------ + FormController::~FormController() { } - //------------------------------------------------------------------------ + IMPLEMENT_FORWARD_XINTERFACE2( FormController, OPropertyBrowserController, FormController_PropertyBase1 ) - //------------------------------------------------------------------------ + Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException) { ::cppu::OTypeCollection aTypes( @@ -109,16 +109,16 @@ namespace pcr return aTypes.getTypes(); } - //------------------------------------------------------------------------ + IMPLEMENT_GET_IMPLEMENTATION_ID( FormController ) - //------------------------------------------------------------------------ + OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException) { return m_aServiceDescriptor.GetImplementationName(); } - //------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException) { Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); @@ -127,13 +127,13 @@ namespace pcr return aSupported; } - //------------------------------------------------------------------------ + OUString FormController::getImplementationName_static( ) throw(RuntimeException) { return OUString("org.openoffice.comp.extensions.FormController"); } - //------------------------------------------------------------------------ + Sequence< OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -141,7 +141,7 @@ namespace pcr return aSupported; } - //------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL FormController::Create(const Reference< XComponentContext >& _rxContext ) { ServiceDescriptor aService; @@ -150,19 +150,19 @@ namespace pcr return *(new FormController( _rxContext, aService, true ) ); } - //------------------------------------------------------------------------ + Reference< XPropertySetInfo > SAL_CALL FormController::getPropertySetInfo( ) throw(RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } - //------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper& SAL_CALL FormController::getInfoHelper() { return *getArrayHelper(); } - //------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper* FormController::createArrayHelper( ) const { Sequence< Property > aProps( 2 ); @@ -181,7 +181,7 @@ namespace pcr return new ::cppu::OPropertyArrayHelper( aProps ); } - //------------------------------------------------------------------------ + sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) { switch ( nHandle ) @@ -201,7 +201,7 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------------ + void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception) { switch ( _nHandle ) @@ -237,7 +237,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void SAL_CALL FormController::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const { switch ( nHandle ) @@ -255,13 +255,13 @@ namespace pcr //==================================================================== //= DialogController //==================================================================== - //------------------------------------------------------------------------ + OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { return OUString("org.openoffice.comp.extensions.DialogController"); } - //------------------------------------------------------------------------ + Sequence< OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -269,7 +269,7 @@ namespace pcr return aSupported; } - //------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL DialogController::Create(const Reference< XComponentContext >& _rxContext) { ServiceDescriptor aService; diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 3995229df83c..b444cfabb4a4 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -254,14 +254,14 @@ namespace pcr //= FormGeometryHandler - implementation //==================================================================== DBG_NAME( FormGeometryHandler ) - //-------------------------------------------------------------------- + FormGeometryHandler::FormGeometryHandler( const Reference< XComponentContext >& _rxContext ) :FormGeometryHandler_Base( _rxContext ) { DBG_CTOR( FormGeometryHandler, NULL ); } - //-------------------------------------------------------------------- + FormGeometryHandler::~FormGeometryHandler( ) { if ( !rBHelper.bDisposed ) @@ -273,7 +273,7 @@ namespace pcr DBG_DTOR( FormGeometryHandler, NULL ); } - //-------------------------------------------------------------------- + void FormGeometryHandler::onNewComponent() { if ( m_xChangeNotifier.is() ) @@ -313,13 +313,13 @@ namespace pcr m_xChangeNotifier = new ShapeGeometryChangeNotifier( *this, m_aMutex, m_xAssociatedShape.get() ); } - //-------------------------------------------------------------------- + OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -327,7 +327,7 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -376,7 +376,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -442,7 +442,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) @@ -491,7 +491,7 @@ namespace pcr return aLineDesc; } - //-------------------------------------------------------------------- + void SAL_CALL FormGeometryHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -500,7 +500,7 @@ namespace pcr m_xChangeNotifier->addPropertyChangeListener( _listener ); } - //-------------------------------------------------------------------- + void SAL_CALL FormGeometryHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -509,7 +509,7 @@ namespace pcr m_xChangeNotifier->removePropertyChangeListener( _listener ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException) { Sequence< OUString > aInterestedIn(1); @@ -517,7 +517,7 @@ namespace pcr return aInterestedIn; } - //-------------------------------------------------------------------- + void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -541,7 +541,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL FormGeometryHandler::doDescribeSupportedProperties() const { if ( !m_xAssociatedShape.is() ) @@ -563,7 +563,7 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + void SAL_CALL FormGeometryHandler::disposing() { FormGeometryHandler_Base::disposing(); @@ -575,7 +575,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + bool FormGeometryHandler::impl_haveTextAnchorType_nothrow() const { ENSURE_OR_THROW( m_xShapeProperties.is(), "not to be called without shape properties" ); @@ -592,7 +592,7 @@ namespace pcr return false; } - //-------------------------------------------------------------------- + bool FormGeometryHandler::impl_haveSheetAnchorType_nothrow() const { ENSURE_OR_THROW( m_xShapeProperties.is(), "not to be called without shape properties" ); @@ -612,7 +612,7 @@ namespace pcr return false; } - //-------------------------------------------------------------------- + namespace { static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows, @@ -646,7 +646,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void FormGeometryHandler::impl_setSheetAnchorType_nothrow( const sal_Int32 _nAnchorType ) const { ENSURE_OR_THROW( m_xShapeProperties.is(), "illegal to be called without shape properties." ); @@ -722,7 +722,7 @@ namespace pcr }; } - //-------------------------------------------------------------------- + void SAL_CALL ShapeGeometryChangeNotifier::propertyChange( const PropertyChangeEvent& _event ) throw (RuntimeException) { ::comphelper::ComponentMethodGuard aGuard( *this ); @@ -766,14 +766,14 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ ) throw (RuntimeException) { ::comphelper::ComponentMethodGuard aGuard( *this ); impl_dispose_nothrow(); } - //-------------------------------------------------------------------- + void ShapeGeometryChangeNotifier::impl_init_nothrow() { osl_atomic_increment( &m_refCount ); @@ -789,7 +789,7 @@ namespace pcr osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + void ShapeGeometryChangeNotifier::impl_dispose_nothrow() { try diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 047747737de9..9fd09141ae72 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -92,7 +92,7 @@ namespace pcr DECL_LINK( OnFieldNameChanged, ComboBox* ); }; - //------------------------------------------------------------------------ + FieldLinkRow::FieldLinkRow( Window* _pParent, const ResId& _rId ) :Window( _pParent, _rId ) ,m_aDetailColumn( this, ResId( 1, *_rId.GetResMgr() ) ) @@ -108,7 +108,7 @@ namespace pcr m_aMasterColumn.SetModifyHdl( LINK( this, FieldLinkRow, OnFieldNameChanged ) ); } - //------------------------------------------------------------------------ + void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames ) { ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn; @@ -119,7 +119,7 @@ namespace pcr pBox->InsertEntry( *pFieldName ); } - //------------------------------------------------------------------------ + bool FieldLinkRow::GetFieldName( LinkParticipant _eWhich, OUString& /* [out] */ _rName ) const { const ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn; @@ -127,14 +127,14 @@ namespace pcr return !_rName.isEmpty(); } - //------------------------------------------------------------------------ + void FieldLinkRow::SetFieldName( LinkParticipant _eWhich, const OUString& _rName ) { ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn; pBox->SetText( _rName ); } - //------------------------------------------------------------------------ + IMPL_LINK( FieldLinkRow, OnFieldNameChanged, ComboBox*, /*_pBox*/ ) { if ( m_aLinkChangeHandler.IsSet() ) @@ -146,7 +146,7 @@ namespace pcr //======================================================================== //= FormLinkDialog //======================================================================== - //------------------------------------------------------------------------ + FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, const OUString& _sExplanation, @@ -185,12 +185,12 @@ namespace pcr updateOkButton(); } - //------------------------------------------------------------------------ + FormLinkDialog::~FormLinkDialog( ) { } - //------------------------------------------------------------------------ + void FormLinkDialog::commitLinkPairs() { // collect the field lists from the rows @@ -231,7 +231,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + short FormLinkDialog::Execute() { short nResult = ModalDialog::Execute(); @@ -242,7 +242,7 @@ namespace pcr return nResult; } - //------------------------------------------------------------------------ + void FormLinkDialog::initializeFieldLists() { Sequence< OUString > sDetailFields; @@ -262,7 +262,7 @@ namespace pcr } - //------------------------------------------------------------------------ + void FormLinkDialog::initializeColumnLabels() { // label for the detail form @@ -292,7 +292,7 @@ namespace pcr m_aMasterLabel.SetText( sMasterType ); } - //------------------------------------------------------------------------ + void FormLinkDialog::initializeFieldRowsFrom( Sequence< OUString >& _rDetailFields, Sequence< OUString >& _rMasterFields ) { // our UI does allow 4 fields max @@ -312,7 +312,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormLinkDialog::initializeLinks() { try @@ -335,7 +335,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormLinkDialog::updateOkButton() { // in all rows, there must be either two valid selections, or none at all @@ -359,7 +359,7 @@ namespace pcr m_aOK.Enable( bEnable ); } - //------------------------------------------------------------------------ + OUString FormLinkDialog::getFormDataSourceType( const Reference< XPropertySet >& _rxForm ) const SAL_THROW(()) { OUString sReturn; @@ -386,7 +386,7 @@ namespace pcr return sReturn; } - //------------------------------------------------------------------------ + void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(( )) { _rNames.realloc( 0 ); @@ -438,7 +438,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void FormLinkDialog::ensureFormConnection( const Reference< XPropertySet >& _rxFormProps, Reference< XConnection >& /* [out] */ _rxConnection ) const SAL_THROW(( Exception )) { OSL_PRECOND( _rxFormProps.is(), "FormLinkDialog::ensureFormConnection: invalid form!" ); @@ -451,7 +451,7 @@ namespace pcr _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xContext, sal_True ); } - //------------------------------------------------------------------------ + void FormLinkDialog::getConnectionMetaData( const Reference< XPropertySet >& _rxFormProps, Reference< XDatabaseMetaData >& /* [out] */ _rxMeta ) const SAL_THROW(( Exception )) { if ( _rxFormProps.is() ) @@ -464,7 +464,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + Reference< XPropertySet > FormLinkDialog::getCanonicUnderlyingTable( const Reference< XPropertySet >& _rxFormProps ) const { Reference< XPropertySet > xTable; @@ -491,7 +491,7 @@ namespace pcr return xTable; } - //------------------------------------------------------------------------ + sal_Bool FormLinkDialog::getExistingRelation( const Reference< XPropertySet >& _rxLHS, const Reference< XPropertySet >& /*_rxRHS*/, // TODO: fix the usage of _rxRHS. This is issue #i81956#. Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) const @@ -557,7 +557,7 @@ namespace pcr return ( _rLeftFields.getLength() > 0 ) && ( !_rLeftFields[ 0 ].isEmpty() ); } - //------------------------------------------------------------------------ + void FormLinkDialog::initializeSuggest() { Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY ); @@ -631,21 +631,21 @@ namespace pcr } } - //------------------------------------------------------------------------ + IMPL_LINK( FormLinkDialog, OnSuggest, void*, /*_pNotInterestedIn*/ ) { initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns ); return 0L; } - //------------------------------------------------------------------------ + IMPL_LINK( FormLinkDialog, OnFieldChanged, FieldLinkRow*, /*_pRow*/ ) { updateOkButton(); return 0L; } - //------------------------------------------------------------------------ + IMPL_LINK( FormLinkDialog, OnInitialize, void*, /*_pNotInterestedIn*/ ) { initializeColumnLabels(); diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 971c0c7ac971..e161bf6fbbea 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -56,7 +56,7 @@ namespace pcr sal_uInt32 _nUIFlags); }; - //------------------------------------------------------------------------ + OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, const OUString& aString, sal_uInt16 nP, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) @@ -68,7 +68,7 @@ namespace pcr { } - //------------------------------------------------------------------------ + // Compare PropertyInfo struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > { @@ -99,7 +99,7 @@ namespace pcr sal_uInt16 OPropertyInfoService::s_nCount = 0; OPropertyInfoImpl* OPropertyInfoService::s_pPropertyInfos = NULL; - //------------------------------------------------------------------------ + const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo() { if ( s_pPropertyInfos ) @@ -362,49 +362,49 @@ namespace pcr return s_pPropertyInfos; } - //------------------------------------------------------------------------ + sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName); return pInfo ? pInfo->nId : -1; } - //------------------------------------------------------------------------ + OUString OPropertyInfoService::getPropertyName( sal_Int32 _nPropId ) { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nPropId); return pInfo ? pInfo->sName : OUString(); } - //------------------------------------------------------------------------ + OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->sTranslation : OUString(); } - //------------------------------------------------------------------------ + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->sHelpId : OString(); } - //------------------------------------------------------------------------ + sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nPos : 0xFFFF; } - //------------------------------------------------------------------------ + sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nUIFlags : 0; } - //------------------------------------------------------------------------ + ::std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), @@ -528,7 +528,7 @@ namespace pcr return aReturn; } - //------------------------------------------------------------------------ + sal_Bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const { sal_Int32 nId = getPropertyId( _rPropertyName ); @@ -539,7 +539,7 @@ namespace pcr return ( nFlags & PROP_FLAG_COMPOSEABLE ) != 0; } - //------------------------------------------------------------------------ + const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const OUString& _rName) { // Initialization @@ -560,7 +560,7 @@ namespace pcr } - //------------------------------------------------------------------------ + const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // Initialization @@ -579,7 +579,7 @@ namespace pcr //= DefaultEnumRepresentation //==================================================================== DBG_NAME( DefaultEnumRepresentation ) - //-------------------------------------------------------------------- + DefaultEnumRepresentation::DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const Type& _rType, sal_Int32 _nPropertyId ) :m_refCount( 0 ) ,m_rMetaData( _rInfo ) @@ -589,19 +589,19 @@ namespace pcr DBG_CTOR( DefaultEnumRepresentation, NULL ); } - //-------------------------------------------------------------------- + DefaultEnumRepresentation::~DefaultEnumRepresentation() { DBG_DTOR( DefaultEnumRepresentation, NULL ); } - //-------------------------------------------------------------------- + ::std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const { return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId ); } - //-------------------------------------------------------------------- + void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const { sal_uInt32 nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId ); @@ -644,7 +644,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const { OUString sReturn; @@ -668,13 +668,13 @@ namespace pcr return sReturn; } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL DefaultEnumRepresentation::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL DefaultEnumRepresentation::release() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 7a257bc6ae57..6362a6227567 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -57,7 +57,7 @@ namespace pcr //==================================================================== //= PropertyHandlerHelper //==================================================================== - //-------------------------------------------------------------------- + void PropertyHandlerHelper::describePropertyLine( const Property& _rProperty, LineDescriptor& /* [out] */ _out_rDescriptor, const Reference< XPropertyControlFactory >& _rxControlFactory ) { @@ -111,7 +111,7 @@ namespace pcr _out_rDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, bReadOnlyControl ); } - //-------------------------------------------------------------------- + namespace { Reference< XPropertyControl > lcl_implCreateListLikeControl( @@ -142,21 +142,21 @@ namespace pcr } } - //-------------------------------------------------------------------- + Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_True ); } - //-------------------------------------------------------------------- + Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted ) { return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_False ); } - //-------------------------------------------------------------------- + Reference< XPropertyControl > PropertyHandlerHelper::createNumericControl( const Reference< XPropertyControlFactory >& _rxControlFactory, sal_Int16 _nDigits, const Optional< double >& _rMinValue, const Optional< double >& _rMaxValue, sal_Bool _bReadOnlyControl ) { @@ -172,7 +172,7 @@ namespace pcr return xNumericControl.get(); } - //-------------------------------------------------------------------- + Any PropertyHandlerHelper::convertToPropertyValue( const Reference< XComponentContext >& _rxContext,const Reference< XTypeConverter >& _rxTypeConverter, const Property& _rProperty, const Any& _rControlValue ) { @@ -209,7 +209,7 @@ namespace pcr return aPropertyValue; } - //-------------------------------------------------------------------- + Any PropertyHandlerHelper::convertToControlValue( const Reference< XComponentContext >& _rxContext,const Reference< XTypeConverter >& _rxTypeConverter, const Any& _rPropertyValue, const Type& _rControlValueType ) { @@ -239,7 +239,7 @@ namespace pcr return aControlValue; } - //-------------------------------------------------------------------- + void PropertyHandlerHelper::setContextDocumentModified( const Reference<XComponentContext> & _rContext ) { try @@ -275,7 +275,7 @@ namespace pcr return xI; } - //-------------------------------------------------------------------- + Window* PropertyHandlerHelper::getDialogParentWindow( const Reference<XComponentContext>& _rContext ) { Window* pInspectorWindow = NULL; diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index 397ffe6ce41b..4e7f6a7cfb5f 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -26,7 +26,7 @@ namespace pcr //==================================================================== //= InspectorHelpWindow //==================================================================== - //-------------------------------------------------------------------- + InspectorHelpWindow::InspectorHelpWindow( Window* _pParent ) :Window( _pParent, WB_DIALOGCONTROL ) ,m_aSeparator( this ) @@ -46,20 +46,20 @@ namespace pcr m_aHelpText.Show(); } - //-------------------------------------------------------------------- + void InspectorHelpWindow::SetText( const OUString& _rStr ) { m_aHelpText.SetText( _rStr ); } - //-------------------------------------------------------------------- + void InspectorHelpWindow::SetLimits( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ) { m_nMinLines = _nMinLines; m_nMaxLines = _nMaxLines; } - //-------------------------------------------------------------------- + long InspectorHelpWindow::impl_getHelpTextBorderHeight() { sal_Int32 nTop(0), nBottom(0), nDummy(0); @@ -67,7 +67,7 @@ namespace pcr return nTop + nBottom; } - //-------------------------------------------------------------------- + long InspectorHelpWindow::impl_getSpaceAboveTextWindow() { Size aSeparatorSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) ); @@ -75,25 +75,25 @@ namespace pcr return aSeparatorSize.Height() + a3AppFontSize.Height(); } - //-------------------------------------------------------------------- + long InspectorHelpWindow::GetMinimalHeightPixel() { return impl_getMinimalTextWindowHeight() + impl_getSpaceAboveTextWindow(); } - //-------------------------------------------------------------------- + long InspectorHelpWindow::impl_getMinimalTextWindowHeight() { return impl_getHelpTextBorderHeight() + m_aHelpText.GetTextHeight() * m_nMinLines; } - //-------------------------------------------------------------------- + long InspectorHelpWindow::impl_getMaximalTextWindowHeight() { return impl_getHelpTextBorderHeight() + m_aHelpText.GetTextHeight() * m_nMaxLines; } - //-------------------------------------------------------------------- + long InspectorHelpWindow::GetOptimalHeightPixel() { // --- calc the height as needed for the mere text window @@ -111,7 +111,7 @@ namespace pcr return nOptTextWindowHeight + impl_getSpaceAboveTextWindow(); } - //-------------------------------------------------------------------- + void InspectorHelpWindow::Resize() { Size a3AppFont( LogicToPixel( Size( 3, 3 ), MAP_APPFONT ) ); diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 3d5f2b57d309..9bbc8237cfce 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -90,7 +90,7 @@ namespace pcr //==================================================================== //= InspectorModelProperties //==================================================================== - //-------------------------------------------------------------------- + InspectorModelProperties::InspectorModelProperties( ::osl::Mutex& _rMutex ) :m_rMutex( _rMutex ) ,m_bHasHelpSection( sal_False ) @@ -124,7 +124,7 @@ namespace pcr ); } - //-------------------------------------------------------------------- + void InspectorModelProperties::constructWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { m_bHasHelpSection = sal_True; @@ -134,7 +134,7 @@ namespace pcr // only be used during construction phase, where we don't expect to have any listeners. } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& InspectorModelProperties::getInfoHelper() { ::osl::MutexGuard aGuard( m_rMutex ); @@ -148,7 +148,7 @@ namespace pcr return *m_pPropertyInfo; } - //-------------------------------------------------------------------- + Reference< XPropertySetInfo > InspectorModelProperties::getPropertySetInfo() { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); @@ -163,72 +163,72 @@ namespace pcr { } - //-------------------------------------------------------------------- + ImplInspectorModel::~ImplInspectorModel() { } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( ImplInspectorModel, ImplInspectorModel_Base, ImplInspectorModel_PBase ) - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( ImplInspectorModel, ImplInspectorModel_Base, ImplInspectorModel_PBase ) - //-------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL ImplInspectorModel::getPropertySetInfo( ) throw (RuntimeException) { return m_pProperties->getPropertySetInfo(); } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL ImplInspectorModel::getInfoHelper() { return m_pProperties->getInfoHelper(); } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL ImplInspectorModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) { return m_pProperties->convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, rValue ); } - //-------------------------------------------------------------------- + void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) { m_pProperties->setFastPropertyValue( nHandle, rValue ); } - //-------------------------------------------------------------------- + void SAL_CALL ImplInspectorModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { m_pProperties->getFastPropertyValue( rValue, nHandle ); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL ImplInspectorModel::getHasHelpSection() throw (RuntimeException) { return m_pProperties->hasHelpSection(); } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines() throw (RuntimeException) { return m_pProperties->getMinHelpTextLines(); } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines() throw (RuntimeException) { return m_pProperties->getMaxHelpTextLines(); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() throw (::com::sun::star::uno::RuntimeException) { return m_pProperties->isReadOnly(); } - //-------------------------------------------------------------------- + void SAL_CALL ImplInspectorModel::setIsReadOnly( ::sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException) { setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( _IsReadOnly ) ); @@ -239,7 +239,7 @@ namespace pcr return cppu::supportsService(this, ServiceName); } - //-------------------------------------------------------------------- + void ImplInspectorModel::enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { m_pProperties->constructWithHelpSection( _nMinHelpTextLines, _nMaxHelpTextLines ); diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 9b4ac38deda8..1087354427dd 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -36,7 +36,7 @@ namespace pcr //==================================================================== //= ListSelectionDialog //==================================================================== - //-------------------------------------------------------------------- + ListSelectionDialog::ListSelectionDialog( Window* _pParent, const Reference< XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName ) :ModalDialog( _pParent, PcrRes( RID_DLG_SELECTION ) ) @@ -58,7 +58,7 @@ namespace pcr initialize( ); } - //------------------------------------------------------------------------ + short ListSelectionDialog::Execute() { short nResult = ModalDialog::Execute(); @@ -69,7 +69,7 @@ namespace pcr return nResult; } - //-------------------------------------------------------------------- + void ListSelectionDialog::initialize( ) { if ( !m_xListBox.is() ) @@ -100,7 +100,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void ListSelectionDialog::commitSelection() { if ( !m_xListBox.is() ) @@ -119,7 +119,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void ListSelectionDialog::fillEntryList( const Sequence< OUString >& _rListEntries ) { m_aEntries.Clear(); @@ -129,7 +129,7 @@ namespace pcr m_aEntries.InsertEntry( *_pListEntries ); } - //-------------------------------------------------------------------- + void ListSelectionDialog::collectSelection( Sequence< sal_Int16 >& /* [out] */ _rSelection ) { sal_uInt16 nSelectedCount = m_aEntries.GetSelectEntryCount( ); @@ -139,7 +139,7 @@ namespace pcr *pSelection = static_cast< sal_Int16 >( m_aEntries.GetSelectEntryPos( selected ) ); } - //-------------------------------------------------------------------- + void ListSelectionDialog::selectEntries( const Sequence< sal_Int16 >& /* [in ] */ _rSelection ) { m_aEntries.SetNoSelection(); diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 096166d4e93f..cd267d5e9f8b 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -31,7 +31,7 @@ namespace pcr //==================================================================== //= NewDataTypeDialog //==================================================================== - //-------------------------------------------------------------------- + NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) :ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) ) ,m_aLabel ( this, PcrRes( FT_LABEL ) ) @@ -72,7 +72,7 @@ namespace pcr OnNameModified( NULL ); } - //-------------------------------------------------------------------- + IMPL_LINK( NewDataTypeDialog, OnNameModified, void*, /*_pNotInterestedIn*/ ) { OUString sCurrentName = GetName(); diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index 1682f0edb0ee..13ee90101ce1 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -98,27 +98,27 @@ namespace pcr { } - //-------------------------------------------------------------------- + Sequence< Any > SAL_CALL ObjectInspectorModel::getHandlerFactories() throw (RuntimeException) { return m_aFactories; } - //-------------------------------------------------------------------- + Sequence< PropertyCategoryDescriptor > SAL_CALL ObjectInspectorModel::describeCategories( ) throw (RuntimeException) { // no category info provided by this default implementation return Sequence< PropertyCategoryDescriptor >( ); } - //-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException) { // no ordering provided by this default implementation return 0; } - //-------------------------------------------------------------------- + void SAL_CALL ObjectInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -153,52 +153,52 @@ namespace pcr impl_verifyArgument_throw( false, 2 ); } - //-------------------------------------------------------------------- + OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } - //-------------------------------------------------------------------- + OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) { return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); } - //-------------------------------------------------------------------- + Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); return Sequence< OUString >( &sService, 1 ); } - //-------------------------------------------------------------------- + Reference< XInterface > SAL_CALL ObjectInspectorModel::Create(const Reference< XComponentContext >& /* _rxContext */ ) { return *( new ObjectInspectorModel() ); } - //-------------------------------------------------------------------- + void ObjectInspectorModel::createDefault() { m_aFactories.realloc( 1 ); m_aFactories[0] <<= OUString( "com.sun.star.inspection.GenericPropertyHandler" ); } - //-------------------------------------------------------------------- + void ObjectInspectorModel::createWithHandlerFactories( const Sequence< Any >& _rFactories ) { impl_verifyArgument_throw( _rFactories.getLength() > 0, 1 ); m_aFactories = _rFactories; } - //-------------------------------------------------------------------- + void ObjectInspectorModel::createWithHandlerFactoriesAndHelpSection( const Sequence< Any >& _rFactories, sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { impl_verifyArgument_throw( _rFactories.getLength() > 0, 1 ); @@ -210,7 +210,7 @@ namespace pcr enableHelpSectionProperties( _nMinHelpTextLines, _nMaxHelpTextLines ); } - //-------------------------------------------------------------------- + void ObjectInspectorModel::impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition ) { if ( !_bCondition ) @@ -221,7 +221,7 @@ namespace pcr } // namespace pcr //........................................................................ -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() { ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration; diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 1fef1572cc1c..e1c427b257d5 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -35,7 +35,7 @@ namespace pcr //======================================================================== //= HelpIdUrl //======================================================================== - //------------------------------------------------------------------------ + OString HelpIdUrl::getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); @@ -45,7 +45,7 @@ namespace pcr return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------ + OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { OUStringBuffer aBuffer; diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 49caa26c0e94..17b4749f0fc3 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -20,14 +20,14 @@ #include "modulepcr.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_OPropertyBrowserController(); extern "C" void SAL_CALL createRegistryInfo_FormController(); @@ -49,7 +49,7 @@ extern "C" void SAL_CALL createRegistryInfo_StringRepresentation(); extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog(); extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler(); -//--------------------------------------------------------------------------------------- + extern "C" void SAL_CALL pcr_initializeModule() { @@ -79,7 +79,7 @@ extern "C" void SAL_CALL pcr_initializeModule() } } -//--------------------------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 93c4dade759a..d2dcc962b929 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -44,7 +44,7 @@ namespace pcr //==================================================================== //= OTabOrderDialog //==================================================================== - //--------------------------------------------------------------------- + OTabOrderDialog::OTabOrderDialog( const Reference< XComponentContext >& _rxContext ) :OGenericUnoDialog( _rxContext ) { @@ -57,7 +57,7 @@ namespace pcr &m_xTabbingModel, ::getCppuType( &m_xTabbingModel ) ); } - //--------------------------------------------------------------------- + OTabOrderDialog::~OTabOrderDialog() { if ( m_pDialog ) @@ -68,38 +68,38 @@ namespace pcr } } - //--------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } - //--------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OTabOrderDialog::Create( const Reference< XComponentContext >& _rxContext ) { return *( new OTabOrderDialog( _rxContext ) ); } - //--------------------------------------------------------------------- + OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException) { return getImplementationName_static(); } - //--------------------------------------------------------------------- + OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { return OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence SAL_CALL OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_static(); } - //--------------------------------------------------------------------- + ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(2); @@ -108,20 +108,20 @@ namespace pcr return aSupported; } - //--------------------------------------------------------------------- + Reference<XPropertySetInfo> SAL_CALL OTabOrderDialog::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //--------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& OTabOrderDialog::getInfoHelper() { return *const_cast< OTabOrderDialog* >( this )->getArrayHelper(); } - //-------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OTabOrderDialog::createArrayHelper( ) const { Sequence< Property > aProps; @@ -129,7 +129,7 @@ namespace pcr return new ::cppu::OPropertyArrayHelper( aProps ); } - //-------------------------------------------------------------------------- + Dialog* OTabOrderDialog::createDialog( Window* _pParent ) { return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext ); diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 9d6d93b7859f..fd30ffd41fe9 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -52,7 +52,7 @@ #include <functional> #include <sal/macros.h> -//------------------------------------------------------------------------ + // !!! outside the namespace !!! extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController() { @@ -82,7 +82,7 @@ namespace pcr //= OPropertyBrowserController //======================================================================== DBG_NAME(OPropertyBrowserController) - //------------------------------------------------------------------------ + OPropertyBrowserController::OPropertyBrowserController( const Reference< XComponentContext >& _rxContext ) :m_xContext(_rxContext) ,m_aDisposeListeners( m_aMutex ) @@ -96,7 +96,7 @@ namespace pcr DBG_CTOR(OPropertyBrowserController,NULL); } - //------------------------------------------------------------------------ + OPropertyBrowserController::~OPropertyBrowserController() { // stop listening for property changes @@ -105,10 +105,10 @@ namespace pcr DBG_DTOR(OPropertyBrowserController,NULL); } - //------------------------------------------------------------------------ + IMPLEMENT_FORWARD_REFCOUNT( OPropertyBrowserController, OPropertyBrowserController_Base ) - //------------------------------------------------------------------------ + Any SAL_CALL OPropertyBrowserController::queryInterface( const Type& _rType ) throw (RuntimeException) { Any aReturn = OPropertyBrowserController_Base::queryInterface( _rType ); @@ -120,7 +120,7 @@ namespace pcr return aReturn; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::startContainerWindowListening() { if (m_bContainerFocusListening) @@ -139,7 +139,7 @@ namespace pcr DBG_ASSERT(m_bContainerFocusListening, "OPropertyBrowserController::startContainerWindowListening: unable to start listening (inconsistence)!"); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::stopContainerWindowListening() { if (!m_bContainerFocusListening) @@ -158,13 +158,13 @@ namespace pcr DBG_ASSERT(!m_bContainerFocusListening, "OPropertyBrowserController::stopContainerWindowListening: unable to stop listening (inconsistence)!"); } - //-------------------------------------------------------------------- + Reference< XObjectInspectorModel > SAL_CALL OPropertyBrowserController::getInspectorModel() throw (RuntimeException) { return m_xModel; } - //-------------------------------------------------------------------- + void OPropertyBrowserController::impl_initializeView_nothrow() { OSL_PRECOND( haveView(), "OPropertyBrowserController::impl_initializeView_nothrow: not to be called when we have no view!" ); @@ -186,7 +186,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void OPropertyBrowserController::impl_updateReadOnlyView_nothrow() { // this is a huge cudgel, admitted. @@ -198,7 +198,7 @@ namespace pcr impl_rebindToInspectee_nothrow( m_aInspectedObjects ); } - //-------------------------------------------------------------------- + bool OPropertyBrowserController::impl_isReadOnlyModel_throw() const { if ( !m_xModel.is() ) @@ -207,7 +207,7 @@ namespace pcr return m_xModel->getIsReadOnly(); } - //-------------------------------------------------------------------- + void OPropertyBrowserController::impl_startOrStopModelListening_nothrow( bool _bDoListen ) const { try @@ -232,7 +232,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void OPropertyBrowserController::impl_bindToNewModel_nothrow( const Reference< XObjectInspectorModel >& _rxInspectorModel ) { impl_startOrStopModelListening_nothrow( false ); @@ -248,7 +248,7 @@ namespace pcr impl_rebindToInspectee_nothrow( m_aInspectedObjects ); } - //-------------------------------------------------------------------- + void SAL_CALL OPropertyBrowserController::setInspectorModel( const Reference< XObjectInspectorModel >& _inspectorModel ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -259,14 +259,14 @@ namespace pcr impl_bindToNewModel_nothrow( _inspectorModel ); } - //-------------------------------------------------------------------- + Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI() throw (RuntimeException) { // we're derived from this interface, though we do not expose it in queryInterface and getTypes. return this; } - //-------------------------------------------------------------------- + void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (com::sun::star::util::VetoException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -287,14 +287,14 @@ namespace pcr } - //-------------------------------------------------------------------- + Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException) { // we don't have any dispatches at all, right now return Reference< XDispatch >(); } - //-------------------------------------------------------------------- + Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests ) throw (RuntimeException) { Sequence< Reference< XDispatch > > aReturn; @@ -311,7 +311,7 @@ namespace pcr return aReturn; } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) { if ( m_bConstructed ) @@ -336,13 +336,13 @@ namespace pcr throw IllegalArgumentException( OUString(), *this, 0 ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::createDefault() { m_bConstructed = true; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::createWithModel( const Reference< XObjectInspectorModel >& _rxModel ) { osl_atomic_increment( &m_refCount ); @@ -354,7 +354,7 @@ namespace pcr m_bConstructed = true; } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; @@ -396,7 +396,7 @@ namespace pcr UpdateUI(); } - //------------------------------------------------------------------------ + sal_Bool SAL_CALL OPropertyBrowserController::attachModel( const Reference< XModel >& _rxModel ) throw(RuntimeException) { Reference< XObjectInspectorModel > xModel( _rxModel, UNO_QUERY ); @@ -407,7 +407,7 @@ namespace pcr return getInspectorModel() == _rxModel; } - //------------------------------------------------------------------------ + sal_Bool OPropertyBrowserController::suspendAll_nothrow() { // if there is a handle inside its "onInteractivePropertySelection" method, @@ -426,7 +426,7 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------------ + sal_Bool OPropertyBrowserController::suspendPropertyHandlers_nothrow( sal_Bool _bSuspend ) { PropertyHandlerArray aAllHandlers; // will contain every handler exactly once @@ -462,7 +462,7 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------------ + sal_Bool SAL_CALL OPropertyBrowserController::suspend( sal_Bool _bSuspend ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -489,13 +489,13 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------------ + Any SAL_CALL OPropertyBrowserController::getViewData( ) throw(RuntimeException) { return makeAny( m_sPageSelection ); } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException) { OUString sPageSelection; @@ -506,20 +506,20 @@ namespace pcr } } - //------------------------------------------------------------------------ + Reference< XModel > SAL_CALL OPropertyBrowserController::getModel( ) throw(RuntimeException) { // have no model return Reference< XModel >(); } - //------------------------------------------------------------------------ + Reference< XFrame > SAL_CALL OPropertyBrowserController::getFrame( ) throw(RuntimeException) { return m_xFrame; } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::dispose( ) throw(RuntimeException) { SolarMutexGuard aSolarGuard; @@ -545,19 +545,19 @@ namespace pcr impl_bindToNewModel_nothrow( NULL ); } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::addEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException) { m_aDisposeListeners.addInterface(_rxListener); } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::removeEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException) { m_aDisposeListeners.removeInterface(_rxListener); } - //------------------------------------------------------------------------ + OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); @@ -568,19 +568,19 @@ namespace pcr return cppu::supportsService(this, ServiceName); } - //------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } - //------------------------------------------------------------------------ + OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { return OUString("org.openoffice.comp.extensions.ObjectInspector"); } - //------------------------------------------------------------------------ + Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); @@ -588,13 +588,13 @@ namespace pcr return aSupported; } - //------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL OPropertyBrowserController::Create(const Reference< XComponentContext >& _rxContext) { return *(new OPropertyBrowserController( _rxContext ) ); } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource ) throw (RuntimeException) { Reference< XWindow > xSourceWindow(_rSource.Source, UNO_QUERY); @@ -609,13 +609,13 @@ namespace pcr } } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::focusLost( const FocusEvent& /*_rSource*/ ) throw (RuntimeException) { // not interested in } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::disposing( const EventObject& _rSource ) throw(RuntimeException) { if ( m_xView.is() && ( m_xView == _rSource.Source ) ) @@ -637,14 +637,14 @@ namespace pcr } } - //------------------------------------------------------------------------ + IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation) { updateViewDataFromActivePage(); return 0L; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::updateViewDataFromActivePage() { if (!haveView()) @@ -675,7 +675,7 @@ namespace pcr m_sLastValidPageSelection = sOldSelection; } - //------------------------------------------------------------------------ + sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const { sal_uInt16 nPageId = (sal_uInt16)-1; @@ -685,7 +685,7 @@ namespace pcr return nPageId; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::selectPageFromViewData() { sal_uInt16 nNewPage = impl_getPageIdForCategory_nothrow( m_sPageSelection ); @@ -697,7 +697,7 @@ namespace pcr updateViewDataFromActivePage(); } - //------------------------------------------------------------------------ + sal_Bool OPropertyBrowserController::Construct(Window* _pParentWin) { DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!"); @@ -723,7 +723,7 @@ namespace pcr return sal_True; } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) { if ( _rEvent.Source == m_xModel ) @@ -761,7 +761,7 @@ namespace pcr impl_broadcastPropertyChange_nothrow( _rEvent.PropertyName, aNewValue, _rEvent.OldValue, false ); } - //------------------------------------------------------------------------ + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, ::sal_Bool _CreateReadOnly ) throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -833,7 +833,7 @@ namespace pcr return xControl; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::impl_toggleInspecteeListening_nothrow( bool _bOn ) { for ( InterfaceArray::const_iterator loop = m_aInspectedObjects.begin(); @@ -859,7 +859,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void OPropertyBrowserController::stopInspection( bool _bCommitModified ) { if ( haveView() ) @@ -929,14 +929,14 @@ namespace pcr clearContainer( m_aDependencyHandlers ); } - //------------------------------------------------------------------------ + bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); return ( handlerPos != m_aPropertyHandlers.end() ); } - //------------------------------------------------------------------------ + OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const { PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName ); @@ -945,14 +945,14 @@ namespace pcr return handlerPos->second; } - //------------------------------------------------------------------------ + Any OPropertyBrowserController::impl_getPropertyValue_throw( const OUString& _rPropertyName ) { PropertyHandlerRef handler = impl_getHandlerForProperty_throw( _rPropertyName ); return handler->getPropertyValue( _rPropertyName ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::impl_rebindToInspectee_nothrow( const InterfaceArray& _rObjects ) { try @@ -974,7 +974,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void OPropertyBrowserController::doInspection() { try @@ -1103,7 +1103,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() throw (::com::sun::star::uno::RuntimeException) { ::com::sun::star::awt::Size aSize; @@ -1113,13 +1113,13 @@ namespace pcr return aSize; } - //------------------------------------------------------------------------ + ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() throw (::com::sun::star::uno::RuntimeException) { return getMinimumSize(); } - //------------------------------------------------------------------------ + ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const ::com::sun::star::awt::Size& _rNewSize ) throw (::com::sun::star::uno::RuntimeException) { awt::Size aMinSize = getMinimumSize( ); @@ -1131,7 +1131,7 @@ namespace pcr return aAdjustedSize; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::describePropertyLine( const Property& _rProperty, OLineDescriptor& _rDescriptor ) SAL_THROW((Exception)) { try @@ -1174,7 +1174,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void OPropertyBrowserController::impl_buildCategories_throw() { OSL_PRECOND( m_aPageIds.empty(), "OPropertyBrowserController::impl_buildCategories_throw: duplicate call!" ); @@ -1196,7 +1196,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void OPropertyBrowserController::UpdateUI() { try @@ -1310,7 +1310,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void OPropertyBrowserController::Clicked( const OUString& _rName, sal_Bool _bPrimary ) { try @@ -1354,7 +1354,7 @@ namespace pcr m_xInteractiveHandler = NULL; } - //------------------------------------------------------------------------ + sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin(); @@ -1366,7 +1366,7 @@ namespace pcr return false; } - //------------------------------------------------------------------------ + void OPropertyBrowserController::Commit( const OUString& rName, const Any& _rValue ) { try @@ -1425,24 +1425,24 @@ namespace pcr m_sCommittingProperty = ""; } - //-------------------------------------------------------------------- + namespace { } - //-------------------------------------------------------------------- + void OPropertyBrowserController::focusGained( const Reference< XPropertyControl >& _Control ) { m_aControlObservers.notifyEach( &XPropertyControlObserver::focusGained, _Control ); } - //-------------------------------------------------------------------- + void OPropertyBrowserController::valueChanged( const Reference< XPropertyControl >& _Control ) { m_aControlObservers.notifyEach( &XPropertyControlObserver::valueChanged, _Control ); } - //------------------------------------------------------------------------ + namespace { Reference< XPropertyHandler > lcl_createHandler( const Reference<XComponentContext>& _rContext, const Any& _rFactoryDescriptor ) @@ -1464,7 +1464,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + void OPropertyBrowserController::getPropertyHandlers( const InterfaceArray& _rObjects, PropertyHandlerArray& _rHandlers ) { _rHandlers.resize( 0 ); @@ -1540,7 +1540,7 @@ namespace pcr // properties they feel responsible for } - //------------------------------------------------------------------------ + bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty ) { OrderedPropertyMap::const_iterator search = m_aProperties.begin(); @@ -1552,7 +1552,7 @@ namespace pcr return ( search != m_aProperties.end() ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1576,7 +1576,7 @@ namespace pcr getPropertyBox().ChangeEntry( aDescriptor ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1589,7 +1589,7 @@ namespace pcr getPropertyBox().EnablePropertyLine( _rPropertyName, _bEnable ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1602,7 +1602,7 @@ namespace pcr getPropertyBox().EnablePropertyControls( _rPropertyName, _nElements, _bEnable ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1652,7 +1652,7 @@ namespace pcr aDescriptor, impl_getPageIdForCategory_nothrow( aDescriptor.Category ), nUIPos ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1665,7 +1665,7 @@ namespace pcr getPropertyBox().RemoveEntry( _rPropertyName ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1678,7 +1678,7 @@ namespace pcr getPropertyBox().ShowPropertyPage( nPageId, _bShow ); } - //------------------------------------------------------------------------ + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1689,19 +1689,19 @@ namespace pcr return xControl; } - //-------------------------------------------------------------------- + void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { m_aControlObservers.addInterface( _Observer ); } - //-------------------------------------------------------------------- + void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException) { m_aControlObservers.removeInterface( _Observer ); } - //------------------------------------------------------------------------ + void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1716,7 +1716,7 @@ namespace pcr getPropertyBox().SetHelpText( _rHelpText ); } - //------------------------------------------------------------------------ + void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const { // are there one or more handlers which are interested in the actuation? diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index cbc14a316bde..517f3325c058 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -43,7 +43,7 @@ namespace pcr //==================================================================== namespace { - //---------------------------------------------------------------- + struct SetPropertyValue : public ::std::unary_function< Reference< XPropertyHandler >, void > { OUString sPropertyName; @@ -55,7 +55,7 @@ namespace pcr } }; - //---------------------------------------------------------------- + template < class BagType > void putIntoBag( const Sequence< typename BagType::value_type >& _rArray, BagType& /* [out] */ _rBag ) { @@ -63,7 +63,7 @@ namespace pcr ::std::insert_iterator< BagType >( _rBag, _rBag.begin() ) ); } - //---------------------------------------------------------------- + template < class BagType > void copyBagToArray( const BagType& /* [out] */ _rBag, Sequence< typename BagType::value_type >& _rArray ) { @@ -81,7 +81,7 @@ namespace pcr // which is O( n * k ) at worst (n being the number of handlers, k being the maximum number // of supported properties per handler). Shouldn't we cache this? So that it is O( log k )? - //-------------------------------------------------------------------- + PropertyComposer::PropertyComposer( const ::std::vector< Reference< XPropertyHandler > >& _rSlaveHandlers ) :PropertyComposer_Base ( m_aMutex ) ,m_aSlaveHandlers ( _rSlaveHandlers ) @@ -107,7 +107,7 @@ namespace pcr osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException) { MethodGuard aGuard( *this ); @@ -121,35 +121,35 @@ namespace pcr } } - //-------------------------------------------------------------------- + Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, PropertyVetoException) { MethodGuard aGuard( *this ); ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); } - //-------------------------------------------------------------------- + Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue ); } - //-------------------------------------------------------------------- + Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType ); } - //-------------------------------------------------------------------- + PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); @@ -188,21 +188,21 @@ namespace pcr return eState; } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aPropertyListeners.addListener( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aPropertyListeners.removeListener( _rxListener ); } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties() throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -258,7 +258,7 @@ namespace pcr return aSurvived; } - //-------------------------------------------------------------------- + void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ), Sequence< OUString >& /* [out] */ _rUnion ) { @@ -277,7 +277,7 @@ namespace pcr copyBagToArray( aUnitedBag, _rUnion ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -288,7 +288,7 @@ namespace pcr return aSuperseded; } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -299,7 +299,7 @@ namespace pcr return aActuating; } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) @@ -308,14 +308,14 @@ namespace pcr return m_aSlaveHandlers[0]->describePropertyLine( _rPropertyName, _rxControlFactory ); } - //-------------------------------------------------------------------- + ::sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->isComposable( _rPropertyName ); } - //-------------------------------------------------------------------- + InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -366,7 +366,7 @@ namespace pcr return eResult; } - //-------------------------------------------------------------------- + void PropertyComposer::impl_ensureUIRequestComposer( const Reference< XObjectInspectorUI >& _rxInspectorUI ) { OSL_ENSURE( !m_pUIRequestComposer.get() || m_pUIRequestComposer->getDelegatorUI().get() == _rxInspectorUI.get(), @@ -376,7 +376,7 @@ namespace pcr m_pUIRequestComposer.reset( new ComposedPropertyUIUpdate( _rxInspectorUI, this ) ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -412,10 +412,10 @@ namespace pcr } } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XCOMPONENT( PropertyComposer, PropertyComposer_Base ) - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::disposing() { MethodGuard aGuard( *this ); @@ -437,7 +437,7 @@ namespace pcr m_pUIRequestComposer.reset(); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { if ( !impl_isSupportedProperty_nothrow( evt.PropertyName ) ) @@ -456,14 +456,14 @@ namespace pcr m_aPropertyListeners.notify( aTranslatedEvent, &XPropertyChangeListener::propertyChange ); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyComposer::disposing( const EventObject& Source ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_aPropertyListeners.disposing( Source ); } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL PropertyComposer::suspend( sal_Bool _bSuspend ) throw (RuntimeException) { MethodGuard aGuard( *this ); @@ -492,7 +492,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) { return impl_isSupportedProperty_nothrow( _rName ); diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index 56b375693b84..76bf639ee5a8 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -60,7 +60,7 @@ namespace pcr //==================================================================== //= PropertyControlExtender //==================================================================== - //-------------------------------------------------------------------- + PropertyControlExtender::PropertyControlExtender( const Reference< XPropertyControl >& _rxObservedControl ) :m_pData( new PropertyControlExtender_Data ) { @@ -76,12 +76,12 @@ namespace pcr } } - //-------------------------------------------------------------------- + PropertyControlExtender::~PropertyControlExtender() { } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlExtender::keyPressed( const KeyEvent& _event ) throw (RuntimeException) { OSL_ENSURE( _event.Source == m_pData->xControlWindow, "PropertyControlExtender::keyPressed: where does this come from?" ); @@ -110,13 +110,13 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ ) throw (RuntimeException) { // not interested in } - //-------------------------------------------------------------------- + void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source ) throw (RuntimeException) { OSL_ENSURE( Source.Source == m_pData->xControlWindow, "PropertyControlExtender::disposing: where does this come from?" ); diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index e6f017d74215..850a5db29398 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -41,7 +41,7 @@ namespace pcr // class OPropertyEditor //================================================================== DBG_NAME(OPropertyEditor) - //------------------------------------------------------------------ + OPropertyEditor::OPropertyEditor( Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle) ,m_aTabControl( this ) @@ -59,7 +59,7 @@ namespace pcr m_aTabControl.SetPaintTransparent(true); } - //------------------------------------------------------------------ + OPropertyEditor::~OPropertyEditor() { Hide(); @@ -67,7 +67,7 @@ namespace pcr DBG_DTOR(OPropertyEditor,NULL); } - //------------------------------------------------------------------ + void OPropertyEditor::ClearAll() { m_nNextId=1; @@ -97,7 +97,7 @@ namespace pcr } } - //------------------------------------------------------------------ + sal_Int32 OPropertyEditor::getMinimumHeight() { sal_Int32 nMinHeight( LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM ); @@ -121,7 +121,7 @@ namespace pcr return nMinHeight; } - //------------------------------------------------------------------ + sal_Int32 OPropertyEditor::getMinimumWidth() { sal_uInt16 nCount = m_aTabControl.GetPageCount(); @@ -140,7 +140,7 @@ namespace pcr return nPageMinWidth+6; } - //------------------------------------------------------------------ + void OPropertyEditor::CommitModified() { // commit all of my pages, if necessary @@ -156,13 +156,13 @@ namespace pcr } } - //------------------------------------------------------------------ + void OPropertyEditor::GetFocus() { m_aTabControl.GrabFocus(); } - //------------------------------------------------------------------ + OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) { OBrowserPage* pPage = NULL; @@ -172,25 +172,25 @@ namespace pcr return pPage; } - //------------------------------------------------------------------ + const OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) const { return const_cast< OPropertyEditor* >( this )->getPage( _rPropertyName ); } - //------------------------------------------------------------------ + OBrowserPage* OPropertyEditor::getPage( sal_uInt16& _rPageId ) { return static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( _rPageId ) ); } - //------------------------------------------------------------------ + const OBrowserPage* OPropertyEditor::getPage( sal_uInt16& _rPageId ) const { return const_cast< OPropertyEditor* >( this )->getPage( _rPageId ); } - //------------------------------------------------------------------ + void OPropertyEditor::Resize() { Rectangle aPlayground( @@ -205,7 +205,7 @@ namespace pcr m_aTabControl.SetPosSizePixel( aTabArea.TopLeft(), aTabArea.GetSize() ); } - //------------------------------------------------------------------ + sal_uInt16 OPropertyEditor::AppendPage( const OUString & _rText, const OString& _rHelpId ) { // obtain a new id @@ -231,14 +231,14 @@ namespace pcr return nId; } - //------------------------------------------------------------------ + void OPropertyEditor::SetHelpId( const OString& rHelpId ) { Control::SetHelpId(""); m_aTabControl.SetHelpId(rHelpId); } - //------------------------------------------------------------------ + void OPropertyEditor::RemovePage(sal_uInt16 nID) { OBrowserPage* pPage = static_cast<OBrowserPage*>(m_aTabControl.GetTabPage(nID)); @@ -250,13 +250,13 @@ namespace pcr delete pPage; } - //------------------------------------------------------------------ + void OPropertyEditor::SetPage(sal_uInt16 nId) { m_aTabControl.SetCurPageId(nId); } - //------------------------------------------------------------------ + sal_uInt16 OPropertyEditor::GetCurPage() { if(m_aTabControl.GetPageCount()>0) @@ -265,7 +265,7 @@ namespace pcr return 0; } - //------------------------------------------------------------------ + void OPropertyEditor::Update(const ::std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction) { // forward this to all our pages @@ -278,18 +278,18 @@ namespace pcr _aUpdateFunction(&pPage->getListBox()); } } - //------------------------------------------------------------------ + void OPropertyEditor::EnableUpdate() { Update(::std::mem_fun(&OBrowserListBox::EnableUpdate)); } - //------------------------------------------------------------------ + void OPropertyEditor::DisableUpdate() { Update(::std::mem_fun(&OBrowserListBox::DisableUpdate)); } - //------------------------------------------------------------------ + void OPropertyEditor::forEachPage( PageOperation _pOperation, const void* _pArgument ) { sal_uInt16 nCount = m_aTabControl.GetPageCount(); @@ -303,52 +303,52 @@ namespace pcr } } - //------------------------------------------------------------------ + void OPropertyEditor::setPageLineListener( OBrowserPage& _rPage, const void* ) { _rPage.getListBox().SetListener( m_pListener ); } - //------------------------------------------------------------------ + void OPropertyEditor::SetLineListener(IPropertyLineListener* _pListener) { m_pListener = _pListener; forEachPage( &OPropertyEditor::setPageLineListener ); } - //------------------------------------------------------------------ + void OPropertyEditor::setPageControlObserver( OBrowserPage& _rPage, const void* ) { _rPage.getListBox().SetObserver( m_pObserver ); } - //------------------------------------------------------------------ + void OPropertyEditor::SetControlObserver( IPropertyControlObserver* _pObserver ) { m_pObserver = _pObserver; forEachPage( &OPropertyEditor::setPageControlObserver ); } - //------------------------------------------------------------------ + void OPropertyEditor::EnableHelpSection( bool _bEnable ) { m_bHasHelpSection = _bEnable; forEachPage( &OPropertyEditor::enableHelpSection ); } - //------------------------------------------------------------------ + bool OPropertyEditor::HasHelpSection() const { return m_bHasHelpSection; } - //------------------------------------------------------------------ + void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText ); } - //------------------------------------------------------------------ + void OPropertyEditor::SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ) { m_nMinHelpLines = _nMinLines; @@ -356,13 +356,13 @@ namespace pcr forEachPage( &OPropertyEditor::setHelpLineLimits ); } - //------------------------------------------------------------------ + void OPropertyEditor::enableHelpSection( OBrowserPage& _rPage, const void* ) { _rPage.getListBox().EnableHelpSection( m_bHasHelpSection ); } - //------------------------------------------------------------------ + void OPropertyEditor::setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString ) { OSL_ENSURE( _pPointerToOUString, "OPropertyEditor::setHelpSectionText: invalid argument!" ); @@ -373,13 +373,13 @@ namespace pcr _rPage.getListBox().SetHelpText( rText ); } - //------------------------------------------------------------------ + void OPropertyEditor::setHelpLineLimits( OBrowserPage& _rPage, const void* ) { _rPage.getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines ); } - //------------------------------------------------------------------ + sal_uInt16 OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 _nPageId, sal_uInt16 nPos ) { // let the current page handle this @@ -397,7 +397,7 @@ namespace pcr return nEntry; } - //------------------------------------------------------------------ + void OPropertyEditor::RemoveEntry( const OUString& _rName ) { OBrowserPage* pPage = getPage( _rName ); @@ -411,7 +411,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OPropertyEditor::ChangeEntry( const OLineDescriptor& rData ) { OBrowserPage* pPage = getPage( rData.sName ); @@ -419,7 +419,7 @@ namespace pcr pPage->getListBox().ChangeEntry( rData, EDITOR_LIST_REPLACE_EXISTING ); } - //------------------------------------------------------------------ + void OPropertyEditor::SetPropertyValue( const OUString& rEntryName, const Any& _rValue, bool _bUnknownValue ) { OBrowserPage* pPage = getPage( rEntryName ); @@ -427,7 +427,7 @@ namespace pcr pPage->getListBox().SetPropertyValue( rEntryName, _rValue, _bUnknownValue ); } - //------------------------------------------------------------------ + sal_uInt16 OPropertyEditor::GetPropertyPos( const OUString& rEntryName ) const { sal_uInt16 nVal=LISTBOX_ENTRY_NOTFOUND; @@ -437,7 +437,7 @@ namespace pcr return nVal; } - //------------------------------------------------------------------ + void OPropertyEditor::ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow ) { if ( !_bShow ) @@ -464,7 +464,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OPropertyEditor::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) @@ -475,7 +475,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void OPropertyEditor::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ) { for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i ) @@ -486,7 +486,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const OUString& rEntryName) { Reference< XPropertyControl > xControl; @@ -497,7 +497,7 @@ namespace pcr return xControl; } - //------------------------------------------------------------------ + IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate) { if (m_aPageActivationHandler.IsSet()) @@ -505,7 +505,7 @@ namespace pcr return 0L; } - //------------------------------------------------------------------ + IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate) { // commit the data on the current (to-be-decativated) tab page diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx index 163634fe57d9..2e08ea928ada 100644 --- a/extensions/source/propctrlr/propeventtranslation.cxx +++ b/extensions/source/propctrlr/propeventtranslation.cxx @@ -39,7 +39,7 @@ namespace pcr //==================================================================== //= PropertyEventTranslation //==================================================================== - //-------------------------------------------------------------------- + PropertyEventTranslation::PropertyEventTranslation( const Reference< XPropertyChangeListener >& _rxDelegator, const Reference< XInterface >& _rxTranslatedEventSource ) :m_xDelegator( _rxDelegator ) @@ -49,7 +49,7 @@ namespace pcr throw NullPointerException(); } - //-------------------------------------------------------------------- + void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { if ( !m_xDelegator.is() ) @@ -65,7 +65,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source ) throw (RuntimeException) { if ( !m_xDelegator.is() ) diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 8d65391b9cc9..0278b036481c 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -35,7 +35,7 @@ namespace pcr using namespace ::com::sun::star::beans; using namespace ::com::sun::star::form; - //------------------------------------------------------------------------ + namespace { static const sal_Int32 s_nFirstVirtualButtonType = 1 + (sal_Int32)FormButtonType_URL; @@ -79,7 +79,7 @@ namespace pcr //======================================================================== //= PushButtonNavigation //======================================================================== - //------------------------------------------------------------------------ + PushButtonNavigation::PushButtonNavigation( const Reference< XPropertySet >& _rxControlModel ) :m_xControlModel( _rxControlModel ) ,m_bIsPushButton( sal_False ) @@ -96,7 +96,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + sal_Int32 PushButtonNavigation::implGetCurrentButtonType() const SAL_THROW((Exception)) { sal_Int32 nButtonType = FormButtonType_PUSH; @@ -119,7 +119,7 @@ namespace pcr return nButtonType; } - //------------------------------------------------------------------------ + Any PushButtonNavigation::getCurrentButtonType() const SAL_THROW(()) { OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::getCurrentButtonType: not expected to be called for forms!" ); @@ -136,7 +136,7 @@ namespace pcr return aReturn; } - //------------------------------------------------------------------------ + void PushButtonNavigation::setCurrentButtonType( const Any& _rValue ) const SAL_THROW(()) { OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::setCurrentButtonType: not expected to be called for forms!" ); @@ -167,7 +167,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + PropertyState PushButtonNavigation::getCurrentButtonTypeState( ) const SAL_THROW(()) { OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::getCurrentButtonTypeState: not expected to be called for forms!" ); @@ -201,7 +201,7 @@ namespace pcr return eState; } - //------------------------------------------------------------------------ + Any PushButtonNavigation::getCurrentTargetURL() const SAL_THROW(()) { Any aReturn; @@ -231,7 +231,7 @@ namespace pcr return aReturn; } - //------------------------------------------------------------------------ + void PushButtonNavigation::setCurrentTargetURL( const Any& _rValue ) const SAL_THROW(()) { if ( !m_xControlModel.is() ) @@ -247,7 +247,7 @@ namespace pcr } } - //------------------------------------------------------------------------ + PropertyState PushButtonNavigation::getCurrentTargetURLState( ) const SAL_THROW(()) { PropertyState eState = PropertyState_DIRECT_VALUE; @@ -268,7 +268,7 @@ namespace pcr return eState; } - //------------------------------------------------------------------------ + bool PushButtonNavigation::currentButtonTypeIsOpenURL() const { sal_Int32 nButtonType( FormButtonType_PUSH ); @@ -283,7 +283,7 @@ namespace pcr return nButtonType == FormButtonType_URL; } - //------------------------------------------------------------------------ + bool PushButtonNavigation::hasNonEmptyCurrentTargetURL() const { OUString sTargetURL; diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 154c34e998a2..d85e626a99fd 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -47,7 +47,7 @@ namespace pcr // OSelectLabelDialog //======================================================================== DBG_NAME(OSelectLabelDialog) - //------------------------------------------------------------------------ + OSelectLabelDialog::OSelectLabelDialog( Window* pParent, Reference< XPropertySet > _xControlModel ) :ModalDialog(pParent, PcrRes(RID_DLG_SELECTLABELCONTROL)) ,m_aMainDesc(this, PcrRes(1)) @@ -150,7 +150,7 @@ namespace pcr FreeResource(); } - //------------------------------------------------------------------------ + OSelectLabelDialog::~OSelectLabelDialog() { // delete the entry datas of the listbox entries @@ -166,7 +166,7 @@ namespace pcr DBG_DTOR(OSelectLabelDialog,NULL); } - //------------------------------------------------------------------------ + sal_Int32 OSelectLabelDialog::InsertEntries(const Reference< XInterface > & _xContainer, SvTreeListEntry* pContainerEntry) { Reference< XIndexAccess > xContainer(_xContainer, UNO_QUERY); @@ -241,7 +241,7 @@ namespace pcr return nChildren; } - //------------------------------------------------------------------------ + IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB) { DBG_ASSERT(pLB == &m_aControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?"); @@ -259,7 +259,7 @@ namespace pcr return 0L; } - //------------------------------------------------------------------------ + IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton) { DBG_ASSERT(pButton == &m_aNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?"); diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 4672ac6ff147..f286d9bf2275 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -89,7 +89,7 @@ namespace pcr //==================================================================== //= ISQLCommandAdapter //==================================================================== - //-------------------------------------------------------------------- + ISQLCommandAdapter::~ISQLCommandAdapter() { } @@ -97,7 +97,7 @@ namespace pcr //==================================================================== //= SQLCommandDesigner //==================================================================== - //-------------------------------------------------------------------- + SQLCommandDesigner::SQLCommandDesigner( const Reference< XComponentContext >& _rxContext, const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter, const ::dbtools::SharedConnection& _rConnection, const Link& _rCloseLink ) @@ -114,12 +114,12 @@ namespace pcr impl_doOpenDesignerFrame_nothrow(); } - //-------------------------------------------------------------------- + SQLCommandDesigner::~SQLCommandDesigner() { } - //-------------------------------------------------------------------- + void SAL_CALL SQLCommandDesigner::propertyChange( const PropertyChangeEvent& Event ) throw (RuntimeException) { OSL_ENSURE( m_xDesigner.is() && ( Event.Source == m_xDesigner ), "SQLCommandDesigner::propertyChange: where did this come from?" ); @@ -150,7 +150,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source ) throw (RuntimeException) { if ( m_xDesigner.is() && ( Source.Source == m_xDesigner ) ) @@ -160,7 +160,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SQLCommandDesigner::dispose() { if ( impl_isDisposed() ) @@ -174,28 +174,28 @@ namespace pcr m_xORB.clear(); } - //-------------------------------------------------------------------- + void SQLCommandDesigner::impl_checkDisposed_throw() const { if ( impl_isDisposed() ) throw DisposedException(); } - //-------------------------------------------------------------------- + void SQLCommandDesigner::raise() const { impl_checkDisposed_throw(); impl_raise_nothrow(); } - //------------------------------------------------------------------------ + bool SQLCommandDesigner::suspend() const { impl_checkDisposed_throw(); return impl_trySuspendDesigner_nothrow(); } - //-------------------------------------------------------------------- + void SQLCommandDesigner::impl_raise_nothrow() const { OSL_PRECOND( isActive(), "SQLCommandDesigner::impl_raise_nothrow: not active!" ); @@ -218,7 +218,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void SQLCommandDesigner::impl_doOpenDesignerFrame_nothrow() { OSL_PRECOND( !isActive(), @@ -284,7 +284,7 @@ namespace pcr osl_atomic_decrement(&m_refCount); } - //------------------------------------------------------------------------ + Reference< XFrame > SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow( ) const { OSL_PRECOND( m_xORB.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: this will crash!" ); @@ -306,14 +306,14 @@ namespace pcr return xFrame; } - //------------------------------------------------------------------------ + void SQLCommandDesigner::impl_designerClosed_nothrow() { if ( m_aCloseLink.IsSet() ) m_aCloseLink.Call( this ); } - //------------------------------------------------------------------------ + void SQLCommandDesigner::impl_closeDesigner_nothrow() { OSL_PRECOND( isActive(), "SQLCommandDesigner::impl_closeDesigner_nothrow: invalid calle!" ); @@ -355,7 +355,7 @@ namespace pcr m_xDesigner.clear(); } - //------------------------------------------------------------------------ + bool SQLCommandDesigner::impl_trySuspendDesigner_nothrow() const { OSL_PRECOND( isActive(), "SQLCommandDesigner::impl_trySuspendDesigner_nothrow: no active designer, this will crash!" ); diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index d5e4e5371cd1..54f3ccd7381b 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -67,7 +67,7 @@ namespace pcr //================================================================== //= OTimeControl //================================================================== - //------------------------------------------------------------------ + OTimeControl::OTimeControl( Window* pParent, WinBits nWinStyle ) :OTimeControl_Base( PropertyControlType::TimeField, pParent, nWinStyle ) { @@ -76,7 +76,7 @@ namespace pcr getTypedControlWindow()->EnableEmptyFieldValue( true ); } - //------------------------------------------------------------------ + void SAL_CALL OTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { util::Time aUNOTime; @@ -92,7 +92,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Any SAL_CALL OTimeControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -103,7 +103,7 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OTimeControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< util::Time* >( NULL ) ); @@ -112,7 +112,7 @@ namespace pcr //================================================================== //= ODateControl //================================================================== - //------------------------------------------------------------------ + ODateControl::ODateControl( Window* pParent, WinBits nWinStyle ) :ODateControl_Base( PropertyControlType::DateField, pParent, nWinStyle | WB_DROPDOWN ) { @@ -128,7 +128,7 @@ namespace pcr pControlWindow->EnableEmptyFieldValue( true ); } - //------------------------------------------------------------------ + void SAL_CALL ODateControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { util::Date aUNODate; @@ -144,7 +144,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Any SAL_CALL ODateControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -157,7 +157,7 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL ODateControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< util::Date* >( NULL ) ); @@ -166,7 +166,7 @@ namespace pcr //================================================================== //= OEditControl //================================================================== - //------------------------------------------------------------------ + OEditControl::OEditControl(Window* _pParent, sal_Bool _bPW, WinBits _nWinStyle) :OEditControl_Base( _bPW ? PropertyControlType::CharacterField : PropertyControlType::TextField, _pParent, _nWinStyle ) { @@ -176,7 +176,7 @@ namespace pcr getTypedControlWindow()->SetMaxTextLen( 1 ); } - //------------------------------------------------------------------ + void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { OUString sText; @@ -195,7 +195,7 @@ namespace pcr getTypedControlWindow()->SetText( sText ); } - //------------------------------------------------------------------ + Any SAL_CALL OEditControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -212,13 +212,13 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OEditControl::getValueType() throw (RuntimeException) { return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< OUString* >( NULL ) ); } - //------------------------------------------------------------------ + void OEditControl::modified() { OEditControl_Base::modified(); @@ -228,7 +228,7 @@ namespace pcr m_aImplControl.notifyModifiedValue(); } - //------------------------------------------------------------------ + static long ImplCalcLongValue( double nValue, sal_uInt16 nDigits ) { double n = nValue; @@ -240,7 +240,7 @@ namespace pcr return (long)n; } - //------------------------------------------------------------------ + static double ImplCalcDoubleValue( long nValue, sal_uInt16 nDigits ) { double n = nValue; @@ -252,7 +252,7 @@ namespace pcr //================================================================== // class ODateTimeControl //================================================================== - //------------------------------------------------------------------ + ODateTimeControl::ODateTimeControl( Window* _pParent, WinBits _nWinStyle) :ODateTimeControl_Base( PropertyControlType::DateTimeField, _pParent, _nWinStyle ) { @@ -268,7 +268,7 @@ namespace pcr getTypedControlWindow()->SetFormatKey( nStandardDateTimeFormat ); } - //------------------------------------------------------------------ + void SAL_CALL ODateTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { if ( !_rValue.hasValue() ) @@ -288,7 +288,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Any SAL_CALL ODateTimeControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -316,7 +316,7 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL ODateTimeControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< util::DateTime* >( NULL ) ); @@ -325,7 +325,7 @@ namespace pcr //======================================================================== //= HyperlinkInput //======================================================================== - //-------------------------------------------------------------------- + HyperlinkInput::HyperlinkInput( Window* _pParent, WinBits _nWinStyle ) :Edit( _pParent, _nWinStyle ) { @@ -346,7 +346,7 @@ namespace pcr SetSettings( aAllSettings ); } - //-------------------------------------------------------------------- + void HyperlinkInput::MouseMove( const ::MouseEvent& rMEvt ) { Edit::MouseMove( rMEvt ); @@ -362,7 +362,7 @@ namespace pcr SetPointer( Pointer( ePointerStyle ) ); } - //-------------------------------------------------------------------- + void HyperlinkInput::MouseButtonDown( const ::MouseEvent& rMEvt ) { Edit::MouseButtonDown( rMEvt ); @@ -373,7 +373,7 @@ namespace pcr m_aMouseButtonDownPos.X() = m_aMouseButtonDownPos.Y() = -1; } - //-------------------------------------------------------------------- + void HyperlinkInput::MouseButtonUp( const ::MouseEvent& rMEvt ) { Edit::MouseButtonUp( rMEvt ); @@ -381,14 +381,14 @@ namespace pcr impl_checkEndClick( rMEvt ); } - //-------------------------------------------------------------------- + bool HyperlinkInput::impl_textHitTest( const ::Point& _rWindowPos ) { sal_Int32 nPos = GetCharPos( _rWindowPos ); return ( ( nPos != EDIT_NOLIMIT ) && ( nPos < GetText().getLength() ) ); } - //-------------------------------------------------------------------- + void HyperlinkInput::impl_checkEndClick( const ::MouseEvent rMEvt ) { const MouseSettings& rMouseSettings( GetSettings().GetMouseSettings() ); @@ -398,7 +398,7 @@ namespace pcr Application::PostUserEvent( m_aClickHandler ); } - //-------------------------------------------------------------------- + void HyperlinkInput::Tracking( const TrackingEvent& rTEvt ) { Edit::Tracking( rTEvt ); @@ -410,7 +410,7 @@ namespace pcr //======================================================================== //= OHyperlinkControl //======================================================================== - //-------------------------------------------------------------------- + OHyperlinkControl::OHyperlinkControl( Window* _pParent, WinBits _nWinStyle ) :OHyperlinkControl_Base( PropertyControlType::HyperlinkField, _pParent, _nWinStyle ) ,m_aActionListeners( m_aMutex ) @@ -418,14 +418,14 @@ namespace pcr getTypedControlWindow()->SetClickHdl( LINK( this, OHyperlinkControl, OnHyperlinkClicked ) ); } - //-------------------------------------------------------------------- + Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException) { OUString sText = getTypedControlWindow()->GetText(); return makeAny( sText ); } - //-------------------------------------------------------------------- + void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException) { OUString sText; @@ -433,26 +433,26 @@ namespace pcr getTypedControlWindow()->SetText( sText ); } - //-------------------------------------------------------------------- + Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< OUString* >( NULL ) ); } - //-------------------------------------------------------------------- + void SAL_CALL OHyperlinkControl::addActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException) { if ( listener.is() ) m_aActionListeners.addInterface( listener ); } - //-------------------------------------------------------------------- + void SAL_CALL OHyperlinkControl::removeActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException) { m_aActionListeners.removeInterface( listener ); } - //------------------------------------------------------------------ + void SAL_CALL OHyperlinkControl::disposing() { OHyperlinkControl_Base::disposing(); @@ -461,7 +461,7 @@ namespace pcr m_aActionListeners.disposeAndClear( aEvent ); } - //------------------------------------------------------------------ + IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ ) { ActionEvent aEvent( *this, OUString( "clicked" ) ); @@ -476,7 +476,7 @@ namespace pcr //================================================================== //= ONumericControl //================================================================== - //------------------------------------------------------------------ + ONumericControl::ONumericControl( Window* _pParent, WinBits _nWinStyle ) :ONumericControl_Base( PropertyControlType::NumericField, _pParent, _nWinStyle ) ,m_eValueUnit( FUNIT_NONE ) @@ -491,19 +491,19 @@ namespace pcr setMinValue( value ); } - //-------------------------------------------------------------------- + ::sal_Int16 SAL_CALL ONumericControl::getDecimalDigits() throw (RuntimeException) { return getTypedControlWindow()->GetDecimalDigits(); } - //-------------------------------------------------------------------- + void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (RuntimeException) { getTypedControlWindow()->SetDecimalDigits( _decimaldigits ); } - //-------------------------------------------------------------------- + Optional< double > SAL_CALL ONumericControl::getMinValue() throw (RuntimeException) { Optional< double > aReturn( sal_True, 0 ); @@ -517,7 +517,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue ) throw (RuntimeException) { if ( !_minvalue.IsPresent ) @@ -526,7 +526,7 @@ namespace pcr getTypedControlWindow()->SetMin( impl_apiValueToFieldValue_nothrow( _minvalue.Value ) , m_eValueUnit); } - //-------------------------------------------------------------------- + Optional< double > SAL_CALL ONumericControl::getMaxValue() throw (RuntimeException) { Optional< double > aReturn( sal_True, 0 ); @@ -540,7 +540,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue ) throw (RuntimeException) { if ( !_maxvalue.IsPresent ) @@ -549,13 +549,13 @@ namespace pcr getTypedControlWindow()->SetMax( impl_apiValueToFieldValue_nothrow( _maxvalue.Value ), m_eValueUnit ); } - //-------------------------------------------------------------------- + ::sal_Int16 SAL_CALL ONumericControl::getDisplayUnit() throw (RuntimeException) { return VCLUnoHelper::ConvertToMeasurementUnit( getTypedControlWindow()->GetUnit(), 1 ); } - //-------------------------------------------------------------------- + void SAL_CALL ONumericControl::setDisplayUnit( ::sal_Int16 _displayunit ) throw (IllegalArgumentException, RuntimeException) { if ( ( _displayunit < MeasureUnit::MM_100TH ) || ( _displayunit > MeasureUnit::PERCENT ) ) @@ -578,13 +578,13 @@ namespace pcr getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit ); } - //-------------------------------------------------------------------- + ::sal_Int16 SAL_CALL ONumericControl::getValueUnit() throw (RuntimeException) { return VCLUnoHelper::ConvertToMeasurementUnit( m_eValueUnit, m_nFieldToUNOValueFactor ); } - //-------------------------------------------------------------------- + void SAL_CALL ONumericControl::setValueUnit( ::sal_Int16 _valueunit ) throw (RuntimeException) { if ( ( _valueunit < MeasureUnit::MM_100TH ) || ( _valueunit > MeasureUnit::PERCENT ) ) @@ -592,7 +592,7 @@ namespace pcr m_eValueUnit = VCLUnoHelper::ConvertToFieldUnit( _valueunit, m_nFieldToUNOValueFactor ); } - //-------------------------------------------------------------------- + void SAL_CALL ONumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { if ( !_rValue.hasValue() ) @@ -609,7 +609,7 @@ namespace pcr } } - //------------------------------------------------------------------ + long ONumericControl::impl_apiValueToFieldValue_nothrow( double _nApiValue ) const { long nControlValue = ImplCalcLongValue( _nApiValue, getTypedControlWindow()->GetDecimalDigits() ); @@ -617,7 +617,7 @@ namespace pcr return nControlValue; } - //------------------------------------------------------------------ + double ONumericControl::impl_fieldValueToApiValue_nothrow( sal_Int64 _nFieldValue ) const { double nApiValue = ImplCalcDoubleValue( (long)_nFieldValue, getTypedControlWindow()->GetDecimalDigits() ); @@ -625,7 +625,7 @@ namespace pcr return nApiValue; } - //------------------------------------------------------------------ + Any SAL_CALL ONumericControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -637,7 +637,7 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL ONumericControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< double* >( NULL ) ); @@ -647,7 +647,7 @@ namespace pcr //= OColorControl //================================================================== #define LB_DEFAULT_COUNT 20 - //------------------------------------------------------------------ + OUString MakeHexStr(sal_uInt32 nVal, sal_Int32 nLength) { OUStringBuffer aStr; @@ -663,7 +663,7 @@ namespace pcr return aStr.makeStringAndClear(); } - //------------------------------------------------------------------ + OColorControl::OColorControl(Window* pParent, WinBits nWinStyle) :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle ) { @@ -700,7 +700,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void SAL_CALL OColorControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { if ( _rValue.hasValue() ) @@ -733,7 +733,7 @@ namespace pcr getTypedControlWindow()->SetNoSelection(); } - //------------------------------------------------------------------ + Any SAL_CALL OColorControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -751,32 +751,32 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OColorControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< sal_Int32* >( NULL ) ); } - //------------------------------------------------------------------ + void SAL_CALL OColorControl::clearList() throw (RuntimeException) { getTypedControlWindow()->Clear(); } - //------------------------------------------------------------------ + void SAL_CALL OColorControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); m_aNonColorEntries.insert( NewEntry ); } - //------------------------------------------------------------------ + void SAL_CALL OColorControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); m_aNonColorEntries.insert( NewEntry ); } - //------------------------------------------------------------------ + Sequence< OUString > SAL_CALL OColorControl::getListEntries( ) throw (RuntimeException) { if ( !m_aNonColorEntries.empty() ) @@ -784,7 +784,7 @@ namespace pcr return Sequence< OUString >(); } - //------------------------------------------------------------------ + void OColorControl::modified() { OColorControl_Base::modified(); @@ -797,7 +797,7 @@ namespace pcr //================================================================== //= OListboxControl //================================================================== - //------------------------------------------------------------------ + OListboxControl::OListboxControl( Window* pParent, WinBits nWinStyle) :OListboxControl_Base( PropertyControlType::ListBox, pParent, nWinStyle ) { @@ -809,7 +809,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Any SAL_CALL OListboxControl::getValue() throw (RuntimeException) { OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); @@ -820,13 +820,13 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< OUString* >( NULL ) ); } - //------------------------------------------------------------------ + void SAL_CALL OListboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { if ( !_rValue.hasValue() ) @@ -847,24 +847,24 @@ namespace pcr } } - //------------------------------------------------------------------ + void SAL_CALL OListboxControl::clearList() throw (RuntimeException) { getTypedControlWindow()->Clear(); } - //------------------------------------------------------------------ + void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } - //------------------------------------------------------------------ + void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } - //------------------------------------------------------------------ + Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); @@ -876,7 +876,7 @@ namespace pcr return aRet; } - //------------------------------------------------------------------ + void OListboxControl::modified() { OListboxControl_Base::modified(); @@ -889,7 +889,7 @@ namespace pcr //================================================================== //= OComboboxControl //================================================================== - //------------------------------------------------------------------ + OComboboxControl::OComboboxControl( Window* pParent, WinBits nWinStyle) :OComboboxControl_Base( PropertyControlType::ComboBox, pParent, nWinStyle ) { @@ -897,7 +897,7 @@ namespace pcr getTypedControlWindow()->SetSelectHdl( LINK( this, OComboboxControl, OnEntrySelected ) ); } - //------------------------------------------------------------------ + void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { OUString sText; @@ -905,36 +905,36 @@ namespace pcr getTypedControlWindow()->SetText( sText ); } - //------------------------------------------------------------------ + Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException) { return makeAny( OUString( getTypedControlWindow()->GetText() ) ); } - //------------------------------------------------------------------ + Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< OUString* >( NULL ) ); } - //------------------------------------------------------------------ + void SAL_CALL OComboboxControl::clearList() throw (RuntimeException) { getTypedControlWindow()->Clear(); } - //------------------------------------------------------------------ + void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } - //------------------------------------------------------------------ + void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException) { getTypedControlWindow()->InsertEntry( NewEntry ); } - //------------------------------------------------------------------ + Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException) { const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount(); @@ -946,7 +946,7 @@ namespace pcr return aRet; } - //------------------------------------------------------------------ + IMPL_LINK( OComboboxControl, OnEntrySelected, void*, /*_pNothing*/ ) { if ( !getTypedControlWindow()->IsTravelSelect() ) @@ -974,7 +974,7 @@ namespace pcr virtual bool PreNotify(NotifyEvent& _rNEvt); }; - //------------------------------------------------------------------ + OMultilineFloatingEdit::OMultilineFloatingEdit(Window* _pParent) :FloatingWindow(_pParent, WB_BORDER) ,m_aImplEdit(this, WB_VSCROLL|WB_IGNORETAB|WB_NOBORDER) @@ -982,13 +982,13 @@ namespace pcr m_aImplEdit.Show(); } - //------------------------------------------------------------------ + void OMultilineFloatingEdit::Resize() { m_aImplEdit.SetSizePixel(GetOutputSizePixel()); } - //------------------------------------------------------------------ + bool OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt) { bool nResult = true; @@ -1021,7 +1021,7 @@ namespace pcr //================================================================== //= DropDownEditControl_Base //================================================================== - //------------------------------------------------------------------ + DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle ) :DropDownEditControl_Base( _pParent, _nStyle ) ,m_pFloatingEdit( NULL ) @@ -1050,7 +1050,7 @@ namespace pcr m_pFloatingEdit->getEdit()->SetReadOnly( ( _nStyle & WB_READONLY ) != 0 ); } - //------------------------------------------------------------------ + void DropDownEditControl::setControlHelper( ControlHelper& _rControlHelper ) { DropDownEditControl_Base::setControlHelper( _rControlHelper ); @@ -1060,7 +1060,7 @@ namespace pcr m_pImplEdit->SetLoseFocusHdl( LINK( &_rControlHelper, ControlHelper, LoseFocusHdl ) ); } - //------------------------------------------------------------------ + DropDownEditControl::~DropDownEditControl() { { @@ -1078,7 +1078,7 @@ namespace pcr } } - //------------------------------------------------------------------ + void DropDownEditControl::Resize() { ::Size aOutSz = GetOutputSizePixel(); @@ -1094,7 +1094,7 @@ namespace pcr m_pImplEdit->setPosSizePixel( 0, 1, aOutSz.Width(), aOutSz.Height()-2 ); } - //------------------------------------------------------------------ + bool DropDownEditControl::PreNotify( NotifyEvent& rNEvt ) { bool nResult = true; @@ -1152,7 +1152,7 @@ namespace pcr return nResult; } - //------------------------------------------------------------------ + namespace { //.............................................................. @@ -1199,7 +1199,7 @@ namespace pcr } } - //------------------------------------------------------------------ + #define STD_HEIGHT 100 sal_Bool DropDownEditControl::ShowDropDown( sal_Bool bShow ) { @@ -1241,7 +1241,7 @@ namespace pcr } - //------------------------------------------------------------------ + long DropDownEditControl::FindPos(long nSinglePos) { long nPos=0; @@ -1298,7 +1298,7 @@ namespace pcr return nPos; } - //------------------------------------------------------------------ + IMPL_LINK( DropDownEditControl, ReturnHdl, OMultilineFloatingEdit*, /*pMEd*/) { @@ -1315,27 +1315,27 @@ namespace pcr return 0; } - //------------------------------------------------------------------ + IMPL_LINK( DropDownEditControl, DropDownHdl, PushButton*, /*pPb*/ ) { ShowDropDown(!m_bDropdown); return 0; } - //------------------------------------------------------------------ + void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ) { SetText( lcl_convertListToDisplayText( _rStrings ) ); m_pFloatingEdit->getEdit()->SetText( lcl_convertListToMultiLine( _rStrings ) ); } - //------------------------------------------------------------------ + StlSyntaxSequence< OUString > DropDownEditControl::GetStringListValue() const { return lcl_convertMultiLineToList( m_pFloatingEdit->getEdit()->GetText() ); } - //------------------------------------------------------------------ + void DropDownEditControl::SetTextValue( const OUString& _rText ) { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::SetTextValue: illegal call!" ); @@ -1344,7 +1344,7 @@ namespace pcr SetText( _rText ); } - //------------------------------------------------------------------ + OUString DropDownEditControl::GetTextValue() const { OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::GetTextValue: illegal call!" ); @@ -1354,7 +1354,7 @@ namespace pcr //================================================================== //= OMultilineEditControl //================================================================== - //------------------------------------------------------------------ + OMultilineEditControl::OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ) :OMultilineEditControl_Base( _eMode == eMultiLineText ? PropertyControlType::MultiLineTextField : PropertyControlType::StringListField , pParent @@ -1364,7 +1364,7 @@ namespace pcr getTypedControlWindow()->setOperationMode( _eMode ); } - //------------------------------------------------------------------ + void SAL_CALL OMultilineEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { impl_checkDisposed_throw(); @@ -1390,7 +1390,7 @@ namespace pcr } } - //------------------------------------------------------------------ + Any SAL_CALL OMultilineEditControl::getValue() throw (RuntimeException) { impl_checkDisposed_throw(); @@ -1408,7 +1408,7 @@ namespace pcr return aValue; } - //------------------------------------------------------------------ + Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException) { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index cfba15f94d37..d2a63c706af7 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -271,7 +271,7 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & } } } -//------------------------------------------------------------------------ + OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) { OUString sReturn; @@ -307,7 +307,7 @@ OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue ) return sReturn; } -//-------------------------------------------------------------------- + namespace { struct ConvertIntegerFromAndToString @@ -365,7 +365,7 @@ namespace } } -//-------------------------------------------------------------------- + bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, OUString& _rStringRep ) { bool bCanConvert = true; @@ -473,7 +473,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, return bCanConvert; } -//------------------------------------------------------------------------ + uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType ) { uno::Any aReturn; @@ -504,7 +504,7 @@ uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,co } return aReturn; } -//-------------------------------------------------------------------- + bool StringRepresentation::convertStringToGenericValue( const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType ) { bool bCanConvert = true; @@ -612,10 +612,10 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString return bCanConvert; } -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ + + } // pcr -//------------------------------------------------------------------------ + // component helper namespace @@ -643,7 +643,7 @@ uno::Reference< uno::XInterface > SAL_CALL _create( } // closing component helper namespace -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_StringRepresentation() { ::pcr::PcrModule::getInstance().registerImplementation( diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index bdb8a10612ac..e7637ab58233 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -30,7 +30,7 @@ #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_SubmissionPropertyHandler() { ::pcr::SubmissionPropertyHandler::registerImplementation(); @@ -55,7 +55,7 @@ namespace pcr //==================================================================== //= SubmissionHelper //==================================================================== - //-------------------------------------------------------------------- + SubmissionHelper::SubmissionHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxIntrospectee, const Reference< frame::XModel >& _rxContextDocument ) :EFormsHelper( _rMutex, _rxIntrospectee, _rxContextDocument ) { @@ -63,7 +63,7 @@ namespace pcr "SubmissionHelper::SubmissionHelper: you should not have instantiated me!" ); } - //-------------------------------------------------------------------- + bool SubmissionHelper::canTriggerSubmissions( const Reference< XPropertySet >& _rxControlModel, const Reference< frame::XModel >& _rxContextDocument ) SAL_THROW(()) { @@ -87,7 +87,7 @@ namespace pcr //= SubmissionPropertyHandler //==================================================================== DBG_NAME( SubmissionPropertyHandler ) - //-------------------------------------------------------------------- + SubmissionPropertyHandler::SubmissionPropertyHandler( const Reference< XComponentContext >& _rxContext ) :EditPropertyHandler_Base( _rxContext ) ,OPropertyChangeListener( m_aMutex ) @@ -96,20 +96,20 @@ namespace pcr DBG_CTOR( SubmissionPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + SubmissionPropertyHandler::~SubmissionPropertyHandler( ) { disposeAdapter(); DBG_DTOR( SubmissionPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -117,7 +117,7 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -166,7 +166,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -209,7 +209,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -221,7 +221,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -235,7 +235,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SubmissionPropertyHandler::onNewComponent() { if ( m_pPropChangeMultiplexer ) @@ -262,7 +262,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Sequence< Property > SAL_CALL SubmissionPropertyHandler::doDescribeSupportedProperties() const { ::std::vector< Property > aProperties; @@ -276,7 +276,7 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) @@ -317,7 +317,7 @@ namespace pcr return aDescriptor; } - //-------------------------------------------------------------------- + void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -343,7 +343,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -382,7 +382,7 @@ namespace pcr return aPropertyValue; } - //-------------------------------------------------------------------- + Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -423,7 +423,7 @@ namespace pcr return aControlValue; } - //-------------------------------------------------------------------- + void SubmissionPropertyHandler::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw(RuntimeException) { if ( _rEvent.PropertyName == PROPERTY_BUTTONTYPE ) diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 285aedc75617..73f2be452a89 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -71,7 +71,7 @@ namespace pcr //= TabOrderDialog //======================================================================== DBG_NAME(TabOrderDialog) - //------------------------------------------------------------------------ + TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB ) :ModalDialog( _pParent, "TabOrderDialog", "modules/spropctrlr/ui/taborder.ui") @@ -111,13 +111,13 @@ namespace pcr } - //------------------------------------------------------------------------ + void TabOrderDialog::SetModified() { m_pPB_OK->Enable(); } - //------------------------------------------------------------------------ + TabOrderDialog::~TabOrderDialog() { m_pLB_Controls->Hide(); @@ -127,7 +127,7 @@ namespace pcr DBG_DTOR(TabOrderDialog,NULL); } - //------------------------------------------------------------------------ + Image TabOrderDialog::GetImage( const Reference< XPropertySet >& _rxSet ) const { sal_uInt16 nImageId = RID_SVXIMG_CONTROL; @@ -165,7 +165,7 @@ namespace pcr return pImageList->GetImage( nImageId ); } - //------------------------------------------------------------------------ + void TabOrderDialog::FillList() { DBG_ASSERT( m_xTempModel.is() && m_xControlContainer.is(), "TabOrderDialog::FillList: invalid call!" ); @@ -219,21 +219,21 @@ namespace pcr m_pLB_Controls->Select( pFirstEntry ); } - //------------------------------------------------------------------------ + IMPL_LINK( TabOrderDialog, MoveUpClickHdl, Button*, /*pButton*/ ) { m_pLB_Controls->MoveSelection( -1 ); return 0; } - //------------------------------------------------------------------------ + IMPL_LINK( TabOrderDialog, MoveDownClickHdl, Button*, /*pButton*/ ) { m_pLB_Controls->MoveSelection( 1 ); return 0; } - //------------------------------------------------------------------------ + IMPL_LINK( TabOrderDialog, AutoOrderClickHdl, Button*, /*pButton*/ ) { try @@ -257,7 +257,7 @@ namespace pcr return 0; } - //------------------------------------------------------------------------ + IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ ) { sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount(); @@ -292,7 +292,7 @@ namespace pcr //= TabOrderListBox //======================================================================== DBG_NAME(TabOrderListBox); - //------------------------------------------------------------------------ + TabOrderListBox::TabOrderListBox( Window* pParent, WinBits nBits ) :SvTreeListBox( pParent, nBits ) { @@ -313,13 +313,13 @@ namespace pcr return new TabOrderListBox(pParent, nWinStyle); } - //------------------------------------------------------------------------ + TabOrderListBox::~TabOrderListBox() { DBG_DTOR(TabOrderListBox,NULL); } - //------------------------------------------------------------------------ + void TabOrderListBox::ModelHasMoved( SvTreeListEntry* _pSource ) { SvTreeListBox::ModelHasMoved( _pSource ); @@ -327,7 +327,7 @@ namespace pcr ((TabOrderDialog*)GetParentDialog())->SetModified(); } - //------------------------------------------------------------------------ + void TabOrderListBox::MoveSelection( long nRelPos ) { OUString aSelEntryPrevText, aSelEntryNextText; diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 833dd60df576..842294c3230f 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -44,7 +44,7 @@ namespace pcr //================================================================== // NumberFormatSampleField //================================================================== - //------------------------------------------------------------------ + bool NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt ) { // want to handle two keys myself : Del/Backspace should empty the window (setting my prop to "standard" this way) @@ -64,7 +64,7 @@ namespace pcr return BaseClass::PreNotify( rNEvt ); } - //------------------------------------------------------------------ + void NumberFormatSampleField::SetFormatSupplier( const SvNumberFormatsSupplierObj* pSupplier ) { if ( pSupplier ) @@ -86,13 +86,13 @@ namespace pcr //================================================================== // OFormatSampleControl //================================================================== - //------------------------------------------------------------------ + OFormatSampleControl::OFormatSampleControl( Window* pParent, WinBits nWinStyle ) :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) { } - //------------------------------------------------------------------ + void SAL_CALL OFormatSampleControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { sal_Int32 nFormatKey = 0; @@ -114,7 +114,7 @@ namespace pcr else getTypedControlWindow()->SetText( "" ); } - //------------------------------------------------------------------ + double OFormatSampleControl::getPreviewValue( const SvNumberformat& i_rEntry ) { double nValue = 1234.56789; @@ -140,7 +140,7 @@ namespace pcr return nValue; } - //------------------------------------------------------------------ + double OFormatSampleControl::getPreviewValue(SvNumberFormatter* _pNF,sal_Int32 _nFormatKey) { const SvNumberformat* pEntry = _pNF->GetEntry(_nFormatKey); @@ -150,7 +150,7 @@ namespace pcr nValue = getPreviewValue( *pEntry ); return nValue; } - //------------------------------------------------------------------ + Any SAL_CALL OFormatSampleControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -159,7 +159,7 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OFormatSampleControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< sal_Int32* >( NULL ) ); @@ -169,7 +169,7 @@ namespace pcr // class OFormattedNumericControl //================================================================== DBG_NAME(OFormattedNumericControl); - //------------------------------------------------------------------ + OFormattedNumericControl::OFormattedNumericControl( Window* pParent, WinBits nWinStyle ) :OFormattedNumericControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) { @@ -180,13 +180,13 @@ namespace pcr m_nLastDecimalDigits = getTypedControlWindow()->GetDecimalDigits(); } - //------------------------------------------------------------------ + OFormattedNumericControl::~OFormattedNumericControl() { DBG_DTOR(OFormattedNumericControl,NULL); } - //------------------------------------------------------------------ + void SAL_CALL OFormattedNumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { double nValue( 0 ); @@ -196,7 +196,7 @@ namespace pcr getTypedControlWindow()->SetText(""); } - //------------------------------------------------------------------ + Any SAL_CALL OFormattedNumericControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -205,13 +205,13 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OFormattedNumericControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< double* >( NULL ) ); } - //------------------------------------------------------------------ + void OFormattedNumericControl::SetFormatDescription(const FormatDescription& rDesc) { sal_Bool bFallback = sal_True; @@ -264,7 +264,7 @@ namespace pcr //======================================================================== //= OFileUrlControl //======================================================================== - //------------------------------------------------------------------ + OFileUrlControl::OFileUrlControl( Window* pParent, WinBits nWinStyle ) :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN ) { @@ -272,12 +272,12 @@ namespace pcr getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ; } - //------------------------------------------------------------------ + OFileUrlControl::~OFileUrlControl() { } - //------------------------------------------------------------------ + void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException) { OUString sURL; @@ -292,7 +292,7 @@ namespace pcr getTypedControlWindow()->SetText( "" ); } - //------------------------------------------------------------------ + Any SAL_CALL OFileUrlControl::getValue() throw (RuntimeException) { Any aPropValue; @@ -301,7 +301,7 @@ namespace pcr return aPropValue; } - //------------------------------------------------------------------ + Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException) { return ::getCppuType( static_cast< OUString* >( NULL ) ); @@ -310,7 +310,7 @@ namespace pcr //======================================================================== //= OTimeDurationControl //======================================================================== - //------------------------------------------------------------------ + OTimeDurationControl::OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ) :ONumericControl( pParent, nWinStyle ) { @@ -319,12 +319,12 @@ namespace pcr getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) ); } - //------------------------------------------------------------------ + OTimeDurationControl::~OTimeDurationControl() { } - //------------------------------------------------------------------ + ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() throw (::com::sun::star::uno::RuntimeException) { // don't use the base class'es method, it would claim we're a standard control, which @@ -332,7 +332,7 @@ namespace pcr return PropertyControlType::Unknown; } - //------------------------------------------------------------------ + IMPL_LINK( OTimeDurationControl, OnCustomConvert, MetricField*, /*pField*/ ) { long nMultiplier = 1; diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 76a1796a038b..30073ac652c2 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -37,7 +37,7 @@ namespace pcr //==================================================================== //= helper //==================================================================== - //-------------------------------------------------------------------- + template< typename INTERFACE, typename ARGUMENT > void setSave( INTERFACE* pObject, void ( SAL_CALL INTERFACE::*pSetter )( ARGUMENT ), ARGUMENT _rArg ) { @@ -51,7 +51,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + template< typename INTERFACE, typename ARGUMENT > ARGUMENT getSave( INTERFACE* pObject, ARGUMENT ( SAL_CALL INTERFACE::*pGetter )( ) ) { @@ -85,7 +85,7 @@ namespace pcr //==================================================================== //= XSDDataType //==================================================================== - //-------------------------------------------------------------------- + XSDDataType::XSDDataType( const Reference< XDataType >& _rxDataType ) :m_xDataType( _rxDataType ) ,m_refCount( 0 ) @@ -95,13 +95,13 @@ namespace pcr m_xFacetInfo = m_xDataType->getPropertySetInfo(); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL XSDDataType::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL XSDDataType::release() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) @@ -112,12 +112,12 @@ namespace pcr return m_refCount; } - //-------------------------------------------------------------------- + XSDDataType::~XSDDataType() { } - //-------------------------------------------------------------------- + sal_Int16 XSDDataType::classify() const SAL_THROW(()) { sal_Int16 nTypeClass = DataTypeClass::STRING; @@ -133,19 +133,19 @@ namespace pcr return nTypeClass; } - //-------------------------------------------------------------------- + bool XSDDataType::isBasicType() const SAL_THROW(()) { return getSave( m_xDataType.get(), &XDataType::getIsBasic ); } - //-------------------------------------------------------------------- + OUString XSDDataType::getName() const SAL_THROW(()) { return getSave( m_xDataType.get(), &XDataType::getName ); } - //-------------------------------------------------------------------- + void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue ) SAL_THROW(()) { try @@ -158,7 +158,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + bool XSDDataType::hasFacet( const OUString& _rFacetName ) const SAL_THROW(()) { bool bReturn = false; @@ -172,7 +172,7 @@ namespace pcr } return bReturn; } - //-------------------------------------------------------------------- + Any XSDDataType::getFacet( const OUString& _rFacetName ) SAL_THROW(()) { Any aReturn; @@ -187,7 +187,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + namespace { void lcl_copyProperties( const Reference< XPropertySet >& _rxSource, const Reference< XPropertySet >& _rxDest ) @@ -213,7 +213,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void XSDDataType::copyFacetsFrom( const ::rtl::Reference< XSDDataType >& _pSourceType ) { OSL_ENSURE( _pSourceType.is(), "XSDDataType::copyFacetsFrom: invalid source type!" ); diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index 4a6f1eada469..ceffc2127fb3 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -48,7 +48,7 @@ namespace pcr //==================================================================== //= XSDValidationHelper //==================================================================== - //-------------------------------------------------------------------- + XSDValidationHelper::XSDValidationHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxIntrospectee, const Reference< frame::XModel >& _rxContextDocument ) :EFormsHelper( _rMutex, _rxIntrospectee, _rxContextDocument ) ,m_bInspectingFormattedField( false ) @@ -73,7 +73,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { _rNames.resize( 0 ); @@ -94,7 +94,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository() const SAL_THROW((Exception)) { Reference< XDataTypeRepository > xRepository; @@ -106,7 +106,7 @@ namespace pcr return xRepository; } - //-------------------------------------------------------------------- + Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((Exception)) { Reference< XDataTypeRepository > xRepository; @@ -118,7 +118,7 @@ namespace pcr return xRepository; } - //-------------------------------------------------------------------- + Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const SAL_THROW((Exception)) { Reference< XDataType > xDataType; @@ -132,7 +132,7 @@ namespace pcr return xDataType; } - //-------------------------------------------------------------------- + OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(()) { OUString sDataTypeName; @@ -152,7 +152,7 @@ namespace pcr return sDataTypeName; } - //-------------------------------------------------------------------- + ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { ::rtl::Reference< XSDDataType > pReturn; @@ -175,13 +175,13 @@ namespace pcr return pReturn; } - //-------------------------------------------------------------------- + ::rtl::Reference< XSDDataType > XSDValidationHelper::getValidatingDataType( ) const SAL_THROW(()) { return getDataTypeByName( getValidatingDataTypeName() ); } - //-------------------------------------------------------------------- + bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(()) { OSL_ENSURE( _pDataType.is(), "XSDValidationHelper::removeDataTypeFromRepository: invalid data type!" ); @@ -209,7 +209,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(()) { try @@ -235,7 +235,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(()) { try @@ -273,7 +273,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void XSDValidationHelper::copyDataType( const OUString& _rFromModel, const OUString& _rToModel, const OUString& _rDataTypeName ) const SAL_THROW(()) { @@ -313,7 +313,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + void XSDValidationHelper::findDefaultFormatForIntrospectee() SAL_THROW(()) { try @@ -365,13 +365,13 @@ namespace pcr } } - //-------------------------------------------------------------------- + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(()) { return getBasicTypeNameForClass( _nClass, getDataTypeRepository() ); } - //-------------------------------------------------------------------- + OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(()) { OUString sReturn; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index edf7f6ee3e46..5dbbd362ed5f 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -46,7 +46,7 @@ #include <functional> #include <limits> -//------------------------------------------------------------------------ + extern "C" void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler() { ::pcr::XSDValidationPropertyHandler::registerImplementation(); @@ -72,26 +72,26 @@ namespace pcr //= XSDValidationPropertyHandler //==================================================================== DBG_NAME( XSDValidationPropertyHandler ) - //-------------------------------------------------------------------- + XSDValidationPropertyHandler::XSDValidationPropertyHandler( const Reference< XComponentContext >& _rxContext ) :XSDValidationPropertyHandler_Base( _rxContext ) { DBG_CTOR( XSDValidationPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + XSDValidationPropertyHandler::~XSDValidationPropertyHandler() { DBG_DTOR( XSDValidationPropertyHandler, NULL ); } - //-------------------------------------------------------------------- + OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) { return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aSupported( 1 ); @@ -99,7 +99,7 @@ namespace pcr return aSupported; } - //-------------------------------------------------------------------- + Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -129,7 +129,7 @@ namespace pcr return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -158,7 +158,7 @@ namespace pcr impl_setContextDocumentModified_nothrow(); } - //-------------------------------------------------------------------- + void XSDValidationPropertyHandler::onNewComponent() { XSDValidationPropertyHandler_Base::onNewComponent(); @@ -171,7 +171,7 @@ namespace pcr m_pHelper.reset(); } - //-------------------------------------------------------------------- + Sequence< Property > XSDValidationPropertyHandler::doDescribeSupportedProperties() const { ::std::vector< Property > aProperties; @@ -226,7 +226,7 @@ namespace pcr return Sequence< Property >( &(*aProperties.begin()), aProperties.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -263,7 +263,7 @@ namespace pcr return Sequence< OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -278,7 +278,7 @@ namespace pcr return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() ); } - //-------------------------------------------------------------------- + namespace { void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const OUString& _rPropertyName, bool _bShow ) @@ -290,7 +290,7 @@ namespace pcr } } - //-------------------------------------------------------------------- + LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException) @@ -426,7 +426,7 @@ namespace pcr return aDescriptor; } - //-------------------------------------------------------------------- + InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -464,7 +464,7 @@ namespace pcr return InteractiveSelectionResult_Cancelled; } - //-------------------------------------------------------------------- + void SAL_CALL XSDValidationPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -473,7 +473,7 @@ namespace pcr m_pHelper->registerBindingListener( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL XSDValidationPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -482,7 +482,7 @@ namespace pcr XSDValidationPropertyHandler_Base::removePropertyChangeListener( _rxListener ); } - //-------------------------------------------------------------------- + bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: this will crash!" ); @@ -505,7 +505,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" ); @@ -521,7 +521,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + bool XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType() SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: this will crash!" ); @@ -543,7 +543,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + bool XSDValidationPropertyHandler::implDoRemoveCurrentDataType() SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoRemoveCurrentDataType: this will crash!" ); @@ -563,7 +563,7 @@ namespace pcr return true; } - //-------------------------------------------------------------------- + void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) { if ( !_rxInspectorUI.is() ) @@ -586,7 +586,7 @@ namespace pcr _rxInspectorUI->enablePropertyUIElements( PROPERTY_XSD_DATA_TYPE, PropertyLineElement::PrimaryButton, xDataType.is() ); _rxInspectorUI->enablePropertyUIElements( PROPERTY_XSD_DATA_TYPE, PropertyLineElement::SecondaryButton, xDataType.is() && !bIsBasicType ); - //------------------------------------------------------------ + // show the facets which are available at the data type OUString aFacets[] = { OUString(PROPERTY_XSD_WHITESPACES), OUString(PROPERTY_XSD_PATTERN), @@ -653,7 +653,7 @@ namespace pcr m_pHelper->findDefaultFormatForIntrospectee(); } - //-------------------------------------------------------------------- + void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(()) { OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" ); diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 0de4b76c36bd..37db727047b1 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -162,13 +162,13 @@ namespace extensions { namespace resource { } - //-------------------------------------------------------------------- + Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) throw (MissingResourceException, RuntimeException) { return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() ); } - //-------------------------------------------------------------------- + Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index d337c5f6e86e..02f709cf4274 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -38,7 +38,7 @@ ResId SaneResId( sal_uInt32 ); * ***********************************************************************/ -// --------------------------------------------------------------------- + GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, sal_Bool bCutValues ) : ModalDialog( pParent, SaneResId( GRID_DIALOG ) ), @@ -96,7 +96,7 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* FreeResource(); } -// --------------------------------------------------------------------- + GridWindow::~GridWindow() { @@ -104,7 +104,7 @@ GridWindow::~GridWindow() delete [] m_pNewYValues; } -// --------------------------------------------------------------------- + double GridWindow::findMinX() { @@ -117,7 +117,7 @@ double GridWindow::findMinX() return fMin; } -// --------------------------------------------------------------------- + double GridWindow::findMinY() { @@ -130,7 +130,7 @@ double GridWindow::findMinY() return fMin; } -// --------------------------------------------------------------------- + double GridWindow::findMaxX() { @@ -143,7 +143,7 @@ double GridWindow::findMaxX() return fMax; } -// --------------------------------------------------------------------- + double GridWindow::findMaxY() { @@ -156,7 +156,7 @@ double GridWindow::findMaxY() return fMax; } -// --------------------------------------------------------------------- + void GridWindow::computeExtremes() { @@ -179,7 +179,7 @@ void GridWindow::computeExtremes() } } -// --------------------------------------------------------------------- + Point GridWindow::transform( double x, double y ) { @@ -195,7 +195,7 @@ Point GridWindow::transform( double x, double y ) return aRet; } -// --------------------------------------------------------------------- + void GridWindow::transform( const Point& rOriginal, double& x, double& y ) { @@ -203,14 +203,14 @@ void GridWindow::transform( const Point& rOriginal, double& x, double& y ) y = ( m_aGridArea.Bottom() - rOriginal.Y() ) * (m_fMaxY - m_fMinY) / (double)m_aGridArea.GetHeight() + m_fMinY; } -// --------------------------------------------------------------------- + void GridWindow::drawLine( double x1, double y1, double x2, double y2 ) { DrawLine( transform( x1, y1 ), transform( x2, y2 ) ); } -// --------------------------------------------------------------------- + void GridWindow::computeChunk( double fMin, double fMax, double& fChunkOut, double& fMinChunkOut ) { @@ -238,7 +238,7 @@ void GridWindow::computeChunk( double fMin, double fMax, double& fChunkOut, doub fMinChunkOut += fChunkOut; } -// --------------------------------------------------------------------- + void GridWindow::computeNew() { @@ -287,7 +287,7 @@ void GridWindow::computeNew() } } -// --------------------------------------------------------------------- + double GridWindow::interpolate( double x, @@ -313,7 +313,7 @@ double GridWindow::interpolate( return ret; } -// --------------------------------------------------------------------- + void GridWindow::setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY ) { @@ -326,7 +326,7 @@ void GridWindow::setBoundings( double fMinX, double fMinY, double fMaxX, double computeChunk( m_fMinY, m_fMaxY, m_fChunkY, m_fMinChunkY ); } -// --------------------------------------------------------------------- + void GridWindow::drawGrid() { @@ -366,7 +366,7 @@ void GridWindow::drawGrid() drawLine( m_fMaxX, m_fMinY, m_fMaxX, m_fMaxY ); } -// --------------------------------------------------------------------- + void GridWindow::drawOriginal() { @@ -381,7 +381,7 @@ void GridWindow::drawOriginal() } } -// --------------------------------------------------------------------- + void GridWindow::drawNew() { @@ -398,7 +398,7 @@ void GridWindow::drawNew() } } -// --------------------------------------------------------------------- + void GridWindow::drawHandles() { @@ -408,7 +408,7 @@ void GridWindow::drawHandles() } } -// --------------------------------------------------------------------- + void GridWindow::Paint( const Rectangle& rRect ) { @@ -419,7 +419,7 @@ void GridWindow::Paint( const Rectangle& rRect ) drawHandles(); } -// --------------------------------------------------------------------- + void GridWindow::MouseMove( const MouseEvent& rEvt ) { @@ -454,7 +454,7 @@ void GridWindow::MouseMove( const MouseEvent& rEvt ) ModalDialog::MouseMove( rEvt ); } -// --------------------------------------------------------------------- + void GridWindow::MouseButtonUp( const MouseEvent& rEvt ) { @@ -472,7 +472,7 @@ void GridWindow::MouseButtonUp( const MouseEvent& rEvt ) ModalDialog::MouseButtonUp( rEvt ); } -// --------------------------------------------------------------------- + void GridWindow::MouseButtonDown( const MouseEvent& rEvt ) { @@ -524,7 +524,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt ) ModalDialog::MouseButtonDown( rEvt ); } -// --------------------------------------------------------------------- + IMPL_LINK( GridWindow, ClickButtonHdl, Button*, pButton ) { diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index 671968d9c748..cb0d79cbd0f4 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -19,16 +19,16 @@ #include <scanner.hxx> -// ------------------ + // - ScannerManager - -// ------------------ + Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception ) { return *( new ScannerManager() ); } -// ----------------------------------------------------------------------------- + ScannerManager::ScannerManager() : mpData( NULL ) @@ -36,14 +36,14 @@ ScannerManager::ScannerManager() : AcquireData(); } -// ----------------------------------------------------------------------------- + ScannerManager::~ScannerManager() { ReleaseData(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeException ) { @@ -54,35 +54,35 @@ Any SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeE return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) ); } -// ----------------------------------------------------------------------------- + void SAL_CALL ScannerManager::acquire() throw() { OWeakObject::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL ScannerManager::release() throw() { OWeakObject::release(); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw() { return Sequence< sal_Int8 >(); } -// ----------------------------------------------------------------------------- + OUString ScannerManager::getImplementationName_Static() throw() { return OUString( "com.sun.star.scanner.ScannerManager" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw () { diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 4d2a48e2d5f4..6c0985d79f7e 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -40,7 +40,7 @@ BitmapTransporter::~BitmapTransporter() #endif } -// ----------------------------------------------------------------------------- + Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( RuntimeException ) { @@ -49,7 +49,7 @@ Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) ); } -// ----------------------------------------------------------------------------- + css::awt::Size BitmapTransporter::getSize() throw() { @@ -73,7 +73,7 @@ css::awt::Size BitmapTransporter::getSize() throw() return aRet; } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > BitmapTransporter::getDIB() throw() { @@ -92,9 +92,9 @@ Sequence< sal_Int8 > BitmapTransporter::getDIB() throw() return aValue; } -// -------------- + // - SaneHolder - -// -------------- + struct SaneHolder { @@ -139,9 +139,9 @@ namespace struct theSanes : public rtl::Static<allSanes, theSanes> {}; } -// ----------------- + // - ScannerThread - -// ----------------- + class ScannerThread : public osl::Thread { @@ -159,7 +159,7 @@ public: virtual ~ScannerThread(); }; -// ----------------------------------------------------------------------------- + ScannerThread::ScannerThread( boost::shared_ptr<SaneHolder> pHolder, @@ -207,9 +207,9 @@ void ScannerThread::run() m_pHolder->m_bBusy = false; } -// ------------------ + // - ScannerManager - -// ------------------ + void ScannerManager::AcquireData() { @@ -223,7 +223,7 @@ void ScannerManager::ReleaseData() theSanes::get().release(); } -// ----------------------------------------------------------------------------- + css::awt::Size ScannerManager::getSize() throw() { @@ -232,14 +232,14 @@ css::awt::Size ScannerManager::getSize() throw() return aRet; } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > ScannerManager::getDIB() throw() { return Sequence< sal_Int8 >(); } -// ----------------------------------------------------------------------------- + Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw() { @@ -264,7 +264,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw() return Sequence< ScannerContext >(); } -// ----------------------------------------------------------------------------- + sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException ) @@ -306,7 +306,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex return bRet; } -// ----------------------------------------------------------------------------- + void ScannerManager::startScan( const ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException ) @@ -337,7 +337,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, pThread->create(); } -// ----------------------------------------------------------------------------- + ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException ) { @@ -356,7 +356,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro return pHolder->m_nError; } -// ----------------------------------------------------------------------------- + Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException ) { diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 94beb83856d9..fa3ea2a4b7f3 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -55,7 +55,7 @@ struct OutData OutData(osl::Condition& rCondition) : FileHandle(NULL), Offset(0), StopCondition(rCondition), curl(NULL) {}; }; -//------------------------------------------------------------------------------ + static void openFile( OutData& out ) { @@ -99,7 +99,7 @@ static void openFile( OutData& out ) } } -//------------------------------------------------------------------------------ + static inline OString getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) @@ -110,7 +110,7 @@ getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, cons return OUStringToOString(aValue.get<OUString>(), RTL_TEXTENCODING_UTF8); } -//------------------------------------------------------------------------------ + static inline sal_Int32 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, @@ -124,7 +124,7 @@ getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, return n; } -//------------------------------------------------------------------------------ + static size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream ) @@ -142,7 +142,7 @@ write_function( void *ptr, size_t size, size_t nmemb, void *stream ) return (size_t) nBytesWritten; } -//------------------------------------------------------------------------------ + static int progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow ) @@ -175,7 +175,7 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, return -1; } -//------------------------------------------------------------------------------ + void Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const @@ -219,7 +219,7 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) } } -//------------------------------------------------------------------------------ + bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort) { @@ -337,7 +337,7 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal return ret; } -//------------------------------------------------------------------------------ + bool Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir) @@ -425,7 +425,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe return ret; } -//------------------------------------------------------------------------------ + void Download::stop() diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 33ffd7e0418c..f49829c4edbb 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -71,7 +71,7 @@ namespace uno = com::sun::star::uno ; #define PROPERTY_SHOW_MENUICON "MenuIconVisible" extern "C" bool SAL_CALL WNT_hasInternetConnection(); -//------------------------------------------------------------------------------ + // Returns the URL of the release note for the given position OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled) @@ -93,7 +93,7 @@ OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloa return OUString(); } -//------------------------------------------------------------------------------ + namespace { @@ -105,7 +105,7 @@ static inline OUString getBuildId() return aPathVal; } -//------------------------------------------------------------------------------ + #if defined LINUX || defined SOLARIS static inline OUString getBaseInstallation() { @@ -115,7 +115,7 @@ static inline OUString getBaseInstallation() } #endif -//------------------------------------------------------------------------------ + inline bool isObsoleteUpdateInfo(const OUString& rBuildId) { @@ -123,7 +123,7 @@ inline bool isObsoleteUpdateInfo(const OUString& rBuildId) } -//------------------------------------------------------------------------------ + OUString getImageFromFileName(const OUString& aFile) { @@ -199,7 +199,7 @@ OUString getImageFromFileName(const OUString& aFile) } -//------------------------------------------------------------------------------ + static uno::Reference< beans::XPropertySet > createMenuBarUI( const uno::Reference< uno::XComponentContext >& xContext, @@ -224,7 +224,7 @@ static uno::Reference< beans::XPropertySet > createMenuBarUI( return xMenuBarUI; } -//------------------------------------------------------------------------------ + @@ -337,7 +337,7 @@ private: Download m_aDownload; }; -//------------------------------------------------------------------------------ + class ShutdownThread : public osl::Thread { public: @@ -354,7 +354,7 @@ private: const uno::Reference<uno::XComponentContext> m_xContext; }; -//------------------------------------------------------------------------------ + UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext ) : @@ -367,13 +367,13 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition, resume(); } -//------------------------------------------------------------------------------ + UpdateCheckThread::~UpdateCheckThread() { } -//------------------------------------------------------------------------------ + void SAL_CALL @@ -385,7 +385,7 @@ UpdateCheckThread::terminate() osl::Thread::terminate(); } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckThread::join() @@ -399,7 +399,7 @@ UpdateCheckThread::join() } } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckThread::cancel() @@ -410,7 +410,7 @@ UpdateCheckThread::cancel() xProvider->cancel(); } -//------------------------------------------------------------------------------ + bool UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) @@ -449,7 +449,7 @@ UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) return ret; } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckThread::onTerminated() @@ -457,7 +457,7 @@ UpdateCheckThread::onTerminated() delete this; } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckThread::run() @@ -561,7 +561,7 @@ UpdateCheckThread::run() } } -//------------------------------------------------------------------------------ + void SAL_CALL ManualUpdateCheckThread::run() @@ -579,14 +579,14 @@ ManualUpdateCheckThread::run() } } -//------------------------------------------------------------------------------ + MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck) : m_aUpdateCheck(rUpdateCheck) { }; -//------------------------------------------------------------------------------ + uno::Any SAL_CALL MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) @@ -600,7 +600,7 @@ MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) return uno::Any(); } -//------------------------------------------------------------------------------ + DownloadThread::DownloadThread(osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext, @@ -614,13 +614,13 @@ DownloadThread::DownloadThread(osl::Condition& rCondition, createSuspended(); } -//------------------------------------------------------------------------------ + DownloadThread::~DownloadThread() { } -//------------------------------------------------------------------------------ + void SAL_CALL DownloadThread::run() @@ -667,7 +667,7 @@ DownloadThread::run() } } -//------------------------------------------------------------------------------ + void SAL_CALL DownloadThread::cancel() { @@ -678,7 +678,7 @@ void SAL_CALL DownloadThread::cancel() aController->cancelDownload(); } -//------------------------------------------------------------------------------ + void SAL_CALL DownloadThread::suspend() { @@ -686,26 +686,26 @@ void SAL_CALL DownloadThread::suspend() m_aDownload.stop(); } -//------------------------------------------------------------------------------ + void SAL_CALL DownloadThread::onTerminated() { delete this; } -//------------------------------------------------------------------------------ + ShutdownThread::ShutdownThread( const uno::Reference<uno::XComponentContext>& xContext) : m_xContext( xContext ) { create(); } -//------------------------------------------------------------------------------ + ShutdownThread::~ShutdownThread() { } -//------------------------------------------------------------------------------ + void SAL_CALL ShutdownThread::run() { @@ -724,18 +724,18 @@ ShutdownThread::run() xDesktop->terminate(); } -//------------------------------------------------------------------------------ + void SAL_CALL ShutdownThread::onTerminated() { delete this; } -//------------------------------------------------------------------------------ + } // anonymous namespace -//------------------------------------------------------------------------------ + UpdateCheck::UpdateCheck(): m_eState(NOT_INITIALIZED), m_eUpdateState(UPDATESTATES_COUNT), @@ -842,7 +842,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, } } -//------------------------------------------------------------------------------ + void UpdateCheck::cancel() @@ -860,7 +860,7 @@ UpdateCheck::cancel() setUIState(eUIState); } -//------------------------------------------------------------------------------ + void UpdateCheck::download() @@ -889,7 +889,7 @@ UpdateCheck::download() } } -//------------------------------------------------------------------------------ + void UpdateCheck::install() @@ -933,7 +933,7 @@ UpdateCheck::install() } } -//------------------------------------------------------------------------------ + void UpdateCheck::pause() @@ -950,7 +950,7 @@ UpdateCheck::pause() setUIState(UPDATESTATE_DOWNLOAD_PAUSED); } -//------------------------------------------------------------------------------ + void UpdateCheck::resume() @@ -967,7 +967,7 @@ UpdateCheck::resume() setUIState(UPDATESTATE_DOWNLOADING); } -//------------------------------------------------------------------------------ + void UpdateCheck::closeAfterFailure() @@ -982,7 +982,7 @@ UpdateCheck::closeAfterFailure() } } -//------------------------------------------------------------------------------ + void UpdateCheck::shutdownThread(bool join) @@ -1006,7 +1006,7 @@ UpdateCheck::shutdownThread(bool join) } } -//------------------------------------------------------------------------------ + void UpdateCheck::enableAutoCheck(bool enable) @@ -1017,7 +1017,7 @@ UpdateCheck::enableAutoCheck(bool enable) m_eState = enable ? CHECK_SCHEDULED : DISABLED; } -//------------------------------------------------------------------------------ + void UpdateCheck::enableDownload(bool enable, bool paused) @@ -1044,7 +1044,7 @@ UpdateCheck::enableDownload(bool enable, bool paused) } -//------------------------------------------------------------------------------ + bool UpdateCheck::downloadTargetExists(const OUString& rFileName) @@ -1088,7 +1088,7 @@ UpdateCheck::downloadTargetExists(const OUString& rFileName) return cont; } -//------------------------------------------------------------------------------ + bool UpdateCheck::checkDownloadDestination( const OUString& rFileName ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1105,7 +1105,7 @@ bool UpdateCheck::checkDownloadDestination( const OUString& rFileName ) return bReload; } -//------------------------------------------------------------------------------ + void UpdateCheck::downloadStalled(const OUString& rErrorMessage) @@ -1118,7 +1118,7 @@ UpdateCheck::downloadStalled(const OUString& rErrorMessage) setUIState(UPDATESTATE_ERROR_DOWNLOADING); } -//------------------------------------------------------------------------------ + void UpdateCheck::downloadProgressAt(sal_Int8 nPercent) @@ -1131,7 +1131,7 @@ UpdateCheck::downloadProgressAt(sal_Int8 nPercent) setUIState(UPDATESTATE_DOWNLOADING); } -//------------------------------------------------------------------------------ + void UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize) @@ -1150,7 +1150,7 @@ UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize } } -//------------------------------------------------------------------------------ + void UpdateCheck::downloadFinished(const OUString& rLocalFileName) @@ -1173,7 +1173,7 @@ UpdateCheck::downloadFinished(const OUString& rLocalFileName) showReleaseNote(aURL); } -//------------------------------------------------------------------------------ + void UpdateCheck::cancelDownload() @@ -1200,7 +1200,7 @@ UpdateCheck::cancelDownload() } -//------------------------------------------------------------------------------ + void UpdateCheck::showDialog(bool forceCheck) @@ -1262,7 +1262,7 @@ UpdateCheck::showDialog(bool forceCheck) } } -//------------------------------------------------------------------------------ + void UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) @@ -1343,7 +1343,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) setUIState(eUIState, bSuppressBubble); } -//------------------------------------------------------------------------------ + void UpdateCheck::setCheckFailedState() @@ -1351,7 +1351,7 @@ UpdateCheck::setCheckFailedState() setUIState(UPDATESTATE_ERROR_CHECKING); } -//------------------------------------------------------------------------------ + void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandler, UpdateState& eState, bool suppressBubble ) @@ -1386,7 +1386,7 @@ void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandle } } -//------------------------------------------------------------------------------ + void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -1440,7 +1440,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) aUpdateHandler->setState(eState); } -//------------------------------------------------------------------------------ + UpdateState UpdateCheck::getUIState(const UpdateInfo& rInfo) @@ -1458,7 +1458,7 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo) return eUIState; } -//------------------------------------------------------------------------------ + void UpdateCheck::showReleaseNote(const OUString& rURL) const @@ -1472,7 +1472,7 @@ UpdateCheck::showReleaseNote(const OUString& rURL) const } } -//------------------------------------------------------------------------------ + bool UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL) @@ -1518,7 +1518,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL) return true; } -//------------------------------------------------------------------------------ + void UpdateCheck::showExtensionDialog() { OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog"; @@ -1540,7 +1540,7 @@ void UpdateCheck::showExtensionDialog() xExecuteable->trigger( sArguments ); } -//------------------------------------------------------------------------------ + rtl::Reference<UpdateHandler> UpdateCheck::getUpdateHandler() @@ -1553,7 +1553,7 @@ UpdateCheck::getUpdateHandler() return m_aUpdateHandler; } -//------------------------------------------------------------------------------ + uno::Reference< task::XInteractionHandler > UpdateCheck::getInteractionHandler() const @@ -1568,7 +1568,7 @@ UpdateCheck::getInteractionHandler() const return xHandler; } -//------------------------------------------------------------------------------ + bool UpdateCheck::isDialogShowing() const @@ -1577,7 +1577,7 @@ UpdateCheck::isDialogShowing() const return m_aUpdateHandler.is() && m_aUpdateHandler->isVisible(); }; -//------------------------------------------------------------------------------ + void UpdateCheck::autoCheckStatusChanged(bool enabled) @@ -1596,7 +1596,7 @@ UpdateCheck::autoCheckStatusChanged(bool enabled) } }; -//------------------------------------------------------------------------------ + void UpdateCheck::autoCheckIntervalChanged() @@ -1605,7 +1605,7 @@ UpdateCheck::autoCheckIntervalChanged() m_aCondition.set(); }; -//------------------------------------------------------------------------------ + oslInterlockedCount SAL_CALL UpdateCheck::acquire() SAL_THROW(()) @@ -1613,7 +1613,7 @@ UpdateCheck::acquire() SAL_THROW(()) return ReferenceObject::acquire(); } -//------------------------------------------------------------------------------ + oslInterlockedCount SAL_CALL UpdateCheck::release() SAL_THROW(()) diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index f0f7ce1d6070..34c23a05fb2a 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -80,13 +80,13 @@ static const sal_Char * const aUpdateEntryProperties[] = { static const sal_uInt32 nUpdateEntryProperties = SAL_N_ELEMENTS(aUpdateEntryProperties); -//------------------------------------------------------------------------------ + NamedValueByNameAccess::~NamedValueByNameAccess() { } -//------------------------------------------------------------------------------ + ::com::sun::star::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName) @@ -101,7 +101,7 @@ NamedValueByNameAccess::getValue(const sal_Char * pName) } -//------------------------------------------------------------------------------ + bool UpdateCheckROModel::isAutoCheckEnabled() const @@ -109,7 +109,7 @@ UpdateCheckROModel::isAutoCheckEnabled() const return sal_True == m_aNameAccess.getValue(AUTOCHECK_ENABLED).get< sal_Bool >(); } -//------------------------------------------------------------------------------ + bool UpdateCheckROModel::isDownloadPaused() const @@ -117,7 +117,7 @@ UpdateCheckROModel::isDownloadPaused() const return sal_True == m_aNameAccess.getValue(DOWNLOAD_PAUSED).get< sal_Bool >(); } -//------------------------------------------------------------------------------ + OUString UpdateCheckROModel::getStringValue(const sal_Char * pStr) const @@ -130,14 +130,14 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const return aRet; } -//------------------------------------------------------------------------------ + OUString UpdateCheckROModel::getLocalFileName() const { return getStringValue(LOCAL_FILE); }; -//------------------------------------------------------------------------------ + sal_Int64 UpdateCheckROModel::getDownloadSize() const { @@ -148,7 +148,7 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const return nRet; }; -//------------------------------------------------------------------------------ + OUString UpdateCheckROModel::getUpdateEntryVersion() const @@ -156,7 +156,7 @@ UpdateCheckROModel::getUpdateEntryVersion() const return getStringValue(OLD_VERSION); } -//------------------------------------------------------------------------------ + void UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const @@ -181,7 +181,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getDesktopDirectory() { @@ -210,7 +210,7 @@ OUString UpdateCheckConfig::getDesktopDirectory() return aRet; } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getAllUsersDirectory() { @@ -231,7 +231,7 @@ OUString UpdateCheckConfig::getAllUsersDirectory() return aRet; } -//------------------------------------------------------------------------------ + UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer, const uno::Reference<container::XNameContainer>& xAvailableUpdates, const uno::Reference<container::XNameContainer>& xIgnoredUpdates, @@ -242,11 +242,11 @@ UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameConta m_rListener( rListener ) {} -//------------------------------------------------------------------------------ + UpdateCheckConfig::~UpdateCheckConfig() {} -//------------------------------------------------------------------------------ + ::rtl::Reference< UpdateCheckConfig > UpdateCheckConfig::get( @@ -279,7 +279,7 @@ UpdateCheckConfig::get( return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener ); } -//------------------------------------------------------------------------------ + bool UpdateCheckConfig::isAutoCheckEnabled() const @@ -289,7 +289,7 @@ UpdateCheckConfig::isAutoCheckEnabled() const return nValue; } -//------------------------------------------------------------------------------ + bool UpdateCheckConfig::isAutoDownloadEnabled() const @@ -299,7 +299,7 @@ UpdateCheckConfig::isAutoDownloadEnabled() const return nValue; } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getUpdateEntryVersion() const @@ -312,7 +312,7 @@ UpdateCheckConfig::getUpdateEntryVersion() const return aValue; } -//------------------------------------------------------------------------------ + sal_Int64 UpdateCheckConfig::getLastChecked() const @@ -325,7 +325,7 @@ UpdateCheckConfig::getLastChecked() const return nValue; } -//------------------------------------------------------------------------------ + sal_Int64 UpdateCheckConfig::getCheckInterval() const @@ -338,7 +338,7 @@ UpdateCheckConfig::getCheckInterval() const return nValue; } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getLocalFileName() const @@ -352,7 +352,7 @@ UpdateCheckConfig::getLocalFileName() const return aRet; } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getDownloadDestination() const @@ -365,7 +365,7 @@ UpdateCheckConfig::getDownloadDestination() const return aRet; } -//------------------------------------------------------------------------------ + void UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize) @@ -385,7 +385,7 @@ UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 commitChanges(); } -//------------------------------------------------------------------------------ + void UpdateCheckConfig::clearLocalFileName() @@ -402,7 +402,7 @@ UpdateCheckConfig::clearLocalFileName() commitChanges(); } -//------------------------------------------------------------------------------ + void UpdateCheckConfig::storeDownloadPaused(bool paused) @@ -411,7 +411,7 @@ UpdateCheckConfig::storeDownloadPaused(bool paused) commitChanges(); } -//------------------------------------------------------------------------------ + void UpdateCheckConfig::updateLastChecked() @@ -424,7 +424,7 @@ UpdateCheckConfig::updateLastChecked() replaceByName(LAST_CHECK, uno::makeAny(lastCheck)); } -//------------------------------------------------------------------------------ + void UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild) @@ -461,7 +461,7 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aC commitChanges(); } -//------------------------------------------------------------------------------ + void UpdateCheckConfig::clearUpdateFound() @@ -490,7 +490,7 @@ UpdateCheckConfig::clearUpdateFound() commitChanges(); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > UpdateCheckConfig::getServiceNames() @@ -500,7 +500,7 @@ UpdateCheckConfig::getServiceNames() return aServiceList; } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getImplName() @@ -508,7 +508,7 @@ UpdateCheckConfig::getImplName() return OUString("vnd.sun.UpdateCheckConfig"); } -//------------------------------------------------------------------------------ + uno::Type SAL_CALL UpdateCheckConfig::getElementType() throw (uno::RuntimeException) @@ -516,7 +516,7 @@ UpdateCheckConfig::getElementType() throw (uno::RuntimeException) return m_xContainer->getElementType(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL UpdateCheckConfig::hasElements() throw (uno::RuntimeException) @@ -524,7 +524,7 @@ UpdateCheckConfig::hasElements() throw (uno::RuntimeException) return m_xContainer->hasElements(); } -//------------------------------------------------------------------------------ + uno::Any SAL_CALL UpdateCheckConfig::getByName( const OUString& aName ) @@ -545,7 +545,7 @@ UpdateCheckConfig::getByName( const OUString& aName ) return aValue; } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException) @@ -553,7 +553,7 @@ UpdateCheckConfig::getElementNames( ) throw (uno::RuntimeException) return m_xContainer->getElementNames(); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException) @@ -561,7 +561,7 @@ UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeExcepti return m_xContainer->hasByName( aName ); } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement ) @@ -571,7 +571,7 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen return m_xContainer->replaceByName( aName, aElement ); } -//------------------------------------------------------------------------------ + // XChangesBatch void SAL_CALL @@ -618,7 +618,7 @@ UpdateCheckConfig::commitChanges() } } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException) @@ -630,7 +630,7 @@ UpdateCheckConfig::hasPendingChanges( ) throw (uno::RuntimeException) return sal_False; } -//------------------------------------------------------------------------------ + uno::Sequence< util::ElementChange > SAL_CALL UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException) @@ -642,7 +642,7 @@ UpdateCheckConfig::getPendingChanges( ) throw (uno::RuntimeException) return uno::Sequence< util::ElementChange >(); } -//------------------------------------------------------------------------------ + bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName, const OUString& rVersion ) { @@ -673,7 +673,7 @@ bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName, return bNotify; } -//------------------------------------------------------------------------------ + bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName, const OUString& rVersion ) { @@ -706,7 +706,7 @@ bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName, return false; } -//------------------------------------------------------------------------------ + OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion, sal_Int32 *nIndex ) { @@ -718,7 +718,7 @@ OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion, return rVersion.getToken( 0, '.', *nIndex ); } -//------------------------------------------------------------------------------ + // checks if the second version string is greater than the first one bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, @@ -742,9 +742,9 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1, return false; } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + OUString SAL_CALL UpdateCheckConfig::getImplementationName() throw (uno::RuntimeException) @@ -759,7 +759,7 @@ UpdateCheckConfig::supportsService(OUString const & serviceName) return cppu::supportsService(this, serviceName); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL UpdateCheckConfig::getSupportedServiceNames() throw (uno::RuntimeException) diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 0ba47146b27d..f3276f973e36 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -111,9 +111,9 @@ private: void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ); }; -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + InitUpdateCheckJobThread::InitUpdateCheckJobThread( const uno::Reference< uno::XComponentContext > &xContext, const uno::Sequence< beans::NamedValue > &xParameters, @@ -126,7 +126,7 @@ InitUpdateCheckJobThread::InitUpdateCheckJobThread( create(); } -//------------------------------------------------------------------------------ + void SAL_CALL InitUpdateCheckJobThread::run() { if (!m_bShowDialog) { @@ -158,7 +158,7 @@ UpdateCheckJob::~UpdateCheckJob() { } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > UpdateCheckJob::getServiceNames() @@ -168,7 +168,7 @@ UpdateCheckJob::getServiceNames() return aServiceList; }; -//------------------------------------------------------------------------------ + OUString UpdateCheckJob::getImplName() @@ -177,7 +177,7 @@ UpdateCheckJob::getImplName() } -//------------------------------------------------------------------------------ + uno::Any UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) @@ -222,7 +222,7 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) return uno::Any(); } -//------------------------------------------------------------------------------ + void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp ) { try { @@ -260,7 +260,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa } } -//------------------------------------------------------------------------------ + OUString SAL_CALL UpdateCheckJob::getImplementationName() throw (uno::RuntimeException) @@ -268,7 +268,7 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException) return getImplName(); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException) @@ -282,7 +282,7 @@ UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::Runt return cppu::supportsService(this, serviceName); } -//------------------------------------------------------------------------------ + // XEventListener void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt ) throw ( uno::RuntimeException ) @@ -296,14 +296,14 @@ void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt ) } } -//------------------------------------------------------------------------------ + // XTerminateListener void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & ) throw ( frame::TerminationVetoException, uno::RuntimeException ) { } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) throw ( uno::RuntimeException ) { @@ -316,7 +316,7 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) } // anonymous namespace -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createJobInstance(const uno::Reference<uno::XComponentContext>& xContext) @@ -328,7 +328,7 @@ createJobInstance(const uno::Reference<uno::XComponentContext>& xContext) return static_cast<cppu::OWeakObject *>(job.get()); } -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext) @@ -336,7 +336,7 @@ createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext) return *UpdateCheckConfig::get(xContext, *UpdateCheck::get()); } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -359,7 +359,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = { NULL, NULL, NULL, NULL, NULL, 0 } } ; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 57ff85fbe0ba..73a7da79d0e1 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -82,7 +82,7 @@ using namespace com::sun::star; -//-------------------------------------------------------------------- + UpdateHandler::UpdateHandler( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< IActionListener > & rxActionListener ) : mxContext( rxContext ), @@ -100,7 +100,7 @@ UpdateHandler::UpdateHandler( const uno::Reference< uno::XComponentContext > & r { } -//-------------------------------------------------------------------- + UpdateHandler::~UpdateHandler() { mxContext = NULL; @@ -109,7 +109,7 @@ UpdateHandler::~UpdateHandler() mxActionListener = NULL; } -//-------------------------------------------------------------------- + void UpdateHandler::enableControls( short nCtrlState ) { osl::MutexGuard aGuard( maMutex ); @@ -138,7 +138,7 @@ void UpdateHandler::enableControls( short nCtrlState ) mnLastCtrlState = nCtrlState; } -//-------------------------------------------------------------------- + void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) { osl::MutexGuard aGuard( maMutex ); @@ -157,7 +157,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) } } -//-------------------------------------------------------------------- + void UpdateHandler::setState( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); @@ -168,7 +168,7 @@ void UpdateHandler::setState( UpdateState eState ) updateState( meCurState ); } -//-------------------------------------------------------------------- + bool UpdateHandler::isVisible() const { if ( !mxUpdDlg.is() ) return false; @@ -181,7 +181,7 @@ bool UpdateHandler::isVisible() const return false; } -//-------------------------------------------------------------------- + void UpdateHandler::setVisible( bool bVisible ) { osl::MutexGuard aGuard( maMutex ); @@ -224,7 +224,7 @@ void UpdateHandler::setVisible( bool bVisible ) } } -//-------------------------------------------------------------------- + void UpdateHandler::setProgress( sal_Int32 nPercent ) { if ( nPercent > 100 ) @@ -242,13 +242,13 @@ void UpdateHandler::setProgress( sal_Int32 nPercent ) } } -//-------------------------------------------------------------------- + void UpdateHandler::setErrorMessage( const OUString& rErrorMsg ) { setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rErrorMsg ) ); } -//-------------------------------------------------------------------- + void UpdateHandler::setDownloadFile( const OUString& rFilePath ) { sal_Int32 nLast = rFilePath.lastIndexOf( '/' ); @@ -260,7 +260,7 @@ void UpdateHandler::setDownloadFile( const OUString& rFilePath ) } } -//-------------------------------------------------------------------- + OUString UpdateHandler::getBubbleText( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); @@ -276,7 +276,7 @@ OUString UpdateHandler::getBubbleText( UpdateState eState ) return sText; } -//-------------------------------------------------------------------- + OUString UpdateHandler::getBubbleTitle( UpdateState eState ) { osl::MutexGuard aGuard( maMutex ); @@ -292,7 +292,7 @@ OUString UpdateHandler::getBubbleTitle( UpdateState eState ) return sText; } -//-------------------------------------------------------------------- + OUString UpdateHandler::getDefaultInstErrMsg() { osl::MutexGuard aGuard( maMutex ); @@ -303,7 +303,7 @@ OUString UpdateHandler::getDefaultInstErrMsg() } // XActionListener -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt ) throw( uno::RuntimeException ) { @@ -311,7 +311,7 @@ void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt ) mxUpdDlg.clear(); } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) throw( uno::RuntimeException ) { @@ -376,13 +376,13 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent ) } // XTopWindowListener -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowOpened( const lang::EventObject& ) throw( uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e ) throw( uno::RuntimeException ) { @@ -393,40 +393,40 @@ void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e ) actionPerformed( aActionEvt ); } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowClosed( const lang::EventObject& ) throw( uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowMinimized( const lang::EventObject& ) throw( uno::RuntimeException ) { mbMinimized = true; } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowNormalized( const lang::EventObject& ) throw( uno::RuntimeException ) { mbMinimized = false; } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowActivated( const lang::EventObject& ) throw( uno::RuntimeException ) { } -//-------------------------------------------------------------------- + void SAL_CALL UpdateHandler::windowDeactivated( const lang::EventObject& ) throw( uno::RuntimeException ) { } // XInteractionHandler -//------------------------------------------------------------------------------ + void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > const & rRequest) throw (uno::RuntimeException) { @@ -468,9 +468,9 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > mxInteractionHdl->handle( rRequest ); } -//------------------------------------------------------------------------------ + // XTerminateListener -//------------------------------------------------------------------------------ + void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& ) throw ( frame::TerminationVetoException, uno::RuntimeException ) { @@ -488,7 +488,7 @@ void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& ) setVisible( false ); } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& ) throw ( uno::RuntimeException ) { @@ -508,9 +508,9 @@ void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& ) } } -//-------------------------------------------------------------------- -//-------------------------------------------------------------------- -//-------------------------------------------------------------------- + + + void UpdateHandler::updateState( UpdateState eState ) { if ( meLastState == eState ) @@ -610,7 +610,7 @@ void UpdateHandler::updateState( UpdateState eState ) meLastState = eState; } -//-------------------------------------------------------------------- + OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle > xBundle, sal_Int32 nResourceId ) const { @@ -639,7 +639,7 @@ OUString UpdateHandler::substVariables( const OUString &rSource ) const .replaceAll( "%PERCENT", OUString::number( mnPercent ) ); } -//-------------------------------------------------------------------- + void UpdateHandler::loadStrings() { if ( mbStringsLoaded ) @@ -726,7 +726,7 @@ void UpdateHandler::loadStrings() } -//-------------------------------------------------------------------- + void UpdateHandler::startThrobber( bool bStart ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); @@ -745,7 +745,7 @@ void UpdateHandler::startThrobber( bool bStart ) xWindow->setVisible( bStart ); } -//-------------------------------------------------------------------- + void UpdateHandler::setControlProperty( const OUString &rCtrlName, const OUString &rPropName, const uno::Any &rPropValue ) @@ -766,7 +766,7 @@ void UpdateHandler::setControlProperty( const OUString &rCtrlName, } } -//-------------------------------------------------------------------- + void UpdateHandler::showControl( const OUString &rCtrlName, bool bShow ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); @@ -782,7 +782,7 @@ void UpdateHandler::showControl( const OUString &rCtrlName, bool bShow ) xWindow->setVisible( bShow ); } -//-------------------------------------------------------------------- + void UpdateHandler::focusControl( DialogControls eID ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); @@ -800,7 +800,7 @@ void UpdateHandler::focusControl( DialogControls eID ) xWindow->setFocus(); } -//-------------------------------------------------------------------- + void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > const & rxDialogModel, OUString const & rServiceName, OUString const & rControlName, @@ -828,7 +828,7 @@ void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > con xContainer->insertByName( rControlName, uno::Any (uno::Reference< uno::XInterface >(xModel, uno::UNO_QUERY))); } -//-------------------------------------------------------------------- + void UpdateHandler::setFullVersion( OUString& rString ) { uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( @@ -854,7 +854,7 @@ void UpdateHandler::setFullVersion( OUString& rString ) rString = rString.replaceFirst( aProductVersion, aProductFullVersion ); } -//-------------------------------------------------------------------- + bool UpdateHandler::showWarning( const OUString &rWarningText ) const { bool bRet = false; @@ -901,7 +901,7 @@ bool UpdateHandler::showWarning( const OUString &rWarningText ) const return bRet; } -//-------------------------------------------------------------------- + bool UpdateHandler::showWarning( const OUString &rWarningText, const OUString &rBtnText_1, const OUString &rBtnText_2 ) const @@ -972,7 +972,7 @@ bool UpdateHandler::showWarning( const OUString &rWarningText, return bRet; } -//-------------------------------------------------------------------- + bool UpdateHandler::showOverwriteWarning( const OUString& rFileName ) const { return showWarning( @@ -982,13 +982,13 @@ bool UpdateHandler::showOverwriteWarning( const OUString& rFileName ) const msReloadContinue, msReloadReload ); } -//-------------------------------------------------------------------- + bool UpdateHandler::showOverwriteWarning() const { return showWarning( msOverwriteWarning ); } -//-------------------------------------------------------------------- + #define BUTTON_HEIGHT 14 #define BUTTON_WIDTH 50 #define BUTTON_X_OFFSET 7 @@ -1023,7 +1023,7 @@ bool UpdateHandler::showOverwriteWarning() const #define PROGRESS_X_POS ( DIALOG_BORDER + 8 ) #define PROGRESS_Y_POS ( DIALOG_BORDER + 2*LABEL_OFFSET ) -//-------------------------------------------------------------------- + void UpdateHandler::showControls( short nControls ) { // The buttons from CANCEL_BUTTON to RESUME_BUTTON will be shown or @@ -1055,7 +1055,7 @@ void UpdateHandler::showControls( short nControls ) setControlProperty( TEXT_STATUS, "Height", uno::Any( sal_Int32(BOX_HEIGHT1 - 4*TEXT_OFFSET - LABEL_HEIGHT ) ) ); } -//-------------------------------------------------------------------- + void UpdateHandler::createDialog() { if ( !mxContext.is() ) diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 7ef271aa1d40..ddf58590675c 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -44,7 +44,7 @@ namespace uno = css::uno ; namespace task = css::task ; namespace xml = css::xml ; -//------------------------------------------------------------------------------ + static bool getBootstrapData( @@ -74,7 +74,7 @@ getBootstrapData( return true; } -//------------------------------------------------------------------------------ + // Returns 'true' if successfully connected to the update server bool @@ -243,7 +243,7 @@ checkForUpdates( return true; } -//------------------------------------------------------------------------------ + bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext, const uno::Sequence< uno::Sequence< OUString > > &rUpdateInfos ) { @@ -261,7 +261,7 @@ bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & return bNotify; } -//------------------------------------------------------------------------------ + // Returns 'true' if there are updates for any extension bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & rxContext ) @@ -288,7 +288,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & return bNotify; } -//------------------------------------------------------------------------------ + // Returns 'true' if there are any pending updates for any extension (offline check) bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rxContext ) diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index 60cbe243157a..803c3efe75d7 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -31,7 +31,7 @@ namespace task = ::com::sun::star::task; namespace uno = ::com::sun::star::uno; -// ----------------------------------------------------------------------- + SAL_IMPLEMENT_MAIN() { diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index d45b7f2d2c8d..c205732dc2fe 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -37,7 +37,7 @@ namespace lang = ::com::sun::star::lang; namespace uno = ::com::sun::star::uno; namespace xml = ::com::sun::star::xml; -// ----------------------------------------------------------------------- + SAL_IMPLEMENT_MAIN() { diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 4503a64b82b3..1ed4e8605576 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -66,7 +66,7 @@ namespace xml = com::sun::star::xml ; namespace sdbc = com::sun::star::sdbc ; -//------------------------------------------------------------------------------ + namespace { @@ -113,7 +113,7 @@ public: #define INPUT_STREAM(i) i #endif -//------------------------------------------------------------------------------ + class ActiveDataSink : public ::cppu::WeakImplHelper1< io::XActiveDataSink > { @@ -128,7 +128,7 @@ public: throw (uno::RuntimeException) { m_xStream = rStream; }; }; -//------------------------------------------------------------------------------ + class UpdateInformationProvider : public ::cppu::WeakImplHelper3< deployment::XUpdateInformationProvider, @@ -219,7 +219,7 @@ private: sal_Int32 m_nCommandId; }; -//------------------------------------------------------------------------------ + class UpdateInformationEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > { @@ -286,7 +286,7 @@ private: sal_Int32 m_nCount; }; -//------------------------------------------------------------------------------ + class SingleUpdateInformationEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > { @@ -312,7 +312,7 @@ private: }; -//------------------------------------------------------------------------------ + UpdateInformationProvider::UpdateInformationProvider( const uno::Reference<uno::XComponentContext>& xContext, @@ -366,7 +366,7 @@ UpdateInformationProvider::UpdateInformationProvider( } } -//------------------------------------------------------------------------------ + uno::Reference< uno::XInterface > UpdateInformationProvider::createInstance(const uno::Reference<uno::XComponentContext>& xContext) { @@ -383,13 +383,13 @@ UpdateInformationProvider::createInstance(const uno::Reference<uno::XComponentCo return *new UpdateInformationProvider(xContext, xUniversalContentBroker, xDocumentBuilder, xXPath); } -//------------------------------------------------------------------------------ + UpdateInformationProvider::~UpdateInformationProvider() { } -//------------------------------------------------------------------------------ + OUString UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item) @@ -412,7 +412,7 @@ UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServi return sRet; } -//------------------------------------------------------------------------------ + void UpdateInformationProvider::storeCommandInfo( @@ -425,7 +425,7 @@ UpdateInformationProvider::storeCommandInfo( m_xCommandProcessor = rxCommandProcessor; } -//------------------------------------------------------------------------------ + uno::Reference< io::XInputStream > UpdateInformationProvider::load(const OUString& rURL) @@ -482,7 +482,7 @@ UpdateInformationProvider::load(const OUString& rURL) return INPUT_STREAM(aSink->getInputStream()); } -//------------------------------------------------------------------------------ + // TODO: docu content node @@ -529,7 +529,7 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode return uno::Reference< xml::dom::XElement > (); } -//------------------------------------------------------------------------------ + uno::Reference< xml::dom::XNode > UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, @@ -544,7 +544,7 @@ UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& } } -//------------------------------------------------------------------------------ + uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( @@ -615,7 +615,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration( return uno::Reference< container::XEnumeration >(); } -//------------------------------------------------------------------------------ + uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( @@ -660,7 +660,7 @@ UpdateInformationProvider::getUpdateInformation( return aRet; } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateInformationProvider::cancel() throw (uno::RuntimeException) @@ -672,7 +672,7 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException) m_xCommandProcessor->abort(m_nCommandId); } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateInformationProvider::setInteractionHandler( @@ -683,7 +683,7 @@ UpdateInformationProvider::setInteractionHandler( m_xInteractionHandler = handler; } -//------------------------------------------------------------------------------ + uno::Reference< task::XInteractionHandler > SAL_CALL UpdateInformationProvider::getInteractionHandler() @@ -715,7 +715,7 @@ UpdateInformationProvider::getInteractionHandler() return m_xPwContainerInteractionHandler; } } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > UpdateInformationProvider::getServiceNames() @@ -725,7 +725,7 @@ UpdateInformationProvider::getServiceNames() return aServiceList; }; -//------------------------------------------------------------------------------ + OUString UpdateInformationProvider::getImplName() @@ -733,7 +733,7 @@ UpdateInformationProvider::getImplName() return OUString("vnd.sun.UpdateInformationProvider"); } -//------------------------------------------------------------------------------ + OUString SAL_CALL UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException) @@ -741,7 +741,7 @@ UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException) return getImplName(); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException) @@ -757,7 +757,7 @@ UpdateInformationProvider::supportsService( OUString const & serviceName ) throw } // anonymous namespace -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createInstance(uno::Reference<uno::XComponentContext> const & xContext) @@ -765,7 +765,7 @@ createInstance(uno::Reference<uno::XComponentContext> const & xContext) return UpdateInformationProvider::createInstance(xContext); } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -780,7 +780,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = { NULL, NULL, NULL, NULL, NULL, 0 } } ; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 1361ebaee414..8af861593fe5 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------------ + static uno::Sequence< OUString > getServiceNames() { @@ -72,19 +72,19 @@ static uno::Sequence< OUString > getServiceNames() return aServiceList; } -//------------------------------------------------------------------------------ + static OUString getImplementationName() { return OUString("vnd.sun.UpdateCheckUI"); } -//------------------------------------------------------------------------------ + namespace { -//------------------------------------------------------------------------------ + class BubbleWindow : public FloatingWindow { Point maTipPos; @@ -116,7 +116,7 @@ public: const Image& rImage ); }; -//------------------------------------------------------------------------------ + class UpdateCheckUI : public ::cppu::WeakImplHelper3 < lang::XServiceInfo, document::XEventListener, beans::XPropertySet > { @@ -195,7 +195,7 @@ public: throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ); }; -//------------------------------------------------------------------------------ + UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xContext) : m_xContext(xContext) , mpBubbleWin( NULL ) @@ -225,7 +225,7 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont Application::AddEventListener( maApplicationEventHdl ); } -//------------------------------------------------------------------------------ + UpdateCheckUI::~UpdateCheckUI() { Application::RemoveEventListener( maApplicationEventHdl ); @@ -234,14 +234,14 @@ UpdateCheckUI::~UpdateCheckUI() delete mpSfxResMgr; } -//------------------------------------------------------------------------------ + OUString SAL_CALL UpdateCheckUI::getImplementationName() throw (uno::RuntimeException) { return ::getImplementationName(); } -//------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -254,7 +254,7 @@ UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::Runti return cppu::supportsService(this, serviceName); } -//------------------------------------------------------------------------------ + Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) { sal_uInt32 nResID; @@ -272,7 +272,7 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) return Image( ResId( nResID, *mpUpdResMgr ) ); } -//------------------------------------------------------------------------------ + Image UpdateCheckUI::GetBubbleImage( OUString &rURL ) { Image aImage; @@ -310,7 +310,7 @@ Image UpdateCheckUI::GetBubbleImage( OUString &rURL ) return aImage; } -//------------------------------------------------------------------------------ + void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) { if ( ! mbShowMenuIcon ) @@ -364,7 +364,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) } } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckUI::notifyEvent(const document::EventObject& rEvent) throw (uno::RuntimeException) { @@ -376,20 +376,20 @@ void SAL_CALL UpdateCheckUI::notifyEvent(const document::EventObject& rEvent) } } -//------------------------------------------------------------------------------ + void SAL_CALL UpdateCheckUI::disposing(const lang::EventObject&) throw (uno::RuntimeException) { } -//------------------------------------------------------------------------------ + uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo(void) throw ( uno::RuntimeException ) { return NULL; } -//------------------------------------------------------------------------------ + void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -455,7 +455,7 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName, mpBubbleWin->Show( sal_False ); } -//------------------------------------------------------------------------------ + uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -481,7 +481,7 @@ uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName) return aRet; } -//------------------------------------------------------------------------------ + void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -489,7 +489,7 @@ void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/ //no bound properties } -//------------------------------------------------------------------------------ + void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -497,7 +497,7 @@ void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyNam //no bound properties } -//------------------------------------------------------------------------------ + void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -505,7 +505,7 @@ void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/ //no vetoable properties } -//------------------------------------------------------------------------------ + void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) @@ -514,9 +514,9 @@ void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyNam } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + BubbleWindow * UpdateCheckUI::GetBubbleWindow() { if ( !mpIconSysWin ) @@ -546,7 +546,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow() return pBubbleWin; } -//------------------------------------------------------------------------------ + void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) { SolarMutexGuard aGuard; @@ -579,7 +579,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl) { SolarMutexGuard aGuard; @@ -602,7 +602,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pData ) { if ( pData->bHighlight ) @@ -613,7 +613,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl) { SolarMutexGuard aGuard; @@ -628,7 +628,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl) { RemoveBubbleWindow( false ); @@ -636,7 +636,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl) { SolarMutexGuard aGuard; @@ -669,7 +669,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) { sal_uLong nEventID = pEvent->GetId(); @@ -721,7 +721,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) return 0; } -//------------------------------------------------------------------------------ + IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) { switch (pEvent->GetId()) @@ -746,9 +746,9 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) } return 0; } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + #define TIP_HEIGHT 15 #define TIP_WIDTH 7 @@ -757,7 +757,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) #define TEXT_MAX_WIDTH 300 #define TEXT_MAX_HEIGHT 200 -//------------------------------------------------------------------------------ + BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle, const OUString& rText, const Image& rImage ) : FloatingWindow( pParent, WB_SYSTEMWINDOW @@ -773,12 +773,12 @@ BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle, SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetHelpColor() ) ); } -//------------------------------------------------------------------------------ + BubbleWindow::~BubbleWindow() { } -//------------------------------------------------------------------------------ + void BubbleWindow::Resize() { SolarMutexGuard aGuard; @@ -809,7 +809,7 @@ void BubbleWindow::Resize() SetWindowRegionPixel( maBounds ); } -//------------------------------------------------------------------------------ + void BubbleWindow::SetTitleAndText( const OUString& rTitle, const OUString& rText, const Image& rImage ) @@ -821,7 +821,7 @@ void BubbleWindow::SetTitleAndText( const OUString& rTitle, Resize(); } -//------------------------------------------------------------------------------ + void BubbleWindow::Paint( const Rectangle& ) { SolarMutexGuard aGuard; @@ -861,13 +861,13 @@ void BubbleWindow::Paint( const Rectangle& ) DrawText( aTextRect, maBubbleText, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK ); } -//------------------------------------------------------------------------------ + void BubbleWindow::MouseButtonDown( const MouseEvent& ) { Show( sal_False ); } -//------------------------------------------------------------------------------ + void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags ) { SolarMutexGuard aGuard; @@ -916,7 +916,7 @@ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags ) FloatingWindow::Show( bVisible, nFlags ); } -//------------------------------------------------------------------------------ + void BubbleWindow::RecalcTextRects() { Size aTotalSize; @@ -957,13 +957,13 @@ void BubbleWindow::RecalcTextRects() maTitleRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT ); maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetHeight() * 3 / 4 ); } -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ + + + } // anonymous namespace -//------------------------------------------------------------------------------ + static uno::Reference<uno::XInterface> SAL_CALL createInstance(const uno::Reference<uno::XComponentContext>& xContext) @@ -971,7 +971,7 @@ createInstance(const uno::Reference<uno::XComponentContext>& xContext) return *new UpdateCheckUI(xContext); } -//------------------------------------------------------------------------------ + static const cppu::ImplementationEntry kImplementations_entries[] = { @@ -986,7 +986,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] = { NULL, NULL, NULL, NULL, NULL, 0 } } ; -//------------------------------------------------------------------------------ + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index e938b87b79f3..d70440582ec8 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -560,7 +560,7 @@ Sequence< Sequence<Reference<XEventListener > > > SAL_CALL OComponent::methodXEv return aSeq; } -//--------------------------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte(void) throw( RuntimeException) { @@ -711,7 +711,7 @@ void SAL_CALL OComponent::setAttrXInterface( const Sequence< Reference< XInterfa m_seqxInterface= _attrxinterface; } -// ---------------------------------------------------------------------------- + ::sal_Int8 SAL_CALL OComponent::getAByte() throw (RuntimeException) { @@ -852,7 +852,7 @@ void SAL_CALL OComponent::setAXInvocation( const Reference< XInvocation >& _axin { m_attr_xinvocation = _axinvocation; } -//----------------------------------------------------------------------------------- + void SAL_CALL OComponent::testout_methodByte(sal_Int8& rOut) throw( RuntimeException ) { rOut= m_int8; diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index 0ff0a7496bda..cf59aaae4edb 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -618,8 +618,8 @@ UString OMyPersistObject_getImplementationName( ) THROWS(()) } -// --------------------------------------------- -// ----------------------------------------------- + + class OObjectStreamTest : public ODataStreamTest { diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index 83be75863cd0..c04ec9953000 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.cxx @@ -389,7 +389,7 @@ UString OMarkableOutputStreamTest_getImplementationName() THROWS(()) -//----------------------------------------------------- + // Input stream class OMarkableInputStreamTest : diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 3e1cb25bd664..b38f318ad1d9 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -18,7 +18,7 @@ */ -//------------------------------------------------------ + // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. // Example : testcomponent com.sun.star.io.Pipe stm diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 5f5b72037529..247374caaf8e 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -84,7 +84,7 @@ public: void removeAllListeners( const XControlRef& xControl ); }; -//-------------------------------------------------------------------------------------------------- + void Listener_Impl::addAllListeners( const XControlRef& xControl ) { XWindowRef xWindow( xControl, USR_QUERY ); @@ -99,7 +99,7 @@ void Listener_Impl::addAllListeners( const XControlRef& xControl ) xControl->addEventListener( (XEventListener*)(XPaintListener*)this ); } -//-------------------------------------------------------------------------------------------------- + void Listener_Impl::removeAllListeners( const XControlRef& xControl ) { XWindowRef xWindow( xControl, USR_QUERY ); @@ -114,10 +114,10 @@ void Listener_Impl::removeAllListeners( const XControlRef& xControl ) xControl->removeEventListener( (XEventListener*)(XPaintListener*)this ); } -//-------------------------------------------------------------------------------------------------- + SMART_UNO_IMPLEMENTATION( Listener_Impl, UsrObject ); -//-------------------------------------------------------------------------------------------------- + BOOL Listener_Impl::queryInterface( Uik aUik, XInterfaceRef& rOut ) { if (aUik == XMouseListener::getSmartUik()) @@ -140,7 +140,7 @@ BOOL Listener_Impl::queryInterface( Uik aUik, XInterfaceRef& rOut ) return TRUE; } -//-------------------------------------------------------------------------------------------------- + // XMouseListener void Listener_Impl::mousePressed( const VclMouseEvent& evt ) {} void Listener_Impl::mouseReleased( const VclMouseEvent& evt ) {} @@ -213,7 +213,7 @@ Application* pApp = &g_App; #endif -//-------------------------------------------------------------------------------------------------- + void FrameControlApplication::init() { XMultiServiceFactoryRef xMgr = createRegistryServiceManager( L"test.rdb" ); @@ -262,7 +262,7 @@ void FrameControlApplication::init() } } -//-------------------------------------------------------------------------------------------------- + void FrameControlApplication::deinit() { if (_pListener) @@ -281,7 +281,7 @@ void FrameControlApplication::deinit() } -//-------------------------------------------------------------------------------------------------- + void FrameControlApplication::Main() { // void TestErrcodes(); diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index 152d380839c5..e31420824349 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.cxx @@ -37,7 +37,7 @@ public: MyApp aMyApp; -// ----------------------------------------------------------------------- + void MyApp::Main() { |