diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-01 15:32:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-02 08:20:11 +0200 |
commit | de020fc9c3c67541067bc7e0b72ed41eae650288 (patch) | |
tree | b4f3d4a10ad71c4d2c77b4ef2785de4cde19faaf /forms/source/richtext | |
parent | db494c6b34fa14d5f444f39b52a7cdad90e7f21a (diff) |
com::sun::star->css in forms/
Change-Id: I1c09e88f839bdf11c6ff809ec95769e8f729c7cd
Diffstat (limited to 'forms/source/richtext')
-rw-r--r-- | forms/source/richtext/attributedispatcher.hxx | 8 | ||||
-rw-r--r-- | forms/source/richtext/clipboarddispatcher.hxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.hxx | 22 | ||||
-rw-r--r-- | forms/source/richtext/parametrizedattributedispatcher.hxx | 8 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 14 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.hxx | 34 | ||||
-rw-r--r-- | forms/source/richtext/richtextmodel.hxx | 46 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/specialdispatchers.hxx | 22 |
9 files changed, 80 insertions, 80 deletions
diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index a0aad0fbb83a..b4e971f9cbb2 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -50,7 +50,7 @@ namespace frm OAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); @@ -58,7 +58,7 @@ namespace frm virtual ~OAttributeDispatcher( ); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ITextAttributeListener virtual void onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ) SAL_OVERRIDE; @@ -67,10 +67,10 @@ namespace frm virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ) SAL_OVERRIDE; // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; // own overridables - virtual void fillFeatureEventFromAttributeState( ::com::sun::star::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const; + virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const; }; diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index 11706ebf5de2..6bf95259a4b9 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -48,11 +48,11 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ORichTextFeatureDispatcher virtual void invalidateFeatureState_Broadcast() SAL_OVERRIDE; - virtual ::com::sun::star::frame::FeatureStateEvent + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; protected: diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 03a7891e4f7f..23c94ddfc52c 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -31,14 +31,14 @@ class EditView; namespace frm { - typedef ::cppu::WeakImplHelper < ::com::sun::star::frame::XDispatch + typedef ::cppu::WeakImplHelper < css::frame::XDispatch > ORichTextFeatureDispatcher_Base; class ORichTextFeatureDispatcher :public ::comphelper::OBaseMutex ,public ORichTextFeatureDispatcher_Base { private: - ::com::sun::star::util::URL m_aFeatureURL; + css::util::URL m_aFeatureURL; ::cppu::OInterfaceContainerHelper m_aStatusListeners; EditView* m_pEditView; bool m_bDisposed; @@ -48,13 +48,13 @@ namespace frm const EditView* getEditView() const { return m_pEditView; } protected: - inline const ::com::sun::star::util::URL& getFeatureURL() const { return m_aFeatureURL; } + inline const css::util::URL& getFeatureURL() const { return m_aFeatureURL; } inline ::cppu::OInterfaceContainerHelper& getStatusListeners() { return m_aStatusListeners; } inline bool isDisposed() const { return m_bDisposed; } - inline void checkDisposed() const { if ( isDisposed() ) throw ::com::sun::star::lang::DisposedException(); } + inline void checkDisposed() const { if ( isDisposed() ) throw css::lang::DisposedException(); } protected: - ORichTextFeatureDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); + ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL& _rURL ); virtual ~ORichTextFeatureDispatcher( ); public: @@ -65,24 +65,24 @@ namespace frm void invalidate(); protected: - void newStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener ); + void newStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener ); // overridables virtual void disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify ); virtual void invalidateFeatureState_Broadcast(); // to be overridden, and filled with the info special do your derived class - virtual ::com::sun::star::frame::FeatureStateEvent + virtual css::frame::FeatureStateEvent buildStatusEvent() const; static void doNotify( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, - const ::com::sun::star::frame::FeatureStateEvent& _rEvent + const css::uno::Reference< css::frame::XStatusListener >& _rxListener, + const css::frame::FeatureStateEvent& _rEvent ); protected: // XDispatch - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index 1724e1b85060..fbb26d415e8d 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -33,7 +33,7 @@ namespace frm OParametrizedAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); @@ -41,10 +41,10 @@ namespace frm virtual ~OParametrizedAttributeDispatcher(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OAttributeDispatcher - virtual void fillFeatureEventFromAttributeState( ::com::sun::star::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const SAL_OVERRIDE; + virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const SAL_OVERRIDE; protected: // own overridables @@ -52,7 +52,7 @@ namespace frm be used with a IMultiAttributeDispatcher::executeAttribute */ virtual const SfxPoolItem* convertDispatchArgsToItem( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ); + const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ); }; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 58c4209cc650..de244900e5e6 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -241,7 +241,7 @@ namespace frm return aServices; } - Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception) { Reference< XDispatch > aReturn; Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY ); @@ -330,7 +330,7 @@ namespace frm } - void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -463,7 +463,7 @@ namespace frm } - ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL ) + ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const css::util::URL& _rURL ) { VclPtr< RichTextControl > pRichTextControl = GetAs< RichTextControl >(); OSL_PRECOND( pRichTextControl, "ORichTextPeer::implCreateDispatcher: invalid window!" ); @@ -625,7 +625,7 @@ namespace frm } - Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const css::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception) { Reference< XDispatch > xReturn; if ( !GetWindow() ) @@ -691,9 +691,9 @@ namespace frm } // namespace frm -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_form_ORichTextControl_get_implementation(::com::sun::star::uno::XComponentContext*, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_form_ORichTextControl_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new frm::ORichTextControl()); } diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index cd1a48e75ff3..67514179c9a8 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -40,7 +40,7 @@ namespace frm class ORichTextFeatureDispatcher; - typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProvider + typedef ::cppu::ImplHelper1 < css::frame::XDispatchProvider > ORichTextControl_Base; class ORichTextControl :public UnoEditControl ,public ORichTextControl_Base @@ -54,32 +54,32 @@ namespace frm public: // XServiceInfo - static version static OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl ) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) 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 ::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; // XTypeProvider DECLARE_XTYPEPROVIDER() // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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; // UnoControl virtual bool requiresNewPeer( const OUString& _rPropertyName ) const SAL_OVERRIDE; }; - typedef ::cppu::ImplHelper1 < ::com::sun::star::frame::XDispatchProvider + typedef ::cppu::ImplHelper1 < css::frame::XDispatchProvider > ORichTextPeer_Base; class ORichTextPeer :public VCLXWindow ,public ORichTextPeer_Base @@ -96,7 +96,7 @@ namespace frm a new ORichTextPeer instance, which has been acquired once! */ static ORichTextPeer* Create( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel, + const css::uno::Reference< css::awt::XControlModel >& _rxModel, vcl::Window* _pParentWindow, WinBits _nStyle ); @@ -109,28 +109,28 @@ namespace frm virtual ~ORichTextPeer(); // XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XVclWindowPeer - virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider DECLARE_XTYPEPROVIDER( ) // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose( ) throw(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& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) 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; // ITextSelectionListener virtual void onSelectionChanged( const ESelection& _rSelection ) SAL_OVERRIDE; private: - SingleAttributeDispatcher implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL ); + SingleAttributeDispatcher implCreateDispatcher( SfxSlotId _nSlotId, const css::util::URL& _rURL ); }; diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index ff0caf5ec23f..7964acaa17f7 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -41,9 +41,9 @@ namespace frm //= ORichTextModel - typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::util::XModifyBroadcaster + typedef ::cppu::ImplHelper3 < css::awt::XControlModel + , css::lang::XUnoTunnel + , css::util::XModifyBroadcaster > ORichTextModel_BASE; class ORichTextModel @@ -58,12 +58,12 @@ namespace frm private: // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > + css::uno::Reference< css::awt::XDevice > m_xReferenceDevice; - ::com::sun::star::uno::Any m_aTabStop; - ::com::sun::star::uno::Any m_aBackgroundColor; - ::com::sun::star::uno::Any m_aBorderColor; - ::com::sun::star::uno::Any m_aVerticalAlignment; + css::uno::Any m_aTabStop; + css::uno::Any m_aBackgroundColor; + css::uno::Any m_aBorderColor; + css::uno::Any m_aVerticalAlignment; OUString m_sDefaultControl; OUString m_sHelpText; OUString m_sHelpURL; @@ -85,7 +85,7 @@ namespace frm // </properties> // <properties_for_awt_edit_compatibility> - ::com::sun::star::uno::Any m_aAlign; + css::uno::Any m_aAlign; sal_Int16 m_nEchoChar; sal_Int16 m_nMaxTextLength; bool m_bMultiLine; @@ -99,13 +99,13 @@ namespace frm m_aModifyListeners; public: - static RichTextEngine* getEditEngine( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ); + static RichTextEngine* getEditEngine( const css::uno::Reference< css::awt::XControlModel >& _rxModel ); private: // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel ) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -121,26 +121,26 @@ namespace frm virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet and friends - virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) 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; - 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 ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const 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 css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const SAL_OVERRIDE; virtual void describeAggregateProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const SAL_OVERRIDE; // prevent method hiding @@ -170,7 +170,7 @@ namespace frm DECL_LINK_TYPED( OnEngineContentModified, LinkParamNone*, void ); - static ::com::sun::star::uno::Sequence< sal_Int8 > getEditEngineTunnelId(); + static css::uno::Sequence< sal_Int8 > getEditEngineTunnelId(); private: ORichTextModel( const ORichTextModel& ) SAL_DELETED_FUNCTION; diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 1beabd0b0e8c..7d0219e2c3a3 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -235,7 +235,7 @@ namespace frm { "Text (*.txt)", "*.txt", EE_FORMAT_TEXT } }; - ::sfx2::FileDialogHelper aFP( bLoad ? com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, this ); + ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, this ); for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i ) { diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index d3c02cc92abf..199a74e24983 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -29,18 +29,18 @@ namespace frm class OSelectAllDispatcher : public ORichTextFeatureDispatcher { public: - OSelectAllDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); + OSelectAllDispatcher( EditView& _rView, const css::util::URL& _rURL ); protected: virtual ~OSelectAllDispatcher(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; }; class OParagraphDirectionDispatcher : public OAttributeDispatcher @@ -49,26 +49,26 @@ namespace frm OParagraphDirectionDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); protected: // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; }; class OTextDirectionDispatcher : public ORichTextFeatureDispatcher { public: - OTextDirectionDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); + OTextDirectionDispatcher( EditView& _rView, const css::util::URL& _rURL ); protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ORichTextFeatureDispatcher - virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; + virtual css::frame::FeatureStateEvent buildStatusEvent() const SAL_OVERRIDE; }; class OAsianFontLayoutDispatcher : public OParametrizedAttributeDispatcher @@ -77,14 +77,14 @@ namespace frm OAsianFontLayoutDispatcher( EditView& _rView, AttributeId _nAttributeId, - const ::com::sun::star::util::URL& _rURL, + const css::util::URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher ); protected: // OParametrizedAttributeDispatcher virtual const SfxPoolItem* convertDispatchArgsToItem( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ) SAL_OVERRIDE; + const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) SAL_OVERRIDE; }; |