diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-30 11:48:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-01 12:18:24 +0200 |
| commit | f1de3e14df9665ce48d676ac6f3439506d2b81f2 (patch) | |
| tree | 26ad43f511ec7d09bdf906c376fb468c22947d31 /extensions/source | |
| parent | 10e59aee74ede837ad0560e261b0f106371ce96a (diff) | |
com::sun::star->css in extensions/
Change-Id: I64af9f5ae444e1f7bc6c0e8c29df383a9531dba9
Diffstat (limited to 'extensions/source')
142 files changed, 1932 insertions, 1945 deletions
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 9203d9ebd182..f67d103b7c43 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -45,7 +45,7 @@ namespace abp // helper OAddessBookSourcePilot* getDialog(); const OAddessBookSourcePilot* getDialog() const; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & + const css::uno::Reference< css::uno::XComponentContext > & getORB(); AddressSettings& getSettings(); const AddressSettings& getSettings() const; diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 93ed19897841..cc31b20b8576 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -33,7 +33,7 @@ namespace abp class OAddessBookSourcePilot : public OAddessBookSourcePilot_Base { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xORB; AddressSettings m_aSettings; @@ -44,10 +44,10 @@ namespace abp /// ctor OAddessBookSourcePilot( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + const css::uno::Reference< css::uno::XComponentContext >& _rxORB); /// get the service factory which was used to create the dialog - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& + const css::uno::Reference< css::uno::XComponentContext >& getORB() { return m_xORB; } AddressSettings& getSettings() { return m_aSettings; } const AddressSettings& getSettings() const { return m_aSettings; } diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index ce37d5218eb0..33cdc098a9b5 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -43,7 +43,7 @@ namespace abp using namespace ::com::sun::star::sdbc; OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource + const css::uno::Reference< css::beans::XPropertySet >& _rxDataSource , vcl::Window* _pMessageParent) :m_xContext(_rxContext) ,m_xDataSource(_rxDataSource) diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx index 9dc5d3b0cb8a..5e1e38a4ea38 100644 --- a/extensions/source/abpilot/admininvokationimpl.hxx +++ b/extensions/source/abpilot/admininvokationimpl.hxx @@ -34,15 +34,15 @@ namespace abp class OAdminDialogInvokation { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; + css::uno::Reference< css::uno::XComponentContext > + m_xContext; + css::uno::Reference< css::beans::XPropertySet > m_xDataSource; VclPtr<vcl::Window> m_pMessageParent; public: OAdminDialogInvokation( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rDataSource, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::beans::XPropertySet >& _rDataSource, vcl::Window* _pMessageParent ); diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 656409f50a7f..c2b83ae6b2a8 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -49,7 +49,7 @@ namespace abp public: explicit ODataSourceContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); ~ODataSourceContext(); @@ -113,7 +113,7 @@ namespace abp /// constructs an object which is initially invalid explicit ODataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); /// copy ctor @@ -176,7 +176,7 @@ namespace abp bool hasTable( const OUString& _rTableName ) const; /// return the intern data source object - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const; + css::uno::Reference< css::beans::XPropertySet > getDataSource() const; @@ -184,7 +184,7 @@ namespace abp <p>Available to selected clients only</p> */ void setDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS + const css::uno::Reference< css::beans::XPropertySet >& _rxDS ,const OUString& _sName ,PackageAccessControl ); diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index 7ac1e5fb7fb3..5f1b539dd46a 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -60,9 +60,9 @@ namespace abp field mapping dialog. */ bool invokeDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, class vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource, + const css::uno::Reference< css::beans::XPropertySet >& _rxDataSource, AddressSettings& _rSettings ); @@ -72,7 +72,7 @@ namespace abp and this function creates a mapping which uses this configuration information.</p> */ void defaultMapping( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, MapString2String& /* [out] */ _rFieldAssignment ); @@ -80,7 +80,7 @@ namespace abp /** writes a field mapping for the template document address source */ void writeTemplateAddressFieldMapping( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const MapString2String& _rFieldAssignment ); @@ -98,7 +98,7 @@ namespace abp expect it. */ void writeTemplateAddressSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _rDataSourceName, const OUString& _rTableName ); @@ -106,7 +106,7 @@ namespace abp /** writes the configuration entry which states the pilot has been completed successfully */ void markPilotSuccess( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 6077f0124b6c..43ee2095f8d3 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -165,7 +165,7 @@ namespace abp // User has one chance to accept it or not. // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); + css::uno::Sequence< css::beans::NamedValue > lProtocol(1); lProtocol[0].Name = "Deactivate"; lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index ba4c6205e8c1..7bc05204137c 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -32,7 +32,7 @@ namespace abp class OABSPilotUno; typedef ::svt::OGenericUnoDialog OABSPilotUno_DBase; - typedef ::cppu::ImplHelper1< ::com::sun::star::task::XJob > OABSPilotUno_JBase; + typedef ::cppu::ImplHelper1< css::task::XJob > OABSPilotUno_JBase; typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno > OABSPilotUno_PBase; /// the UNO wrapper for the address book source pilot class OABSPilotUno @@ -42,40 +42,40 @@ namespace abp ,public OABSPilotUno_PBase { OUString m_sDataSourceName; - OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); + OABSPilotUno(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XInterface (disambiguation) - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XJob - virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& lArgs ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialisation - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; using OABSPilotUno_DBase::execute; protected: diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 9d165bbfcdc9..3726f7a336ed 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -44,10 +44,10 @@ namespace bib { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xController; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xToolBarRef; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xGridRef; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xGridWin; + css::uno::Reference< css::frame::XController > m_xController; + css::uno::Reference< css::frame::XFrame > m_xToolBarRef; + css::uno::Reference< css::frame::XFrame > m_xGridRef; + css::uno::Reference< css::awt::XWindow > m_xGridWin; BibDataManager* pDatMan; VclPtr<BibToolBar> pToolBar; @@ -61,17 +61,17 @@ namespace bib void createGridWin(); // FormControlContainer ---------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + virtual css::uno::Reference< css::awt::XControlContainer > getControlContainer() SAL_OVERRIDE; public: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > + css::uno::Reference< css::frame::XDispatchProviderInterception > getDispatchProviderInterception(); BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK ); virtual ~BibBeamer(); virtual void dispose() SAL_OVERRIDE; - void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); + void SetXController(const css::uno::Reference< css::frame::XController > &); virtual void GetFocus() SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 649ff8affbe3..0a8b0ac2b66f 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -213,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) SetModified(); }; -void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& ) +void BibConfig::Notify( const css::uno::Sequence<OUString>& ) { } diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 341f05d4d080..b2a36de1bf2d 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -101,7 +101,7 @@ class BibConfig : public utl::ConfigItem OUString aColumnDefaults[COLUMN_COUNT]; - static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; @@ -109,7 +109,7 @@ public: BibConfig(); virtual ~BibConfig(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; BibDBDescriptor GetBibliographyURL(); void SetBibliographyURL(const BibDBDescriptor& rDesc); @@ -117,7 +117,7 @@ public: const Mapping* GetMapping(const BibDBDescriptor& rDesc) const; void SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping); - const OUString& GetDefColumnName(sal_uInt16 nIndex) const + const OUString& GetDefColumnName(sal_uInt16 nIndex) const {return aColumnDefaults[nIndex];} @@ -126,13 +126,13 @@ public: void setViewSize(long nSize) {SetModified(); nViewSize = nSize;} long getViewSize() {return nViewSize;} - const OUString& getQueryField() const {return sQueryField;} + const OUString& getQueryField() const {return sQueryField;} void setQueryField(const OUString& rSet) {SetModified(); sQueryField = rSet;} - const OUString& getQueryText() const {return sQueryText;} + const OUString& getQueryText() const {return sQueryText;} void setQueryText(const OUString& rSet) {SetModified(); sQueryText = rSet;} - bool IsShowColumnAssignmentWarning() const + bool IsShowColumnAssignmentWarning() const { return bShowColumnAssignmentWarning;} void SetShowColumnAssignmentWarning(bool bSet) { bShowColumnAssignmentWarning = bSet;} @@ -140,12 +140,12 @@ public: class DBChangeDialogConfig_Impl { - com::sun::star::uno::Sequence<OUString> aSourceNames; + css::uno::Sequence<OUString> aSourceNames; public: DBChangeDialogConfig_Impl(); ~DBChangeDialogConfig_Impl(); - const com::sun::star::uno::Sequence<OUString>& GetDataSourceNames(); + const css::uno::Sequence<OUString>& GetDataSourceNames(); }; #endif diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index 580e722854f0..a79a3945146a 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -64,11 +64,11 @@ class BibBookContainer: public BibSplitWindow { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTopFrameRef; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xBottomFrameRef; + css::uno::Reference< css::frame::XFrame > xTopFrameRef; + css::uno::Reference< css::frame::XFrame > xBottomFrameRef; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef; + css::uno::Reference< css::awt::XWindow > xTopPeerRef; + css::uno::Reference< css::awt::XWindow > xBottomPeerRef; VclPtr<BibWindowContainer> pTopWin; VclPtr<BibWindowContainer> pBottomWin; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index cb3b7f880fea..0292af0ade18 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -133,8 +133,8 @@ public: // XLoader virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, - const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const Reference< XLoadEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; BibliographyLoader::BibliographyLoader() : @@ -213,7 +213,7 @@ extern "C" } -void BibliographyLoader::cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibliographyLoader::cancel() throw (css::uno::RuntimeException, std::exception) { //! //! @@ -221,7 +221,7 @@ void BibliographyLoader::cancel() throw (::com::sun::star::uno::RuntimeException void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL, const Sequence< PropertyValue >& rArgs, - const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException, std::exception) + const Reference< XLoadEventListener > & rListener) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -308,7 +308,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt // attach menu bar Reference< XPropertySet > xPropSet( rFrame, UNO_QUERY ); - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::frame::XLayoutManager > xLayoutManager; if ( xPropSet.is() ) { try diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index bfa6f57c686c..37b970c32e29 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -41,11 +41,11 @@ namespace bib VclPtr<BibView> mpBibView; protected: // FormControlContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + virtual css::uno::Reference< css::awt::XControlContainer > getControlContainer() SAL_OVERRIDE; // XLoadListener equivalents - virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; - virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _loaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _reloaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; public: using FormControlContainer::connectForm; using FormControlContainer::disconnectForm; @@ -56,11 +56,11 @@ namespace bib class BibView : public BibWindow { private: - BibDataManager* m_pDatMan; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable> m_xDatMan; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener> m_xGeneralPage; - VclPtr<BibGeneralPage> m_pGeneralPage; - BibViewFormControlContainer m_aFormControlContainer; + BibDataManager* m_pDatMan; + css::uno::Reference< css::form::XLoadable> m_xDatMan; + css::uno::Reference< css::awt::XFocusListener> m_xGeneralPage; + VclPtr<BibGeneralPage> m_pGeneralPage; + BibViewFormControlContainer m_aFormControlContainer; private: DECL_LINK_TYPED(CallMappingHdl, void*, void); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 961be409d860..c61520d93b23 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -535,7 +535,7 @@ OUString DBChangeDialog_Impl::GetCurrentURL()const } // XDispatchProvider -BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch) +BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, css::uno::Reference< css::frame::XDispatch > xDispatch) { if( pBibBeamer ) { @@ -558,8 +558,8 @@ void BibInterceptorHelper::ReleaseInterceptor() xInterception.clear(); } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::frame::XDispatch > SAL_CALL + BibInterceptorHelper::queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (css::uno::RuntimeException, std::exception) { Reference< XDispatch > xReturn; @@ -573,8 +573,8 @@ void BibInterceptorHelper::ReleaseInterceptor() return xReturn; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL - BibInterceptorHelper::queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL + BibInterceptorHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw (css::uno::RuntimeException, std::exception) { Sequence< Reference< XDispatch> > aReturn( aDescripts.getLength() ); Reference< XDispatch >* pReturn = aReturn.getArray(); @@ -587,24 +587,24 @@ void BibInterceptorHelper::ReleaseInterceptor() } // XDispatchProviderInterceptor -::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - BibInterceptorHelper::getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL + BibInterceptorHelper::getSlaveDispatchProvider( ) throw (css::uno::RuntimeException, std::exception) { return xSlaveDispatchProvider; } -void SAL_CALL BibInterceptorHelper::setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL BibInterceptorHelper::setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (css::uno::RuntimeException, std::exception) { xSlaveDispatchProvider = xNewSlaveDispatchProvider; } -::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - BibInterceptorHelper::getMasterDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL + BibInterceptorHelper::getMasterDispatchProvider( ) throw (css::uno::RuntimeException, std::exception) { return xMasterDispatchProvider; } -void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (css::uno::RuntimeException, std::exception) { xMasterDispatchProvider = xNewMasterDispatchProvider; } @@ -1419,7 +1419,7 @@ void SAL_CALL BibDataManager::disposing() } -void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( css::uno::RuntimeException, std::exception ) { // not interested in } diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 967af889cc19..b5816a6c80dd 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -47,78 +47,78 @@ class BibToolBar; struct BibDBDescriptor; class BibInterceptorHelper - :public cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor > + :public cppu::WeakImplHelper< css::frame::XDispatchProviderInterceptor > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xMasterDispatchProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xSlaveDispatchProvider; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xFormDispatch; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > xInterception; + css::uno::Reference< css::frame::XDispatchProvider > xMasterDispatchProvider; + css::uno::Reference< css::frame::XDispatchProvider > xSlaveDispatchProvider; + css::uno::Reference< css::frame::XDispatch > xFormDispatch; + css::uno::Reference< css::frame::XDispatchProviderInterception > xInterception; protected: virtual ~BibInterceptorHelper( ); public: - BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch); + BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, css::uno::Reference< css::frame::XDispatch > xDispatch); void ReleaseInterceptor(); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -typedef cppu::WeakComponentImplHelper < ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::form::XLoadable +typedef cppu::WeakComponentImplHelper < css::beans::XPropertyChangeListener + , css::form::XLoadable > BibDataManager_Base; class BibDataManager :public ::comphelper::OMutexAndBroadcastHelper ,public BibDataManager_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xForm; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > m_xGridModel; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSourceProps; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xParser; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xFormCtrl; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xFormDispatch; - BibInterceptorHelper* m_pInterceptorHelper; + css::uno::Reference< css::form::XForm > m_xForm; + css::uno::Reference< css::awt::XControlModel > m_xGridModel; + css::uno::Reference< css::beans::XPropertySet > m_xSourceProps; + css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xParser; + css::uno::Reference< css::form::runtime::XFormController > m_xFormCtrl; + css::uno::Reference< css::frame::XDispatch > m_xFormDispatch; + BibInterceptorHelper* m_pInterceptorHelper; OUString aActiveDataTable; OUString aDataSourceURL; OUString aQuoteChar; - ::com::sun::star::uno::Any aUID; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xBibCursor; + css::uno::Any aUID; + css::uno::Reference< css::sdbc::XResultSet > xBibCursor; ::cppu::OInterfaceContainerHelper m_aLoadListeners; VclPtr< ::bib::BibView> pBibView; - VclPtr<BibToolBar> pToolbar; + VclPtr<BibToolBar> pToolbar; - OUString sIdentifierMapping; + OUString sIdentifierMapping; protected: - void InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); + void InsertFields(const css::uno::Reference< css::form::XFormComponent > & xGrid); void SetMeAsUidListener(); void RemoveMeAsUidListener(); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > + css::uno::Reference< css::awt::XControlModel > + updateGridModel(const css::uno::Reference< css::form::XForm > & xDbForm); + static css::uno::Reference< css::awt::XControlModel > createGridModel( const OUString& rName ); // XLoadable - virtual void SAL_CALL load( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unload( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reload( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isLoaded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL load( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unload( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reload( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLoaded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -127,18 +127,18 @@ public: BibDataManager(); virtual ~BibDataManager(); - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc); + css::uno::Reference< css::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(); + css::uno::Reference< css::awt::XControlModel > updateGridModel(); - ::com::sun::star::uno::Sequence< OUString> getDataSources(); + css::uno::Sequence< OUString> getDataSources(); OUString getActiveDataSource() {return aDataSourceURL;} void setActiveDataSource(const OUString& rURL); @@ -149,17 +149,17 @@ public: void setFilter(const OUString& rQuery); OUString getFilter(); - ::com::sun::star::uno::Sequence< OUString> getQueryFields(); + css::uno::Sequence< OUString> getQueryFields(); OUString getQueryField(); void startQueryWith(const OUString& rQuery); - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; } - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; } + const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; } + const css::uno::Reference< css::form::XForm >& getForm() { return m_xForm; } static OUString getControlName(sal_Int32 nFormatKey ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName, + css::uno::Reference< css::awt::XControlModel > loadControlModel(const OUString& rName, bool bForceListBox = false); void CreateMappingDialog(vcl::Window* pParent); @@ -175,7 +175,7 @@ public: const OUString& GetIdentifierMapping(); void ResetIdentifierMapping() {sIdentifierMapping.clear();} - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(); + css::uno::Reference< css::form::runtime::XFormController > GetFormController(); void RegisterInterceptor( ::bib::BibBeamer* pBibBeamer); bool HasActiveConnection(); diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index 51265d4ef9b7..b74ac8b9ff7b 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -114,26 +114,26 @@ namespace bib implSetDesignMode( !m_xForm.is() || !m_xForm->isLoaded() ); } - void FormControlContainer::_loaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) + void FormControlContainer::_loaded( const css::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( false ); } - void FormControlContainer::_unloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) + void FormControlContainer::_unloading( const css::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( true ); } - void FormControlContainer::_unloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) + void FormControlContainer::_unloaded( const css::lang::EventObject& /*_rEvent*/ ) { } - void FormControlContainer::_reloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) + void FormControlContainer::_reloading( const css::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( true ); } - void FormControlContainer::_reloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) + void FormControlContainer::_reloaded( const css::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( false ); } diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx index c7f512ef8ce2..8a81dcc37e48 100644 --- a/extensions/source/bibliography/formcontrolcontainer.hxx +++ b/extensions/source/bibliography/formcontrolcontainer.hxx @@ -33,9 +33,8 @@ namespace bib ,public ::bib::OLoadListener { private: - OLoadListenerAdapter* m_pFormAdapter; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > - m_xForm; + OLoadListenerAdapter* m_pFormAdapter; + css::uno::Reference< css::form::XLoadable > m_xForm; private: void implSetDesignMode( bool _bDesign ); @@ -43,22 +42,22 @@ namespace bib FormControlContainer( ); virtual ~FormControlContainer( ); - bool isFormConnected() const { return NULL != m_pFormAdapter; } - void connectForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxForm ); + bool isFormConnected() const { return NULL != m_pFormAdapter; } + void connectForm( const css::uno::Reference< css::form::XLoadable >& _rxForm ); void disconnectForm(); void ensureDesignMode(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + virtual css::uno::Reference< css::awt::XControlContainer > getControlContainer() = 0; protected: // XLoadListener equivalents - virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; - virtual void _unloading( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; - virtual void _unloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; - virtual void _reloading( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; - virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _loaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _unloading( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _unloaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _reloading( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _reloaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index af476f6b251a..0486e9b371b9 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -146,7 +146,7 @@ public: virtual ~BibFrameCtrl_Impl(); virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -159,7 +159,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& ) throw( uno::Runtim } void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; if ( pController ) @@ -191,37 +191,37 @@ BibFrameController_Impl::~BibFrameController_Impl() CloseBibModul(pBibMod); } -OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.extensions.Bibliography"); } -sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService( this, sServiceName ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { // return only top level services ... // base services are included there and should be asked by uno-rtti. - ::com::sun::star::uno::Sequence< OUString > lNames(1); + css::uno::Sequence< OUString > lNames(1); lNames[0] = "com.sun.star.frame.Bibliography"; return lNames; } -void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (css::uno::RuntimeException, std::exception) { xFrame = xArg; xFrame->addFrameActionListener( pImp ); } -sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ ) throw (css::uno::RuntimeException, std::exception) { return sal_False; } -sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception) { if ( bSuspend ) getFrame()->removeFrameActionListener( pImp ); @@ -230,26 +230,26 @@ sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (::com::sun return sal_True; } -uno::Any BibFrameController_Impl::getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception) +uno::Any BibFrameController_Impl::getViewData() throw (css::uno::RuntimeException, std::exception) { return uno::Any(); } -void BibFrameController_Impl::restoreViewData( const uno::Any& /*Value*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibFrameController_Impl::restoreViewData( const uno::Any& /*Value*/ ) throw (css::uno::RuntimeException, std::exception) { } -uno::Reference< XFrame > BibFrameController_Impl::getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< XFrame > BibFrameController_Impl::getFrame() throw (css::uno::RuntimeException, std::exception) { return xFrame; } -uno::Reference< XModel > BibFrameController_Impl::getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< XModel > BibFrameController_Impl::getModel() throw (css::uno::RuntimeException, std::exception) { return uno::Reference< XModel > (); } -void BibFrameController_Impl::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibFrameController_Impl::dispose() throw (css::uno::RuntimeException, std::exception) { bDisposing = true; lang::EventObject aObject; @@ -260,17 +260,17 @@ void BibFrameController_Impl::dispose() throw (::com::sun::star::uno::RuntimeExc aStatusListeners.clear(); } -void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) { pImp->aLC.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } -void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) { pImp->aLC.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener ); } -uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (css::uno::RuntimeException, std::exception) { if ( !bDisposing ) { @@ -287,7 +287,7 @@ uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( cons return uno::Reference< frame::XDispatch > (); } -uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispatches( const uno::Sequence<DispatchDescriptor>& aDescripts ) throw (::com::sun::star::uno::RuntimeException, std::exception) +uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispatches( const uno::Sequence<DispatchDescriptor>& aDescripts ) throw (css::uno::RuntimeException, std::exception) { uno::Sequence< uno::Reference< XDispatch > > aDispatches( aDescripts.getLength() ); for ( sal_Int32 i=0; i<aDescripts.getLength(); ++i ) @@ -296,7 +296,7 @@ uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispat } uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { uno::Sequence< ::sal_Int16 > aDispatchInfo( 4 ); @@ -309,7 +309,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { const CmdToInfoCache& rCmdCache = GetCommandToInfoCache(); @@ -339,8 +339,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) } } - ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > aSeq = - comphelper::containerToSequence< ::com::sun::star::frame::DispatchInformation, std::list< ::com::sun::star::frame::DispatchInformation > >( aDispatchInfoList ); + css::uno::Sequence< css::frame::DispatchInformation > aSeq = + comphelper::containerToSequence< css::frame::DispatchInformation, std::list< css::frame::DispatchInformation > >( aDispatchInfoList ); return aSeq; } @@ -405,7 +405,7 @@ static vcl::Window* lcl_GetFocusChild( vcl::Window* pParent ) //class XDispatch void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequence< beans::PropertyValue >& aArgs) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) { if ( !bDisposing ) @@ -541,9 +541,9 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } else if(aCommand == "Bib/DeleteRecord") { - Reference< ::com::sun::star::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY); - Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY); - Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY); + Reference< css::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY); + Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY); bool bIsNew = ::comphelper::getBOOL(xSet->getPropertyValue("IsNew")); if(!bIsNew) { @@ -638,7 +638,7 @@ IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void ) void BibFrameController_Impl::addStatusListener( const uno::Reference< frame::XStatusListener > & aListener, const util::URL& aURL) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) { BibConfig* pConfig = BibModul::GetConfig(); @@ -750,9 +750,9 @@ void BibFrameController_Impl::addStatusListener( } else if(aURL.Path == "Bib/DeleteRecord") { - Reference< ::com::sun::star::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY); - Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY); - Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY); + Reference< css::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY); + Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY); + Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY); bool bIsNew = ::comphelper::getBOOL(xSet->getPropertyValue("IsNew")); if(!bIsNew) { @@ -771,7 +771,7 @@ void BibFrameController_Impl::addStatusListener( void BibFrameController_Impl::removeStatusListener( const uno::Reference< frame::XStatusListener > & aObject, const util::URL& aURL) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // search listener array for given listener // for checking equality always "cast" to XInterface diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index f56e56135628..514b5d95796a 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -40,9 +40,9 @@ namespace com{namespace sun{namespace star{ class BibStatusDispatch { public: - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; - BibStatusDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& rRef ) + css::util::URL aURL; + css::uno::Reference< css::frame::XStatusListener > xListener; + BibStatusDispatch( const css::util::URL& rURL, const css::uno::Reference< css::frame::XStatusListener >& rRef ) : aURL( rURL ) , xListener( rRef ) {} @@ -51,71 +51,71 @@ public: typedef boost::ptr_vector<BibStatusDispatch> BibStatusDispatchArr; class BibFrameController_Impl : public cppu::WeakImplHelper < - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::frame::XController, - ::com::sun::star::frame::XDispatch, - ::com::sun::star::frame::XDispatchProvider, - ::com::sun::star::frame::XDispatchInformationProvider + css::lang::XServiceInfo, + css::frame::XController, + css::frame::XDispatch, + css::frame::XDispatchProvider, + css::frame::XDispatchInformationProvider > { friend class BibFrameCtrl_Impl; BibFrameCtrl_Impl* pImp; BibStatusDispatchArr aStatusListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; + css::uno::Reference< css::awt::XWindow > xWindow; + css::uno::Reference< css::frame::XFrame > xFrame; bool bDisposing; bool bHierarchical; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xDatMan; + css::uno::Reference< css::form::XLoadable > m_xDatMan; BibDataManager* pDatMan; HdlBibModul pBibMod; DECL_LINK_TYPED( DisposeHdl, void*, void ); - static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController); + static bool SaveModified(const css::uno::Reference< css::form::runtime::XFormController>& xController); public: - BibFrameController_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > & xComponent, + BibFrameController_Impl( const css::uno::Reference< css::awt::XWindow > & xComponent, BibDataManager* pDatMan); virtual ~BibFrameController_Impl(); - void ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs); + void ChangeDataSource(const css::uno::Sequence< css::beans::PropertyValue >& aArgs); void RemoveFilter(); - // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::frame::XController - virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - //class ::com::sun::star::frame::XDispatch - virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) - throw (::com::sun::star::uno::RuntimeException, + // css::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::frame::XController + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL restoreViewData( const css::uno::Any& Value ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XComponent + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::frame::XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + //class css::frame::XDispatch + virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::frame::XDispatchInformationProvider - virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::frame::XDispatchInformationProvider + virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index d613df6dce7f..ab2bc1961a73 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -695,17 +695,17 @@ bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent ) BibGeneralPageFocusListener::BibGeneralPageFocusListener(BibGeneralPage *pBibGeneralPage): mpBibGeneralPage(pBibGeneralPage) {} -void BibGeneralPageFocusListener::focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void BibGeneralPageFocusListener::focusGained( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) { mpBibGeneralPage->focusGained(e); } -void BibGeneralPageFocusListener::focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void BibGeneralPageFocusListener::focusLost( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) { mpBibGeneralPage->focusLost(e); } -void BibGeneralPageFocusListener::disposing( const ::com::sun::star::lang::EventObject& ) throw( com::sun::star::uno::RuntimeException, std::exception ) +void BibGeneralPageFocusListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 44ee591090d1..58b789e22bb4 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -45,15 +45,15 @@ class BibDataManager; * We need to split off the listener because both it and the vcl::Window baseclass are ref-counted */ class BibGeneralPage; -class BibGeneralPageFocusListener : public cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener > +class BibGeneralPageFocusListener : public cppu::WeakAggImplHelper1 < css::awt::XFocusListener > { private: VclPtr<BibGeneralPage> mpBibGeneralPage; public: explicit BibGeneralPageFocusListener(BibGeneralPage *pBibGeneralPage); - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -107,7 +107,7 @@ class BibGeneralPage: public BibTabPage VclPtr<FixedText> aFixedTexts[ FIELD_COUNT ]; sal_Int16 nFT2CtrlMap[ FIELD_COUNT ]; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > + css::uno::Reference< css::awt::XWindow > aControls[ FIELD_COUNT ]; OUString sErrorPrefix; @@ -115,23 +115,23 @@ class BibGeneralPage: public BibTabPage OUString sTypeColumnName; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > xCtrlContnr; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent > + css::uno::Reference< css::form::XBoundComponent > xCurrentBoundComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent > + css::uno::Reference< css::form::XBoundComponent > xLBModel; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener > + css::uno::Reference< css::sdbc::XRowSetListener > xPosListener; rtl::Reference<BibGeneralPageFocusListener> mxBibGeneralPageFocusListener; BibDataManager* pDatMan; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > + css::uno::Reference< css::awt::XControlModel > AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId, sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren ); @@ -149,9 +149,9 @@ public: inline const OUString& GetErrorString() const; - inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >& + inline const css::uno::Reference< css::form::XBoundComponent >& GetTypeListBoxModel() const; - inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& + inline const css::uno::Reference< css::awt::XControlContainer >& GetControlContainer() const; inline BibDataManager* GetDataManager(); @@ -177,13 +177,13 @@ inline const OUString& BibGeneralPage::GetErrorString() const return sTableErrorString; } -inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >& +inline const css::uno::Reference< css::form::XBoundComponent >& BibGeneralPage::GetTypeListBoxModel() const { return xLBModel; } -inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& +inline const css::uno::Reference< css::awt::XControlContainer >& BibGeneralPage::GetControlContainer() const { return xCtrlContnr; diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index bff35f2ddbc6..ec7399d47a64 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -57,19 +57,18 @@ namespace bib friend class OComponentListener; private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > - m_xComponent; + css::uno::Reference< css::lang::XComponent > m_xComponent; OComponentListener* m_pListener; sal_Int32 m_nLockCount; - bool m_bListening : 1; - bool m_bAutoRelease : 1; + bool m_bListening : 1; + bool m_bAutoRelease : 1; // impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster virtual void disposing() = 0; protected: // attribute access for derivees - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& + const css::uno::Reference< css::lang::XComponent >& getComponent() const { return m_xComponent; } OComponentListener* getListener() { return m_pListener; } @@ -80,7 +79,7 @@ namespace bib public: OComponentAdapterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp, + const css::uno::Reference< css::lang::XComponent >& _rxComp, bool _bAutoRelease = true ); @@ -102,7 +101,7 @@ namespace bib protected: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception); }; class OLoadListener : public OComponentListener @@ -113,14 +112,14 @@ namespace bib explicit OLoadListener( ::osl::Mutex& _rMutex ) : OComponentListener( _rMutex ) { } // XLoadListener equivalents - virtual void _loaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0; - virtual void _unloading( const ::com::sun::star::lang::EventObject& aEvent ) = 0; - virtual void _unloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0; - virtual void _reloading( const ::com::sun::star::lang::EventObject& aEvent ) = 0; - virtual void _reloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0; + virtual void _loaded( const css::lang::EventObject& aEvent ) = 0; + virtual void _unloading( const css::lang::EventObject& aEvent ) = 0; + virtual void _unloaded( const css::lang::EventObject& aEvent ) = 0; + virtual void _reloading( const css::lang::EventObject& aEvent ) = 0; + virtual void _reloaded( const css::lang::EventObject& aEvent ) = 0; }; - typedef ::cppu::WeakImplHelper< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base; + typedef ::cppu::WeakImplHelper< css::form::XLoadListener > OLoadListenerAdapter_Base; class OLoadListenerAdapter :public OLoadListenerAdapter_Base ,public OComponentAdapterBase @@ -134,7 +133,7 @@ namespace bib public: OLoadListenerAdapter( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable, + const css::uno::Reference< css::form::XLoadable >& _rxLoadable, bool _bAutoRelease = true ); @@ -144,14 +143,14 @@ namespace bib protected: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLoadListener - virtual void SAL_CALL loaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unloading( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reloading( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 7504e2876bcc..8fa2b4e66056 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -57,14 +57,14 @@ BibToolBarListener::~BibToolBarListener() { } -void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvt)throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void BibToolBarListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)throw( css::uno::RuntimeException, std::exception ) { if(rEvt.FeatureURL.Complete == aCommand) { SolarMutexGuard aGuard; pToolBar->EnableItem(nIndex,rEvt.IsEnabled); - ::com::sun::star::uno::Any aState=rEvt.State; + css::uno::Any aState=rEvt.State; if(aState.getValueType()==cppu::UnoType<bool>::get()) { bool bChecked= *static_cast<sal_Bool const *>(aState.getValue()); @@ -84,7 +84,7 @@ BibTBListBoxListener::~BibTBListBoxListener() { } -void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvt)throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void BibTBListBoxListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)throw( css::uno::RuntimeException, std::exception ) { if(rEvt.FeatureURL.Complete == GetCommand()) { diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 5d8b514092d0..a4b131a29a88 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -35,7 +35,7 @@ class BibDataManager; class BibToolBar; -class BibToolBarListener: public cppu::WeakImplHelper < ::com::sun::star::frame::XStatusListener> +class BibToolBarListener: public cppu::WeakImplHelper < css::frame::XStatusListener> { private: @@ -53,14 +53,14 @@ public: OUString GetCommand() const { return aCommand;} - // ::com::sun::star::lang::XEventListener + // css::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; + virtual void SAL_CALL disposing(const css::lang::EventObject& /*Source*/) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; - // ::com::sun::star::frame::XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::frame::XStatusListener + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -71,8 +71,8 @@ public: BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); virtual ~BibTBListBoxListener(); - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -83,8 +83,8 @@ public: BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); virtual ~BibTBEditListener(); - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -95,13 +95,13 @@ public: BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); virtual ~BibTBQueryMenuListener(); - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; -typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> BibToolBarListenerRef; +typedef css::uno::Reference< css::frame::XStatusListener> BibToolBarListenerRef; typedef boost::ptr_vector<BibToolBarListenerRef> BibToolBarListenerArr; class BibToolBar: public ToolBox @@ -152,7 +152,7 @@ class BibToolBar: public ToolBox virtual ~BibToolBar(); virtual void dispose() SAL_OVERRIDE; - void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); + void SetXController(const css::uno::Reference< css::frame::XController > &); void ClearSourceList(); void UpdateSourceList(bool bFlag=true); @@ -168,11 +168,11 @@ class BibToolBar: public ToolBox sal_uInt16 InsertFilterItem(const OUString& ); void SelectFilterItem(sal_uInt16 nId); - void statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) - throw( ::com::sun::star::uno::RuntimeException ); + void statusChanged(const css::frame::FeatureStateEvent& Event) + throw( css::uno::RuntimeException ); void SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;} - void SendDispatch(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs); + void SendDispatch(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue >& rArgs); }; diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index b0c308c0e78f..3ca79a24a193 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -93,7 +93,7 @@ public: @param aUserProfileMap Map containing LDAP->00o mapping @param aUserProfile struct for holding OOo values - @throws com::sun::star::ldap::LdapGenericException + @throws css::ldap::LdapGenericException if an LDAP error occurs. */ void getUserProfile(const OUString& aUser, LdapData * data) diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index b8adf46b6540..6e8267d83efc 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -37,8 +37,8 @@ namespace dbp VclPtr<PushButton> m_pSearchDatabase; VclPtr<ListBox> m_pTable; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > - m_xDSContext; + css::uno::Reference< css::sdb::XDatabaseContext > + m_xDSContext; public: explicit OTableSelectionPage(OControlWizard* _pParent); @@ -59,8 +59,8 @@ namespace dbp DECL_LINK_TYPED( OnSearchClicked, Button*, void ); void implCollectDatasource(); - void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& - _rxConn = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >()); + void implFillTables(const css::uno::Reference< css::sdbc::XConnection >& + _rxConn = css::uno::Reference< css::sdbc::XConnection >()); // OControlWizardPage overridables virtual bool canAdvance() const SAL_OVERRIDE; diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 413f5f3b6984..2ceebad23638 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -61,8 +61,8 @@ namespace dbp const OControlWizard* getDialog() const; const OControlWizardContext& getContext(); bool updateContext(); - void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + void setFormConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); + css::uno::Reference< css::sdbc::XConnection > getFormConnection() const; public: OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ); @@ -72,11 +72,11 @@ namespace dbp protected: static void fillListBox( ListBox& _rList, - const ::com::sun::star::uno::Sequence< OUString >& _rItems, + const css::uno::Sequence< OUString >& _rItems, bool _bClear = true); static void fillListBox( ComboBox& _rList, - const ::com::sun::star::uno::Sequence< OUString >& _rItems, + const css::uno::Sequence< OUString >& _rItems, bool _bClear = true); protected: @@ -94,14 +94,14 @@ namespace dbp { private: OControlWizardContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xContext; + css::uno::Reference< css::uno::XComponentContext > + m_xContext; public: OControlWizard( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); virtual ~OControlWizard(); @@ -109,19 +109,19 @@ namespace dbp bool travelNext() { return OControlWizard_Base::travelNext(); } public: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > getComponentContext() const { return m_xContext; } const OControlWizardContext& getContext() const { return m_aContext; } bool updateContext(const OAccessRegulator&); - void setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + void setFormConnection(const OAccessRegulator&, const css::uno::Reference< css::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); + css::uno::Reference< css::sdbc::XConnection > getFormConnection(const OAccessRegulator&) const; /** returns the com.sun.star.task.InteractionHandler @param _pWindow The window will be used when an error message has to be shown. */ - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler(vcl::Window* _pWindow) const; + css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler(vcl::Window* _pWindow) const; protected: // initialize the derivees settings (which have to be derived from OControlWizardSettings) @@ -132,7 +132,7 @@ namespace dbp bool needDatasourceSelection(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > getFormConnection() const; virtual bool approveControl(sal_Int16 _nClassId) = 0; diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index 4a15509c640c..63c035596d53 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.hxx @@ -28,7 +28,7 @@ namespace dbp void disambiguateName( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, + const css::uno::Reference< css::container::XNameAccess >& _rxContainer, OUString& _rElementsName); diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index ca3a9b4e4cc6..98c0aa41e98a 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -28,7 +28,7 @@ namespace dbp { struct OGridSettings : public OControlWizardSettings { - ::com::sun::star::uno::Sequence< OUString > aSelectedFields; + css::uno::Sequence< OUString > aSelectedFields; }; class OGridWizard : public OControlWizard @@ -40,8 +40,8 @@ namespace dbp public: OGridWizard( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); OGridSettings& getSettings() { return m_aSettings; } diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 567eebf9b86c..0515544c0784 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -47,8 +47,8 @@ namespace dbp public: OGroupBoxWizard( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); OOptionGroupSettings& getSettings() { return m_aSettings; } diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 75a839c75150..efe066862b2f 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -52,8 +52,8 @@ namespace dbp public: OListComboWizard( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); OListComboSettings& getSettings() { return m_aSettings; } @@ -89,10 +89,8 @@ namespace dbp bool isListBox() { return static_cast<OListComboWizard*>(getDialog())->isListBox(); } protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - getTables(bool _bNeedIt); - ::com::sun::star::uno::Sequence< OUString > - getTableFields(bool _bNeedIt); + css::uno::Reference< css::container::XNameAccess > getTables(bool _bNeedIt); + css::uno::Sequence< OUString > getTableFields(bool _bNeedIt); }; class OContentTableSelection : public OLCPage diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 4ac4b955e092..266edb89e721 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -78,7 +78,7 @@ namespace dbp sal_Int32 nTopSpace = 0; // the shape of the groupbox - ::com::sun::star::awt::Size aControlShapeSize = _rContext.xObjectShape->getSize(); + css::awt::Size aControlShapeSize = _rContext.xObjectShape->getSize(); // maybe need to adjust the size if the control shapes sal_Int32 nMinShapeHeight = BUTTON_HEIGHT*(nRadioButtons+1) + BUTTON_HEIGHT + BUTTON_HEIGHT/4; if (aControlShapeSize.Height < nMinShapeHeight) @@ -97,12 +97,12 @@ namespace dbp sal_Int32 nTempHeight = (aControlShapeSize.Height - BUTTON_HEIGHT/4) / (nRadioButtons + 1); - ::com::sun::star::awt::Point aShapePosition = _rContext.xObjectShape->getPosition(); + css::awt::Point aShapePosition = _rContext.xObjectShape->getPosition(); - ::com::sun::star::awt::Size aButtonSize(aControlShapeSize); + css::awt::Size aButtonSize(aControlShapeSize); aButtonSize.Width = aControlShapeSize.Width - OFFSET; aButtonSize.Height = HEIGHT; - ::com::sun::star::awt::Point aButtonPosition; + css::awt::Point aButtonPosition; aButtonPosition.X = aShapePosition.X + OFFSET; OUString sElementsName("RadioGroup"); diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx index 2c1c41f256ca..bf67374e1665 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.hxx +++ b/extensions/source/dbpilots/optiongrouplayouter.hxx @@ -37,12 +37,12 @@ namespace dbp class OOptionGroupLayouter { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > mxContext; public: explicit OOptionGroupLayouter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); public: @@ -53,7 +53,7 @@ namespace dbp protected: static void implAnchorShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxShapeProps + const css::uno::Reference< css::beans::XPropertySet >& _rxShapeProps ); }; diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 5be6570c444f..a3a375a8ec7d 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -38,55 +38,54 @@ namespace dbp ,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > > ,public OModuleResourceClient { - explicit OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) + explicit OUnoAutoPilot(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) : OUnoAutoPilot_Base(_rxORB) { } protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xObjectModel; + css::uno::Reference< css::beans::XPropertySet > m_xObjectModel; public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return getImplementationName_Static(); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return getSupportedServiceNames_Static(); } // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ) + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ) { return SERVICEINFO::getServiceNames(); } - static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ) + static OUString getImplementationName_Static() throw( css::uno::RuntimeException ) { return SERVICEINFO::getImplementationName(); } - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxFactory) + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new OUnoAutoPilot<TYPE, SERVICEINFO>( comphelper::getComponentContext(_rxFactory) )); } // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } @@ -98,7 +97,7 @@ namespace dbp // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; + css::uno::Sequence< css::beans::Property > aProps; describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } @@ -110,9 +109,9 @@ namespace dbp return VclPtr<TYPE>::Create(_pParent, m_xObjectModel, m_aContext); } - virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE + virtual void implInitialize(const css::uno::Any& _rValue) SAL_OVERRIDE { - ::com::sun::star::beans::PropertyValue aArgument; + css::beans::PropertyValue aArgument; if (_rValue >>= aArgument) if (aArgument.Name == "ObjectModel") { diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx index e1e9640e31f5..58cda7c209d0 100644 --- a/extensions/source/dbpilots/wizardcontext.hxx +++ b/extensions/source/dbpilots/wizardcontext.hxx @@ -40,37 +40,37 @@ namespace dbp struct OControlWizardContext { // the global data source context - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > + css::uno::Reference< css::sdb::XDatabaseContext > xDatasourceContext; // the control mode - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > xObjectModel; // the form the control model belongs to - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > xForm; // the form as rowset - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > + css::uno::Reference< css::sdbc::XRowSet > xRowSet; // the model of the document - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > xDocumentModel; // the page where the control mode resides - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > xDrawPage; // the shape which carries the control - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XControlShape > + css::uno::Reference< css::drawing::XControlShape > xObjectShape; // the tables or queries of the data source the form is bound to (if any) - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > xObjectContainer; // the column types container of the object the form is bound to (table, query or SQL statement) typedef std::map<OUString, sal_Int32> TNameTypeMap; TNameTypeMap aTypes; // the column names of the object the form is bound to (table, query or SQL statement) - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > aFieldNames; bool bEmbedded; diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx index 02e0a120a151..9ed99154e0b4 100644 --- a/extensions/source/dbpilots/wizardservices.hxx +++ b/extensions/source/dbpilots/wizardservices.hxx @@ -31,7 +31,7 @@ namespace dbp { public: static OUString getImplementationName(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getServiceNames(); }; @@ -40,7 +40,7 @@ namespace dbp { public: static OUString getImplementationName(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getServiceNames(); }; @@ -50,7 +50,7 @@ namespace dbp { public: static OUString getImplementationName(); - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getServiceNames(); }; diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 3515ef45b9dd..162125f357d6 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -44,12 +44,12 @@ namespace COMPMOD_NAMESPACE { -typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) +typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, + const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager, const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, + const css::uno::Sequence< OUString > & _rServiceNames, rtl_ModuleCount* ); @@ -69,13 +69,13 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService static OString s_sResPrefix; // auto registration administration - static ::com::sun::star::uno::Sequence< OUString >* + static css::uno::Sequence< OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >* + static css::uno::Sequence< css::uno::Sequence< OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static css::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static css::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; public: @@ -98,7 +98,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService */ static void registerComponent( const OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, + const css::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction); @@ -118,9 +118,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService @return the XInterface access to a factory for the component */ - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( + static css::uno::Reference< css::uno::XInterface > getComponentFactory( const OUString& _rImplementationName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager + const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxServiceManager ); protected: @@ -162,9 +162,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService <p>Assumed that the template argument has the three methods <ul> <li><code>static OUString getImplementationName_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> + <li><code>static css::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> + <li><code>static css::uno::Reference< css::uno::XInterface > + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code> </li> <ul/> the instantiation of this object will automatically register the class via <method>OModule::registerComponent</method>. @@ -201,9 +201,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService <p>Assumed that the template argument has the three methods <ul> <li><code>static OUString getImplementationName_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> + <li><code>static css::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> + <li><code>static css::uno::Reference< css::uno::XInterface > + Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&)</code> </li> <ul/> the instantiation of this object will automatically register the class via <method>OModule::registerComponent</method>. diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index d05f0dfd6ce3..8b05347dedf1 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -91,7 +91,7 @@ namespace logging virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -252,7 +252,7 @@ namespace logging if ( !( _rArguments[0] >>= aSettings ) ) throw IllegalArgumentException( OUString(), *this, 1 ); - // createWithSettings( [in] sequence< ::com::sun::star::beans::NamedValue > Settings ) + // createWithSettings( [in] sequence< css::beans::NamedValue > Settings ) ::comphelper::NamedValueCollection aTypedSettings( aSettings ); m_aHandlerHelper.initFromSettings( aTypedSettings ); diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 43a0c6715e25..9e8068c17d75 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -96,7 +96,7 @@ namespace logging bool m_LogTimestamp; bool m_LogSource; bool m_MultiColumn; - ::com::sun::star::uno::Sequence< OUString > m_Columnnames; + css::uno::Sequence< OUString > m_Columnnames; }; } // namespace logging @@ -143,9 +143,9 @@ namespace buf.append(str); }; - ::com::sun::star::uno::Sequence< OUString> initialColumns() + css::uno::Sequence< OUString> initialColumns() { - com::sun::star::uno::Sequence< OUString> result = ::com::sun::star::uno::Sequence< OUString>(1); + css::uno::Sequence< OUString> result = css::uno::Sequence< OUString>(1); result[0] = "message"; return result; }; diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 7db279da0615..96acea42de8d 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -108,7 +108,7 @@ namespace logging virtual sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -347,7 +347,7 @@ namespace logging } else if ( _rArguments[0] >>= aSettings ) { - // createWithSettings( [in] sequence< ::com::sun::star::beans::NamedValue > Settings ) + // createWithSettings( [in] sequence< css::beans::NamedValue > Settings ) ::comphelper::NamedValueCollection aTypedSettings( aSettings ); m_aHandlerHelper.initFromSettings( aTypedSettings ); diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx index b951945fee18..66efdfc51c73 100644 --- a/extensions/source/logging/loggerconfig.cxx +++ b/extensions/source/logging/loggerconfig.cxx @@ -243,7 +243,7 @@ namespace logging throw NullPointerException(); Reference< XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get(_rContext)); + css::configuration::theDefaultProvider::get(_rContext)); // write access to the "Settings" node (which includes settings for all loggers) Sequence< Any > aArguments(1); diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx index 72724b39a44b..bc603135da2c 100644 --- a/extensions/source/logging/loggerconfig.hxx +++ b/extensions/source/logging/loggerconfig.hxx @@ -41,7 +41,7 @@ namespace logging */ void initializeLoggerFromConfiguration( const css::uno::Reference<css::uno::XComponentContext>& _rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogger >& _rxLogger + const css::uno::Reference< css::logging::XLogger >& _rxLogger ); diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index 428e2d69a577..c87d50504a24 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.hxx @@ -36,13 +36,13 @@ namespace logging { private: // <attributes> - rtl_TextEncoding m_eEncoding; - sal_Int32 m_nLevel; - ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogFormatter > - m_xFormatter; + rtl_TextEncoding m_eEncoding; + sal_Int32 m_nLevel; + css::uno::Reference< css::logging::XLogFormatter > + m_xFormatter; // <//attributes> - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; ::osl::Mutex& m_rMutex; ::cppu::OBroadcastHelper& m_rBHelper; @@ -50,7 +50,7 @@ namespace logging public: LogHandlerHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, ::osl::Mutex& _rMutex, ::cppu::OBroadcastHelper& _rBHelper ); @@ -65,10 +65,10 @@ namespace logging inline rtl_TextEncoding getTextEncoding() const { return m_eEncoding; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogFormatter > + inline css::uno::Reference< css::logging::XLogFormatter > getFormatter() const { return m_xFormatter; } inline void - setFormatter( const ::com::sun::star::uno::Reference< ::com::sun::star::logging::XLogFormatter >& _rxFormatter ) + setFormatter( const css::uno::Reference< css::logging::XLogFormatter >& _rxFormatter ) { m_xFormatter = _rxFormatter; } @@ -104,7 +104,7 @@ namespace logging Finally, the unicode string is encoded into a byte string, using our encoding setting. Then, <TRUE/> is returned. */ - bool formatForPublishing( const ::com::sun::star::logging::LogRecord& _rRecord, OString& _out_rEntry ) const; + bool formatForPublishing( const css::logging::LogRecord& _rRecord, OString& _out_rEntry ) const; /** retrieves our formatter's heading, encoded with our encoding diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx index 877b7cf0517b..eb192f80fb68 100644 --- a/extensions/source/logging/logrecord.hxx +++ b/extensions/source/logging/logrecord.hxx @@ -28,7 +28,7 @@ namespace logging { - ::com::sun::star::logging::LogRecord createLogRecord( + css::logging::LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rClassName, const OUString& _rMethodName, @@ -37,7 +37,7 @@ namespace logging oslInterlockedCount _nEventNumber ); - inline ::com::sun::star::logging::LogRecord createLogRecord( + inline css::logging::LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rMessage, sal_Int32 _nLogLevel, diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 161af47af2e9..2abd1e48b371 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -109,17 +109,17 @@ public: throw(Exception, RuntimeException); // XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return m_sDefaultMember; } // XDefaultMethod - virtual OUString SAL_CALL getDefaultMethodName( ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; } + virtual OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) { return m_sDefaultMember; } - virtual ::com::sun::star::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invokeGetProperty( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invokePutProperty( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); // XDirectInvocation - virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMember( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual css::uno::Any SAL_CALL directInvoke( const OUString& aName, const css::uno::Sequence< css::uno::Any >& aParams ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMember( const OUString& aName ) throw (css::uno::RuntimeException); Any invokeWithDispIdComTlb(FuncDesc& aFuncDesc, diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index a11f1a635227..5ca22a0f8fb8 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -58,23 +58,23 @@ using namespace com::sun::star::frame; namespace ext_plug { -class FileSink : public ::cppu::WeakAggImplHelper1< ::com::sun::star::io::XOutputStream > +class FileSink : public ::cppu::WeakAggImplHelper1< css::io::XOutputStream > { private: - Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + Reference< css::uno::XComponentContext > m_xContext; FILE* fp; - Reference< ::com::sun::star::plugin::XPlugin > m_xPlugin; + Reference< css::plugin::XPlugin > m_xPlugin; OUString m_aTarget; OUString m_aFileName; public: - FileSink( const Reference< ::com::sun::star::uno::XComponentContext > &, - const Reference< ::com::sun::star::plugin::XPlugin > & plugin, + FileSink( const Reference< css::uno::XComponentContext > &, + const Reference< css::plugin::XPlugin > & plugin, const OUString& target, - const Reference< ::com::sun::star::io::XActiveDataSource > & source ); + const Reference< css::io::XActiveDataSource > & source ); virtual ~FileSink(); - // ::com::sun::star::io::XOutputStream + // css::io::XOutputStream virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput() throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -83,32 +83,32 @@ public: } using namespace ext_plug; -class XPluginContext_Impl : public ::cppu::WeakAggImplHelper1< ::com::sun::star::plugin::XPluginContext > +class XPluginContext_Impl : public ::cppu::WeakAggImplHelper1< css::plugin::XPluginContext > { - Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - rtl_TextEncoding m_aEncoding; + Reference< css::uno::XComponentContext > m_xContext; + rtl_TextEncoding m_aEncoding; public: - XPluginContext_Impl( const Reference< ::com::sun::star::uno::XComponentContext > & ); + XPluginContext_Impl( const Reference< css::uno::XComponentContext > & ); virtual ~XPluginContext_Impl(); - virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getValue(const Reference< css::plugin::XPlugin > & plugin, css::plugin::PluginVariable variable) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL getURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< css::lang::XEventListener > & listener) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL getURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL postURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< css::lang::XEventListener > & listener) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL postURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL newStream(const Reference< css::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< css::io::XActiveDataSource > & source) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL displayStatusText(const Reference< css::plugin::XPlugin > & plugin, const OUString& message) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getUserAgent(const Reference< css::plugin::XPlugin > & plugin) throw( css::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; }; -Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw(std::exception) +Reference< css::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw(std::exception) { return new XPluginContext_Impl( m_xContext ); } -XPluginContext_Impl::XPluginContext_Impl( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext ) +XPluginContext_Impl::XPluginContext_Impl( const Reference< css::uno::XComponentContext > & rxContext ) : m_xContext( rxContext ), m_aEncoding( osl_getThreadTextEncoding() ) { @@ -118,14 +118,14 @@ XPluginContext_Impl::~XPluginContext_Impl() { } -OUString XPluginContext_Impl::getValue( const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, ::com::sun::star::plugin::PluginVariable /*variable*/ ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +OUString XPluginContext_Impl::getValue( const Reference< css::plugin::XPlugin > & /*plugin*/, css::plugin::PluginVariable /*variable*/ ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { return OUString(); } -void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::getURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( css::plugin::PluginException, RuntimeException, std::exception ) { Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext); @@ -150,52 +150,52 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu { try { - ::com::sun::star::beans::PropertyValue aValue; + css::beans::PropertyValue aValue; aValue.Name = "Referer"; aValue.Value <<= pPlugin->getRefererURL(); - Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); - Reference< ::com::sun::star::lang::XComponent > xComp = + Sequence< css::beans::PropertyValue > aArgs( &aValue, 1 ); + Reference< css::lang::XComponent > xComp = xDesktop->loadComponentFromURL( url, target, - ::com::sun::star::frame::FrameSearchFlag::PARENT | - ::com::sun::star::frame::FrameSearchFlag::SELF | - ::com::sun::star::frame::FrameSearchFlag::CHILDREN | - ::com::sun::star::frame::FrameSearchFlag::SIBLINGS | - ::com::sun::star::frame::FrameSearchFlag::TASKS | - ::com::sun::star::frame::FrameSearchFlag::CREATE, + css::frame::FrameSearchFlag::PARENT | + css::frame::FrameSearchFlag::SELF | + css::frame::FrameSearchFlag::CHILDREN | + css::frame::FrameSearchFlag::SIBLINGS | + css::frame::FrameSearchFlag::TASKS | + css::frame::FrameSearchFlag::CREATE, aArgs ); } catch(...) { - throw ::com::sun::star::plugin::PluginException(); + throw css::plugin::PluginException(); } } } -void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::getURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< css::lang::XEventListener > & listener ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { getURL( plugin, url, target ); if( listener.is() ) - listener->disposing( ::com::sun::star::lang::EventObject() ); + listener->disposing( css::lang::EventObject() ); } -OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +OUString XPluginContext_Impl::getUserAgent(const Reference< css::plugin::XPlugin > & /*plugin*/) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { return OUString("Mozilla 3.0"); } -void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::displayStatusText(const Reference< css::plugin::XPlugin > & /*plugin*/, const OUString& /*message*/) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { } -void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::postURL(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { Sequence< sal_Int8 > aBuf; @@ -223,43 +223,43 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl { try { - ::com::sun::star::beans::PropertyValue aValues[2]; + css::beans::PropertyValue aValues[2]; aValues[0].Name = "Referer"; aValues[0].Value <<= pPlugin->getRefererURL(); aValues[1].Name = "PostString"; aValues[1].Value <<= OStringToOUString( reinterpret_cast<char const *>(( file ? aBuf : buf ).getConstArray()), m_aEncoding ); - Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); - Reference< ::com::sun::star::lang::XComponent > xComp = + Sequence< css::beans::PropertyValue > aArgs( aValues, 2 ); + Reference< css::lang::XComponent > xComp = xDesktop->loadComponentFromURL( url, target, - ::com::sun::star::frame::FrameSearchFlag::PARENT | - ::com::sun::star::frame::FrameSearchFlag::SELF | - ::com::sun::star::frame::FrameSearchFlag::CHILDREN | - ::com::sun::star::frame::FrameSearchFlag::SIBLINGS | - ::com::sun::star::frame::FrameSearchFlag::TASKS | - ::com::sun::star::frame::FrameSearchFlag::CREATE, + css::frame::FrameSearchFlag::PARENT | + css::frame::FrameSearchFlag::SELF | + css::frame::FrameSearchFlag::CHILDREN | + css::frame::FrameSearchFlag::SIBLINGS | + css::frame::FrameSearchFlag::TASKS | + css::frame::FrameSearchFlag::CREATE, aArgs ); } catch( ... ) { - throw ::com::sun::star::plugin::PluginException(); + throw css::plugin::PluginException(); } } } -void XPluginContext_Impl::postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::postURLNotify(const Reference< css::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< css::lang::XEventListener > & listener ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { postURL( plugin, url, target, buf, file ); if( listener.is() ) - listener->disposing( ::com::sun::star::lang::EventObject() ); + listener->disposing( css::lang::EventObject() ); } -void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString&, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) - throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) +void XPluginContext_Impl::newStream( const Reference< css::plugin::XPlugin > & plugin, const OUString&, const OUString& target, const Reference< css::io::XActiveDataSource > & source ) + throw( css::plugin::PluginException, RuntimeException, std::exception ) { FileSink* pNewSink = new FileSink( m_xContext, plugin, target, source ); pNewSink->acquire(); @@ -267,8 +267,8 @@ void XPluginContext_Impl::newStream( const Reference< ::com::sun::star::plugin:: -FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext, const Reference< ::com::sun::star::plugin::XPlugin > & plugin, - const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source ) : +FileSink::FileSink( const Reference< css::uno::XComponentContext > & rxContext, const Reference< css::plugin::XPlugin > & plugin, + const OUString& target, const Reference< css::io::XActiveDataSource > & source ) : m_xContext( rxContext ), m_xPlugin( plugin ), m_aTarget( target ) @@ -277,9 +277,9 @@ FileSink::FileSink( const Reference< ::com::sun::star::uno::XComponentContext > OString aFile = OUStringToOString( m_aFileName, osl_getThreadTextEncoding() ); fp = fopen( aFile.getStr() , "wb" ); - Reference< ::com::sun::star::io::XActiveDataControl > xControl( source, UNO_QUERY ); + Reference< css::io::XActiveDataControl > xControl( source, UNO_QUERY ); - source->setOutputStream( Reference< ::com::sun::star::io::XOutputStream > ( this ) ); + source->setOutputStream( Reference< css::io::XOutputStream > ( this ) ); if( xControl.is() ) xControl->start(); } @@ -301,21 +301,21 @@ void FileSink::closeOutput() throw (RuntimeException, std::exception) { try { - ::com::sun::star::beans::PropertyValue aValue; + css::beans::PropertyValue aValue; aValue.Name = "Referer"; aValue.Value <<= pPlugin->getRefererURL(); - Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); - Reference< ::com::sun::star::lang::XComponent > xComp = + Sequence< css::beans::PropertyValue > aArgs( &aValue, 1 ); + Reference< css::lang::XComponent > xComp = xDesktop->loadComponentFromURL( m_aFileName, m_aTarget, - ::com::sun::star::frame::FrameSearchFlag::PARENT | - ::com::sun::star::frame::FrameSearchFlag::SELF | - ::com::sun::star::frame::FrameSearchFlag::CHILDREN | - ::com::sun::star::frame::FrameSearchFlag::SIBLINGS | - ::com::sun::star::frame::FrameSearchFlag::TASKS | - ::com::sun::star::frame::FrameSearchFlag::CREATE, + css::frame::FrameSearchFlag::PARENT | + css::frame::FrameSearchFlag::SELF | + css::frame::FrameSearchFlag::CHILDREN | + css::frame::FrameSearchFlag::SIBLINGS | + css::frame::FrameSearchFlag::TASKS | + css::frame::FrameSearchFlag::CREATE, aArgs ); } diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index 228778b86dda..ef865fdf6d04 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.cxx @@ -62,7 +62,7 @@ PluginEventListener::~PluginEventListener() free( m_pNormalizedUrl ); } -void PluginEventListener::disposing( const ::com::sun::star::lang::EventObject& /*rEvt*/ ) throw(std::exception) +void PluginEventListener::disposing( const css::lang::EventObject& /*rEvt*/ ) throw(std::exception) { m_pPlugin->getPluginComm()-> NPP_URLNotify( &m_pPlugin->getNPPInstance(), diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 688a0b2eacff..231ab0ef4993 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -68,7 +68,7 @@ PluginManager& PluginManager::get() return *pManager; } -void PluginManager::setServiceFactory( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) +void PluginManager::setServiceFactory( const Reference< css::lang::XMultiServiceFactory >& xFactory ) { PluginManager& rManager = get(); if( ! rManager.m_xSMgr.is() ) @@ -100,13 +100,13 @@ const Sequence< OUString >& PluginManager::getAdditionalSearchPaths() } -Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( Exception ) +Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( Exception ) { Reference< XInterface > xService = *new XPluginManager_Impl( comphelper::getComponentContext(rSMgr) ); return xService; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString XPluginManager_Impl::getImplementationName() throw( ) { @@ -114,13 +114,13 @@ OUString XPluginManager_Impl::getImplementationName() throw( ) } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo sal_Bool XPluginManager_Impl::supportsService(const OUString& ServiceName) throw( ) { return cppu::supportsService(this, ServiceName); } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames() throw( ) { return getSupportedServiceNames_Static(); @@ -134,10 +134,10 @@ Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static() thro return aSNS; } -XPluginManager_Impl::XPluginManager_Impl( const Reference< ::com::sun::star::uno::XComponentContext > & rxContext ) +XPluginManager_Impl::XPluginManager_Impl( const Reference< css::uno::XComponentContext > & rxContext ) : m_xContext( rxContext ) { - PluginManager::setServiceFactory( Reference< ::com::sun::star::lang::XMultiServiceFactory>(rxContext->getServiceManager(), UNO_QUERY_THROW) ); + PluginManager::setServiceFactory( Reference< css::lang::XMultiServiceFactory>(rxContext->getServiceManager(), UNO_QUERY_THROW) ); } XPluginManager_Impl::~XPluginManager_Impl() @@ -157,23 +157,23 @@ XPlugin_Impl* XPluginManager_Impl::getXPluginFromNPP( NPP instance ) return NULL; } -XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< ::com::sun::star::plugin::XPlugin >& plugin ) +XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< css::plugin::XPlugin >& plugin ) { ::std::list<XPlugin_Impl*>::iterator iter; for( iter = PluginManager::get().getPlugins().begin(); iter != PluginManager::get().getPlugins().end(); ++iter ) { - if( plugin == Reference< ::com::sun::star::plugin::XPlugin >((*iter)) ) + if( plugin == Reference< css::plugin::XPlugin >((*iter)) ) return *iter; } return NULL; } -Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() +Sequence<css::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw (RuntimeException, std::exception) { - Sequence<com::sun::star::plugin::PluginDescription> aRet; + Sequence<css::plugin::PluginDescription> aRet; vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get(); OUString aVal( pCfg->getValue( OUString( "BrowserPlugins" ), @@ -185,10 +185,10 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug return aRet; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype) - throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ) +Reference< css::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< css::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const css::plugin::PluginDescription& plugintype) + throw( RuntimeException,css::plugin::PluginException, std::exception ) { - XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); + XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< css::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); pImpl->setPluginContext( acontext ); PluginManager::get().getPlugins().push_back( pImpl ); @@ -201,10 +201,10 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin return pImpl; } -Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< ::com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< ::com::sun::star::awt::XToolkit > & toolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw (RuntimeException, std::exception) +Reference< css::plugin::XPlugin > XPluginManager_Impl::createPluginFromURL( const Reference< css::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< css::awt::XToolkit > & toolkit, const Reference< css::awt::XWindowPeer > & parent, const OUString& url ) throw (RuntimeException, std::exception) { - XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< ::com::sun::star::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); - Reference< ::com::sun::star::plugin::XPlugin > xRef = pImpl; + XPlugin_Impl* pImpl = new XPlugin_Impl( Reference< css::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW) ); + Reference< css::plugin::XPlugin > xRef = pImpl; pImpl->setPluginContext( acontext ); @@ -219,7 +219,7 @@ Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugi pImpl->createPeer( toolkit, parent ); pImpl->provideNewStream( pImpl->getDescription().Mimetype, - Reference< com::sun::star::io::XActiveDataSource >(), + Reference< css::io::XActiveDataSource >(), url, 0, 0, comphelper::isFileUrl(url) ); diff --git a/extensions/source/plugin/base/multiplx.cxx b/extensions/source/plugin/base/multiplx.cxx index 54ca0015df44..e28d492532bc 100644 --- a/extensions/source/plugin/base/multiplx.cxx +++ b/extensions/source/plugin/base/multiplx.cxx @@ -34,17 +34,17 @@ MRCListenerMultiplexerHelper::MRCListenerMultiplexerHelper ( - const Reference< ::com::sun::star::awt::XWindow > & rControl - , const Reference< ::com::sun::star::awt::XWindow > & rPeer + const Reference< css::awt::XWindow > & rControl + , const Reference< css::awt::XWindow > & rPeer ) : xPeer( rPeer ) - , xControl( Reference< ::com::sun::star::awt::XControl >( rControl, UNO_QUERY ) ) + , xControl( Reference< css::awt::XControl >( rControl, UNO_QUERY ) ) , aListenerHolder( aMutex ) { } -void MRCListenerMultiplexerHelper::setPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer ) +void MRCListenerMultiplexerHelper::setPeer( const Reference< css::awt::XWindow > & rPeer ) { ::osl::Guard< ::osl::Mutex > aGuard( aMutex ); if( xPeer != rPeer ) @@ -76,30 +76,30 @@ void MRCListenerMultiplexerHelper::setPeer( const Reference< ::com::sun::star::a // MRCListenerMultiplexerHelper void MRCListenerMultiplexerHelper::disposeAndClear() { - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; aEvt.Source = xControl; aListenerHolder.disposeAndClear( aEvt ); } // MRCListenerMultiplexerHelper -void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ) +void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ) { // add a listener to the source (peer) - if( type == cppu::UnoType<com::sun::star::awt::XWindowListener>::get()) + if( type == cppu::UnoType<css::awt::XWindowListener>::get()) rPeer->addWindowListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XKeyListener>::get()) + else if( type == cppu::UnoType<css::awt::XKeyListener>::get()) rPeer->addKeyListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XFocusListener>::get()) + else if( type == cppu::UnoType<css::awt::XFocusListener>::get()) rPeer->addFocusListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseListener>::get()) rPeer->addMouseListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseMotionListener>::get()) rPeer->addMouseMotionListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XPaintListener>::get()) + else if( type == cppu::UnoType<css::awt::XPaintListener>::get()) rPeer->addPaintListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XTopWindowListener>::get()) + else if( type == cppu::UnoType<css::awt::XTopWindowListener>::get()) { - Reference< ::com::sun::star::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); + Reference< css::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); if( xTop.is() ) xTop->addTopWindowListener( this ); } @@ -110,24 +110,24 @@ void MRCListenerMultiplexerHelper::adviseToPeer( const Reference< ::com::sun::st } // MRCListenerMultiplexerHelper -void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ) +void MRCListenerMultiplexerHelper::unadviseFromPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ) { // the last listener is removed, remove the listener from the source (peer) - if( type == cppu::UnoType<com::sun::star::awt::XWindowListener>::get()) + if( type == cppu::UnoType<css::awt::XWindowListener>::get()) rPeer->removeWindowListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XKeyListener>::get()) + else if( type == cppu::UnoType<css::awt::XKeyListener>::get()) rPeer->removeKeyListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XFocusListener>::get()) + else if( type == cppu::UnoType<css::awt::XFocusListener>::get()) rPeer->removeFocusListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseListener>::get()) rPeer->removeMouseListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get()) + else if( type == cppu::UnoType<css::awt::XMouseMotionListener>::get()) rPeer->removeMouseMotionListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XPaintListener>::get()) + else if( type == cppu::UnoType<css::awt::XPaintListener>::get()) rPeer->removePaintListener( this ); - else if( type == cppu::UnoType<com::sun::star::awt::XTopWindowListener>::get()) + else if( type == cppu::UnoType<css::awt::XTopWindowListener>::get()) { - Reference< ::com::sun::star::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); + Reference< css::awt::XTopWindow > xTop( rPeer, UNO_QUERY ); if( xTop.is() ) xTop->removeTopWindowListener( this ); } @@ -162,12 +162,12 @@ void MRCListenerMultiplexerHelper::unadvise(const Type & type, const Reference< } } -// ::com::sun::star::lang::XEventListener -void MRCListenerMultiplexerHelper::disposing(const ::com::sun::star::lang::EventObject& ) throw(std::exception) +// css::lang::XEventListener +void MRCListenerMultiplexerHelper::disposing(const css::lang::EventObject& ) throw(std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( aMutex ); // peer is disposed, clear the reference - xPeer = Reference< ::com::sun::star::awt::XWindow > (); + xPeer = Reference< css::awt::XWindow > (); } #define MULTIPLEX( InterfaceName, MethodName, EventName ) \ @@ -198,136 +198,136 @@ if( pCont ) \ } \ } -// ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) +// css::awt::XFocusListener +void MRCListenerMultiplexerHelper::focusGained(const css::awt::FocusEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XFocusListener, focusGained, ::com::sun::star::awt::FocusEvent ) + MULTIPLEX( css::awt::XFocusListener, focusGained, css::awt::FocusEvent ) } -// ::com::sun::star::awt::XFocusListener -void MRCListenerMultiplexerHelper::focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) +// css::awt::XFocusListener +void MRCListenerMultiplexerHelper::focusLost(const css::awt::FocusEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XFocusListener, focusLost, ::com::sun::star::awt::FocusEvent ) + MULTIPLEX( css::awt::XFocusListener, focusLost, css::awt::FocusEvent ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowResized(const css::awt::WindowEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowResized, ::com::sun::star::awt::WindowEvent ) + MULTIPLEX( css::awt::XWindowListener, windowResized, css::awt::WindowEvent ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowMoved(const css::awt::WindowEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowMoved, ::com::sun::star::awt::WindowEvent ) + MULTIPLEX( css::awt::XWindowListener, windowMoved, css::awt::WindowEvent ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowShown(const css::lang::EventObject& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowShown, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XWindowListener, windowShown, css::lang::EventObject ) } -// ::com::sun::star::awt::XWindowListener -void MRCListenerMultiplexerHelper::windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception) +// css::awt::XWindowListener +void MRCListenerMultiplexerHelper::windowHidden(const css::lang::EventObject& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XWindowListener, windowHidden, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XWindowListener, windowHidden, css::lang::EventObject ) } -// ::com::sun::star::awt::XKeyListener -void MRCListenerMultiplexerHelper::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw(std::exception) +// css::awt::XKeyListener +void MRCListenerMultiplexerHelper::keyPressed(const css::awt::KeyEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XKeyListener, keyPressed, ::com::sun::star::awt::KeyEvent ) + MULTIPLEX( css::awt::XKeyListener, keyPressed, css::awt::KeyEvent ) } -// ::com::sun::star::awt::XKeyListener -void MRCListenerMultiplexerHelper::keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw(std::exception) +// css::awt::XKeyListener +void MRCListenerMultiplexerHelper::keyReleased(const css::awt::KeyEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XKeyListener, keyReleased, ::com::sun::star::awt::KeyEvent ) + MULTIPLEX( css::awt::XKeyListener, keyReleased, css::awt::KeyEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mousePressed(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mousePressed, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mousePressed, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mouseReleased(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseReleased, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mouseReleased, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mouseEntered(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseEntered, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mouseEntered, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseListener -void MRCListenerMultiplexerHelper::mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseListener +void MRCListenerMultiplexerHelper::mouseExited(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseListener, mouseExited, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseListener, mouseExited, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseMotionListener -void MRCListenerMultiplexerHelper::mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseMotionListener +void MRCListenerMultiplexerHelper::mouseDragged(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseMotionListener, mouseDragged, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseMotionListener, mouseDragged, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XMouseMotionListener -void MRCListenerMultiplexerHelper::mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) +// css::awt::XMouseMotionListener +void MRCListenerMultiplexerHelper::mouseMoved(const css::awt::MouseEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XMouseMotionListener, mouseMoved, ::com::sun::star::awt::MouseEvent ) + MULTIPLEX( css::awt::XMouseMotionListener, mouseMoved, css::awt::MouseEvent ) } -// ::com::sun::star::awt::XPaintListener -void MRCListenerMultiplexerHelper::windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception) +// css::awt::XPaintListener +void MRCListenerMultiplexerHelper::windowPaint(const css::awt::PaintEvent& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XPaintListener, windowPaint, ::com::sun::star::awt::PaintEvent ) + MULTIPLEX( css::awt::XPaintListener, windowPaint, css::awt::PaintEvent ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowOpened(const ::com::sun::star::lang::EventObject& e) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowOpened(const css::lang::EventObject& e) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowOpened, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowOpened, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowClosing( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowClosing, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowClosing, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowClosed( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowClosed, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowClosed, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowMinimized( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowMinimized, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowMinimized, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowNormalized( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowNormalized, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowNormalized, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowActivated( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowActivated, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowActivated, css::lang::EventObject ) } -// ::com::sun::star::awt::XTopWindowListener -void MRCListenerMultiplexerHelper::windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) +// css::awt::XTopWindowListener +void MRCListenerMultiplexerHelper::windowDeactivated( const css::lang::EventObject& e ) throw(std::exception) { - MULTIPLEX( ::com::sun::star::awt::XTopWindowListener, windowDeactivated, ::com::sun::star::lang::EventObject ) + MULTIPLEX( css::awt::XTopWindowListener, windowDeactivated, css::lang::EventObject ) } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index f57540abd0ed..865fed5b88b8 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -198,7 +198,7 @@ IMPL_LINK_TYPED( AsynchronousGetURL, getURL, void*, p, void ) aUrl, aTarget ); } - catch(const ::com::sun::star::plugin::PluginException&) + catch(const css::plugin::PluginException&) { } pImpl->leavePluginCallback(); @@ -316,11 +316,11 @@ extern "C" { pImpl, OStringToOUString( type, pImpl->getTextEncoding () ), OStringToOUString( target, pImpl->getTextEncoding() ), - ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) + css::uno::Reference< css::io::XActiveDataSource > ( pStream->getOutputStream(), UNO_QUERY ) ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& e ) + catch( const css::plugin::PluginException& e ) { pImpl->leavePluginCallback(); return e.ErrorCode; @@ -336,7 +336,7 @@ extern "C" { if( ! pImpl ) return NPERR_INVALID_INSTANCE_ERROR; - ::com::sun::star::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); + css::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); OString aPostURL = normalizeURL( pImpl, url ); PluginEventListener* pListener = @@ -359,10 +359,10 @@ extern "C" { OStringToOUString( target, pImpl->getTextEncoding() ), Bytes, file, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > ( pListener ) ); + css::uno::Reference< css::lang::XEventListener > ( pListener ) ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& e ) + catch( const css::plugin::PluginException& e ) { pImpl->leavePluginCallback(); return e.ErrorCode; @@ -378,7 +378,7 @@ extern "C" { if( ! pImpl ) return NPERR_INVALID_INSTANCE_ERROR; - ::com::sun::star::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); + css::uno::Sequence<sal_Int8> Bytes( reinterpret_cast<sal_Int8 const *>(buf), len ); OString aPostURL = normalizeURL( pImpl, url ); try { @@ -391,7 +391,7 @@ extern "C" { file ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& e ) + catch( const css::plugin::PluginException& e ) { pImpl->leavePluginCallback(); return e.ErrorCode; @@ -475,7 +475,7 @@ extern "C" { displayStatusText( pImpl, OStringToOUString( message, pImpl->getTextEncoding() ) ); pImpl->leavePluginCallback(); } - catch( const ::com::sun::star::plugin::PluginException& ) + catch( const css::plugin::PluginException& ) { pImpl->leavePluginCallback(); return; @@ -500,7 +500,7 @@ extern "C" { free( pAgent ); pAgent = strdup( OUStringToOString( UserAgent, pImpl->getTextEncoding() ).getStr() ); } - catch( const ::com::sun::star::plugin::PluginException& ) + catch( const css::plugin::PluginException& ) { pImpl->leavePluginCallback(); } @@ -533,7 +533,7 @@ int32_t SAL_CALL NP_LOADDS NPN_Write( NPP instance, NPStream* stream, int32_t l return 0; pImpl->enterPluginCallback(); - ::com::sun::star::uno::Sequence<sal_Int8> Bytes( static_cast<sal_Int8*>(buffer), len ); + css::uno::Sequence<sal_Int8> Bytes( static_cast<sal_Int8*>(buffer), len ); static_cast<PluginOutputStream*>(pStream)->getOutputStream()->writeBytes( Bytes ); pImpl->leavePluginCallback(); diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index 917809d03976..4204586707a0 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -64,25 +64,25 @@ MRCListenerMultiplexerHelper* PluginControl_Impl::getMultiplexer() } -void PluginControl_Impl::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) +void PluginControl_Impl::addEventListener( const Reference< css::lang::XEventListener > & l ) throw( RuntimeException, std::exception ) { _aDisposeListeners.push_back( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginControl_Impl::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) +//---- css::lang::XComponent ---------------------------------------------------------------------------------- +void PluginControl_Impl::removeEventListener( const Reference< css::lang::XEventListener > & l ) throw( RuntimeException, std::exception ) { _aDisposeListeners.remove( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- +//---- css::lang::XComponent ---------------------------------------------------------------------------------- void PluginControl_Impl::dispose() throw( RuntimeException, std::exception ) { // send disposing events - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; if( getMultiplexer() ) getMultiplexer()->disposeAndClear(); @@ -92,7 +92,7 @@ void PluginControl_Impl::dispose() } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) { @@ -106,14 +106,14 @@ void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWi _xPeerWindow->setPosSize( _nX, _nY, _nWidth, _nHeight, nFlags ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -::com::sun::star::awt::Rectangle PluginControl_Impl::getPosSize() +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +css::awt::Rectangle PluginControl_Impl::getPosSize() throw( RuntimeException, std::exception ) { return _xPeerWindow->getPosSize(); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception ) { @@ -122,7 +122,7 @@ void PluginControl_Impl::setVisible( sal_Bool bVisible ) _xPeerWindow->setVisible( _bVisible && !_bInDesignMode ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception ) { @@ -131,7 +131,7 @@ void PluginControl_Impl::setEnable( sal_Bool bEnable ) _xPeerWindow->setEnable( _bEnable ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- +//---- css::awt::XWindow ------------------------------------------------------------------------------------- void PluginControl_Impl::setFocus() throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) @@ -147,14 +147,14 @@ void PluginControl_Impl::releasePeer() _xParentWindow->removeFocusListener( this ); _xPeerWindow->dispose(); _pSysChild = NULL; - _xPeerWindow = Reference< ::com::sun::star::awt::XWindow > (); - _xPeer = Reference< ::com::sun::star::awt::XWindowPeer > (); - getMultiplexer()->setPeer( Reference< ::com::sun::star::awt::XWindow > () ); + _xPeerWindow = Reference< css::awt::XWindow > (); + _xPeer = Reference< css::awt::XWindowPeer > (); + getMultiplexer()->setPeer( Reference< css::awt::XWindow > () ); } } -//---- ::com::sun::star::awt::XControl ------------------------------------------------------------------------------------ -void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XToolkit > & /*xToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer > & xParentPeer ) +//---- css::awt::XControl ------------------------------------------------------------------------------------ +void PluginControl_Impl::createPeer( const Reference< css::awt::XToolkit > & /*xToolkit*/, const Reference< css::awt::XWindowPeer > & xParentPeer ) throw( RuntimeException, std::exception ) { if (_xPeer.is()) @@ -164,7 +164,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo } _xParentPeer = xParentPeer; - _xParentWindow = Reference< ::com::sun::star::awt::XWindow > ( xParentPeer, UNO_QUERY ); + _xParentWindow = Reference< css::awt::XWindow > ( xParentPeer, UNO_QUERY ); DBG_ASSERT( _xParentWindow.is(), "### no parent peer window!" ); vcl::Window* pImpl = VCLUnoHelper::GetWindow( xParentPeer ); @@ -175,8 +175,8 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo _pSysChild->GrabFocus(); // get peer - _xPeer = Reference< ::com::sun::star::awt::XWindowPeer > ( _pSysChild->GetComponentInterface() ); - _xPeerWindow = Reference< ::com::sun::star::awt::XWindow > ( _xPeer, UNO_QUERY ); + _xPeer = Reference< css::awt::XWindowPeer > ( _pSysChild->GetComponentInterface() ); + _xPeerWindow = Reference< css::awt::XWindow > ( _xPeer, UNO_QUERY ); // !_BOTH_ MUST BE VALID! DBG_ASSERT( (_xPeer.is() && _xPeerWindow.is()), "### no peer!" ); @@ -193,7 +193,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo getMultiplexer()->setPeer( _xPeerWindow ); } -//---- ::com::sun::star::awt::XControl ------------------------------------------------------------------------------------ +//---- css::awt::XControl ------------------------------------------------------------------------------------ void PluginControl_Impl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception ) { @@ -202,119 +202,119 @@ void PluginControl_Impl::setDesignMode( sal_Bool bOn ) _xPeerWindow->setVisible( _bVisible && !_bInDesignMode ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addPaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addPaintListener( const Reference< css::awt::XPaintListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XPaintListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XPaintListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removePaintListener( const Reference< ::com::sun::star::awt::XPaintListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removePaintListener( const Reference< css::awt::XPaintListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XPaintListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XPaintListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addWindowListener( const Reference< css::awt::XWindowListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XWindowListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XWindowListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeWindowListener( const Reference< ::com::sun::star::awt::XWindowListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeWindowListener( const Reference< css::awt::XWindowListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XWindowListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XWindowListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addFocusListener( const Reference< css::awt::XFocusListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XFocusListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XFocusListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeFocusListener( const Reference< ::com::sun::star::awt::XFocusListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeFocusListener( const Reference< css::awt::XFocusListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XFocusListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XFocusListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addKeyListener( const Reference< css::awt::XKeyListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XKeyListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XKeyListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeKeyListener( const Reference< ::com::sun::star::awt::XKeyListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeKeyListener( const Reference< css::awt::XKeyListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XKeyListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XKeyListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addMouseListener( const Reference< css::awt::XMouseListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XMouseListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XMouseListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeMouseListener( const Reference< ::com::sun::star::awt::XMouseListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeMouseListener( const Reference< css::awt::XMouseListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XMouseListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XMouseListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::addMouseMotionListener( const Reference< css::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->advise( cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get(), l ); + getMultiplexer()->advise( cppu::UnoType<css::awt::XMouseMotionListener>::get(), l ); } -//---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::removeMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) +//---- css::awt::XWindow ------------------------------------------------------------------------------------- +void PluginControl_Impl::removeMouseMotionListener( const Reference< css::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) { - getMultiplexer()->unadvise( cppu::UnoType<com::sun::star::awt::XMouseMotionListener>::get(), l ); + getMultiplexer()->unadvise( cppu::UnoType<css::awt::XMouseMotionListener>::get(), l ); } -//---- ::com::sun::star::awt::XView --------------------------------------------------------------------------------------- +//---- css::awt::XView --------------------------------------------------------------------------------------- void PluginControl_Impl::draw( sal_Int32 /*x*/, sal_Int32 /*y*/ ) throw( RuntimeException, std::exception ) { // has to be done by further implementation of control } -//---- ::com::sun::star::awt::XView --------------------------------------------------------------------------------------- +//---- css::awt::XView --------------------------------------------------------------------------------------- void PluginControl_Impl::setZoom( float /*ZoomX*/, float /*ZoomY*/ ) throw( RuntimeException, std::exception ) { // has to be done by further implementation of control } -//---- ::com::sun::star::lang::XEventListener ------------------------------------------------------------------------------ -void PluginControl_Impl::disposing( const ::com::sun::star::lang::EventObject & /*rSource*/ ) +//---- css::lang::XEventListener ------------------------------------------------------------------------------ +void PluginControl_Impl::disposing( const css::lang::EventObject & /*rSource*/ ) throw( RuntimeException, std::exception ) { } -//---- ::com::sun::star::awt::XFocusListener ------------------------------------------------------------------------------ -void PluginControl_Impl::focusGained( const ::com::sun::star::awt::FocusEvent & /*rEvt*/ ) +//---- css::awt::XFocusListener ------------------------------------------------------------------------------ +void PluginControl_Impl::focusGained( const css::awt::FocusEvent & /*rEvt*/ ) throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) _xPeerWindow->setFocus(); } -//---- ::com::sun::star::awt::XFocusListener ------------------------------------------------------------------------------ -void PluginControl_Impl::focusLost( const ::com::sun::star::awt::FocusEvent & /*rEvt*/ ) +//---- css::awt::XFocusListener ------------------------------------------------------------------------------ +void PluginControl_Impl::focusLost( const css::awt::FocusEvent & /*rEvt*/ ) throw( RuntimeException, std::exception ) { } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 5c67281c7899..ee52e1c8c9a5 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::uno; -Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ) +Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & ) throw( Exception ) { Reference< XInterface > xService = *new PluginModel(); return xService; @@ -42,12 +42,12 @@ Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< :: Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException, std::exception ) { Any aRet( ::cppu::queryInterface( type, - static_cast< ::com::sun::star::lang::XComponent* >(this), - static_cast< ::com::sun::star::io::XPersistObject* >(this ), - static_cast< ::com::sun::star::awt::XControlModel* >(this), - static_cast< ::com::sun::star::beans::XPropertySet* >(this), - static_cast< ::com::sun::star::beans::XMultiPropertySet* >(this), - static_cast< ::com::sun::star::beans::XFastPropertySet* >(this) + static_cast< css::lang::XComponent* >(this), + static_cast< css::io::XPersistObject* >(this ), + static_cast< css::awt::XControlModel* >(this), + static_cast< css::beans::XPropertySet* >(this), + static_cast< css::beans::XMultiPropertySet* >(this), + static_cast< css::beans::XFastPropertySet* >(this) ) ); return aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( type ); } @@ -67,18 +67,18 @@ static const char* aMime = "TYPE"; static ::osl::Mutex aPropertyMutex; -static ::com::sun::star::beans::Property aProps[] = +static css::beans::Property aProps[] = { - ::com::sun::star::beans::Property( + css::beans::Property( OUString::createFromAscii( aMime ), 1, ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::BOUND ), - ::com::sun::star::beans::Property( + css::beans::PropertyAttribute::BOUND ), + css::beans::Property( OUString::createFromAscii( aCreationURL ), 2, ::cppu::UnoType<OUString>::get(), - ::com::sun::star::beans::PropertyAttribute::BOUND ) + css::beans::PropertyAttribute::BOUND ) }; PluginModel::PluginModel() : @@ -101,9 +101,9 @@ PluginModel::~PluginModel() { } -Reference< ::com::sun::star::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw(std::exception) +Reference< css::beans::XPropertySetInfo > PluginModel::getPropertySetInfo() throw(std::exception) { - static Reference< ::com::sun::star::beans::XPropertySetInfo > aInfo = + static Reference< css::beans::XPropertySetInfo > aInfo = createPropertySetInfo( *this ); return aInfo; } @@ -135,7 +135,7 @@ sal_Bool PluginModel::convertFastPropertyValue( Any & rConvertedValue, void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::uno::Exception, std::exception) + throw(css::uno::Exception, std::exception) { if( rValue.getValueTypeClass() == TypeClass_STRING ) // FIXME wrong type! @@ -146,7 +146,7 @@ void PluginModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, rValue >>= m_aMimeType; } else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw() @@ -157,26 +157,26 @@ void PluginModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const t rValue <<= m_aMimeType; } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::addEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(std::exception) +//---- css::lang::XComponent ---------------------------------------------------------------------------------- +void PluginModel::addEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) { m_aDisposeListeners.push_back( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang::XEventListener > & l ) throw(std::exception) +//---- css::lang::XComponent ---------------------------------------------------------------------------------- +void PluginModel::removeEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) { m_aDisposeListeners.remove( l ); } -//---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- +//---- css::lang::XComponent ---------------------------------------------------------------------------------- void PluginModel::dispose() throw(std::exception) { // send disposing events - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); - ::std::list< Reference< ::com::sun::star::lang::XEventListener > > aLocalListeners = m_aDisposeListeners; - for( ::std::list< Reference< ::com::sun::star::lang::XEventListener > >::iterator it = aLocalListeners.begin(); + ::std::list< Reference< css::lang::XEventListener > > aLocalListeners = m_aDisposeListeners; + for( ::std::list< Reference< css::lang::XEventListener > >::iterator it = aLocalListeners.begin(); it != aLocalListeners.end(); ++it ) (*it)->disposing( aEvt ); @@ -186,18 +186,18 @@ void PluginModel::dispose() throw(std::exception) } -// ::com::sun::star::io::XPersistObject +// css::io::XPersistObject OUString PluginModel::getServiceName() throw(std::exception) { return OUString("com.sun.star.plugin.PluginModel"); } -void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception) +void PluginModel::write(const Reference< css::io::XObjectOutputStream > & OutStream) throw(std::exception) { OutStream->writeUTF( m_aCreationURL ); } -void PluginModel::read(const Reference< ::com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception) +void PluginModel::read(const Reference< css::io::XObjectInputStream > & InStream) throw(std::exception) { m_aCreationURL = InStream->readUTF(); } diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index e4b6bfc9dc9e..40c4824b28f6 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -66,10 +66,10 @@ extern "C" { if( pXUnoSMgr ) { - Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( - static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pXUnoSMgr ) + Reference< css::lang::XMultiServiceFactory > xMgr( + static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr ) ); - Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; + Reference< css::lang::XSingleServiceFactory > xFactory; if( aImplName.equals( XPluginManager_Impl::getImplementationName_Static() ) ) { xFactory = ::cppu::createSingleFactory( diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index f8e69e757fc2..d65515ba5f6d 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -112,7 +112,7 @@ Any XPlugin_Impl::queryAggregation( const Type& type ) throw( RuntimeException, } -XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) : +XPlugin_Impl::XPlugin_Impl( const uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) : PluginControl_Impl(), m_xSMgr( rSMgr ), m_pPluginComm( NULL ), @@ -131,7 +131,7 @@ XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiSe memset( &m_aNPWindow, 0, sizeof( m_aNPWindow ) ); m_xModel = new PluginModel(); - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); xPS->addPropertyChangeListener( OUString(), this ); Guard< Mutex > aGuard( ::PluginManager::get().getPluginMutex() ); @@ -181,7 +181,7 @@ void XPlugin_Impl::checkListeners( const char* normalizedURL ) if( ! strcmp( normalizedURL, (*iter)->getURL() ) || ! strcmp( normalizedURL, (*iter)->getNormalizedURL() ) ) { - (*iter)->disposing( com::sun::star::lang::EventObject() ); + (*iter)->disposing( css::lang::EventObject() ); delete *iter; m_aPEventListeners.remove( *iter ); return; @@ -216,7 +216,7 @@ IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void ) } uno::Reference< XPlugin > xProtection( this ); - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); xPS->removePropertyChangeListener( OUString(), this ); { Guard< Mutex > aPluginGuard( ::PluginManager::get().getPluginMutex() ); @@ -460,7 +460,7 @@ OUString XPlugin_Impl::getCreationURL() Guard< Mutex > aGuard( m_aMutex ); OUString aRet; - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { Any aValue = xPS->getPropertyValue("URL"); @@ -470,12 +470,12 @@ OUString XPlugin_Impl::getCreationURL() } -sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XControlModel > & Model ) +sal_Bool XPlugin_Impl::setModel( const uno::Reference< css::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); - uno::Reference< com::sun::star::beans::XPropertySet > xPS( Model, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( Model, UNO_QUERY ); if( ! xPS.is() ) return sal_False; @@ -489,7 +489,7 @@ sal_Bool XPlugin_Impl::setModel( const uno::Reference< com::sun::star::awt::XCon return sal_False; } -void XPlugin_Impl::createPeer( const uno::Reference< com::sun::star::awt::XToolkit > & xToolkit, const uno::Reference< com::sun::star::awt::XWindowPeer > & Parent ) +void XPlugin_Impl::createPeer( const uno::Reference< css::awt::XToolkit > & xToolkit, const uno::Reference< css::awt::XWindowPeer > & Parent ) throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -585,7 +585,7 @@ void XPlugin_Impl::loadPlugin() #else m_aNPWindow.window = (void*)pEnvData->hWnd; #endif - com::sun::star::awt::Rectangle aPosSize = getPosSize(); + css::awt::Rectangle aPosSize = getPosSize(); for( int i = 0; i < m_nArgs; i++ ) { @@ -649,7 +649,7 @@ PluginStream* XPlugin_Impl::getStreamFromNPStream( NPStream* stream ) } sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, - const uno::Reference< com::sun::star::io::XActiveDataSource > & stream, + const uno::Reference< css::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) @@ -662,7 +662,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, m_nProvidingState = PROVIDING_NOW; Any aAny; aAny <<= url; - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { try @@ -724,7 +724,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, // set mimetype on model { - uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); + uno::Reference< css::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { try @@ -746,7 +746,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, PluginInputStream* pStream = new PluginInputStream( this, aURL.getStr(), length, lastmodified ); - uno::Reference< com::sun::star::io::XOutputStream > xNewStream( pStream ); + uno::Reference< css::io::XOutputStream > xNewStream( pStream ); if( iter != m_aPEventListeners.end() ) pStream->getStream().notifyData = (*iter)->getNotifyData(); @@ -811,21 +811,21 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, } else { - uno::Reference< com::sun::star::io::XConnectable > xConnectable( stream, UNO_QUERY ); + uno::Reference< css::io::XConnectable > xConnectable( stream, UNO_QUERY ); pStream->setPredecessor( xConnectable ); if( xConnectable.is() ) { - xConnectable->setSuccessor( static_cast< com::sun::star::io::XConnectable* >(pStream) ); + xConnectable->setSuccessor( static_cast< css::io::XConnectable* >(pStream) ); while( xConnectable->getPredecessor().is() ) xConnectable = xConnectable->getPredecessor(); } stream->setOutputStream( xNewStream ); pStream->setSource( stream ); - uno::Reference< com::sun::star::io::XActiveDataControl > xController; + uno::Reference< css::io::XActiveDataControl > xController; if( xConnectable.is() ) - xController = uno::Reference< com::sun::star::io::XActiveDataControl >( xConnectable, UNO_QUERY ); + xController = uno::Reference< css::io::XActiveDataControl >( xConnectable, UNO_QUERY ); else - xController = uno::Reference< com::sun::star::io::XActiveDataControl >( stream, UNO_QUERY ); + xController = uno::Reference< css::io::XActiveDataControl >( stream, UNO_QUERY ); if( xController.is() ) xController->start(); @@ -839,11 +839,11 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, return bRet; } -void XPlugin_Impl::disposing( const com::sun::star::lang::EventObject& /*rSource*/ ) throw(std::exception) +void XPlugin_Impl::disposing( const css::lang::EventObject& /*rSource*/ ) throw(std::exception) { } -void XPlugin_Impl::propertyChange(const com::sun::star::beans::PropertyChangeEvent& rEvent) +void XPlugin_Impl::propertyChange(const css::beans::PropertyChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -1062,12 +1062,12 @@ void PluginInputStream::load() m_pContent = new ::ucbhelper::Content( aUrl.GetMainURL(INetURLObject::DECODE_TO_IURI), - uno::Reference< com::sun::star::ucb::XCommandEnvironment >(), + uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); m_pContent->openStream( static_cast< XOutputStream* >( this ) ); } - catch(const com::sun::star::uno::Exception &) + catch(const css::uno::Exception &) { } } @@ -1151,7 +1151,7 @@ void PluginInputStream::closeOutput() throw(std::exception) Guard< Mutex > aGuard( pPlugin->getMutex() ); flush(); - m_xSource = uno::Reference< com::sun::star::io::XActiveDataSource >(); + m_xSource = uno::Reference< css::io::XActiveDataSource >(); } sal_uInt32 PluginInputStream::read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size ) diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 8de11bdea6bd..1ca8c23c4a72 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -115,14 +115,14 @@ class XPlugin_Impl; class PluginDisposer; class PluginEventListener; -class XPlugin_Impl : public com::sun::star::plugin::XPlugin, +class XPlugin_Impl : public css::plugin::XPlugin, public PluginControl_Impl, - public com::sun::star::beans::XPropertyChangeListener + public css::beans::XPropertyChangeListener { private: ::osl::Mutex m_aMutex; - Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; - Reference< com::sun::star::plugin::XPluginContext > m_rBrowserContext; + Reference< css::lang::XMultiServiceFactory > m_xSMgr; + Reference< css::plugin::XPluginContext > m_rBrowserContext; PluginComm* m_pPluginComm; NPP_t m_aInstance; @@ -133,12 +133,12 @@ private: const char** m_pArgv; const char** m_pArgn; int m_nArgs; - OString m_aLastGetUrl; + OString m_aLastGetUrl; - Reference< com::sun::star::awt::XControlModel > m_xModel; + Reference< css::awt::XControlModel > m_xModel; - ::com::sun::star::plugin::PluginDescription m_aDescription; - sal_Int16 m_aPluginMode; + css::plugin::PluginDescription m_aDescription; + sal_Int16 m_aPluginMode; int m_nProvidingState; int m_nCalledFromPlugin; @@ -167,7 +167,7 @@ private: void modelChanged(); public: - XPlugin_Impl( const Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr ); + XPlugin_Impl( const Reference< css::lang::XMultiServiceFactory > & rSMgr ); virtual ~XPlugin_Impl(); ::osl::Mutex& getMutex() { return m_aMutex; } @@ -176,7 +176,7 @@ public: void setLastGetUrl( const OString& rUrl ) { m_aLastGetUrl = rUrl; } - com::sun::star::plugin::PluginDescription fitDescription( const OUString& rURL ); + css::plugin::PluginDescription fitDescription( const OUString& rURL ); ::std::list<PluginInputStream*>& getInputStreams() { return m_aInputStreams; } ::std::list<PluginOutputStream*>& getOutputStreams() { return m_aOutputStreams; } @@ -189,8 +189,8 @@ public: m_pPluginComm->addRef(); } } - Reference< com::sun::star::lang::XMultiServiceFactory > getServiceManager() { return m_xSMgr; } - const com::sun::star::plugin::PluginDescription& getDescription() const { return m_aDescription; } + Reference< css::lang::XMultiServiceFactory > getServiceManager() { return m_xSMgr; } + const css::plugin::PluginDescription& getDescription() const { return m_aDescription; } rtl_TextEncoding getTextEncoding() { return m_aEncoding; } NPP_t& getNPPInstance() { return m_aInstance; } NPWindow& getNPWindow() { return m_aNPWindow; } @@ -205,7 +205,7 @@ public: void checkListeners( const char* normalizedURL ); void initInstance( - const com::sun::star::plugin::PluginDescription& rDescription, + const css::plugin::PluginDescription& rDescription, const Sequence< OUString >& argn, const Sequence< OUString >& argv, sal_Int16 mode ); @@ -223,12 +223,12 @@ public: const SystemEnvData* getSysChildSysData() { return _pSysChild->GetSystemData(); } - const Reference< com::sun::star::plugin::XPluginContext > & getPluginContext() const + const Reference< css::plugin::XPluginContext > & getPluginContext() const { return m_rBrowserContext; } - void setPluginContext( const Reference< com::sun::star::plugin::XPluginContext > & ); + void setPluginContext( const Reference< css::plugin::XPluginContext > & ); // XInterface - virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL queryInterface( const Type& ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE @@ -236,31 +236,31 @@ public: // OWeakAggObject virtual Any SAL_CALL queryAggregation( const Type& ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // PluginContol_Impl virtual void SAL_CALL dispose() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createPeer( const Reference< com::sun::star::awt::XToolkit > & xToolkit, const Reference< com::sun::star::awt::XWindowPeer > & Parent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const Reference< css::awt::XToolkit > & xToolkit, const Reference< css::awt::XWindowPeer > & Parent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setModel( const Reference< com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Reference< com::sun::star::awt::XControlModel > SAL_CALL getModel()throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL setModel( const Reference< css::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< css::awt::XControlModel > SAL_CALL getModel()throw( RuntimeException, std::exception ) SAL_OVERRIDE { return m_xModel; } virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - // com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) SAL_OVERRIDE; + // css::plugin::XPlugin + virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< css::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) SAL_OVERRIDE; - // com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent& rEvent) + // css::beans::XPropertyChangeListener + virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class PluginManager { private: - Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + Reference< css::lang::XMultiServiceFactory > m_xSMgr; ::std::list<PluginComm*> m_aPluginComms; ::std::list<XPlugin_Impl*> m_aAllPlugins; ::osl::Mutex m_aPluginMutex; @@ -271,7 +271,7 @@ private: public: static PluginManager& get(); - static void setServiceFactory( const Reference< com::sun::star::lang::XMultiServiceFactory >& xFactory ); + static void setServiceFactory( const Reference< css::lang::XMultiServiceFactory >& xFactory ); static const Sequence< OUString >& getAdditionalSearchPaths(); ::std::list<PluginComm*>& getPluginComms() { return m_aPluginComms; } @@ -280,29 +280,29 @@ public: }; class XPluginManager_Impl : - public cppu::WeakAggImplHelper2< com::sun::star::plugin::XPluginManager, - com::sun::star::lang::XServiceInfo > + public cppu::WeakAggImplHelper2< css::plugin::XPluginManager, + css::lang::XServiceInfo > { - Reference< com::sun::star::uno::XComponentContext > m_xContext; + Reference< css::uno::XComponentContext > m_xContext; public: - XPluginManager_Impl( const Reference< com::sun::star::uno::XComponentContext > & ); + XPluginManager_Impl( const Reference< css::uno::XComponentContext > & ); virtual ~XPluginManager_Impl(); static XPlugin_Impl* getXPluginFromNPP( NPP ); - static XPlugin_Impl* getPluginImplementation( const Reference< com::sun::star::plugin::XPlugin >& plugin ); + static XPlugin_Impl* getPluginImplementation( const Reference< css::plugin::XPlugin >& plugin ); - virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; + virtual Reference< css::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; // has to be implemented per system - static Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); + static Sequence< css::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions() throw(css::uno::RuntimeException, std::exception); // calls system specific impl_getPluginDescriptions // checks whether plugins are disabled - virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions() + virtual Sequence< css::plugin::PluginDescription > SAL_CALL getPluginDescriptions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ) SAL_OVERRIDE; + virtual Reference< css::plugin::XPlugin > SAL_CALL createPlugin( const Reference< css::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const css::plugin::PluginDescription& plugintype) throw( RuntimeException,css::plugin::PluginException, std::exception ) SAL_OVERRIDE; - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< css::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< css::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< css::awt::XToolkit > & toolkit, const Reference< css::awt::XWindowPeer > & parent, const OUString& url ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw() SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw() SAL_OVERRIDE; @@ -315,7 +315,7 @@ public: return OUString( "com.sun.star.extensions.PluginManager" ); } }; -Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); +Reference< XInterface > SAL_CALL PluginManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & ) throw( Exception ); enum PluginStreamType { InputStream, OutputStream }; @@ -338,23 +338,23 @@ public: class PluginInputStream : public PluginStream, public cppu::WeakAggImplHelper2< - ::com::sun::star::io::XOutputStream, - ::com::sun::star::io::XConnectable + css::io::XOutputStream, + css::io::XConnectable > { private: ::ucbhelper::Content* m_pContent; sal_Int32 m_nMode; - sal_uInt32 m_nWritePos; + sal_uInt32 m_nWritePos; - Reference< com::sun::star::io::XActiveDataSource > m_xSource; + Reference< css::io::XActiveDataSource > m_xSource; // hold a reference on input until closeOutput is called - Reference< com::sun::star::io::XConnectable > m_xPredecessor; - Reference< com::sun::star::io::XConnectable > m_xSuccessor; + Reference< css::io::XConnectable > m_xPredecessor; + Reference< css::io::XConnectable > m_xSuccessor; // needed to hold a reference to self in NP_SEEK mode - Reference< com::sun::star::io::XOutputStream > m_xSelf; + Reference< css::io::XOutputStream > m_xSelf; SvFileStream m_aFileStream; public: @@ -369,7 +369,7 @@ public: void setMode( sal_Int32 nMode ); sal_uInt32 read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size ); - void setSource( const Reference< com::sun::star::io::XActiveDataSource >& xSource ) { m_xSource = xSource; } + void setSource( const Reference< css::io::XActiveDataSource >& xSource ) { m_xSource = xSource; } // get contents ot url via ucbhelper::Content void load(); @@ -383,21 +383,21 @@ public: virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE; // XConnectable - virtual void SAL_CALL setPredecessor( const Reference< com::sun::star::io::XConnectable >& xPredecessor ) throw(std::exception) SAL_OVERRIDE + virtual void SAL_CALL setPredecessor( const Reference< css::io::XConnectable >& xPredecessor ) throw(std::exception) SAL_OVERRIDE { m_xPredecessor = xPredecessor; } - virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) SAL_OVERRIDE + virtual Reference< css::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) SAL_OVERRIDE { return m_xPredecessor; } - virtual void SAL_CALL setSuccessor( const Reference< com::sun::star::io::XConnectable >& xSuccessor ) throw(std::exception) SAL_OVERRIDE + virtual void SAL_CALL setSuccessor( const Reference< css::io::XConnectable >& xSuccessor ) throw(std::exception) SAL_OVERRIDE { m_xSuccessor = xSuccessor; } - virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) SAL_OVERRIDE + virtual Reference< css::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) SAL_OVERRIDE { return m_xSuccessor; } }; class PluginOutputStream : public PluginStream { private: - Reference< com::sun::star::io::XOutputStream > m_xStream; + Reference< css::io::XOutputStream > m_xStream; public: PluginOutputStream( XPlugin_Impl* pPlugin, const char* url, sal_uInt32 len, sal_uInt32 lastmod ); @@ -405,15 +405,15 @@ public: virtual PluginStreamType getStreamType() SAL_OVERRIDE; - Reference< com::sun::star::io::XOutputStream > & getOutputStream() { return m_xStream; } + Reference< css::io::XOutputStream > & getOutputStream() { return m_xStream; } }; class PluginEventListener : - public cppu::WeakAggImplHelper1< com::sun::star::lang::XEventListener > + public cppu::WeakAggImplHelper1< css::lang::XEventListener > { private: XPlugin_Impl* m_pPlugin; - Reference< com::sun::star::plugin::XPlugin > m_xPlugin; // just to hold the plugin + Reference< css::plugin::XPlugin > m_xPlugin; // just to hold the plugin char* m_pUrl; char* m_pNormalizedUrl; void* m_pNotifyData; @@ -428,8 +428,8 @@ public: const char* getNormalizedURL() { return m_pNormalizedUrl; } void* getNotifyData() { return m_pNotifyData; } - // com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw(std::exception) SAL_OVERRIDE; + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(std::exception) SAL_OVERRIDE; }; #endif diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index bd1f2a22e7d0..c5f1ee8bcf86 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -60,15 +60,15 @@ class PluginModel : public BroadcasterHelperHolder, public cppu::OPropertySetHelper, public cppu::OPropertyArrayHelper, public cppu::OWeakAggObject, - public com::sun::star::lang::XComponent, - public com::sun::star::io::XPersistObject, - public com::sun::star::awt::XControlModel + public css::lang::XComponent, + public css::io::XPersistObject, + public css::awt::XControlModel { private: OUString m_aCreationURL; OUString m_aMimeType; - std::list< Reference< com::sun::star::lang::XEventListener > > + std::list< Reference< css::lang::XEventListener > > m_aDisposeListeners; public: // these are here to force memory de/allocation to sal lib. @@ -82,17 +82,17 @@ class PluginModel : public BroadcasterHelperHolder, virtual ~PluginModel(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual Any SAL_CALL queryInterface( const Type& rType ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); } virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakAggObject::release(); } - virtual Any SAL_CALL queryAggregation( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL queryAggregation( const Type& ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // com::sun::star::lang::XTypeProvider + // css::lang::XTypeProvider static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() throw( ); static OUString SAL_CALL getImplementationName_Static() throw( ) @@ -109,23 +109,23 @@ class PluginModel : public BroadcasterHelperHolder, const Any& rValue ) throw() SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw(css::uno::Exception, std::exception) SAL_OVERRIDE; virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw() SAL_OVERRIDE; - virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(std::exception) SAL_OVERRIDE; + virtual Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(std::exception) SAL_OVERRIDE; - // com::sun::star::io::XPersistObject + // css::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const Reference< css::io::XObjectOutputStream > & OutStream) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const Reference< css::io::XObjectInputStream > & InStream) throw(std::exception) SAL_OVERRIDE; - // com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; + // css::lang::XComponent + virtual void SAL_CALL addEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const Reference< css::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; virtual void SAL_CALL dispose() throw(std::exception) SAL_OVERRIDE; private: using cppu::OPropertySetHelper::getFastPropertyValue; }; -Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory > & ) throw( Exception ); +Reference< XInterface > SAL_CALL PluginModel_CreateInstance( const Reference< css::lang::XMultiServiceFactory > & ) throw( Exception ); #endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MODEL_HXX diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx index faa6a219531a..352efc23d3ef 100644 --- a/extensions/source/plugin/inc/plugin/multiplx.hxx +++ b/extensions/source/plugin/inc/plugin/multiplx.hxx @@ -67,13 +67,13 @@ class MRCListenerMultiplexerHelper : public MRCListenerMultiplexerHelper_Mutex, public ::cppu::WeakAggImplHelper7< - ::com::sun::star::awt::XFocusListener, - ::com::sun::star::awt::XWindowListener, - ::com::sun::star::awt::XKeyListener, - ::com::sun::star::awt::XMouseListener, - ::com::sun::star::awt::XMouseMotionListener, - ::com::sun::star::awt::XPaintListener, - ::com::sun::star::awt::XTopWindowListener > + css::awt::XFocusListener, + css::awt::XWindowListener, + css::awt::XKeyListener, + css::awt::XMouseListener, + css::awt::XMouseMotionListener, + css::awt::XPaintListener, + css::awt::XTopWindowListener > { public: /** @@ -84,14 +84,14 @@ public: * @param rPeer The peer from which the original events are dispatched. Null is * allowed. */ - MRCListenerMultiplexerHelper( const Reference< ::com::sun::star::awt::XWindow > & rControl, const Reference< ::com::sun::star::awt::XWindow > & rPeer ); + MRCListenerMultiplexerHelper( const Reference< css::awt::XWindow > & rControl, const Reference< css::awt::XWindow > & rPeer ); /** * Remove all listeners from the previous set peer and add the needed listeners to rPeer. * @param rPeer The peer from which the original events are dispatched. Null is * allowed. */ - void setPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer ); + void setPeer( const Reference< css::awt::XWindow > & rPeer ); /** * Remove all listeners and send a disposing message. @@ -107,54 +107,54 @@ public: */ void unadvise(const Type& type, const Reference< XInterface > & listener); - // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XFocusListener - void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XWindowListener - void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XKeyListener - void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XMouseListener - void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XMouseMotionListener - void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XPaintListener - void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::awt::XTopWindowListener - void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; - void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + // css::lang::XEventListener + void SAL_CALL disposing(const css::lang::EventObject& Source) throw(std::exception) SAL_OVERRIDE; + // css::awt::XFocusListener + void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XWindowListener + void SAL_CALL windowResized(const css::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowMoved(const css::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowShown(const css::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowHidden(const css::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XKeyListener + void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; + // css::awt::XMouseListener + void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XMouseMotionListener + void SAL_CALL mouseDragged(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseMoved(const css::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XPaintListener + void SAL_CALL windowPaint(const css::awt::PaintEvent& e) throw(std::exception) SAL_OVERRIDE; + // css::awt::XTopWindowListener + void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; protected: /** * Remove the listener with the uik rUik from the peer rPeer. * @param rPeer the peer from which the listener is removed. * @param rUik the listener uik, which specify the type of the listener. */ - void adviseToPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ); + void adviseToPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ); /** * Add the listener with the uik rUik to the peer rPeer. * @param rPeer the peer to which the listener is added. * @param rUik the listener uik, which specify the type of the listener. */ - void unadviseFromPeer( const Reference< ::com::sun::star::awt::XWindow > & rPeer, const Type & type ); + void unadviseFromPeer( const Reference< css::awt::XWindow > & rPeer, const Type & type ); private: /** The source of the events. Normally this is the peer object.*/ - Reference< ::com::sun::star::awt::XWindow > xPeer; - WeakReference< ::com::sun::star::awt::XControl > xControl; + Reference< css::awt::XWindow > xPeer; + WeakReference< css::awt::XControl > xControl; ::cppu::OMultiTypeInterfaceContainerHelper aListenerHolder; diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index c42dcc96cd5b..d7533567cd96 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -68,79 +68,79 @@ class SystemChildWindow; class PluginControl_Impl : public ::cppu::WeakAggImplHelper4< - ::com::sun::star::awt::XControl, - ::com::sun::star::awt::XWindow, - ::com::sun::star::awt::XFocusListener, - ::com::sun::star::awt::XView > + css::awt::XControl, + css::awt::XWindow, + css::awt::XFocusListener, + css::awt::XView > { public: - // ::com::sun::star::awt::XControl - virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xContext ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + // css::awt::XControl + virtual void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface > & xContext ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { _xContext = xContext; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _xContext; } - virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & Model ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel > & Model ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE - { return static_cast<com::sun::star::awt::XView*>(this); } + virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE + { return static_cast<css::awt::XView*>(this); } - virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isTransparent() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDesignMode() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _bInDesignMode; } - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & xToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & Parent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit > & xToolkit, const css::uno::Reference< css::awt::XWindowPeer > & Parent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _xPeer; } - // ::com::sun::star::awt::XWindow - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject & rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - - // ::com::sun::star::awt::XView - virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & /*aDevice*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + // css::awt::XWindow + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setFocus() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL getPosSize() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addMouseMotionListener( const Reference< css::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject & rSource ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + // css::awt::XFocusListener + virtual void SAL_CALL focusGained( const css::awt::FocusEvent & rEvt ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent & rEvt ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::lang::XComponent + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & l ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + // css::awt::XView + virtual sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics > & /*aDevice*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE - { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > (); } + virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE + { return css::uno::Reference< css::awt::XGraphics > (); } - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE - { return ::com::sun::star::awt::Size(_nWidth, _nHeight); } + virtual css::awt::Size SAL_CALL getSize() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE + { return css::awt::Size(_nWidth, _nHeight); } - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: PluginControl_Impl(); @@ -152,7 +152,7 @@ protected: void releasePeer(); protected: - ::std::list< Reference< ::com::sun::star::lang::XEventListener > > _aDisposeListeners; + ::std::list< Reference< css::lang::XEventListener > > _aDisposeListeners; MRCListenerMultiplexerHelper* _pMultiplexer; Reference< XInterface > _xContext; @@ -168,11 +168,11 @@ protected: bool _bEnable; VclPtr<SystemChildWindow> _pSysChild; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > _xPeer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > _xPeerWindow; + css::uno::Reference< css::awt::XWindowPeer > _xPeer; + css::uno::Reference< css::awt::XWindow > _xPeerWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > _xParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > _xParentPeer; + css::uno::Reference< css::awt::XWindow > _xParentWindow; + css::uno::Reference< css::awt::XWindowPeer > _xParentPeer; }; #endif diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 3cb466415146..0db9c73a5229 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -34,23 +34,23 @@ namespace pcr ,public PcrClient { public: - MasterDetailLinkDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); + MasterDetailLinkDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); private: // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper @@ -58,10 +58,10 @@ namespace pcr // OGenericUnoDialog overridables virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) SAL_OVERRIDE; - virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; + virtual void implInitialize(const css::uno::Any& _rValue) SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xMaster; + css::uno::Reference< css::beans::XPropertySet> m_xDetail; + css::uno::Reference< css::beans::XPropertySet> m_xMaster; OUString m_sExplanation; OUString m_sDetailLabel; OUString m_sMasterLabel; diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 7dc1f846a9e1..33fd5c485d6a 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -54,13 +54,13 @@ namespace pcr VclPtr<FixedText> m_aFtTitle; Size m_aOutputSize; Point m_aLinePos; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + css::uno::Reference< css::inspection::XPropertyControl > m_xControl; - VclPtr<vcl::Window> m_pControlWindow; - VclPtr<PushButton> m_pBrowseButton; - VclPtr<PushButton> m_pAdditionalBrowseButton; + VclPtr<vcl::Window> m_pControlWindow; + VclPtr<PushButton> m_pBrowseButton; + VclPtr<PushButton> m_pAdditionalBrowseButton; IButtonClickListener* m_pClickListener; - VclPtr<vcl::Window> m_pTheParent; + VclPtr<vcl::Window> m_pTheParent; sal_uInt16 m_nNameWidth; sal_uInt16 m_nEnableFlags; bool m_bIndentTitle; @@ -70,8 +70,8 @@ namespace pcr OBrowserLine( const OUString& _rEntryName, vcl::Window* pParent); ~OBrowserLine(); - void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl() const + void setControl( const css::uno::Reference< css::inspection::XPropertyControl >& _rxControl ); + const css::uno::Reference< css::inspection::XPropertyControl >& getControl() const { return m_xControl; } @@ -80,8 +80,7 @@ namespace pcr return m_pControlWindow; } - const OUString& - GetEntryName() const { return m_sEntryName; } + const OUString& GetEntryName() const { return m_sEntryName; } void SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId ); @@ -93,12 +92,12 @@ namespace pcr void SetPosSizePixel(Point aPos,Size aSize); void Show(bool bFlag=true); void Hide(); - bool IsVisible(); + bool IsVisible(); - vcl::Window* GetRefWindow(); + vcl::Window* GetRefWindow(); void SetTabOrder(vcl::Window* pRefWindow, ZOrderFlags nFlags ); - bool GrabFocus(); + bool GrabFocus(); void ShowBrowseButton( const OUString& _rImageURL, bool _bPrimary ); void ShowBrowseButton( const Image& _rImage, bool _bPrimary ); void ShowBrowseButton( bool _bPrimary ); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 7cfc7b5c4a39..28f67a1e5c75 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -116,7 +116,7 @@ namespace pcr } - /** implementation for of <type scope="com::sun::star::inspection">XPropertyControlContext</type> + /** implementation for of <type scope="css::inspection">XPropertyControlContext</type> which forwards all events to a non-UNO version of this interface */ typedef ::cppu::WeakImplHelper< XPropertyControlContext > PropertyControlContext_Impl_Base; @@ -144,8 +144,8 @@ namespace pcr /** disposes the context. When you call this method, all subsequent callbacks to the - <type scope="com::sun::star::inspection">XPropertyControlContext</type> methods - will throw a <type scope="com::sun::star::lang">DisposedException</type>. + <type scope="css::inspection">XPropertyControlContext</type> methods + will throw a <type scope="css::lang">DisposedException</type>. */ void SAL_CALL dispose(); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 7683f9c526b1..6ccda046585c 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -56,10 +56,10 @@ namespace pcr { OUString aName; BrowserLinePointer pLine; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > + css::uno::Reference< css::inspection::XPropertyHandler > xHandler; - ListBoxLine( const OUString& rName, BrowserLinePointer _pLine, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ) + ListBoxLine( const OUString& rName, BrowserLinePointer _pLine, const css::uno::Reference< css::inspection::XPropertyHandler >& _rxHandler ) : aName( rName ), pLine( _pLine ), xHandler( _rxHandler ) @@ -74,9 +74,9 @@ namespace pcr class SAL_NO_VTABLE IControlContext { public: - virtual void SAL_CALL focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL activateNextControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& CurrentControl ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException) = 0; + virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException) = 0; + virtual void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ) throw (css::uno::RuntimeException) = 0; protected: ~IControlContext() {} @@ -96,7 +96,7 @@ namespace pcr IPropertyControlObserver* m_pControlObserver; long m_nYOffset; long m_nCurrentPreferredHelpHeight; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + css::uno::Reference< css::inspection::XPropertyControl > m_xActiveControl; sal_uInt16 m_nTheNameSize; long m_nRowHeight; @@ -142,12 +142,12 @@ namespace pcr void Clear(); sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 nPos = EDITOR_LIST_APPEND ); - bool RemoveEntry( const OUString& _rName ); + bool RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor&, sal_uInt16 nPos ); - void SetPropertyValue( const OUString& rEntryName, const ::com::sun::star::uno::Any& rValue, bool _bUnknownValue ); + void SetPropertyValue( const OUString& rEntryName, const css::uno::Any& rValue, bool _bUnknownValue ); sal_uInt16 GetPropertyPos( const OUString& rEntryName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + css::uno::Reference< css::inspection::XPropertyControl > GetPropertyControl( const OUString& rEntryName ); void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); @@ -161,9 +161,9 @@ namespace pcr protected: // IControlContext - virtual void SAL_CALL focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL activateNextControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& CurrentControl ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ) throw (css::uno::RuntimeException) SAL_OVERRIDE; // IButtonClickListener void buttonClicked( OBrowserLine* _pLine, bool _bPrimary ) SAL_OVERRIDE; @@ -176,7 +176,7 @@ namespace pcr @param _rxControl The control to lookup. Must denote a control of one of the lines in ->m_aLines */ - sal_uInt16 impl_getControlPos( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ) const; + sal_uInt16 impl_getControlPos( const css::uno::Reference< css::inspection::XPropertyControl >& _rxControl ) const; /** sets the given property value at the given control, after converting it as necessary @param _rLine @@ -185,13 +185,13 @@ namespace pcr the property value to set. If it's not compatible with the control value, it will be converted, using <member>XPropertyHandler::convertToControlValue</member> */ - static void impl_setControlAsPropertyValue( const ListBoxLine& _rLine, const ::com::sun::star::uno::Any& _rPropertyValue ); + static void impl_setControlAsPropertyValue( const ListBoxLine& _rLine, const css::uno::Any& _rPropertyValue ); /** retrieves the value for the given control, as a property value, after converting it as necessary @param _rLine The line whose at which the value is to be set. */ - static ::com::sun::star::uno::Any + static css::uno::Any impl_getControlAsPropertyValue( const ListBoxLine& _rLine ); /** retrieves the ->BrowserLinePointer for a given entry name diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index a26fbdedb7c8..63235def840d 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -104,7 +104,7 @@ namespace pcr m_pPropBox->SetSizePixel(aSize); } - ::com::sun::star::awt::Size OPropertyBrowserView::getMinimumSize() + css::awt::Size OPropertyBrowserView::getMinimumSize() { Size aSize = GetOutputSizePixel(); if( m_pPropBox ) @@ -112,7 +112,7 @@ namespace pcr aSize.setHeight( m_pPropBox->getMinimumHeight() ); aSize.setWidth( m_pPropBox->getMinimumWidth() ); } - return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() ); + return css::awt::Size( aSize.Width(), aSize.Height() ); } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index dd3c8107992e..9addc62a3916 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -57,7 +57,7 @@ namespace pcr void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } - ::com::sun::star::awt::Size getMinimumSize(); + css::awt::Size getMinimumSize(); protected: DECL_LINK_TYPED(OnPageActivation, LinkParamNone*, void); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 77dd59b8a6dc..b6e85bedea35 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -33,37 +33,35 @@ namespace pcr class ButtonNavigationHandler : public ButtonNavigationHandler_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > + css::uno::Reference< css::inspection::XPropertyHandler > m_xSlaveHandler; public: ButtonNavigationHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); protected: virtual ~ButtonNavigationHandler(); - static bool isNavigationCapableButton( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent ); + static bool isNavigationCapableButton( const css::uno::Reference< css::beans::XPropertySet >& _rxComponent ); protected: // XPropertyHandler overriables - virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // PropertyHandler overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > + virtual css::uno::Sequence< css::beans::Property > SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 4c02f23ea13d..b61cf03db39d 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -45,27 +45,26 @@ namespace pcr public: CellBindingPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); protected: virtual ~CellBindingPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // PropertyHandler overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > + virtual css::uno::Sequence< css::beans::Property > SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; virtual void onNewComponent() SAL_OVERRIDE; @@ -86,7 +85,7 @@ namespace pcr @param _rxInspectorUI provides access to the property browser UI. Must not be <NULL/>. */ - void impl_updateDependentProperty_nothrow( PropertyId _nPropId, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) const; + void impl_updateDependentProperty_nothrow( PropertyId _nPropId, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) const; }; diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx index e0224aa9ed27..1bc9adf4c467 100644 --- a/extensions/source/propctrlr/cellbindinghelper.hxx +++ b/extensions/source/propctrlr/cellbindinghelper.hxx @@ -39,9 +39,9 @@ namespace pcr class CellBindingHelper { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; // the model we work for - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDocument; // the document where the model lives public: @@ -50,8 +50,8 @@ namespace pcr the control model which is or will be bound */ CellBindingHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); public: @@ -61,14 +61,14 @@ namespace pcr the document, since then no of it's functionality will be available.</p> */ static bool isSpreadsheetDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); /** gets a cell binding for the given address @precond isCellBindingAllowed returns <TRUE/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > createCellBindingFromStringAddress( const OUString& _rAddress, bool _bSupportIntegerExchange = false @@ -77,15 +77,15 @@ namespace pcr /** creates a cell binding (supporting integer exchange, if requested) for the given address object */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > createCellBindingFromAddress( - const ::com::sun::star::table::CellAddress& _rAddress, + const css::table::CellAddress& _rAddress, bool _bSupportIntegerExchange = false ) const; /** gets a cell range list source binding for the given address */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -98,7 +98,7 @@ namespace pcr @see isCellBinding */ OUString getStringAddressFromCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) const; /** creates an address object for the given value binding's address @@ -110,8 +110,8 @@ namespace pcr @see isCellBinding */ bool getAddressFromCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding, - ::com::sun::star::table::CellAddress& _rAddress + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding, + css::table::CellAddress& _rAddress ) const; /** creates a string representation for the given list source's range address @@ -125,17 +125,17 @@ namespace pcr @see isCellRangeListSource */ OUString getStringAddressFromCellListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) const; /** returns the current binding of our control model, if any. */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > + css::uno::Reference< css::form::binding::XValueBinding > getCurrentBinding( ) const; /** returns the current external list source of the control model, if any */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > getCurrentListSource( ) const; /** sets a new binding for our control model @@ -144,7 +144,7 @@ namespace pcr returning <TRUE/>) */ void setBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** sets a list source for our control model @@ -153,7 +153,7 @@ namespace pcr returning <TRUE/>) */ void setListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); /** checks whether it's possible to bind the control model to a spreadsheet cell @@ -173,27 +173,27 @@ namespace pcr /** checks whether a given binding is a spreadsheet cell binding */ static bool isCellBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** checks whether a given binding is a spreadsheet cell binding, exchanging integer values */ static bool isCellIntegerBinding( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding + const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ); /** checks whether a given list source is a spreadsheet cell list source */ static bool isCellRangeListSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource + const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ); /** retrieves the index of the sheet which our control belongs to @return the index of the sheet which our control belongs to or -1, if an error occurred */ sal_Int16 getControlSheetIndex( - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& _out_rxSheet + css::uno::Reference< css::sheet::XSpreadsheet >& _out_rxSheet ) const; protected: @@ -201,14 +201,14 @@ namespace pcr */ bool convertStringAddress( const OUString& _rAddressDescription, - ::com::sun::star::table::CellAddress& /* [out] */ _rAddress + css::table::CellAddress& /* [out] */ _rAddress ) const; /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( const OUString& _rAddressDescription, - ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress + css::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply @@ -219,7 +219,7 @@ namespace pcr /** checkes whether a given component supports a given servive */ static bool doesComponentSupport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, + const css::uno::Reference< css::uno::XInterface >& _rxComponent, const OUString& _rService ); @@ -233,11 +233,11 @@ namespace pcr the value of the instantiation argument. Not evaluated if <arg>_rArgumentName</arg> is empty. */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, - const ::com::sun::star::uno::Any& _rArgumentValue + const css::uno::Any& _rArgumentValue ) const; /** converts an address representation into another one @@ -257,14 +257,14 @@ namespace pcr @return <TRUE/> if any only if the conversion was successful - @see com::sun::star::table::CellAddressConversion - @see com::sun::star::table::CellRangeAddressConversion + @see css::table::CellAddressConversion + @see css::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( const OUString& _rInputProperty, - const ::com::sun::star::uno::Any& _rInputValue, + const css::uno::Any& _rInputValue, const OUString& _rOutputProperty, - ::com::sun::star::uno::Any& _rOutputValue, + css::uno::Any& _rOutputValue, bool _bIsRange ) const; }; diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index 9b06ff02a60d..b649431adee9 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -71,11 +71,11 @@ namespace pcr //= ControlHelper - /** A helper class for implementing the <type scope="com::sun::star::inspection">XPropertyControl</type> + /** A helper class for implementing the <type scope="css::inspection">XPropertyControl</type> or one of its derived interfaces. This class is intended to be held as member of another class which implements the - <type scope="com::sun::star::inspection">XPropertyControl</type> interface. The pointer + <type scope="css::inspection">XPropertyControl</type> interface. The pointer to this interface is to be passed to the ctor. */ class ControlHelper @@ -83,21 +83,21 @@ namespace pcr private: VclPtr<vcl::Window> m_pControlWindow; sal_Int16 m_nControlType; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > + css::uno::Reference< css::inspection::XPropertyControlContext > m_xContext; - ::com::sun::star::inspection::XPropertyControl& + css::inspection::XPropertyControl& m_rAntiImpl; IModifyListener* m_pModifyListener; - bool m_bModified; + bool m_bModified; public: /** creates the instance @param _rControlWindow - the window which is associated with the <type scope="com::sun::star::inspection">XPropertyControl</type>. + the window which is associated with the <type scope="css::inspection">XPropertyControl</type>. Must not be <NULL/>.<br/> Ownership for this window is taken by the ControlHelper - it will be deleted in <member>disposing</member>. @param _nControlType - the type of the control - one of the <type scope="com::sun::star::inspection">PropertyControlType</type> + the type of the control - one of the <type scope="css::inspection">PropertyControlType</type> constants @param _pAntiImpl Reference to the instance as whose "impl-class" we act. This reference is held during lifetime @@ -113,7 +113,7 @@ namespace pcr ControlHelper( vcl::Window* _pControlWindow, sal_Int16 _nControlType, - ::com::sun::star::inspection::XPropertyControl& _rAntiImpl, + css::inspection::XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ); virtual ~ControlHelper(); @@ -126,12 +126,12 @@ namespace pcr public: // XPropertyControl - ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) { return m_nControlType; } - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (::com::sun::star::uno::RuntimeException) { return m_xContext; } - void SAL_CALL setControlContext( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext >& _controlcontext ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getControlWindow() throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException) { return m_bModified; } - void SAL_CALL notifyModifiedValue( ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) { return m_nControlType; } + css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (css::uno::RuntimeException) { return m_xContext; } + void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException); + css::uno::Reference< css::awt::XWindow > SAL_CALL getControlWindow() throw (css::uno::RuntimeException); + bool SAL_CALL isModified( ) throw (css::uno::RuntimeException) { return m_bModified; } + void SAL_CALL notifyModifiedValue( ) throw (css::uno::RuntimeException); // XComponent void SAL_CALL dispose(); @@ -161,12 +161,12 @@ namespace pcr //= CommonBehaviourControl - /** implements a base class for <type scope="com::sun::star::inspection">XPropertyControl</type> + /** implements a base class for <type scope="css::inspection">XPropertyControl</type> implementations, which delegates the generic functionality of this interface to a <type>ControlHelper</type> member. @param CONTROL_INTERFACE - an interface class which is derived from (or identical to) <type scope="com::sun::star::inspection">XPropertyControl</type> + an interface class which is derived from (or identical to) <type scope="css::inspection">XPropertyControl</type> @param CONTROL_WINDOW a class which is derived from ControlWindow */ @@ -189,12 +189,12 @@ namespace pcr inline CommonBehaviourControl( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); // XPropertyControl - delegated to ->m_aImplControl - virtual ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL setControlContext( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext >& _controlcontext ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getControlWindow() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL notifyModifiedValue( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getControlWindow() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL notifyModifiedValue( ) throw (css::uno::RuntimeException) SAL_OVERRIDE; // XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -247,42 +247,42 @@ namespace pcr template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline ::sal_Int16 SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlType() throw (::com::sun::star::uno::RuntimeException) + inline ::sal_Int16 SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlType() throw (css::uno::RuntimeException) { return m_aImplControl.getControlType(); } template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlContext() throw (::com::sun::star::uno::RuntimeException) + inline css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlContext() throw (css::uno::RuntimeException) { return m_aImplControl.getControlContext(); } template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::setControlContext( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext >& _controlcontext ) throw (::com::sun::star::uno::RuntimeException) + inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException) { m_aImplControl.setControlContext( _controlcontext ); } template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlWindow() throw (::com::sun::star::uno::RuntimeException) + inline css::uno::Reference< css::awt::XWindow > SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::getControlWindow() throw (css::uno::RuntimeException) { return m_aImplControl.getControlWindow(); } template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline sal_Bool SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::isModified( ) throw (::com::sun::star::uno::RuntimeException) + inline sal_Bool SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::isModified( ) throw (css::uno::RuntimeException) { return m_aImplControl.isModified(); } template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::notifyModifiedValue( ) throw (::com::sun::star::uno::RuntimeException) + inline void SAL_CALL CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::notifyModifiedValue( ) throw (css::uno::RuntimeException) { m_aImplControl.notifyModifiedValue(); } @@ -299,7 +299,7 @@ namespace pcr inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::impl_checkDisposed_throw() { if ( ComponentBaseClass::rBHelper.bDisposed ) - throw ::com::sun::star::lang::DisposedException( OUString(), *this ); + throw css::lang::DisposedException( OUString(), *this ); } diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 1fba41a7bdef..e14348e40fb0 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -70,7 +70,7 @@ namespace pcr typedef void (ComposedPropertyUIUpdate::*FNotifySingleUIChange)(); - typedef ::cppu::WeakImplHelper < ::com::sun::star::inspection::XObjectInspectorUI + typedef ::cppu::WeakImplHelper < css::inspection::XObjectInspectorUI > CachedInspectorUI_Base; struct CachedInspectorUI: public CachedInspectorUI_Base, private boost::noncopyable diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 18afbb375eed..e6292507ce3e 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -39,7 +39,7 @@ namespace pcr class SAL_NO_VTABLE IPropertyExistenceCheck { public: - virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) = 0; protected: ~IPropertyExistenceCheck() {} @@ -62,7 +62,7 @@ namespace pcr { private: ::std::unique_ptr< MapHandlerToUI > m_pCollectedUIs; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > + css::uno::Reference< css::inspection::XObjectInspectorUI > m_xDelegatorUI; oslInterlockedCount m_nSuspendCounter; IPropertyExistenceCheck* m_pPropertyCheck; @@ -78,18 +78,18 @@ namespace pcr name.<br/> Beware of lifetime issues. The instance pointed to by <arg>_pPropertyCheck</arg> must live at least as long as the ->ComposedPropertyUIUpdate instance you're going to create. - @throws ::com::sun::star::lang::NullPointerException + @throws css::lang::NullPointerException if ->_rxDelegatorUI is <NULL/> */ ComposedPropertyUIUpdate( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxDelegatorUI, + const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxDelegatorUI, IPropertyExistenceCheck* _pPropertyCheck ); ~ComposedPropertyUIUpdate(); /** returns the delegator UI - @throw ::com::sun::star::lang::DisposedException + @throw css::lang::DisposedException */ - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > getDelegatorUI() const; + css::uno::Reference< css::inspection::XObjectInspectorUI > getDelegatorUI() const; /** returns a ->XObjectInspectorUI instance belonging to a given property handler @@ -98,8 +98,8 @@ namespace pcr to it, and ->ComposedPropertyUIUpdate::fire will use the combination of all cached UI states of all handlers to update the delegator UI. */ - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > - getUIForPropertyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxHandler ); + css::uno::Reference< css::inspection::XObjectInspectorUI > + getUIForPropertyHandler( const css::uno::Reference< css::inspection::XPropertyHandler >& _rxHandler ); /** Suspends automatic firing of UI changes diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index aa49cd2d579d..276f8fb340ee 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -41,8 +41,8 @@ namespace pcr { protected: // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xControlModel; + css::uno::Reference< css::beans::XPropertySet > + m_xControlModel; // </properties> SfxItemSet* m_pFontItems; // item set for the dialog @@ -50,27 +50,27 @@ namespace pcr SfxPoolItem** m_pItemPoolDefaults; // pool defaults public: - OControlFontDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); + OControlFontDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); virtual ~OControlFontDialog(); // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index 780d0cfd1242..56424de541bf 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -43,23 +43,23 @@ namespace pcr virtual ~DefaultFormComponentInspectorModel(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XObjectInspectorModel - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo - static versions - static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create(const css::uno::Reference< css::uno::XComponentContext >&); public: DefaultFormComponentInspectorModel( bool _bUseFormFormComponentHandlers = true ); diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index 3052438916fa..5d1b2e68fc7c 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -37,42 +37,42 @@ namespace pcr //= DefaultHelpProvider - typedef ::cppu::WeakImplHelper < ::com::sun::star::inspection::XPropertyControlObserver - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakImplHelper < css::inspection::XPropertyControlObserver + , css::lang::XInitialization > DefaultHelpProvider_Base; class DefaultHelpProvider : public DefaultHelpProvider_Base { private: bool m_bConstructed; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > + css::uno::Reference< css::inspection::XObjectInspectorUI > m_xInspectorUI; public: DefaultHelpProvider(); // XServiceInfo - static versions - static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create(const css::uno::Reference< css::uno::XComponentContext >&); protected: virtual ~DefaultHelpProvider(); // XPropertyControlObserver - virtual void SAL_CALL focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // Service constructors - void create( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxUI ); + void create( const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxUI ); private: - static vcl::Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - static OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + static vcl::Window* impl_getVclControlWindow_nothrow( const css::uno::Reference< css::inspection::XPropertyControl >& _rxControl ); + static OUString impl_getHelpText_nothrow( const css::uno::Reference< css::inspection::XPropertyControl >& _rxControl ); }; diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index 8afd98291ad3..d29f2facf999 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -38,26 +38,26 @@ namespace pcr { public: EditPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); protected: virtual ~EditPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // PropertyHandler overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > - SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > + SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; private: bool implHaveBothScrollBarProperties() const; bool implHaveTextTypeProperty() const; diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 4a157981b20f..3a19297dabf8 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -466,7 +466,7 @@ namespace pcr } - void EFormsHelper::setBinding( const Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding ) + void EFormsHelper::setBinding( const Reference< css::beans::XPropertySet >& _rxBinding ) { if ( !m_xBindableControl.is() ) return; diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx index b3c819aefa24..fac57b717013 100644 --- a/extensions/source/propctrlr/eformshelper.hxx +++ b/extensions/source/propctrlr/eformshelper.hxx @@ -41,7 +41,7 @@ namespace pcr { - typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::std::less< OUString > > + typedef ::std::map< OUString, css::uno::Reference< css::beans::XPropertySet >, ::std::less< OUString > > MapStringToPropertySet; @@ -50,11 +50,11 @@ namespace pcr class EFormsHelper { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XBindableValue > + css::uno::Reference< css::form::binding::XBindableValue > m_xBindableControl; - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XFormsSupplier > + css::uno::Reference< css::xforms::XFormsSupplier > m_xDocument; PropertyChangeListeners m_aPropertyListeners; @@ -66,8 +66,8 @@ namespace pcr public: EFormsHelper( ::osl::Mutex& _rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); /** determines whether the given document is an eForm @@ -77,7 +77,7 @@ namespace pcr */ static bool isEForm( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); /** registers a listener to be notified when any aspect of the binding changes. @@ -89,14 +89,14 @@ namespace pcr @see revokeBindingListener */ void registerBindingListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxBindingListener + const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxBindingListener ); /** revokes the binding listener which has previously been registered @see registerBindingListener */ void revokeBindingListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxBindingListener + const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxBindingListener ); /** checks whether it's possible to bind the control model to a given XSD data type @@ -125,12 +125,12 @@ namespace pcr void getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const; /// retrieves the XForms model (within the control model's document) with the given name - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > + css::uno::Reference< css::xforms::XModel > getFormModelByName( const OUString& _rModelName ) const; /** retrieves the model which the active binding of the control model belongs to */ - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > + css::uno::Reference< css::xforms::XModel > getCurrentFormModel() const; /** retrieves the name of the model which the active binding of the control model belongs to @@ -140,7 +140,7 @@ namespace pcr /** retrieves the binding instance which is currently attached to the control model */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > getCurrentBinding() const; /** retrieves the name of the binding instance which is currently attached to the control model @@ -150,18 +150,18 @@ namespace pcr /** sets a new binding at the control model */ - void setBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding ); + void setBinding( const css::uno::Reference< css::beans::XPropertySet >& _rxBinding ); /** retrieves the binding instance which is currently used as list source for the control model @see isListEntrySink */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > + css::uno::Reference< css::form::binding::XListEntrySource > getCurrentListSourceBinding() const; /** sets a new list source at the control model @see isListEntrySink */ - void setListSourceBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxListSource ); + void setListSourceBinding( const css::uno::Reference< css::form::binding::XListEntrySource >& _rxListSource ); /** retrieves a given binding for a given model, or creates a new one @@ -171,7 +171,7 @@ namespace pcr the name of the binding to retrieve. If the model denoted by <arg>_rTargetModel</arg> does not have a binding with this name, a new binding is created and returned. */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const; /** types of sub-elements of a model @@ -189,7 +189,7 @@ namespace pcr static OUString getModelElementUIName( const ModelElementType _eType, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement + const css::uno::Reference< css::beans::XPropertySet >& _rxElement ); /** retrieves the submission object for an UI name @@ -199,7 +199,7 @@ namespace pcr @see getModelElementUIName @see getAllElementUINames */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > getModelElementFromUIName( const ModelElementType _eType, const OUString& _rUIName @@ -221,8 +221,8 @@ namespace pcr protected: void firePropertyChanges( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxOldProps, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxNewProps, + const css::uno::Reference< css::beans::XPropertySet >& _rxOldProps, + const css::uno::Reference< css::beans::XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const; @@ -231,19 +231,19 @@ namespace pcr */ void firePropertyChange( const OUString& _rName, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ) const; private: - void impl_switchBindingListening_throw( bool _bDoListening, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ); + void impl_switchBindingListening_throw( bool _bDoListening, const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ); /// implementation for both <member>getOrCreateBindingForModel</member> - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const; void - impl_toggleBindingPropertyListening_throw( bool _bDoListen, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull ); + impl_toggleBindingPropertyListening_throw( bool _bDoListen, const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull ); private: EFormsHelper( const EFormsHelper& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index d3430414d7cf..70634831b8bd 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -48,36 +48,36 @@ namespace pcr public: EFormsPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); protected: virtual ~EFormsPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // PropertyHandler overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > - SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > + SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; virtual void onNewComponent() SAL_OVERRIDE; protected: diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index d2739f172155..fe8d7da6e9af 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -47,13 +47,13 @@ namespace pcr */ virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, - ::com::sun::star::uno::Any& _out_rValue + css::uno::Any& _out_rValue ) const = 0; /** converts a given property value into a description */ virtual OUString SAL_CALL getDescriptionForValue( - const ::com::sun::star::uno::Any& _rEnumValue + const css::uno::Any& _rEnumValue ) const = 0; virtual ~IPropertyEnumRepresentation() { }; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 552a4af2155f..35baee635d87 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -133,9 +133,9 @@ namespace pcr using com::sun::star::uri::XVndSunStarScriptUrlReference; using ::com::sun::star::lang::XEventListener; - namespace PropertyControlType = ::com::sun::star::inspection::PropertyControlType; - namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - namespace FormComponentType = ::com::sun::star::form::FormComponentType; + namespace PropertyControlType = css::inspection::PropertyControlType; + namespace PropertyAttribute = css::beans::PropertyAttribute; + namespace FormComponentType = css::form::FormComponentType; EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) @@ -319,7 +319,7 @@ namespace pcr } } - typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameReplace + typedef ::cppu::WeakImplHelper < css::container::XNameReplace > EventHolder_Base; /* An UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */ class EventHolder : public EventHolder_Base diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index c4c8a20c2980..d633e62f7f49 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -71,8 +71,8 @@ namespace pcr //= EventHandler - typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler - , ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler + , css::lang::XServiceInfo > EventHandler_Base; class EventHandler : public EventHandler_Base { @@ -80,63 +80,61 @@ namespace pcr mutable ::osl::Mutex m_aMutex; /// the context in which the instance was created - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; /// the properties of the object we're handling - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + css::uno::Reference< css::beans::XPropertySet > m_xComponent; /// our XPropertyChangeListener(s) - PropertyChangeListeners m_aPropertyListeners; + PropertyChangeListeners m_aPropertyListeners; /// cache of the events we found at our introspectee - EventMap m_aEvents; + EventMap m_aEvents; /// has m_aEvents been initialized? - bool m_bEventsMapInitialized; + bool m_bEventsMapInitialized; /// is our introspectee a dialog element? - bool m_bIsDialogElement; + bool m_bIsDialogElement; // TODO: move different handling into different derived classes? /// (FormComponent) type of the grid column being inspected, or -1 if we're not inspecting a grid column - sal_Int16 m_nGridColumnType; + sal_Int16 m_nGridColumnType; public: // XServiceInfo - static versions - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); protected: EventHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); virtual ~EventHandler(); protected: // XPropertyHandler overridables - virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > - SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent DECLARE_XCOMPONENT() - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** returns the script events associated with our introspectee @@ -146,7 +144,7 @@ namespace pcr Our introspectee is a form component */ void impl_getFormComponentScriptEvents_nothrow( - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _out_rEvents + css::uno::Sequence< css::script::ScriptEventDescriptor >& _out_rEvents ) const; /** returns the script events associated with our introspectee @@ -156,7 +154,7 @@ namespace pcr Our introspectee is a dialog element */ void impl_getDialogElementScriptEvents_nothrow( - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _out_rEvents + css::uno::Sequence< css::script::ScriptEventDescriptor >& _out_rEvents ) const; /** returns the script events associated with our introspectee @@ -164,7 +162,7 @@ namespace pcr Takes, the events currently associated with the introspectee */ inline void impl_getComponentScriptEvents_nothrow( - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _out_rEvents + css::uno::Sequence< css::script::ScriptEventDescriptor >& _out_rEvents ) const { if ( m_bIsDialogElement ) @@ -178,7 +176,7 @@ namespace pcr Takes, upon successful return, the types of possible listeners at the introspectee */ void impl_getCopmonentListenerTypes_nothrow( - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >& _out_rTypes + css::uno::Sequence< css::uno::Type >& _out_rTypes ) const; /** returns a secondary component to be used for event inspection @@ -197,7 +195,7 @@ namespace pcr @precond ->m_xComponent is not <NULL/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > impl_getSecondaryComponentForEventInspection_throw( ) const; /** returns the event description for the given (programmatic) property name @@ -205,7 +203,7 @@ namespace pcr the name whose event description should be looked up @return the event description for the property name - @throws ::com::sun::star::beans::UnknownPropertyException + @throws css::beans::UnknownPropertyException if our introspectee does not have an event with the given logical name (see ->getSupportedProperties) */ const EventDescription& @@ -221,18 +219,18 @@ namespace pcr @param _rScriptEvent the script event to set */ - void impl_setFormComponentScriptEvent_nothrow( const ::com::sun::star::script::ScriptEventDescriptor& _rScriptEvent ); + void impl_setFormComponentScriptEvent_nothrow( const css::script::ScriptEventDescriptor& _rScriptEvent ); /** sets a given script event as event handler at a dialog component @param _rScriptEvent the script event to set */ - void impl_setDialogElementScriptEvent_nothrow( const ::com::sun::star::script::ScriptEventDescriptor& _rScriptEvent ); + void impl_setDialogElementScriptEvent_nothrow( const css::script::ScriptEventDescriptor& _rScriptEvent ); /** returns the frame associated with our context document */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > + css::uno::Reference< css::frame::XFrame > impl_getContextFrame_nothrow() const; /** approves or denies a certain method to be included in the UI diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 9001fcfcd0ad..6432fc9edd3a 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -71,18 +71,18 @@ namespace pcr class OFontPropertyExtractor { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xPropValueAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > + css::uno::Reference< css::beans::XPropertyState > m_xPropStateAccess; public: - OFontPropertyExtractor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& + OFontPropertyExtractor( const css::uno::Reference< css::beans::XPropertySet >& _rxProps ); public: - bool getCheckFontProperty(const OUString& _rPropName, ::com::sun::star::uno::Any& _rValue); - OUString getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault); + bool getCheckFontProperty(const OUString& _rPropName, css::uno::Any& _rValue); + OUString getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault); sal_Int16 getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault); sal_Int32 getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault); float getFloatFontProperty(const OUString& _rPropName, const float _nDefault); @@ -200,7 +200,7 @@ namespace pcr // some items, which may be in default state, have to be filled with non-void information vcl::Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont(); - ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont); + css::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont); // get the current properties OUString aFontName = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name); @@ -262,10 +262,10 @@ namespace pcr aPropExtractor.invalidateItem(PROPERTY_FONT_NAME, CFID_FONT, *_pSet); aPropExtractor.invalidateItem(PROPERTY_FONT_HEIGHT, CFID_HEIGHT, *_pSet); - aPropExtractor.invalidateItem(PROPERTY_FONT_WEIGHT, CFID_WEIGHT, *_pSet, ::com::sun::star::awt::FontWeight::DONTKNOW == nFontWeight); - aPropExtractor.invalidateItem(PROPERTY_FONT_SLANT, CFID_POSTURE, *_pSet, ::com::sun::star::awt::FontSlant_DONTKNOW == nFontSlant); - aPropExtractor.invalidateItem(PROPERTY_FONT_UNDERLINE, CFID_UNDERLINE, *_pSet, ::com::sun::star::awt::FontUnderline::DONTKNOW == nFontUnderline); - aPropExtractor.invalidateItem(PROPERTY_FONT_STRIKEOUT, CFID_STRIKEOUT, *_pSet, ::com::sun::star::awt::FontStrikeout::DONTKNOW == nFontStrikeout); + aPropExtractor.invalidateItem(PROPERTY_FONT_WEIGHT, CFID_WEIGHT, *_pSet, css::awt::FontWeight::DONTKNOW == nFontWeight); + aPropExtractor.invalidateItem(PROPERTY_FONT_SLANT, CFID_POSTURE, *_pSet, css::awt::FontSlant_DONTKNOW == nFontSlant); + aPropExtractor.invalidateItem(PROPERTY_FONT_UNDERLINE, CFID_UNDERLINE, *_pSet, css::awt::FontUnderline::DONTKNOW == nFontUnderline); + aPropExtractor.invalidateItem(PROPERTY_FONT_STRIKEOUT, CFID_STRIKEOUT, *_pSet, css::awt::FontStrikeout::DONTKNOW == nFontStrikeout); aPropExtractor.invalidateItem(PROPERTY_WORDLINEMODE, CFID_WORDLINEMODE, *_pSet); aPropExtractor.invalidateItem(PROPERTY_TEXTCOLOR, CFID_CHARCOLOR, *_pSet); aPropExtractor.invalidateItem(PROPERTY_FONT_RELIEF, CFID_RELIEF, *_pSet); @@ -356,7 +356,7 @@ namespace pcr const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&>(_rSet.Get(CFID_POSTURE)); - ::com::sun::star::awt::FontSlant eSlant = VCLUnoHelper::ConvertFontSlant(rPostureItem.GetPosture()); + css::awt::FontSlant eSlant = VCLUnoHelper::ConvertFontSlant(rPostureItem.GetPosture()); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_SLANT, makeAny((sal_Int16)eSlant)); } diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index cb157913e77a..1a11681d2b7f 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -46,20 +46,20 @@ namespace pcr /// fills the given item set with values obtained from the given property set static void translatePropertiesToItems( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxModel, SfxItemSet* _pSet); /** fills the given property set with values obtained from the given item set */ static void translateItemsToProperties( const SfxItemSet& _rSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel); + const css::uno::Reference< css::beans::XPropertySet >& _rxModel); /** fills the given property set with values obtained from the given item set */ static void translateItemsToProperties( const SfxItemSet& _rSet, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _out_properties ); + css::uno::Sequence< css::beans::NamedValue >& _out_properties ); protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx index 97c038265b0e..ceafe7995f8b 100644 --- a/extensions/source/propctrlr/formbrowsertools.hxx +++ b/extensions/source/propctrlr/formbrowsertools.hxx @@ -32,32 +32,32 @@ namespace pcr { - OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject); - sal_Int16 classifyComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); + OUString GetUIHeadlineName(sal_Int16 _nClassId, const css::uno::Any& _rUnoObject); + sal_Int16 classifyComponent( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); - struct FindPropertyByHandle : public ::std::unary_function< ::com::sun::star::beans::Property, bool > + struct FindPropertyByHandle : public ::std::unary_function< css::beans::Property, bool > { private: sal_Int32 m_nId; public: FindPropertyByHandle( sal_Int32 _nId ) : m_nId ( _nId ) { } - bool operator()( const ::com::sun::star::beans::Property& _rProp ) const + bool operator()( const css::beans::Property& _rProp ) const { return m_nId == _rProp.Handle; } }; - struct FindPropertyByName : public ::std::unary_function< ::com::sun::star::beans::Property, bool > + struct FindPropertyByName : public ::std::unary_function< css::beans::Property, bool > { private: OUString m_sName; public: FindPropertyByName( const OUString& _rName ) : m_sName( _rName ) { } - bool operator()( const ::com::sun::star::beans::Property& _rProp ) const + bool operator()( const css::beans::Property& _rProp ) const { return m_sName == _rProp.Name; } @@ -65,8 +65,8 @@ namespace pcr struct PropertyLessByName - :public ::std::binary_function < ::com::sun::star::beans::Property, - ::com::sun::star::beans::Property, + :public ::std::binary_function < css::beans::Property, + css::beans::Property, bool > { @@ -78,8 +78,8 @@ namespace pcr struct TypeLessByName - :public ::std::binary_function < ::com::sun::star::uno::Type, - ::com::sun::star::uno::Type, + :public ::std::binary_function < css::uno::Type, + css::uno::Type, bool > { @@ -90,7 +90,7 @@ namespace pcr }; - typedef ::std::set< ::com::sun::star::beans::Property, PropertyLessByName > PropertyBag; + typedef ::std::set< css::beans::Property, PropertyLessByName > PropertyBag; } // namespace pcr diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 6957278d05aa..528b663cfd79 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2783,7 +2783,7 @@ namespace pcr // Not implemented in reports if (bHandleNonLink) { - Reference< XReportDefinition > xReportDef( xModel, ::com::sun::star::uno::UNO_QUERY ); + Reference< XReportDefinition > xReportDef( xModel, css::uno::UNO_QUERY ); bHandleNonLink = !xReportDef.is(); } } diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 5533849d2c0e..eb69debdc2fd 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -66,23 +66,23 @@ namespace pcr { private: /// access to property states - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > m_xPropertyState; + css::uno::Reference< css::beans::XPropertyState > m_xPropertyState; /// the parent of our component - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xObjectParent; + css::uno::Reference< css::uno::XInterface > m_xObjectParent; /// the database connection. Owned by us if and only if we created it ourself. - mutable ::dbtools::SharedConnection m_xRowSetConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; + mutable ::dbtools::SharedConnection m_xRowSetConnection; + css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; /** helper component encapsulating the handling for the QueryDesign component for interactively designing an SQL command */ - ::rtl::Reference< SQLCommandDesigner > m_xCommandDesigner; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > m_xBrowserUI; + ::rtl::Reference< SQLCommandDesigner > m_xCommandDesigner; + css::uno::Reference< css::inspection::XObjectInspectorUI > m_xBrowserUI; /// the string indicating a "default" (VOID) value in list-like controls - OUString m_sDefaultValueString; + OUString m_sDefaultValueString; /// all properties to whose control's we added ->m_sDefaultValueString - ::std::set< OUString > m_aPropertiesWithDefListEntry; + ::std::set< OUString > m_aPropertiesWithDefListEntry; /// type of our component ComponentClassification m_eComponentClass; /// is our component a (database) sub form? @@ -96,16 +96,16 @@ namespace pcr public: FormComponentPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); DECLARE_XINTERFACE( ) // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); protected: virtual ~FormComponentPropertyHandler(); @@ -114,27 +114,27 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // XPropertyHandler overridables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // PropertyHandler - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > - SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > + SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; virtual void onNewComponent() SAL_OVERRIDE; private: @@ -152,14 +152,14 @@ namespace pcr /** const-version of ->getPropertyValue */ - ::com::sun::star::uno::Any impl_getPropertyValue_throw( const OUString& _rPropertyName ) const; + css::uno::Any impl_getPropertyValue_throw( const OUString& _rPropertyName ) const; // some property values are faked, and not used in the way they're provided by our component - void impl_normalizePropertyValue_nothrow( ::com::sun::star::uno::Any& _rValue, PropertyId _nPropId ) const; + void impl_normalizePropertyValue_nothrow( css::uno::Any& _rValue, PropertyId _nPropId ) const; /** determines whether we should exclude a given property from our "supported properties" */ - bool impl_shouldExcludeProperty_nothrow( const ::com::sun::star::beans::Property& _rProperty ) const; + bool impl_shouldExcludeProperty_nothrow( const css::beans::Property& _rProperty ) const; /** initializes the list of field names, if we're handling a control which supports the DataField property @@ -175,11 +175,11 @@ namespace pcr Normally, at least one of those methods should succeed. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > impl_getRowSet_throw( ) const; + css::uno::Reference< css::sdbc::XRowSet > impl_getRowSet_throw( ) const; /** nothrow-version of ->impl_getRowSet_throw */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > impl_getRowSet_nothrow( ) const; + css::uno::Reference< css::sdbc::XRowSet > impl_getRowSet_nothrow( ) const; /** connects the row set belonging to our introspected data aware form component, and remembers the connection in ->m_xRowSetConnection. @@ -207,8 +207,8 @@ namespace pcr @seealso impl_fillQueryNames_throw */ void impl_describeCursorSource_nothrow( - ::com::sun::star::inspection::LineDescriptor& _out_rProperty, - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory + css::inspection::LineDescriptor& _out_rProperty, + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) const; /** describes the UI for selecting a table name @@ -230,7 +230,7 @@ namespace pcr @precond m_xRowSetConnection is not <NULL/> */ - void impl_fillQueryNames_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xQueryNames + void impl_fillQueryNames_throw( const css::uno::Reference< css::container::XNameAccess >& _xQueryNames ,::std::vector< OUString >& _out_rNames ,const OUString& _sName = OUString() ) const; @@ -241,8 +241,8 @@ namespace pcr ->m_xComponent is not <NULL/> */ void impl_describeListSourceUI_throw( - ::com::sun::star::inspection::LineDescriptor& _out_rDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory + css::inspection::LineDescriptor& _out_rDescriptor, + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) const; /** displays a database-related error to the user @@ -289,7 +289,7 @@ namespace pcr <TRUE/> if and only if a new formatting has been chosen by the user. In this case, ->_out_rNewValue is filled with the new property value */ - bool impl_dialogFormatting_nothrow( ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogFormatting_nothrow( css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog which allows to the user to change the ImageURL property of our component by browsing for an image file. @@ -301,7 +301,7 @@ namespace pcr <TRUE/> if and only if a new image URL has been chosen by the user. In this case, ->_out_rNewValue is filled with the new property value */ - bool impl_browseForImage_nothrow( ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_browseForImage_nothrow( css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog which allows the user to change the TargetURL property of our component @@ -313,7 +313,7 @@ namespace pcr <TRUE/> if and only if a new TargetURL has been chosen by the user. In this case, ->_out_rNewValue is filled with the new property value */ - bool impl_browseForTargetURL_nothrow( ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_browseForTargetURL_nothrow( css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** executes a dialog which allows the user to change the font, plus related properties, of our component @@ -324,7 +324,7 @@ namespace pcr @return <TRUE/> if and only if the user successfully changed the font of our component */ - bool impl_executeFontDialog_nothrow( ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_executeFontDialog_nothrow( css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** allows the user browsing for a database document @precond @@ -335,7 +335,7 @@ namespace pcr <TRUE/> if and only if a new DataSource has been chosen by the user. In this case, ->_out_rNewValue is filled with the new property value */ - bool impl_browseForDatabaseDocument_throw( ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_browseForDatabaseDocument_throw( css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** raises a dialog which allows the user to choose a color @param _nColorPropertyId @@ -345,7 +345,7 @@ namespace pcr @return <TRUE/> if and only if a color was chosen by the user */ - bool impl_dialogColorChooser_throw( sal_Int32 _nColorPropertyId, ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogColorChooser_throw( sal_Int32 _nColorPropertyId, css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** raises a dialog which allows the user to choose a label control for our component @param _out_rNewValue @@ -353,7 +353,7 @@ namespace pcr @return <TRUE/> if and only if a label control was chosen by the user */ - bool impl_dialogChooseLabelControl_nothrow( ::com::sun::star::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogChooseLabelControl_nothrow( css::uno::Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** raises a dialog which lets the user chose the tab order of controls of a form @precond @@ -373,7 +373,7 @@ namespace pcr The ->XComponentContext in which we were created is examined for a value named "ControlContext", and this value is returned. */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > impl_getContextControlContainer_nothrow() const; /** opens a query design window for interactively designing the SQL command of a @@ -387,7 +387,7 @@ namespace pcr <FALSE/> otherwise */ bool impl_doDesignSQLCommand_nothrow( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, + const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, PropertyId _nDesignForProperty ); @@ -407,7 +407,7 @@ namespace pcr @param _rxInspectorUI provides access to the property browser UI. Must not be <NULL/>. */ - void impl_updateDependentProperty_nothrow( PropertyId _nPropId, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) const; + void impl_updateDependentProperty_nothrow( PropertyId _nPropId, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) const; /** determines whether the given form has a valid data source signature. @@ -422,7 +422,7 @@ namespace pcr lead to rejection */ static bool impl_hasValidDataSourceSignature_nothrow( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xFormProperties, + const css::uno::Reference< css::beans::XPropertySet >& _xFormProperties, bool _bAllowEmptyDataSourceName ); /** returns the URL of our context document diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 38b2c3c7f2bf..9a6006441983 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -68,7 +68,7 @@ namespace pcr using ::com::sun::star::frame::XFrame; using ::com::sun::star::awt::XWindow; - namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; + namespace PropertyAttribute = css::beans::PropertyAttribute; //= FormController @@ -239,7 +239,7 @@ namespace pcr } - void SAL_CALL FormController::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const + void SAL_CALL FormController::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const { switch ( nHandle ) { diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index efe6c3fb5597..de27d389f9a6 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -37,7 +37,7 @@ namespace pcr { OUString ( *GetImplementationName )( void ); - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > ( *GetSupportedServiceNames )( void ); }; @@ -59,20 +59,20 @@ namespace pcr { private: ServiceDescriptor m_aServiceDescriptor; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xCurrentInspectee; public: FormController( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, ServiceDescriptor _aServiceDescriptor, bool _bUseFormFormComponentHandlers ); // XServiceInfo - static versions - static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create(const css::uno::Reference< css::uno::XComponentContext >&); protected: virtual ~FormController(); @@ -81,22 +81,22 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet and friends - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; + css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue + ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue - ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + sal_Int32 nHandle, const css::uno::Any& rValue + ) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle + css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; private: using FormController_PropertyBase1::getFastPropertyValue; @@ -111,10 +111,10 @@ namespace pcr { public: // XServiceInfo - static versions - static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create(const css::uno::Reference< css::uno::XComponentContext >&); private: DialogController( const DialogController& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 426887f528b6..4720f06922f7 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -91,10 +91,10 @@ namespace pcr using ::com::sun::star::container::XChild; using ::com::sun::star::form::XGridColumnFactory; - namespace MeasureUnit = ::com::sun::star::util::MeasureUnit; + namespace MeasureUnit = css::util::MeasureUnit; - typedef ::com::sun::star::awt::Point AwtPoint; - typedef ::com::sun::star::awt::Size AwtSize; + typedef css::awt::Point AwtPoint; + typedef css::awt::Size AwtSize; #define ANCHOR_TO_SHEET 0 #define ANCHOR_TO_CELL 1 @@ -124,7 +124,7 @@ namespace pcr in the XShape implementation, which broadcasts way too generous and unspecified */ typedef ::comphelper::ComponentBase ShapeGeometryChangeNotifier_CBase; - typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener > ShapeGeometryChangeNotifier_IBase; class ShapeGeometryChangeNotifier :public BroadcastHelperBase @@ -225,10 +225,10 @@ namespace pcr // XPropertyHandler overriables virtual Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHandler overridables diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 3913257fb4c0..1b85cb71e300 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -54,16 +54,16 @@ namespace pcr VclPtr<OKButton> m_pOK; VclPtr<PushButton> m_pSuggest; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xDetailForm; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xMasterForm; - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aRelationDetailColumns; - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > m_aRelationMasterColumns; OUString m_sDetailLabel; @@ -72,9 +72,9 @@ namespace pcr public: FormLinkDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDetailForm, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxMasterForm, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::beans::XPropertySet >& _rxDetailForm, + const css::uno::Reference< css::beans::XPropertySet >& _rxMasterForm, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _sExplanation = OUString(), const OUString& _sDetailLabel = OUString(), const OUString& _sMasterLabel = OUString() @@ -98,36 +98,36 @@ namespace pcr void commitLinkPairs(); void initializeFieldRowsFrom( - ::com::sun::star::uno::Sequence< OUString >& _rDetailFields, - ::com::sun::star::uno::Sequence< OUString >& _rMasterFields + css::uno::Sequence< OUString >& _rDetailFields, + css::uno::Sequence< OUString >& _rMasterFields ); static OUString getFormDataSourceType( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm + const css::uno::Reference< css::beans::XPropertySet >& _rxForm ); void getFormFields( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, - ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rNames + const css::uno::Reference< css::beans::XPropertySet >& _rxForm, + css::uno::Sequence< OUString >& /* [out] */ _rNames ) const; void ensureFormConnection( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& /* [out] */ _rxConnection + const css::uno::Reference< css::beans::XPropertySet >& _rxFormProps, + css::uno::Reference< css::sdbc::XConnection >& /* [out] */ _rxConnection ) const; static void getConnectionMetaData( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& /* [out] */ _rxMeta + const css::uno::Reference< css::beans::XPropertySet >& _rxFormProps, + css::uno::Reference< css::sdbc::XDatabaseMetaData >& /* [out] */ _rxMeta ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - getCanonicUnderlyingTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps ) const; + css::uno::Reference< css::beans::XPropertySet > + getCanonicUnderlyingTable( const css::uno::Reference< css::beans::XPropertySet >& _rxFormProps ) const; static bool getExistingRelation( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLHS, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRHS, - ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rLeftFields, - ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rRightFields + const css::uno::Reference< css::beans::XPropertySet >& _rxLHS, + const css::uno::Reference< css::beans::XPropertySet >& _rxRHS, + css::uno::Sequence< OUString >& /* [out] */ _rLeftFields, + css::uno::Sequence< OUString >& /* [out] */ _rRightFields ); }; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 20c4fbdee61a..d9ecba20a19c 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -72,7 +72,7 @@ namespace pcr { private: const IPropertyInfoService& m_rMetaData; - ::com::sun::star::uno::Type m_aType; + css::uno::Type m_aType; const sal_Int32 m_nPropertyId; public: @@ -82,7 +82,7 @@ namespace pcr An instance implementing IPropertyInfoService. Must live at least as long as the DefaultEnumRepresentation should live. */ - DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const ::com::sun::star::uno::Type& _rType, sal_Int32 _nPropertyId ); + DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const css::uno::Type& _rType, sal_Int32 _nPropertyId ); protected: virtual ~DefaultEnumRepresentation(); @@ -91,8 +91,8 @@ namespace pcr // IPropertyEnumRepresentation implementqation virtual ::std::vector< OUString > SAL_CALL getDescriptions() const SAL_OVERRIDE; - virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const SAL_OVERRIDE; - virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const SAL_OVERRIDE; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const SAL_OVERRIDE; + virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const SAL_OVERRIDE; private: DefaultEnumRepresentation( const DefaultEnumRepresentation& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 7cee5059bb02..54427e7d32c7 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -76,8 +76,8 @@ namespace pcr // IPropertyEnumRepresentation implementqation virtual ::std::vector< OUString > SAL_CALL getDescriptions() const SAL_OVERRIDE; - virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, ::com::sun::star::uno::Any& _out_rValue ) const SAL_OVERRIDE; - virtual OUString SAL_CALL getDescriptionForValue( const ::com::sun::star::uno::Any& _rEnumValue ) const SAL_OVERRIDE; + virtual void SAL_CALL getValueFromDescription( const OUString& _rDescription, css::uno::Any& _out_rValue ) const SAL_OVERRIDE; + virtual OUString SAL_CALL getDescriptionForValue( const css::uno::Any& _rEnumValue ) const SAL_OVERRIDE; private: void impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const; diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 52dcad6e4354..3ada5af77596 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -38,9 +38,9 @@ namespace pcr { - struct TypeLess : ::std::binary_function< ::com::sun::star::uno::Type, ::com::sun::star::uno::Type, bool > + struct TypeLess : ::std::binary_function< css::uno::Type, css::uno::Type, bool > { - bool operator()( const ::com::sun::star::uno::Type& _rLHS, const ::com::sun::star::uno::Type& _rRHS ) const + bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { return _rLHS.getTypeName() < _rRHS.getTypeName(); } @@ -50,8 +50,8 @@ namespace pcr //= GenericPropertyHandler - typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler - , ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler + , css::lang::XServiceInfo > GenericPropertyHandler_Base; class GenericPropertyHandler : public GenericPropertyHandler_Base { @@ -60,20 +60,20 @@ namespace pcr private: /// the service factory for creating services - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; /// need this to keep alive as long as m_xComponent lives - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > m_xComponentIntrospectionAccess; + css::uno::Reference< css::beans::XIntrospectionAccess > m_xComponentIntrospectionAccess; /// the properties of the object we're handling - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + css::uno::Reference< css::beans::XPropertySet > m_xComponent; /// cached interface of ->m_xComponent - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > m_xPropertyState; + css::uno::Reference< css::beans::XPropertyState > m_xPropertyState; /// type converter, needed on various occasions - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; /// cache of our supported properties PropertyMap m_aProperties; /// property change listeners ::cppu::OInterfaceContainerHelper m_aPropertyListeners; - ::std::map< ::com::sun::star::uno::Type, ::rtl::Reference< IPropertyEnumRepresentation >, TypeLess > + ::std::map< css::uno::Type, ::rtl::Reference< IPropertyEnumRepresentation >, TypeLess > m_aEnumConverters; /// has ->m_aProperties been initialized? @@ -81,47 +81,47 @@ namespace pcr public: // XServiceInfo - static versions - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); protected: GenericPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); virtual ~GenericPropertyHandler(); protected: // XPropertyHandler overridables - virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > - SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > + SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent DECLARE_XCOMPONENT() virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** ensures that ->m_aProperties is initialized @@ -133,7 +133,7 @@ namespace pcr /** retrieves the enum converter for the given ENUM type */ ::rtl::Reference< IPropertyEnumRepresentation > - impl_getEnumConverter( const ::com::sun::star::uno::Type& _rEnumType ); + impl_getEnumConverter( const css::uno::Type& _rEnumType ); private: GenericPropertyHandler( const GenericPropertyHandler& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 14ff67f707eb..bc576bd6bf23 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -50,29 +50,29 @@ namespace pcr /** helper for implementing XPropertyHandler::describePropertyLine in a generic way */ static void describePropertyLine( - const ::com::sun::star::beans::Property& _rProperty, - ::com::sun::star::inspection::LineDescriptor& /* [out] */ _out_rDescriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory + const css::beans::Property& _rProperty, + css::inspection::LineDescriptor& /* [out] */ _out_rDescriptor, + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ); /** helper for implementing XPropertyHandler::convertToPropertyValue */ - static ::com::sun::star::uno::Any convertToPropertyValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter, - const ::com::sun::star::beans::Property& _rProperty, - const ::com::sun::star::uno::Any& _rControlValue + static css::uno::Any convertToPropertyValue( + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::script::XTypeConverter >& _rxTypeConverter, + const css::beans::Property& _rProperty, + const css::uno::Any& _rControlValue ); /// helper for implementing XPropertyHandler::convertToControlValue - static ::com::sun::star::uno::Any convertToControlValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter, - const ::com::sun::star::uno::Any& _rPropertyValue, - const ::com::sun::star::uno::Type& _rControlValueType + static css::uno::Any convertToControlValue( + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::script::XTypeConverter >& _rxTypeConverter, + const css::uno::Any& _rPropertyValue, + const css::uno::Type& _rControlValueType ); - /** creates an <member scope="com::sun::star::inspection">PropertyControlType::ListBox</member>-type control + /** creates an <member scope="css::inspection">PropertyControlType::ListBox</member>-type control and fills it with initial values @param _rxControlFactory @@ -90,15 +90,15 @@ namespace pcr @return the newly created control */ - static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + static css::uno::Reference< css::inspection::XPropertyControl > createListBoxControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, const ::std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ); - /** creates an <member scope="com::sun::star::inspection">PropertyControlType::ComboBox</member>-type control + /** creates an <member scope="css::inspection">PropertyControlType::ComboBox</member>-type control and fills it with initial values @param _rxControlFactory @@ -116,47 +116,47 @@ namespace pcr @return the newly created control */ - static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + static css::uno::Reference< css::inspection::XPropertyControl > createComboBoxControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, const ::std::vector< OUString >& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ); - /** creates an <member scope="com::sun::star::inspection">PropertyControlType::NumericField</member>-type control + /** creates an <member scope="css::inspection">PropertyControlType::NumericField</member>-type control and initializes it @param _rxControlFactory A control factory. Must not be <NULL/>. @param _nDigits number of decimal digits for the control - (<member scope="com::sun::star::inspection">XNumericControl::DecimalDigits</member>) + (<member scope="css::inspection">XNumericControl::DecimalDigits</member>) @param _rMinValue minimum value which can be entered in the control - (<member scope="com::sun::star::inspection">XNumericControl::MinValue</member>) + (<member scope="css::inspection">XNumericControl::MinValue</member>) @param _rMaxValue maximum value which can be entered in the control - (<member scope="com::sun::star::inspection">XNumericControl::MaxValue</member>) + (<member scope="css::inspection">XNumericControl::MaxValue</member>) @param _bReadOnlyControl determines whether the control should be read-only @return the newly created control */ - static ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + static css::uno::Reference< css::inspection::XPropertyControl > createNumericControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory, + const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, sal_Int16 _nDigits, - const ::com::sun::star::beans::Optional< double >& _rMinValue, - const ::com::sun::star::beans::Optional< double >& _rMaxValue, + const css::beans::Optional< double >& _rMinValue, + const css::beans::Optional< double >& _rMaxValue, bool _bReadOnlyControl ); /** marks the document passed in our UNO context as modified The method looks up a value called "ContextDocument" in the given UNO component context, - queries it for the ->com::sun::star::util::XModifiable interface, and calls its + queries it for the ->css::util::XModifiable interface, and calls its setModified method. If either of those steps fails, this is asserted in a non-product version, and silently ignore otherwise. @@ -184,15 +184,15 @@ namespace pcr /** determines whether given PropertyAttributes require a to-be-created - <type scope="com::sun::star::inspection">XPropertyControl</type> to be read-only + <type scope="css::inspection">XPropertyControl</type> to be read-only @param _nPropertyAttributes the attributes of the property which should be reflected by a to-be-created - <type scope="com::sun::star::inspection">XPropertyControl</type> + <type scope="css::inspection">XPropertyControl</type> */ inline static bool requiresReadOnlyControl( sal_Int16 _nPropertyAttributes ) { - return ( _nPropertyAttributes & ::com::sun::star::beans::PropertyAttribute::READONLY ) != 0; + return ( _nPropertyAttributes & css::beans::PropertyAttribute::READONLY ) != 0; } private: diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index 343da359c1bb..a2296fa7c2a5 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -79,7 +79,7 @@ namespace pcr inline sal_Int32 getMinHelpTextLines() const { return m_nMinHelpTextLines; } inline sal_Int32 getMaxHelpTextLines() const { return m_nMaxHelpTextLines; } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > getPropertySetInfo(); ::cppu::IPropertyArrayHelper& getInfoHelper(); @@ -223,13 +223,13 @@ namespace pcr } - sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() throw (css::uno::RuntimeException, std::exception) { return m_pProperties->isReadOnly(); } - void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool _IsReadOnly ) throw (css::uno::RuntimeException, std::exception) { setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( _IsReadOnly ) ); } diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index 64930e8ea59d..0c6e9b446261 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -42,9 +42,9 @@ namespace pcr //= ImplInspectorModel - typedef ::cppu::WeakImplHelper < ::com::sun::star::inspection::XObjectInspectorModel - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakImplHelper < css::inspection::XObjectInspectorModel + , css::lang::XInitialization + , css::lang::XServiceInfo > ImplInspectorModel_Base; typedef ::cppu::OPropertySetHelper ImplInspectorModel_PBase; @@ -65,22 +65,22 @@ namespace pcr DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() - // ::com::sun::star::beans::XPropertySet and friends - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // css::beans::XPropertySet and friends + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - - // ::com::sun::star::inspection::XObjectInspectorModel - virtual sal_Bool SAL_CALL getHasHelpSection() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setIsReadOnly( sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; + + // css::inspection::XObjectInspectorModel + virtual sal_Bool SAL_CALL getHasHelpSection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getIsReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIsReadOnly( sal_Bool _IsReadOnly ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + // css::lang::XServiceInfo + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: void enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 245d1e1e3a26..2f1f564fc465 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -30,12 +30,12 @@ namespace pcr //= OLineDescriptor - struct OLineDescriptor : public ::com::sun::star::inspection::LineDescriptor + struct OLineDescriptor : public css::inspection::LineDescriptor { - OUString sName; // the name of the property - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > + OUString sName; // the name of the property + css::uno::Reference< css::inspection::XPropertyHandler > xPropertyHandler; // the handler for this property - ::com::sun::star::uno::Any aValue; // the current value of the property + css::uno::Any aValue; // the current value of the property bool bUnknownValue : 1; // is the property value currently "unknown"? (PropertyState_AMBIGUOUS) bool bReadOnly : 1; @@ -46,9 +46,9 @@ namespace pcr { } - void assignFrom( const ::com::sun::star::inspection::LineDescriptor& _rhs ) + void assignFrom( const css::inspection::LineDescriptor& _rhs ) { - ::com::sun::star::inspection::LineDescriptor::operator=( _rhs ); + css::inspection::LineDescriptor::operator=( _rhs ); } }; diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index ca9a118c06f9..c2cea786ea02 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -33,14 +33,14 @@ namespace pcr private: VclPtr<ListBox> m_pEntries; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xListBox; - OUString m_sPropertyName; + css::uno::Reference< css::beans::XPropertySet > + m_xListBox; + OUString m_sPropertyName; public: ListSelectionDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxListBox, + const css::uno::Reference< css::beans::XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName ); @@ -54,10 +54,10 @@ namespace pcr void initialize( ); void commitSelection(); - void fillEntryList ( const ::com::sun::star::uno::Sequence< OUString >& _rListEntries ); + void fillEntryList ( const css::uno::Sequence< OUString >& _rListEntries ); - void selectEntries ( const ::com::sun::star::uno::Sequence< sal_Int16 >& /* [in ] */ _rSelection ); - void collectSelection( ::com::sun::star::uno::Sequence< sal_Int16 >& /* [out] */ _rSelection ); + void selectEntries ( const css::uno::Sequence< sal_Int16 >& /* [in ] */ _rSelection ); + void collectSelection( css::uno::Sequence< sal_Int16 >& /* [out] */ _rSelection ); }; diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 21977af05d7d..69588604820b 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -44,8 +44,8 @@ namespace pcr //= types - typedef ::comphelper::OSimpleListenerContainer < ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::beans::PropertyChangeEvent + typedef ::comphelper::OSimpleListenerContainer < css::beans::XPropertyChangeListener + , css::beans::PropertyChangeEvent > PropertyChangeListeners; @@ -75,10 +75,10 @@ namespace pcr //= StlSyntaxSequence template< class ELEMENT > - class StlSyntaxSequence : public ::com::sun::star::uno::Sequence< ELEMENT > + class StlSyntaxSequence : public css::uno::Sequence< ELEMENT > { private: - typedef ::com::sun::star::uno::Sequence< ELEMENT > UnoBase; + typedef css::uno::Sequence< ELEMENT > UnoBase; public: inline StlSyntaxSequence() : UnoBase() { } @@ -116,20 +116,20 @@ namespace pcr //= UNO helpers #define DECLARE_XCOMPONENT() \ - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; #define IMPLEMENT_FORWARD_XCOMPONENT( classname, baseclass ) \ - void SAL_CALL classname::dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::dispose( ) throw (css::uno::RuntimeException, std::exception) \ { \ baseclass::WeakComponentImplHelperBase::dispose(); \ } \ - void SAL_CALL classname::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) \ { \ baseclass::WeakComponentImplHelperBase::addEventListener( _Listener ); \ } \ - void SAL_CALL classname::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) \ { \ baseclass::WeakComponentImplHelperBase::removeEventListener( _Listener ); \ } \ diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx index f16ee1ba1658..19c85ba47330 100644 --- a/extensions/source/propctrlr/pcrcommontypes.hxx +++ b/extensions/source/propctrlr/pcrcommontypes.hxx @@ -30,7 +30,7 @@ namespace pcr { - typedef std::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash > + typedef std::unordered_map< OUString, css::beans::Property, OUStringHash > PropertyMap; diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 8257540f6085..10c9a110ae1e 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -43,34 +43,34 @@ namespace pcr { protected: // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > + css::uno::Reference< css::awt::XTabControllerModel > m_xTabbingModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > m_xControlContext; // </properties> public: - OTabOrderDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext ); + OTabOrderDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); virtual ~OTabOrderDialog(); // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); - static OUString getImplementationName_static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); + static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 71b5de05fbba..0e74152de1ec 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -267,7 +267,7 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (com::sun::star::util::VetoException, RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (css::util::VetoException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -528,7 +528,7 @@ namespace pcr stopInspection( false ); // say our dispose listeners goodbye - ::com::sun::star::lang::EventObject aEvt; + css::lang::EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >(this); m_aDisposeListeners.disposeAndClear(aEvt); m_aControlObservers.disposeAndClear(aEvt); @@ -1103,9 +1103,9 @@ namespace pcr } - ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() throw (::com::sun::star::uno::RuntimeException, std::exception) + css::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::awt::Size aSize; + css::awt::Size aSize; if( m_pView ) return m_pView->getMinimumSize(); else @@ -1113,13 +1113,13 @@ namespace pcr } - ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() throw (::com::sun::star::uno::RuntimeException, std::exception) + css::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() throw (css::uno::RuntimeException, std::exception) { return getMinimumSize(); } - ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const ::com::sun::star::awt::Size& _rNewSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) + css::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const css::awt::Size& _rNewSize ) throw (css::uno::RuntimeException, std::exception) { awt::Size aMinSize = getMinimumSize( ); awt::Size aAdjustedSize( _rNewSize ); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index acb9857245e5..183a2716c39c 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -70,19 +70,19 @@ namespace pcr class OPropertyEditor; struct OLineDescriptor; - typedef ::cppu::WeakImplHelper < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::awt::XFocusListener - , ::com::sun::star::awt::XLayoutConstrains - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::inspection::XPropertyControlFactory - , ::com::sun::star::inspection::XObjectInspector - , ::com::sun::star::lang::XInitialization + typedef ::cppu::WeakImplHelper < css::lang::XServiceInfo + , css::awt::XFocusListener + , css::awt::XLayoutConstrains + , css::beans::XPropertyChangeListener + , css::inspection::XPropertyControlFactory + , css::inspection::XObjectInspector + , css::lang::XInitialization > OPropertyBrowserController_Base; class OPropertyBrowserController :public ::comphelper::OMutexAndBroadcastHelper ,public OPropertyBrowserController_Base - ,public ::com::sun::star::inspection::XObjectInspectorUI + ,public css::inspection::XObjectInspectorUI // that's intentionally *not* part of the OPropertyBrowserController_Base // We do not want this to be available in queryInterface, getTypes, and the like. ,public IPropertyLineListener @@ -90,16 +90,16 @@ namespace pcr ,public IPropertyExistenceCheck { private: - typedef ::std::multimap< sal_Int32, ::com::sun::star::beans::Property > OrderedPropertyMap; - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > + typedef ::std::multimap< sal_Int32, css::beans::Property > OrderedPropertyMap; + typedef ::std::vector< css::uno::Reference< css::uno::XInterface > > InterfaceArray; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xView; + css::uno::Reference< css::frame::XFrame > m_xFrame; + css::uno::Reference< css::awt::XWindow > m_xView; ::cppu::OInterfaceContainerHelper m_aDisposeListeners; ::cppu::OInterfaceContainerHelper m_aControlObservers; @@ -109,7 +109,7 @@ namespace pcr OUString m_sPageSelection; OUString m_sLastValidPageSelection; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > + typedef css::uno::Reference< css::inspection::XPropertyHandler > PropertyHandlerRef; typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray; typedef std::unordered_map< OUString, PropertyHandlerRef, OUStringHash > @@ -123,14 +123,14 @@ namespace pcr ::std::unique_ptr< ComposedPropertyUIUpdate > m_pUIRequestComposer; /// our InspectorModel - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > + css::uno::Reference< css::inspection::XObjectInspectorModel > m_xModel; /// the object(s) we're currently inspecting InterfaceArray m_aInspectedObjects; /// the properties of the currently inspected object(s) OrderedPropertyMap m_aProperties; /// the property we're just committing - OUString m_sCommittingProperty; + OUString m_sCommittingProperty; typedef std::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16; HashString2Int16 m_aPageIds; @@ -144,93 +144,93 @@ namespace pcr DECLARE_XINTERFACE() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController - virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getViewData( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Data ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getViewData( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL restoreViewData( const css::uno::Any& Data ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLayoutConstrains - virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Size SAL_CALL getMinimumSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Size SAL_CALL getPreferredSize( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** XPropertyControlFactory */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: OPropertyBrowserController( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + const css::uno::Reference< css::uno::XComponentContext >& _rxContext); protected: virtual ~OPropertyBrowserController(); public: // XServiceInfo - static versions - static OUString getImplementationName_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > SAL_CALL + Create(const css::uno::Reference< css::uno::XComponentContext >&); protected: // IPropertyLineListener virtual void Clicked( const OUString& _rName, bool _bPrimary ) SAL_OVERRIDE; - virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) SAL_OVERRIDE; + virtual void Commit( const OUString& _rName, const css::uno::Any& _rVal ) SAL_OVERRIDE; // IPropertyControlObserver - virtual void focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ) SAL_OVERRIDE; - virtual void valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ) SAL_OVERRIDE; + virtual void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) SAL_OVERRIDE; + virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) SAL_OVERRIDE; // IPropertyExistenceCheck - virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) SAL_OVERRIDE; // XObjectInspectorUI - virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL registerControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokeControlObserver( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlObserver >& _Observer ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& _Observer ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& _Observer ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XObjectInspector - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInspectorModel( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel >& _inspectormodel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > SAL_CALL getInspectorUI() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL inspect( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInspectorModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _inspectormodel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::inspection::XObjectInspectorUI > SAL_CALL getInspectorUI() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL inspect( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void UpdateUI(); @@ -261,7 +261,7 @@ namespace pcr if set to <FALSE/>, this is a real change in the property value, not just a call for purposes of initialization. */ - void impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; + void impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, bool _bFirstTimeInit ) const; /** determines whether the given property is an actuating property, that is, at least one handler expressed interest in changes to this property's value. @@ -280,7 +280,7 @@ namespace pcr @return the value of this property */ - ::com::sun::star::uno::Any + css::uno::Any impl_getPropertyValue_throw( const OUString& _rPropertyName ); /// calls XPropertyHandler::suspend for all our property handlers @@ -298,7 +298,7 @@ namespace pcr void updateViewDataFromActivePage(); /// describes the UI for the given property - void describePropertyLine( const ::com::sun::star::beans::Property& _rPropertyName, OLineDescriptor& _rDescriptor ); + void describePropertyLine( const css::beans::Property& _rPropertyName, OLineDescriptor& _rDescriptor ); /** retrieves the position of the property given by name in m_aProperties @return @@ -332,7 +332,7 @@ namespace pcr respective tab pages into our view @precond m_aPageIds is empty - @throws ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException if one of the callees of this method throws this exception */ void @@ -354,7 +354,7 @@ namespace pcr /** binds the instance to a new model */ - void impl_bindToNewModel_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel >& _rxInspectorModel ); + void impl_bindToNewModel_nothrow( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _rxInspectorModel ); /** initializes our view, as indicated by the model's view-relevant properties @@ -368,8 +368,8 @@ namespace pcr Effectively, this means that the method simply checks the IsReadOnly attribute of the model. If there is no model, <FALSE/> is returned. - @throws ::com::sun::star::uno::RuntimeException - in case asking the model for its IsReadOnly attribute throws a ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException + in case asking the model for its IsReadOnly attribute throws a css::uno::RuntimeException itself. */ bool impl_isReadOnlyModel_throw() const; @@ -389,7 +389,7 @@ namespace pcr private: // constructors void createDefault(); - void createWithModel( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel >& _rxModel ); + void createWithModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _rxModel ); }; diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx index 4cc058962ff5..61ba188e72fa 100644 --- a/extensions/source/propctrlr/propcontrolobserver.hxx +++ b/extensions/source/propctrlr/propcontrolobserver.hxx @@ -34,8 +34,8 @@ namespace pcr class IPropertyControlObserver { public: - virtual void focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ) = 0; - virtual void valueChanged( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _Control ) = 0; + virtual void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) = 0; + virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& _Control ) = 0; protected: ~IPropertyControlObserver() {} diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index f8c534ec0683..69176dac95a0 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -44,8 +44,8 @@ namespace pcr //= PropertyComposer - typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler - , ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler + , css::beans::XPropertyChangeListener > PropertyComposer_Base; /** implements an <type>XPropertyHandler</type> which composes it's information from a set of other property handlers @@ -55,7 +55,7 @@ namespace pcr ,public IPropertyExistenceCheck { public: - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > > + typedef ::std::vector< css::uno::Reference< css::inspection::XPropertyHandler > > HandlerArray; private: @@ -72,56 +72,56 @@ namespace pcr @param _rSlaveHandlers the set of slave handlers to invoke. Must not be <NULL/> */ - PropertyComposer( const ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler > >& _rSlaveHandlers ); + PropertyComposer( const ::std::vector< css::uno::Reference< css::inspection::XPropertyHandler > >& _rSlaveHandlers ); public: // XPropertyHandler overridables - virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState - SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > - SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState + SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > + SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent DECLARE_XCOMPONENT() virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // IPropertyExistenceCheck - virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) SAL_OVERRIDE; private: /** ensures that m_pUIRequestComposer exists */ - void impl_ensureUIRequestComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ); + void impl_ensureUIRequestComposer( const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ); /** checks whether a given property exists in <member>m_aSupportedProperties</member> */ bool impl_isSupportedProperty_nothrow( const OUString& _rPropertyName ) { - ::com::sun::star::beans::Property aDummy; aDummy.Name = _rPropertyName; + css::beans::Property aDummy; aDummy.Name = _rPropertyName; return m_aSupportedProperties.find( aDummy ) != m_aSupportedProperties.end(); } @@ -135,7 +135,7 @@ namespace pcr : ::osl::MutexGuard( _rInstance.m_aMutex ) { if ( _rInstance.m_aSlaveHandlers.empty() ) - throw ::com::sun::star::lang::DisposedException( OUString(), *(&_rInstance) ); + throw css::lang::DisposedException( OUString(), *(&_rInstance) ); } }; }; diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index acf702716974..f9de8ac82971 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -36,20 +36,20 @@ namespace pcr //= PropertyControlExtender struct PropertyControlExtender_Data; - typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XKeyListener + typedef ::cppu::WeakImplHelper < css::awt::XKeyListener > PropertyControlExtender_Base; class PropertyControlExtender : public PropertyControlExtender_Base { public: PropertyControlExtender( - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxObservedControl + const css::uno::Reference< css::inspection::XPropertyControl >& _rxObservedControl ); // XKeyListener - virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~PropertyControlExtender(); diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 4576f226adc3..8128a020b835 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -93,9 +93,9 @@ namespace pcr sal_uInt16 GetCurPage(); void ClearAll(); - void SetPropertyValue(const OUString& _rEntryName, const ::com::sun::star::uno::Any& _rValue, bool _bUnknownValue ); + void SetPropertyValue(const OUString& _rEntryName, const css::uno::Any& _rValue, bool _bUnknownValue ); sal_uInt16 GetPropertyPos(const OUString& rEntryName ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > + css::uno::Reference< css::inspection::XPropertyControl > GetPropertyControl( const OUString& rEntryName ); void EnablePropertyLine( const OUString& _rEntryName, bool _bEnable ); void EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable ); @@ -106,10 +106,10 @@ namespace pcr void RemoveEntry( const OUString& _rName ); void ChangeEntry( const OLineDescriptor& ); - void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } + void setPageActivationHandler(const Link<LinkParamNone*,void>& _rHdl) { m_aPageActivationHandler = _rHdl; } - sal_Int32 getMinimumWidth(); - sal_Int32 getMinimumHeight(); + sal_Int32 getMinimumWidth(); + sal_Int32 getMinimumHeight(); void CommitModified(); diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index c0a81c0f9f39..fd035e90e82a 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -64,7 +64,7 @@ namespace pcr //= PropertyHandler class OPropertyInfoService; - typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::inspection::XPropertyHandler + typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler > PropertyHandler_Base; /** the base class for property handlers */ @@ -72,7 +72,7 @@ namespace pcr { private: /// cache for getSupportedProperties - mutable StlSyntaxSequence< ::com::sun::star::beans::Property > + mutable StlSyntaxSequence< css::beans::Property > m_aSupportedProperties; mutable bool m_bSupportedPropertiesAreKnown; @@ -81,49 +81,49 @@ namespace pcr private: /// the property listener which has been registered - PropertyChangeListeners m_aPropertyListeners; + PropertyChangeListeners m_aPropertyListeners; protected: - mutable ::osl::Mutex m_aMutex; + mutable ::osl::Mutex m_aMutex; /// the context in which the instance was created - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; /// the component we're inspecting - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xComponent; + css::uno::Reference< css::beans::XPropertySet > m_xComponent; /// info about our component's properties - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xComponentPropertyInfo; + css::uno::Reference< css::beans::XPropertySetInfo > m_xComponentPropertyInfo; /// type converter, needed on various occasions - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; /// access to property meta data - ::std::unique_ptr< OPropertyInfoService > m_pInfoService; + ::std::unique_ptr< OPropertyInfoService > m_pInfoService; protected: PropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); virtual ~PropertyHandler(); // default implementations for XPropertyHandler - virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent DECLARE_XCOMPONENT() virtual void SAL_CALL disposing() SAL_OVERRIDE; // own overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > + virtual css::uno::Sequence< css::beans::Property > SAL_CALL doDescribeSupportedProperties() const = 0; /// called when XPropertyHandler::inspect has been called, and we thus have a new component to inspect @@ -134,20 +134,20 @@ namespace pcr @see addPropertyChangeListener */ void firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, - const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ); + const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue ); /** retrieves a window which can be used as parent for dialogs */ vcl::Window* impl_getDefaultDialogParent_nothrow() const; /** retrieves the property id for a given property name - @throw com::sun::star::beans::UnknownPropertyException + @throw css::beans::UnknownPropertyException if the property name is not known to our ->m_pInfoService */ PropertyId impl_getPropertyId_throwUnknownProperty( const OUString& _rPropertyName ) const; /** retrieves the property id for a given property name - @throw com::sun::star::uno::RuntimeException + @throw css::uno::RuntimeException if the property name is not known to our ->m_pInfoService */ PropertyId impl_getPropertyId_throwRuntime( const OUString& _rPropertyName ) const; @@ -164,7 +164,7 @@ namespace pcr Most probably to be called from within getSupportedProperties */ inline void addStringPropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -172,7 +172,7 @@ namespace pcr /** adds a description for the given int32 property to the given property vector */ inline void addInt32PropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -180,7 +180,7 @@ namespace pcr /** adds a description for the given int16 property to the given property vector */ inline void addInt16PropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -188,7 +188,7 @@ namespace pcr /** adds a description for the given double property to the given property vector */ inline void addDoublePropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -196,7 +196,7 @@ namespace pcr /** adds a description for the given date property to the given property vector */ inline void addDatePropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -204,7 +204,7 @@ namespace pcr /** adds a description for the given time property to the given property vector */ inline void addTimePropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; @@ -212,16 +212,16 @@ namespace pcr /** adds a description for the given DateTime property to the given property vector */ inline void addDateTimePropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs = 0 ) const; /// adds a Property, given by name only, to a given vector of Properties void implAddPropertyDescription( - ::std::vector< ::com::sun::star::beans::Property >& _rProperties, + ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, + const css::uno::Type& _rType, sal_Int16 _nAttribs = 0 ) const; @@ -237,7 +237,7 @@ namespace pcr @see doDescribeSupportedProperties @see impl_getPropertyFromId_throw */ - const ::com::sun::star::beans::Property* + const css::beans::Property* impl_getPropertyFromId_nothrow( PropertyId _nPropId ) const; /** retrieves a property given by handle @@ -248,7 +248,7 @@ namespace pcr @seealso doDescribeSupportedProperties @see impl_getPropertyFromId_nothrow */ - const ::com::sun::star::beans::Property& + const css::beans::Property& impl_getPropertyFromId_throw( PropertyId _nPropId ) const; /** determines whether a given property id is part of our supported properties @@ -267,7 +267,7 @@ namespace pcr @seealso doDescribeSupportedProperties */ - const ::com::sun::star::beans::Property& + const css::beans::Property& impl_getPropertyFromName_throw( const OUString& _rPropertyName ) const; /** get the name of a property given by handle @@ -278,11 +278,11 @@ namespace pcr /** returns the value of the ContextDocument property in the ComponentContext which was used to create this handler. */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + inline css::uno::Reference< css::frame::XModel > impl_getContextDocument_nothrow() const { - return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >( - m_xContext->getValueByName( "ContextDocument" ), ::com::sun::star::uno::UNO_QUERY ); + return css::uno::Reference< css::frame::XModel >( + m_xContext->getValueByName( "ContextDocument" ), css::uno::UNO_QUERY ); } /** marks the context document as modified @@ -304,51 +304,51 @@ namespace pcr }; - inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addStringPropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<OUString>::get(), _nAttribs ); } - inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<sal_Int32>::get(), _nAttribs ); } - inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<sal_Int16>::get(), _nAttribs ); } - inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<double>::get(), _nAttribs ); } - inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDatePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<com::sun::star::util::Date>::get(), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<css::util::Date>::get(), _nAttribs ); } - inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addTimePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<com::sun::star::util::Time>::get(), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<css::util::Time>::get(), _nAttribs ); } - inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const + inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< css::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<com::sun::star::util::DateTime>::get(), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<css::util::DateTime>::get(), _nAttribs ); } inline OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const { - const ::com::sun::star::beans::Property* pProp = impl_getPropertyFromId_nothrow( _nPropId ); + const css::beans::Property* pProp = impl_getPropertyFromId_nothrow( _nPropId ); return pProp ? pProp->Name : OUString(); } //= PropertyHandlerComponent - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo + typedef ::cppu::ImplHelper1 < css::lang::XServiceInfo > PropertyHandlerComponent_Base; /** PropertyHandler implementation which additionally supports XServiceInfo */ @@ -357,16 +357,16 @@ namespace pcr { protected: PropertyHandlerComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; }; @@ -389,8 +389,8 @@ namespace pcr { ... public: - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); }; </pre> */ @@ -398,16 +398,16 @@ namespace pcr class HandlerComponentBase : public PropertyHandlerComponent { protected: - HandlerComponentBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) + HandlerComponentBase( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) :PropertyHandlerComponent( _rxContext ) { } protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); public: /** registers the implementation of HANDLER at the <type>PcrModule</type> @@ -417,14 +417,14 @@ namespace pcr template < class HANDLER > - OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { return HANDLER::getImplementationName_static(); } template < class HANDLER > - ::com::sun::star::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) { return HANDLER::getSupportedServiceNames_static(); } @@ -442,7 +442,7 @@ namespace pcr template < class HANDLER > - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL HandlerComponentBase< HANDLER >::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) + css::uno::Reference< css::uno::XInterface > SAL_CALL HandlerComponentBase< HANDLER >::Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) { return *( new HANDLER( _rxContext ) ); } diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index 4b81856351b0..f52fd56e3c43 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -31,14 +31,14 @@ namespace pcr //= PropertyEventTranslation - typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener > PropertyEventTranslation_Base; class PropertyEventTranslation : public PropertyEventTranslation_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > + css::uno::Reference< css::beans::XPropertyChangeListener > m_xDelegator; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xTranslatedEventSource; public: @@ -47,18 +47,18 @@ namespace pcr if <arg>_rxDelegator</arg> is <NULL/> */ PropertyEventTranslation( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxDelegator, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxTranslatedEventSource + const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxDelegator, + const css::uno::Reference< css::uno::XInterface >& _rxTranslatedEventSource ); - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& + inline const css::uno::Reference< css::beans::XPropertyChangeListener >& getDelegator() const { return m_xDelegator; } protected: // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PropertyEventTranslation( const PropertyEventTranslation& ) SAL_DELETED_FUNCTION; diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index b80555c6b8cc..447f3c99ee75 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -32,7 +32,7 @@ namespace pcr { public: virtual void Clicked( const OUString& _rName, bool _bPrimary ) = 0; - virtual void Commit( const OUString& _rName, const ::com::sun::star::uno::Any& _rVal ) = 0; + virtual void Commit( const OUString& _rName, const css::uno::Any& _rVal ) = 0; protected: ~IPropertyLineListener() {} diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx index 489d970837a3..13296f750315 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.hxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx @@ -34,9 +34,9 @@ namespace pcr class PushButtonNavigation { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; - bool m_bIsPushButton; + bool m_bIsPushButton; public: /** ctor @@ -44,41 +44,41 @@ namespace pcr the control model which is or will be bound */ PushButtonNavigation( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel ); /** returns the current value of the "ButtonType" property, taking into account the "virtual" button types such as "move-to-next-record button". */ - ::com::sun::star::uno::Any + css::uno::Any getCurrentButtonType() const; /** sets the current value of the "ButtonType" property, taking into account the "virtual" button types such as "move-to-next-record button". */ - void setCurrentButtonType( const ::com::sun::star::uno::Any& _rValue ) const; + void setCurrentButtonType( const css::uno::Any& _rValue ) const; /** retrieves the current state of the "ButtonType" property, taking into account the "virtual" button types such as "move-to-next-record button". */ - ::com::sun::star::beans::PropertyState + css::beans::PropertyState getCurrentButtonTypeState( ) const; /** returns the current value of the "TargetURL" property, taking into account that some URLs are special values caused by "virtual" ButtonTypes */ - ::com::sun::star::uno::Any + css::uno::Any getCurrentTargetURL() const; /** sets the current value of the "TargetURL" property, taking into account that some URLs are special values caused by "virtual" ButtonTypes */ - void setCurrentTargetURL( const ::com::sun::star::uno::Any& _rValue ) const; + void setCurrentTargetURL( const css::uno::Any& _rValue ) const; /** retrieves the current state of the "TargetURL" property, taking into account that some URLs are special values caused by "virtual" ButtonTypes */ - ::com::sun::star::beans::PropertyState + css::beans::PropertyState getCurrentTargetURLState( ) const; /** determines whether the current button tpye is FormButtonType_URL diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index ee3bf66bc331..a9dbc671e038 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -44,26 +44,26 @@ namespace pcr VclPtr<SvTreeListBox> m_pControlTree; VclPtr<CheckBox> m_pNoAssignment; - ImageList m_aModelImages; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; + ImageList m_aModelImages; + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; OUString m_sRequiredService; - Image m_aRequiredControlImage; - SvTreeListEntry* m_pInitialSelection; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xInitialLabelControl; + Image m_aRequiredControlImage; + SvTreeListEntry* m_pInitialSelection; + css::uno::Reference< css::beans::XPropertySet > m_xInitialLabelControl; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelectedControl; - SvTreeListEntry* m_pLastSelected; - bool m_bHaveAssignableControl; + css::uno::Reference< css::beans::XPropertySet > m_xSelectedControl; + SvTreeListEntry* m_pLastSelected; + bool m_bHaveAssignableControl; public: - OSelectLabelDialog(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xControlModel); + OSelectLabelDialog(vcl::Window* pParent, css::uno::Reference< css::beans::XPropertySet > _xControlModel); virtual ~OSelectLabelDialog(); virtual void dispose() SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetSelected() const { return m_pNoAssignment->IsChecked() ? ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > () : m_xSelectedControl; } + css::uno::Reference< css::beans::XPropertySet > GetSelected() const { return m_pNoAssignment->IsChecked() ? css::uno::Reference< css::beans::XPropertySet > () : m_xSelectedControl; } protected: - sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); + sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); DECL_LINK_TYPED(OnEntrySelected, SvTreeListBox*, void); DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void); diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 4a619e9f02e3..c80fe5638c95 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -42,7 +42,7 @@ namespace pcr //= SQLCommandDesigner - typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener + typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener > SQLCommandDesigner_Base; /** encapsulates the code for calling and managing a query design frame, used for interactively designing the Command property of a ->RowSet @@ -50,12 +50,12 @@ namespace pcr class SQLCommandDesigner : public SQLCommandDesigner_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory > m_xORB; - ::dbtools::SharedConnection m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xDesigner; - ::rtl::Reference< ISQLCommandAdapter > m_xObjectAdapter; - Link<SQLCommandDesigner&,void> m_aCloseLink; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XMultiComponentFactory > m_xORB; + ::dbtools::SharedConnection m_xConnection; + css::uno::Reference< css::frame::XController > m_xDesigner; + ::rtl::Reference< ISQLCommandAdapter > m_xObjectAdapter; + Link<SQLCommandDesigner&,void> m_aCloseLink; public: /** creates the instance, and immediately opens the SQL command design frame @@ -68,12 +68,12 @@ namespace pcr the current connection of ->_rxRowSet. Must not be <NULL/>. @param _rCloseLink link to call when the component has been closed - @throws ::com::sun::star::lang::NullPointerException + @throws css::lang::NullPointerException if any of the arguments (except ->_rCloseLink) is <NULL/>, or if the component context does not provide a valid component factory. */ SQLCommandDesigner( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter, const ::dbtools::SharedConnection& _rConnection, const Link<SQLCommandDesigner&,void>& _rCloseLink @@ -110,10 +110,10 @@ namespace pcr protected: // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~SQLCommandDesigner(); @@ -137,7 +137,7 @@ namespace pcr return !m_xContext.is(); } /** checks whether we are already disposed - @throws ::com::sun::star::lang::DisposedException + @throws css::lang::DisposedException if we in fact are disposed */ void impl_checkDisposed_throw() const; @@ -146,7 +146,7 @@ namespace pcr @precond ->m_xORB is not <NULL/> */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > + css::uno::Reference< css::frame::XFrame > impl_createEmptyParentlessTask_nothrow() const; /** called whenever the component denoted by m_xDesigner has been closed diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index e40ee8a02926..740f551cab1a 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -701,7 +701,7 @@ namespace pcr { if ( _rValue.hasValue() ) { - ::com::sun::star::util::Color nColor = COL_TRANSPARENT; + css::util::Color nColor = COL_TRANSPARENT; if ( _rValue >>= nColor ) { ::Color aRgbCol((ColorData)nColor); @@ -741,7 +741,7 @@ namespace pcr else { ::Color aRgbCol = getTypedControlWindow()->GetSelectEntryColor(); - aPropValue <<= (::com::sun::star::util::Color)aRgbCol.GetColor(); + aPropValue <<= (css::util::Color)aRgbCol.GetColor(); } } return aPropValue; diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index a5940fd71e0a..93c6c32ceba7 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -69,37 +69,37 @@ namespace pcr //= OTimeControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< TimeField > > OTimeControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, ControlWindow< TimeField > > OTimeControl_Base; class OTimeControl : public OTimeControl_Base { public: OTimeControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; //= ODateControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< CalendarField > > ODateControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, ControlWindow< CalendarField > > ODateControl_Base; class ODateControl : public ODateControl_Base { public: ODateControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; //= OEditControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< Edit > > OEditControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, ControlWindow< Edit > > OEditControl_Base; class OEditControl : public OEditControl_Base { protected: @@ -109,9 +109,9 @@ namespace pcr OEditControl( vcl::Window* _pParent, bool _bPassWord, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void modified() SAL_OVERRIDE; @@ -120,16 +120,16 @@ namespace pcr //= ODateTimeControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< FormattedField > > ODateTimeControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, ControlWindow< FormattedField > > ODateTimeControl_Base; class ODateTimeControl : public ODateTimeControl_Base { public: ODateTimeControl( vcl::Window* pParent,WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -163,7 +163,7 @@ namespace pcr //= OHyperlinkControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XHyperlinkControl, ControlWindow< HyperlinkInput > > OHyperlinkControl_Base; + typedef CommonBehaviourControl< css::inspection::XHyperlinkControl, ControlWindow< HyperlinkInput > > OHyperlinkControl_Base; class OHyperlinkControl : public OHyperlinkControl_Base { private: @@ -173,13 +173,13 @@ namespace pcr OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHyperlinkControl - virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // XComponent @@ -208,7 +208,7 @@ namespace pcr //= ONumericControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XNumericControl, CustomConvertibleNumericField > ONumericControl_Base; + typedef CommonBehaviourControl< css::inspection::XNumericControl, CustomConvertibleNumericField > ONumericControl_Base; class ONumericControl : public ONumericControl_Base { private: @@ -219,21 +219,21 @@ namespace pcr ONumericControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNumericControl - virtual ::sal_Int16 SAL_CALL getDecimalDigits() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::Optional< double > SAL_CALL getMinValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMinValue( const ::com::sun::star::beans::Optional< double >& _minvalue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::Optional< double > SAL_CALL getMaxValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setMaxValue( const ::com::sun::star::beans::Optional< double >& _maxvalue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int16 SAL_CALL getDisplayUnit() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Int16 SAL_CALL getValueUnit() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getDecimalDigits() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::Optional< double > SAL_CALL getMinValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMinValue( const css::beans::Optional< double >& _minvalue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::beans::Optional< double > SAL_CALL getMaxValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMaxValue( const css::beans::Optional< double >& _maxvalue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getDisplayUnit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL getValueUnit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** converts an API value (<code>double</code>, as passed into <code>set[Max|Min|]Value) into @@ -252,7 +252,7 @@ namespace pcr //= OColorControl - typedef CommonBehaviourControl < ::com::sun::star::inspection::XStringListControl + typedef CommonBehaviourControl < css::inspection::XStringListControl , ListLikeControlWithModifyHandler< ColorListBox > > OColorControl_Base; class OColorControl : public OColorControl_Base @@ -264,15 +264,15 @@ namespace pcr OColorControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringListControl - virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearList( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void modified() SAL_OVERRIDE; @@ -281,7 +281,7 @@ namespace pcr //= OListboxControl - typedef CommonBehaviourControl < ::com::sun::star::inspection::XStringListControl + typedef CommonBehaviourControl < css::inspection::XStringListControl , ListLikeControlWithModifyHandler< ListBox > > OListboxControl_Base; class OListboxControl : public OListboxControl_Base @@ -290,15 +290,15 @@ namespace pcr OListboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringListControl - virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearList( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual void modified() SAL_OVERRIDE; @@ -307,22 +307,22 @@ namespace pcr //= OComboboxControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XStringListControl, ControlWindow< ComboBox > > OComboboxControl_Base; + typedef CommonBehaviourControl< css::inspection::XStringListControl, ControlWindow< ComboBox > > OComboboxControl_Base; class OComboboxControl : public OComboboxControl_Base { public: OComboboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStringListControl - virtual void SAL_CALL clearList( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearList( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: DECL_LINK( OnEntrySelected, void* ); @@ -361,7 +361,7 @@ namespace pcr MultiLineOperationMode getOperationMode() const { return m_nOperationMode; } void SetTextValue( const OUString& _rText ); - OUString GetTextValue() const; + OUString GetTextValue() const; void SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings ); StlSyntaxSequence< OUString > @@ -388,16 +388,16 @@ namespace pcr //= OMultilineEditControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, DropDownEditControl > OMultilineEditControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, DropDownEditControl > OMultilineEditControl_Base; class OMultilineEditControl : public OMultilineEditControl_Base { public: OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index a689aad8f1e4..d88a710828e0 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -44,8 +44,8 @@ namespace pcr public: SubmissionHelper( osl::Mutex& _rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxIntrospectee, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxIntrospectee, + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); /** determines whether the given control model is able to trigger submissions @@ -54,8 +54,8 @@ namespace pcr for components where this method returned <FALSE/> */ static bool canTriggerSubmissions( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); }; @@ -75,36 +75,36 @@ namespace pcr public: SubmissionPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); virtual ~SubmissionPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // PropertyHandler overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > + virtual css::uno::Sequence< css::beans::Property > SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; virtual void onNewComponent() SAL_OVERRIDE; private: // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 4c6724587b6a..cc49a80787c1 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -64,22 +64,22 @@ namespace pcr class TabOrderDialog : public ModalDialog { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > + css::uno::Reference< css::awt::XTabControllerModel > m_xTempModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > + css::uno::Reference< css::awt::XTabControllerModel > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > m_xControlContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xORB; - VclPtr<TabOrderListBox> m_pLB_Controls; + VclPtr<TabOrderListBox> m_pLB_Controls; - VclPtr<OKButton> m_pPB_OK; + VclPtr<OKButton> m_pPB_OK; - VclPtr<PushButton> m_pPB_MoveUp; - VclPtr<PushButton> m_pPB_MoveDown; - VclPtr<PushButton> m_pPB_AutoOrder; + VclPtr<PushButton> m_pPB_MoveUp; + VclPtr<PushButton> m_pPB_MoveDown; + VclPtr<PushButton> m_pPB_AutoOrder; ImageList* pImageList; @@ -90,15 +90,15 @@ namespace pcr void FillList(); Image GetImage( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxSet + const css::uno::Reference< css::beans::XPropertySet > & _rxSet ) const; public: TabOrderDialog( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& _rxTabModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxControlCont, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB + const css::uno::Reference< css::awt::XTabControllerModel >& _rxTabModel, + const css::uno::Reference< css::awt::XControlContainer >& _rxControlCont, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); virtual ~TabOrderDialog(); diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index 38f87bb5a727..9d32c94e73a5 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -34,16 +34,16 @@ namespace pcr class UnoURL { private: - ::com::sun::star::util::URL m_aURL; + css::util::URL m_aURL; public: UnoURL( const OUString& _rCompleteURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB ); inline operator const OUString& () const { return m_aURL.Complete; } - inline operator const ::com::sun::star::util::URL& () const { return m_aURL; } + inline operator const css::util::URL& () const { return m_aURL; } private: UnoURL(); // never implemented diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 3a2b02de909f..be37b74b3b59 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -123,7 +123,7 @@ namespace pcr case css::util::NumberFormat::DATE: { Date aCurrentDate( Date::SYSTEM ); - static ::com::sun::star::util::Date STANDARD_DB_DATE(30,12,1899); + static css::util::Date STANDARD_DB_DATE(30,12,1899); nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(static_cast<sal_Int32>(aCurrentDate.GetDate())),STANDARD_DB_DATE); } break; @@ -321,7 +321,7 @@ namespace pcr } - ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() throw (::com::sun::star::uno::RuntimeException) + ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() throw (css::uno::RuntimeException) { // don't use the base class'es method, it would claim we're a standard control, which // we in fact aren't diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 44f1a29e8c61..0fd96b9ba407 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -55,16 +55,16 @@ namespace pcr //= OFormatSampleControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, NumberFormatSampleField > OFormatSampleControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, NumberFormatSampleField > OFormatSampleControl_Base; class OFormatSampleControl : public OFormatSampleControl_Base { public: OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; inline void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier ) { @@ -95,7 +95,7 @@ namespace pcr //= OFormattedNumericControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< FormattedField > > OFormattedNumericControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, ControlWindow< FormattedField > > OFormattedNumericControl_Base; class OFormattedNumericControl : public OFormattedNumericControl_Base { private: @@ -105,9 +105,9 @@ namespace pcr OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SetFormatDescription( const FormatDescription& rDesc ); @@ -124,16 +124,16 @@ namespace pcr //= OFileUrlControl - typedef CommonBehaviourControl< ::com::sun::star::inspection::XPropertyControl, ControlWindow< ::svt::FileURLBox > > OFileUrlControl_Base; + typedef CommonBehaviourControl< css::inspection::XPropertyControl, ControlWindow< ::svt::FileURLBox > > OFileUrlControl_Base; class OFileUrlControl : public OFileUrlControl_Base { public: OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& _value ) throw (::com::sun::star::beans::IllegalTypeException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~OFileUrlControl(); @@ -149,7 +149,7 @@ namespace pcr virtual ~OTimeDurationControl(); // XPropertyControl - ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) SAL_OVERRIDE; private: DECL_LINK_TYPED( OnCustomConvert, MetricFormatter&, void ); diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index 37f92bba5c4e..0a7499dfb6b8 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -44,38 +44,37 @@ namespace pcr class XSDDataType : public salhelper::SimpleReferenceObject { private: - ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > + css::uno::Reference< css::xsd::XDataType > m_xDataType; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > m_xFacetInfo; public: XSDDataType( - const ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >& _rxDataType + const css::uno::Reference< css::xsd::XDataType >& _rxDataType ); /// retrieves the underlying UNO component - inline const ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >& + inline const css::uno::Reference< css::xsd::XDataType >& getUnoDataType() const { return m_xDataType; } /// classifies the data typ - sal_Int16 classify() const; + sal_Int16 classify() const; // attribute access - OUString getName() const; + OUString getName() const; bool isBasicType() const; /// determines whether a given facet exists at the type bool hasFacet( const OUString& _rFacetName ) const; /// retrieves a facet value - ::com::sun::star::uno::Any - getFacet( const OUString& _rFacetName ); + css::uno::Any getFacet( const OUString& _rFacetName ); /// sets a facet value - void setFacet( const OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ); + void setFacet( const OUString& _rFacetName, const css::uno::Any& _rFacetValue ); - /** copies as much facets (values, respectively) from a give data type instance - */ - void copyFacetsFrom( const ::rtl::Reference< XSDDataType >& _pSourceType ); + /** copies as much facets (values, respectively) from a give data type instance + */ + void copyFacetsFrom( const ::rtl::Reference< XSDDataType >& _pSourceType ); protected: virtual ~XSDDataType(); diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx index a14c905a6817..20f8f84c1955 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.hxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx @@ -46,8 +46,8 @@ namespace pcr public: XSDValidationHelper( ::osl::Mutex& _rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxIntrospectee, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument + const css::uno::Reference< css::beans::XPropertySet >& _rxIntrospectee, + const css::uno::Reference< css::frame::XModel >& _rxContextDocument ); /** retrieves the names of all XForms models in the document the control lives in @@ -109,17 +109,17 @@ namespace pcr private: /** retrieves the data type repository associated with the current model */ - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > + css::uno::Reference< css::xforms::XDataTypeRepository > getDataTypeRepository() const; /** retrieves the data type repository associated with any model */ - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > + css::uno::Reference< css::xforms::XDataTypeRepository > getDataTypeRepository( const OUString& _rModelName ) const; /** retrieves the data type object for the given name */ - ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > + css::uno::Reference< css::xsd::XDataType > getDataType( const OUString& _rName ) const; /** retrieves the name of the basic data type which has the given class, in the given repository @@ -127,7 +127,7 @@ namespace pcr static OUString getBasicTypeNameForClass( sal_Int16 _nClass, - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > _rxRepository + css::uno::Reference< css::xforms::XDataTypeRepository > _rxRepository ); }; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index ce23f78dad55..c6b1ef3052fb 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -42,33 +42,33 @@ namespace pcr public: XSDValidationPropertyHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); protected: virtual ~XSDValidationPropertyHandler(); protected: // XPropertyHandler overriables - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > + SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::LineDescriptor + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::inspection::InteractiveSelectionResult + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // PropertyHandler overridables - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > + virtual css::uno::Sequence< css::beans::Property > SAL_CALL doDescribeSupportedProperties() const SAL_OVERRIDE; virtual void onNewComponent() SAL_OVERRIDE; diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 985d331acf0f..347a3594ee90 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -37,7 +37,7 @@ namespace return std::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr())); } - class ResourceIndexAccessBase : public cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess> + class ResourceIndexAccessBase : public cppu::WeakImplHelper< css::container::XIndexAccess> { public: ResourceIndexAccessBase( std::shared_ptr<ResMgr> pResMgr) @@ -47,10 +47,10 @@ namespace } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; }; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return static_cast<bool>(m_pResMgr.get()); }; protected: @@ -64,9 +64,9 @@ namespace ResourceStringIndexAccess( std::shared_ptr<ResMgr> pResMgr) : ResourceIndexAccessBase(pResMgr) {} // XIndexAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccessBase - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::cppu::UnoType<OUString>::get(); }; }; @@ -76,9 +76,9 @@ namespace ResourceStringListIndexAccess( std::shared_ptr<ResMgr> pResMgr) : ResourceIndexAccessBase(pResMgr) {} // XIndexAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccessBase - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<Sequence<PropertyValue>>::get(); }; }; } diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 2eabc8460b35..1fb12909fd73 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -26,22 +26,22 @@ class ResMgr; namespace extensions { namespace resource { /** This class provides access to tools library text resources */ - class ResourceIndexAccess : public cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess> + class ResourceIndexAccess : public cppu::WeakImplHelper< css::container::XNameAccess> { public: /** The ctor takes a sequence with one element: the name of the resource, e.g. svt */ - ResourceIndexAccess(::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> const& rArgs, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); + ResourceIndexAccess(css::uno::Sequence< css::uno::Any> const& rArgs, css::uno::Reference< css::uno::XComponentContext> const&); // XNameAccess // The XNameAccess provides access to two named elements: // "String" returns a XIndexAccess to String resources // "StringList" returns a XIndexAccess to StringList/StringArray resources - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { return cppu::UnoType<com::sun::star::uno::XInterface>::get(); }; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return cppu::UnoType<css::uno::XInterface>::get(); }; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return static_cast<bool>(m_pResMgr.get()); }; private: diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 08158fd0f062..512e120aaf54 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -115,19 +115,19 @@ namespace extensions { namespace resource public: // XResourceBundle - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle > SAL_CALL getParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle >& _parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::resource::XResourceBundle > SAL_CALL getParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const css::uno::Reference< css::resource::XResourceBundle >& _parent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (base of XResourceBundle) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (base of XNameAccess) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** retrievs the element with the given key, without asking our parent bundle diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index cdb131b88f26..9ee90a529b9a 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -31,7 +31,7 @@ namespace extensions { namespace resource { - typedef ::std::pair< OUString, ::com::sun::star::lang::Locale> ResourceBundleDescriptor; + typedef ::std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; struct ResourceBundleDescriptorLess : public ::std::binary_function<ResourceBundleDescriptor, ResourceBundleDescriptor, bool> { @@ -49,23 +49,23 @@ namespace extensions { namespace resource } }; - class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< ::com::sun::star::resource::XResourceBundleLoader> + class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< css::resource::XResourceBundleLoader> { public: typedef ::std::map< ResourceBundleDescriptor, - ::com::sun::star::uno::WeakReference< ::com::sun::star::resource::XResourceBundle>, + css::uno::WeakReference< css::resource::XResourceBundle>, ResourceBundleDescriptorLess> ResourceBundleCache; - OpenOfficeResourceLoader(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); + OpenOfficeResourceLoader(css::uno::Reference< css::uno::XComponentContext> const&); // XResourceBundleLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) throw (css::resource::MissingResourceException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) SAL_DELETED_FUNCTION; OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) SAL_DELETED_FUNCTION; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext; + css::uno::Reference< css::uno::XComponentContext> m_xContext; ::osl::Mutex m_aMutex; ResourceBundleCache m_aBundleCache; }; diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx index 1e99fd651b07..7fcbb1fcd9d8 100644 --- a/extensions/source/scanner/scanner.cxx +++ b/extensions/source/scanner/scanner.cxx @@ -24,7 +24,7 @@ // - ScannerManager - -Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception ) +Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception ) { return *( new ScannerManager() ); } diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 70434d6fe6c4..c8c42fdad6a5 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -58,8 +58,8 @@ public: // XScannerManager virtual Sequence< ScannerContext > SAL_CALL getAvailableScanners() throw(std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw (ScannerException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& rxListener ) throw (ScannerException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) SAL_OVERRIDE; virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; virtual Reference< css::awt::XBitmap > SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; @@ -87,7 +87,7 @@ public: void SetData( void* pData ) { ReleaseData(); mpData = pData; } }; -Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& rxFactory ) throw( Exception ); +Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& rxFactory ) throw( Exception ); #endif diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 297a86d7b058..80b11056b63d 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -147,15 +147,15 @@ namespace class ScannerThread : public osl::Thread { std::shared_ptr<SaneHolder> m_pHolder; - Reference< com::sun::star::lang::XEventListener > m_xListener; - ScannerManager* m_pManager; // just for the disposing call + Reference< css::lang::XEventListener > m_xListener; + ScannerManager* m_pManager; // just for the disposing call public: virtual void run() SAL_OVERRIDE; virtual void onTerminated() SAL_OVERRIDE { delete this; } public: ScannerThread( std::shared_ptr<SaneHolder> pHolder, - const Reference< com::sun::star::lang::XEventListener >& listener, + const Reference< css::lang::XEventListener >& listener, ScannerManager* pManager ); virtual ~ScannerThread(); }; @@ -164,7 +164,7 @@ public: ScannerThread::ScannerThread( std::shared_ptr<SaneHolder> pHolder, - const Reference< com::sun::star::lang::XEventListener >& listener, + const Reference< css::lang::XEventListener >& listener, ScannerManager* pManager ) : m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager ) { @@ -206,7 +206,7 @@ void ScannerThread::run() Reference< XInterface > xXInterface( static_cast< OWeakObject* >( m_pManager ) ); - m_xListener->disposing( com::sun::star::lang::EventObject(xXInterface) ); + m_xListener->disposing( css::lang::EventObject(xXInterface) ); m_pHolder->m_bBusy = false; } @@ -270,7 +270,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context, - const Reference< com::sun::star::lang::XEventListener >& listener ) + const Reference< css::lang::XEventListener >& listener ) throw (ScannerException, RuntimeException, std::exception) { bool bRet; @@ -313,7 +313,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex void ScannerManager::startScan( const ScannerContext& scanner_context, - const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException, std::exception ) + const Reference< css::lang::XEventListener >& listener ) throw( ScannerException, std::exception ) { osl::MutexGuard aGuard( theSaneProtector::get() ); sanevec &rSanes = theSanes::get().m_aSanes; diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx index e9a187bd42cd..b722b16ba4d5 100644 --- a/extensions/source/scanner/scnserv.cxx +++ b/extensions/source/scanner/scnserv.cxx @@ -29,13 +29,13 @@ using namespace com::sun::star::registry; extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) { - Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; - void* pRet = 0; + Reference< css::lang::XSingleServiceFactory > xFactory; + void* pRet = 0; if( OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() ) { - xFactory = Reference< ::com::sun::star::lang::XSingleServiceFactory >( ::cppu::createSingleFactory( - static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ), + xFactory = Reference< css::lang::XSingleServiceFactory >( ::cppu::createSingleFactory( + static_cast< css::lang::XMultiServiceFactory* >( pServiceManager ), ScannerManager::getImplementationName_Static(), ScannerManager_CreateInstance, ScannerManager::getSupportedServiceNames_Static() ) ); diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 9847948d8266..5b15700b5434 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -183,7 +183,7 @@ void Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const { uno::Reference< lang::XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( m_xContext ) ); + css::configuration::theDefaultProvider::get( m_xContext ) ); beans::PropertyValue aProperty; aProperty.Name = "nodepath"; diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx index a8285d0f8459..4096308c0a74 100644 --- a/extensions/source/update/check/download.hxx +++ b/extensions/source/update/check/download.hxx @@ -55,7 +55,7 @@ protected: class Download { public: - Download(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, + Download(const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler) : m_xContext(xContext), m_aHandler(rHandler) {}; // returns true when the content of rURL was successfully written to rLocalFile @@ -71,7 +71,7 @@ protected: private: osl::Condition m_aCondition; - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& m_xContext; + const css::uno::Reference< css::uno::XComponentContext >& m_xContext; const rtl::Reference< DownloadInteractionHandler > m_aHandler; }; diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx index 64eefb259af8..543bb131c5d9 100644 --- a/extensions/source/update/check/updatecheck.hxx +++ b/extensions/source/update/check/updatecheck.hxx @@ -64,8 +64,8 @@ public: inline SAL_CALL operator rtl::Reference< UpdateCheckConfigListener > () { return static_cast< UpdateCheckConfigListener * > (this); } - void initialize(const com::sun::star::uno::Sequence<com::sun::star::beans::NamedValue>& rValues, - const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext); + void initialize(const css::uno::Sequence<css::beans::NamedValue>& rValues, + const css::uno::Reference<css::uno::XComponentContext>& xContext); // Update internal update info member void setUpdateInfo(const UpdateInfo& aInfo); @@ -104,7 +104,7 @@ public: void cancelDownload(); // Returns the XInteractionHandler of the UpdateHandler instance if present (and visible) - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const; + css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler() const; // UpdateCheckConfigListener virtual void autoCheckStatusChanged(bool enabled) SAL_OVERRIDE; @@ -163,8 +163,8 @@ private: bool m_bShowExtUpdDlg; rtl::Reference<UpdateHandler> m_aUpdateHandler; - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> m_xMenuBarUI; - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext; + css::uno::Reference<css::beans::XPropertySet> m_xMenuBarUI; + css::uno::Reference<css::uno::XComponentContext> m_xContext; friend class UpdateCheckInitData; }; diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 3588180c223b..27eb528d2bea 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -88,8 +88,7 @@ NamedValueByNameAccess::~NamedValueByNameAccess() -::com::sun::star::uno::Any -NamedValueByNameAccess::getValue(const sal_Char * pName) +css::uno::Any NamedValueByNameAccess::getValue(const sal_Char * pName) { const sal_Int32 nLen = m_rValues.getLength(); for( sal_Int32 n=0; n < nLen; ++n ) @@ -97,7 +96,7 @@ NamedValueByNameAccess::getValue(const sal_Char * pName) if( m_rValues[n].Name.equalsAscii( pName ) ) return m_rValues[n].Value; } - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } @@ -254,7 +253,7 @@ UpdateCheckConfig::get( const ::rtl::Reference< UpdateCheckConfigListener >& rListener) { uno::Reference< lang::XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( xContext ) ); + css::configuration::theDefaultProvider::get( xContext ) ); beans::PropertyValue aProperty; aProperty.Name = "nodepath"; diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index ec4437b29db8..bcf732a801f2 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -34,16 +34,16 @@ /* This helper class provides by name access to a sequence of named values */ class NamedValueByNameAccess { - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& m_rValues; + const css::uno::Sequence< css::beans::NamedValue >& m_rValues; public: NamedValueByNameAccess( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rValues) : + const css::uno::Sequence< css::beans::NamedValue >& rValues) : m_rValues(rValues) {} ; ~NamedValueByNameAccess(); - ::com::sun::star::uno::Any getValue(const sal_Char * pName); + css::uno::Any getValue(const sal_Char * pName); }; @@ -78,24 +78,24 @@ private: */ class UpdateCheckConfig : public ::cppu::WeakImplHelper< - ::com::sun::star::container::XNameReplace, - ::com::sun::star::util::XChangesBatch, - ::com::sun::star::lang::XServiceInfo > + css::container::XNameReplace, + css::util::XChangesBatch, + css::lang::XServiceInfo > { - UpdateCheckConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAvailableUpdates, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xIgnoredUpdates, + UpdateCheckConfig( const css::uno::Reference< css::container::XNameContainer >& xContainer, + const css::uno::Reference< css::container::XNameContainer >& xAvailableUpdates, + const css::uno::Reference< css::container::XNameContainer >& xIgnoredUpdates, const ::rtl::Reference< UpdateCheckConfigListener >& rListener ); virtual ~UpdateCheckConfig(); public: - static ::com::sun::star::uno::Sequence< OUString > getServiceNames(); + static css::uno::Sequence< OUString > getServiceNames(); static OUString getImplName(); static ::rtl::Reference< UpdateCheckConfig > get( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, const ::rtl::Reference< UpdateCheckConfigListener >& rListener = ::rtl::Reference< UpdateCheckConfigListener >()); // Should really implement ROModel... @@ -151,53 +151,53 @@ public: const OUString& rVersion ); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType( ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) + throw (css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangesBatch virtual void SAL_CALL commitChanges( ) - throw (::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPendingChanges( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::util::ElementChange > SAL_CALL getPendingChanges( ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: static OUString getSubVersion( const OUString& rVersion, sal_Int32 *nIndex ); static bool isVersionGreater( const OUString& rVersion1, const OUString& rVersion2 ); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer; - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xAvailableUpdates; - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xIgnoredUpdates; + const css::uno::Reference< css::container::XNameContainer > m_xContainer; + const css::uno::Reference< css::container::XNameContainer > m_xAvailableUpdates; + const css::uno::Reference< css::container::XNameContainer > m_xIgnoredUpdates; const ::rtl::Reference< UpdateCheckConfigListener > m_rListener; }; @@ -205,8 +205,8 @@ private: template <typename T> -T getValue( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rNamedValues, const sal_Char * pszName ) - throw (::com::sun::star::uno::RuntimeException) +T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const sal_Char * pszName ) + throw (css::uno::RuntimeException) { for( sal_Int32 n=0; n < rNamedValues.getLength(); n++ ) { @@ -215,13 +215,13 @@ T getValue( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Name { T value = T(); if( ! (rNamedValues[n].Value >>= value) ) - throw ::com::sun::star::uno::RuntimeException( + throw css::uno::RuntimeException( OUString( cppu_Any_extraction_failure_msg( &rNamedValues[n].Value, ::cppu::getTypeFavourUnsigned(&value).getTypeLibType() ), SAL_NO_ACQUIRE ), - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); + css::uno::Reference< css::uno::XInterface >() ); return value; } diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 3dfefd6a0abc..7c336c126487 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -91,8 +91,8 @@ public: throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener virtual void SAL_CALL queryTermination( lang::EventObject const & evt ) diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 2f9d68d94f6f..af66d3f95e02 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -827,7 +827,7 @@ void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > con void UpdateHandler::setFullVersion( OUString& rString ) { uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( - com::sun::star::configuration::theDefaultProvider::get( mxContext ) ); + css::configuration::theDefaultProvider::get( mxContext ) ); beans::PropertyValue aProperty; aProperty.Name = "nodepath"; diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 8c55a4d5c72b..2e41e0c016dc 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -68,16 +68,16 @@ enum UpdateState { }; class UpdateHandler : ::boost::noncopyable, - public cppu::WeakImplHelper< com::sun::star::awt::XActionListener, - com::sun::star::awt::XTopWindowListener, - com::sun::star::task::XInteractionHandler, - com::sun::star::frame::XTerminateListener > + public cppu::WeakImplHelper< css::awt::XActionListener, + css::awt::XTopWindowListener, + css::task::XInteractionHandler, + css::frame::XTerminateListener > { private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; - com::sun::star::uno::Reference< com::sun::star::awt::XDialog > mxUpdDlg; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > mxInteractionHdl; - rtl::Reference< IActionListener > mxActionListener; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::awt::XDialog > mxUpdDlg; + css::uno::Reference< css::task::XInteractionHandler > mxInteractionHdl; + rtl::Reference< IActionListener > mxActionListener; UpdateState meCurState; UpdateState meLastState; @@ -136,29 +136,29 @@ private: void startThrobber( bool bStart = true ); void setControlProperty( const OUString &rCtrlName, const OUString &rPropName, - const com::sun::star::uno::Any &rPropValue ); + const css::uno::Any &rPropValue ); void showControl( const OUString &rCtrlName, bool bShow = true ); void showControls( short nControls ); void focusControl( DialogControls eID ); void enableControls( short nCtrlState ); void setDownloadBtnLabel( bool bAppendDots ); void loadStrings(); - static OUString loadString( const com::sun::star::uno::Reference< com::sun::star::resource::XResourceBundle >& xBundle, + static OUString loadString( const css::uno::Reference< css::resource::XResourceBundle >& xBundle, sal_Int32 nResourceId ); OUString substVariables( const OUString &rSource ) const; - static void setProperty( com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > &rProps, - const int nIndex, const OUString &rPropName, const com::sun::star::uno::Any &rPropValue ) + static void setProperty( css::uno::Sequence< css::beans::NamedValue > &rProps, + const int nIndex, const OUString &rPropName, const css::uno::Any &rPropValue ) { rProps[ nIndex ].Name = rPropName; rProps[ nIndex ].Value = rPropValue; } - static void insertControlModel( com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > const & rxDialogModel, + static void insertControlModel( css::uno::Reference< css::awt::XControlModel > const & rxDialogModel, OUString const & rServiceName, OUString const & rControlName, - com::sun::star::awt::Rectangle const & rPosSize, - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > const & rProps ); + css::awt::Rectangle const & rPosSize, + css::uno::Sequence< css::beans::NamedValue > const & rProps ); void setFullVersion( OUString& rString ); public: - UpdateHandler( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, + UpdateHandler( const css::uno::Reference< css::uno::XComponentContext > & rxContext, const rtl::Reference< IActionListener > & rxActionListener ); virtual ~UpdateHandler(); @@ -182,29 +182,29 @@ public: bool showOverwriteWarning() const; // Allows runtime exceptions to be thrown by const methods - inline SAL_CALL operator com::sun::star::uno::Reference< com::sun::star::uno::XInterface > () const + inline SAL_CALL operator css::uno::Reference< css::uno::XInterface > () const { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); }; // XActionListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject &rObj ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL actionPerformed( com::sun::star::awt::ActionEvent const & rEvent) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject &rObj ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL actionPerformed( css::awt::ActionEvent const & rEvent) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTopWindowListener - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInteractionHandler - virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& Request ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& e ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx index 4d407ec10413..96e7ed8932ac 100644 --- a/extensions/source/update/check/updateprotocol.hxx +++ b/extensions/source/update/check/updateprotocol.hxx @@ -30,37 +30,37 @@ // Returns 'true' if successfully connected to the update server bool checkForUpdates( UpdateInfo& o_rUpdateInfo, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& rxInteractionHandler, - const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XUpdateInformationProvider >& rxProvider + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::task::XInteractionHandler >& rxInteractionHandler, + const css::uno::Reference< css::deployment::XUpdateInformationProvider >& rxProvider ); // The same as above, that does not read the info from bootstrap SAL_DLLPUBLIC_EXPORT bool checkForUpdates( UpdateInfo& o_rUpdateInfo, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > & rxInteractionHandler, - const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XUpdateInformationProvider >& rUpdateInfoProvider, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::task::XInteractionHandler > & rxInteractionHandler, + const css::uno::Reference< css::deployment::XUpdateInformationProvider >& rUpdateInfoProvider, const OUString &rOS, const OUString &rArch, - const ::com::sun::star::uno::Sequence< OUString > &rRepositoryList, + const css::uno::Sequence< OUString > &rRepositoryList, const OUString &rGitID, const OUString &rInstallID ); // Returns 'true' if there are updates for any extension bool checkForExtensionUpdates( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); bool checkForPendingUpdates( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); bool storeExtensionUpdateInfos( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > &rUpdateInfos + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::uno::Sequence< OUString > > &rUpdateInfos ); #endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEPROTOCOL_HXX diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index 803c3efe75d7..e74ead2fc36a 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -49,7 +49,7 @@ SAL_IMPLEMENT_MAIN() // initialize UCB (for backwards compatibility, in case some code still uses // plain createInstance w/o args directly to obtain an instance): - com::sun::star::ucb::UniversalContentBroker::create(rComponentContext); + css::ucb::UniversalContentBroker::create(rComponentContext); OUString aURL; diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index ca02cc3f8fbe..e76c4f410cb5 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -328,7 +328,7 @@ UpdateInformationProvider::UpdateInformationProvider( , m_nCommandId(0) { uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider( - com::sun::star::configuration::theDefaultProvider::get(xContext)); + css::configuration::theDefaultProvider::get(xContext)); OUStringBuffer buf; buf.append( @@ -648,7 +648,7 @@ UpdateInformationProvider::getUpdateInformation( catch( const lang::WrappedTargetException& e ) { // command aborted, return what we have got so far - if( e.TargetException.isExtractableTo( ::cppu::UnoType< ::com::sun::star::ucb::CommandAbortedException >::get() ) ) + if( e.TargetException.isExtractableTo( ::cppu::UnoType< css::ucb::CommandAbortedException >::get() ) ) { break; } |