diff options
Diffstat (limited to 'sw/source/core')
107 files changed, 1720 insertions, 1904 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index f2f02bcf3c69..8faf03b222ff 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -412,12 +412,12 @@ static OUString ReplaceFourChar(const OUString& oldOUString) return aRet; } -::com::sun::star::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; - ::com::sun::star::uno::Any strRet; + css::uno::Any strRet; SwFrameFormat *pFrameFormat = GetTableBoxFormat(); assert(pFrameFormat); @@ -433,7 +433,7 @@ static OUString ReplaceFourChar(const OUString& oldOUString) } sal_Int32 SAL_CALL SwAccessibleCell::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 03d70950a552..6814270b172b 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -29,9 +29,9 @@ class SwAccessibleTable; class SwFrameFormat; class SwAccessibleCell : public SwAccessibleContext, - ::com::sun::star::accessibility::XAccessibleValue, - ::com::sun::star::accessibility::XAccessibleSelection, - public ::com::sun::star::accessibility::XAccessibleExtendedAttributes + css::accessibility::XAccessibleValue, + css::accessibility::XAccessibleSelection, + public css::accessibility::XAccessibleExtendedAttributes { // Implementation for XAccessibleSelection interface SwAccessibleSelectionHelper aSelectionHelper; @@ -63,25 +63,25 @@ public: /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void Dispose( bool bRecursive = false ) override; @@ -93,9 +93,8 @@ public: // between those inherited through SwAcessibleContext and // XAccessibleValue). - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -104,59 +103,55 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleValue // XAccessibleExtendedAttributes - ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; private: SwFrameFormat* GetTableBoxFormat() const; public: - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( - const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - - virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; + + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 9a5e5fe4bea8..e895bf346930 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -45,11 +45,11 @@ const sal_Char sAccessibleServiceName[] = "com.sun.star.accessibility.Accessible class SwAccessibleContext : public ::cppu::WeakImplHelper< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo + css::accessibility::XAccessible, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo >, public SwAccessibleFrame { @@ -67,8 +67,8 @@ private: // The parent if it has been retrieved. This is always an // SwAccessibleContext. (protected by Mutex) - ::com::sun::star::uno::WeakReference < - ::com::sun::star::accessibility::XAccessible > m_xWeakParent; + css::uno::WeakReference < + css::accessibility::XAccessible > m_xWeakParent; SwAccessibleMap *m_pMap; // must be protected by solar mutex @@ -99,7 +99,7 @@ protected: //This flag is used to mark the object's selected state. bool m_isSelectedInDoc; void SetParent( SwAccessibleContext *pParent ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetWeakParent() const; + css::uno::Reference< css::accessibility::XAccessible> GetWeakParent() const; bool IsDisposing() const { return m_isDisposing; } @@ -163,7 +163,7 @@ protected: public: void SetMap(SwAccessibleMap *const pMap) { m_pMap = pMap; } - void FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventObject& rEvent ); + void FireAccessibleEvent( css::accessibility::AccessibleEventObject& rEvent ); protected: // broadcast visual data event @@ -179,7 +179,7 @@ protected: bool IsEditableState(); - ::com::sun::star::awt::Rectangle SAL_CALL + css::awt::Rectangle SAL_CALL getBoundsImpl(bool bRelative) throw (css::uno::RuntimeException, std::exception); @@ -199,122 +199,119 @@ public: // XAccessible // Return the XAccessibleContext. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext // Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return the specified child or NULL if index is invalid. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; // Return a reference to the parent. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return the object's current name. virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return NULL to indicate that an empty relation set. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return the set of current states. - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( + const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // thread safe C++ interface @@ -382,20 +379,20 @@ public: }; // some heavily used exception support -#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \ - ::com::sun::star::uno::Reference < ifc > xThis( this ); \ - ::com::sun::star::uno::RuntimeException aExcept( \ +#define THROW_RUNTIME_EXCEPTION( ifc, msg ) \ + css::uno::Reference < ifc > xThis( this ); \ + css::uno::RuntimeException aExcept( \ OUString( msg ), xThis ); \ throw aExcept; -#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \ - if( !(GetFrm() && GetMap()) ) \ - { \ - ::com::sun::star::uno::Reference < ifc > xThis( ths ); \ - ::com::sun::star::lang::DisposedException aExcept( \ +#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \ + if( !(GetFrm() && GetMap()) ) \ + { \ + css::uno::Reference < ifc > xThis( ths ); \ + css::lang::DisposedException aExcept( \ OUString( "object is defunctional" ), \ - xThis ); \ - throw aExcept; \ + xThis ); \ + throw aExcept; \ } #define CHECK_FOR_DEFUNC( ifc ) \ diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index d771d27be569..07265493a0eb 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -188,7 +188,7 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() if( xAcc->getAccessibleChild( i ) == xThis ) return i; } - catch(const ::com::sun::star::lang::IndexOutOfBoundsException &) + catch(const css::lang::IndexOutOfBoundsException &) { return -1L; } @@ -203,7 +203,7 @@ OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription() } OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -252,7 +252,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() return aBox; } - catch(const ::com::sun::star::lang::IndexOutOfBoundsException &) + catch(const css::lang::IndexOutOfBoundsException &) { return awt::Rectangle(); } @@ -273,7 +273,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() return aLoc; } -::com::sun::star::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen() +css::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -288,7 +288,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() return aLoc; } -::com::sun::star::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize() +css::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -548,8 +548,8 @@ void SwAccessibleDocument::deselectAccessibleChild( } uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -781,15 +781,15 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() } sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL SwAccessibleDocument::getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw (::com::sun::star::uno::RuntimeException, +css::uno::Sequence< css::uno::Any > + SAL_CALL SwAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -804,7 +804,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() if ( nType == FORSPELLCHECKFLOWTO ) { - uno::Reference< ::com::sun::star::drawing::XShape > xShape; + uno::Reference< css::drawing::XShape > xShape; rAny >>= xShape; if( xShape.is() ) { @@ -836,7 +836,7 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground() } } } - catch ( const com::sun::star::lang::IndexOutOfBoundsException& ) + catch ( const css::lang::IndexOutOfBoundsException& ) { return uno::Sequence< uno::Any >(); } diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index d39f3c7f78ab..5fdb656b7772 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -33,8 +33,7 @@ class VclSimpleEvent; // SwAccessiblePreview class SwAccessibleDocumentBase : public SwAccessibleContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference< css::accessibility::XAccessible> mxParent; VclPtr<vcl::Window> mpChildWin; // protected by solar mutext @@ -55,60 +54,60 @@ public: // Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return the specified child or NULL if index is invalid. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; // Return a reference to the parent. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( - const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( + const css::awt::Point& aPoint ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() + throw (css::uno::RuntimeException, std::exception) override; }; /** * access to an accessible Writer document */ class SwAccessibleDocument : public SwAccessibleDocumentBase, - public com::sun::star::accessibility::XAccessibleSelection, - public com::sun::star::accessibility::XAccessibleExtendedAttributes, - public com::sun::star::accessibility::XAccessibleGetAccFlowTo + public css::accessibility::XAccessibleSelection, + public css::accessibility::XAccessibleExtendedAttributes, + public css::accessibility::XAccessibleGetAccFlowTo { // Implementation for XAccessibleSelection interface SwAccessibleSelectionHelper maSelectionHelper; @@ -130,18 +129,18 @@ public: // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XInterface @@ -149,9 +148,9 @@ public: // XAccessibleSelection. These methods are needed to avoid // ambiguities. - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -160,40 +159,40 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // thread safe C++ interface @@ -203,12 +202,12 @@ public: // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleGetAccFlowTo - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - SAL_CALL getAccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw (::com::sun::star::uno::RuntimeException, + css::uno::Sequence< css::uno::Any > + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 57684d5e55d3..fda48d759d1f 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -47,14 +47,14 @@ SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject() } // XInterface -com::sun::star::uno::Any SAL_CALL - SwAccessibleEmbeddedObject::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL + SwAccessibleEmbeddedObject::queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType); + css::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, - static_cast< ::com::sun::star::accessibility::XAccessibleExtendedAttributes* >(this) ); + static_cast< css::accessibility::XAccessibleExtendedAttributes* >(this) ); return aReturn; } @@ -101,12 +101,12 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation } // XAccessibleExtendedAttributes -::com::sun::star::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; - ::com::sun::star::uno::Any strRet; + css::uno::Any strRet; OUString style; SwFlyFrm* pFFrm = getFlyFrm(); diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index b3b7f6b5ef82..c349edc09de4 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp> class SwAccessibleEmbeddedObject : public SwAccessibleNoTextFrame - , public ::com::sun::star::accessibility::XAccessibleExtendedAttributes + , public css::accessibility::XAccessibleExtendedAttributes { protected: @@ -37,9 +37,9 @@ public: // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() @@ -54,25 +54,25 @@ public: // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleExtendedAttributes - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; }; #endif diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index dd789dbfb49e..cc48ec61488b 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -41,28 +41,28 @@ public: /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; static bool IsEndnote( const SwFootnoteFrm *pFrm ); }; diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index ed4138e4c1d4..c29ca478c9ca 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -72,7 +72,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() // Return this object's role. sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index 4cfc258892b4..35c50b29ddd0 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -36,23 +36,23 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 3e89f6eb81b8..aa594c5fe908 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -113,7 +113,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId() } sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { Reference< XAccessible > xParent = getAccessibleParent(); if (xParent.is()) diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index fbaf7a64ec17..7f91d40eca7a 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -41,31 +41,31 @@ public: /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index cd1430802256..8ccd616bbe66 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -212,7 +212,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( ! xFactory.is() ) return sal_False; - uno::Reference< com::sun::star::frame::XDesktop > xDesktop( xFactory->createInstance( "com.sun.star.frame.Desktop" ), + uno::Reference< css::frame::XDesktop > xDesktop( xFactory->createInstance( "com.sun.star.frame.Desktop" ), uno::UNO_QUERY ); if( !xDesktop.is() ) return sal_False; @@ -220,12 +220,12 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) xComp = xDesktop->getCurrentComponent(); if( !xComp.is() ) return sal_False; - uno::Reference< com::sun::star::document::XLinkTargetSupplier > xLTS(xComp, uno::UNO_QUERY); + uno::Reference< css::document::XLinkTargetSupplier > xLTS(xComp, uno::UNO_QUERY); if ( !xLTS.is()) return sal_False; - uno::Reference< ::com::sun::star::container::XNameAccess > xLinks = xLTS->getLinks(); - uno::Reference< ::com::sun::star::container::XNameAccess > xSubLinks; + uno::Reference< css::container::XNameAccess > xLinks = xLTS->getLinks(); + uno::Reference< css::container::XNameAccess > xSubLinks; const uno::Sequence< OUString > aNames( xLinks->getElementNames() ); const sal_uLong nLinks = aNames.getLength(); const OUString* pNames = aNames.getConstArray(); diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index dd6146f29aee..060be01b617d 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -30,7 +30,7 @@ class SwTextAttr; class SwAccessibleHyperlink : public ::cppu::WeakImplHelper< - ::com::sun::star::accessibility::XAccessibleHyperlink > + css::accessibility::XAccessibleHyperlink > { friend class SwAccessibleParagraph; friend class SwAccessibleHyperTextData; @@ -49,35 +49,35 @@ class SwAccessibleHyperlink : public: // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // XAccessibleHyperlink - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( + virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getStartIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getEndIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 13a2c8bb2019..87f9dbd5e2ec 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2097,7 +2097,7 @@ void SwAccessibleMap::AddShapeContext(const SdrObject *pObj, uno::Reference < XA } //Added by yanjun for sym2_6407 -void SwAccessibleMap::RemoveGroupContext(const SdrObject *pParentObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent) +void SwAccessibleMap::RemoveGroupContext(const SdrObject *pParentObj, css::uno::Reference < css::accessibility::XAccessible > xAccParent) { osl::MutexGuard aGuard( maMutex ); if (mpShapeMap && pParentObj && pParentObj->IsGroupObject() && xAccParent.is()) @@ -3236,7 +3236,7 @@ bool SwAccessibleMap::ReplaceChild ( } //Get the accessible control shape from the model object, here model object is with XPropertySet type -::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException) +::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) { if( mpShapeMap ) { @@ -3259,9 +3259,9 @@ bool SwAccessibleMap::ReplaceChild ( return NULL; } -::com::sun::star::uno::Reference< XAccessible > - SwAccessibleMap::GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&) - throw (::com::sun::star::uno::RuntimeException) +css::uno::Reference< XAccessible > + SwAccessibleMap::GetAccessibleCaption (const css::uno::Reference< css::drawing::XShape >&) + throw (css::uno::RuntimeException) { return NULL; } diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 5a5ec6031830..b0199a102c27 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -263,43 +263,43 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageWidth( ) } // XAccesibleText -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;} +sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;} +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL SwAccessibleNoTextFrame::getCharacterAttributes( sal_Int32 , const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Sequence<beans::PropertyValue> aValues(0); return aValues; } -::com::sun::star::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL SwAccessibleNoTextFrame::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { - return com::sun::star::awt::Rectangle(0, 0, 0, 0 ); + return css::awt::Rectangle(0, 0, 0, 0 ); } -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();} -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} -OUString SAL_CALL SwAccessibleNoTextFrame::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();} -OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return OUString();} -::com::sun::star::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;} +OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} +OUString SAL_CALL SwAccessibleNoTextFrame::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} +OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();} +css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; return aResult; } -::com::sun::star::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; return aResult; } -::com::sun::star::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; return aResult; } -sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} // XAccessibleHyperText diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index d77f116bb297..17c7d5216a85 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -34,14 +34,13 @@ class SwNoTextNode; class SwAccessibleNoTextHyperlink; class SwAccessibleNoTextFrame : public SwAccessibleFrameBase, - public ::com::sun::star::accessibility::XAccessibleImage, - public ::com::sun::star::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink + public css::accessibility::XAccessibleImage, + public css::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink { friend class SwAccessibleNoTextHyperlink; - //HyperLinksMap alinksMap; - com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > alink; + css::uno::Reference< css::accessibility::XAccessibleHyperlink > alink; SwDepend aDepend; - OUString msTitle; // #i73249# + OUString msTitle; OUString msDesc; protected: @@ -61,20 +60,20 @@ public: // #i73249# - Return the object's current name. virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XInterface methods need to be implemented to disambiguate // between those inherited through SwAcessibleContext and // XAccessibleImage. - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -83,61 +82,59 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleImage virtual OUString SAL_CALL getAccessibleImageDescription( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getAccessibleImageHeight( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getAccessibleImageWidth( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // The object is not visible an longer and should be destroyed virtual void Dispose( bool bRecursive = false ) override; - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;//Shen Zhen Jie changed sal_Unicode to sal_uInt32 + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleHyperlink > + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; SwAccessibleMap *GetAccessibleMap(){ return GetMap();} public: - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx index 24eb0d2c626c..e6c149e1ae6c 100644 --- a/sw/source/core/access/accnotexthyperlink.cxx +++ b/sw/source/core/access/accnotexthyperlink.cxx @@ -158,7 +158,7 @@ Reference< XAccessibleKeyBinding > SAL_CALL new ::comphelper::OAccessibleKeyBindingHelper(); xKeyBinding = pKeyBindingHelper; - ::com::sun::star::awt::KeyStroke aKeyStroke; + css::awt::KeyStroke aKeyStroke; aKeyStroke.Modifiers = 0; aKeyStroke.KeyCode = KEY_RETURN; aKeyStroke.KeyChar = 0; @@ -227,7 +227,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getEndIndex() } sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx index 84bdabf2da52..bd1c881338b8 100644 --- a/sw/source/core/access/accnotexthyperlink.hxx +++ b/sw/source/core/access/accnotexthyperlink.hxx @@ -30,7 +30,7 @@ class SwAccessibleNoTextHyperlink : public ::cppu::WeakImplHelper< - ::com::sun::star::accessibility::XAccessibleHyperlink > + css::accessibility::XAccessibleHyperlink > { friend class SwAccessibleNoTextFrame; @@ -47,35 +47,34 @@ public: // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // XAccessibleHyperlink - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionAnchor( + virtual css::uno::Any SAL_CALL getAccessibleActionAnchor( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleActionObject( + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getAccessibleActionObject( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getStartIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getEndIndex() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isValid( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 46d6e0d69dea..55752ae89031 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -167,7 +167,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId() OUString SwAccessiblePage::getAccessibleDescription( ) throw( RuntimeException, std::exception ) { - CHECK_FOR_DEFUNC( ::com::sun::star::accessibility::XAccessibleContext ); + CHECK_FOR_DEFUNC( css::accessibility::XAccessibleContext ); OUString sArg( GetFormattedPageNumber() ); return GetResource( STR_ACCESS_PAGE_DESC, &sArg ); diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 54d4f2858be8..03e4ac8baede 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -56,21 +56,21 @@ public: // XAccessibleContext methods that need to be overridden virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; virtual bool HasCursor() override; // required by map to remember that object }; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 0a1a5bf08321..dce86d889887 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1230,7 +1230,7 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) } else if ( rType == cppu::UnoType<XAccessibleTextSelection>::get()) { - uno::Reference< com::sun::star::accessibility::XAccessibleTextSelection > aTextExtension = this; + uno::Reference< css::accessibility::XAccessibleTextSelection > aTextExtension = this; aRet <<= aTextExtension; } else if ( rType == cppu::UnoType<XAccessibleExtendedAttributes>::get()) @@ -1349,7 +1349,7 @@ sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessibleParagraph::GetCurrentTabStop( sal_Int32 nIndex ) +css::uno::Sequence< css::style::TabStop > SwAccessibleParagraph::GetCurrentTabStop( sal_Int32 nIndex ) { SolarMutexGuard aGuard; @@ -1389,7 +1389,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa GetFrm()->GetCharRect( aCoreRect, aPosition, &aMoveState ); // already get the caret position - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs; + css::uno::Sequence< css::style::TabStop > tabs; const sal_Int32 nStrLen = GetTextNode()->GetText().getLength(); if( nStrLen > 0 ) { @@ -2342,20 +2342,20 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, //tab stop if (rValue.Name == UNO_NAME_TABSTOPS) { - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs = GetCurrentTabStop( nIndex ); + css::uno::Sequence< css::style::TabStop > tabs = GetCurrentTabStop( nIndex ); if( !tabs.hasElements() ) { tabs.realloc(1); - ::com::sun::star::style::TabStop ts; - com::sun::star::awt::Rectangle rc0 = getCharacterBounds(0); - com::sun::star::awt::Rectangle rc1 = getCharacterBounds(nIndex); + css::style::TabStop ts; + css::awt::Rectangle rc0 = getCharacterBounds(0); + css::awt::Rectangle rc1 = getCharacterBounds(nIndex); if( rc1.X - rc0.X >= 48 ) ts.Position = (rc1.X - rc0.X) - (rc1.X - rc0.X - 48)% 47 + 47; else ts.Position = 48; ts.DecimalChar = ' '; ts.FillChar = ' '; - ts.Alignment = ::com::sun::star::style::TabAlign_LEFT; + ts.Alignment = css::style::TabAlign_LEFT; tabs[0] = ts; } rValue.Value <<= tabs; @@ -3304,14 +3304,14 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar } //MSAA Extension Implementation in app module -sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const ::com::sun::star::awt::Point&, sal_Bool ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const css::awt::Point&, sal_Bool ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return sal_False; } sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3350,8 +3350,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( ) } sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3364,8 +3364,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionStart( sal_Int32 nSe } sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3378,8 +3378,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSeletedPositionEnd( sal_Int32 nSele } sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3436,8 +3436,8 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd } sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 startOffset, sal_Int32 endOffset) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3823,7 +3823,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex( return bRet; } -sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -3841,7 +3841,7 @@ sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (::com::sun: //Get the real heading level, Heading1 ~ Heading10 sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel() { - uno::Reference< ::com::sun::star::beans::XPropertySet > xPortion = CreateUnoPortion( 0, 0 ); + uno::Reference< css::beans::XPropertySet > xPortion = CreateUnoPortion( 0, 0 ); OUString pString = "ParaStyleName"; uno::Any styleAny = xPortion->getPropertyValue( pString ); OUString sValue; @@ -3863,7 +3863,7 @@ sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel() } uno::Any SAL_CALL SwAccessibleParagraph::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 0f684883349e..d9831f320fc2 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -50,21 +50,21 @@ namespace com { namespace sun { namespace star { } } } typedef std::unordered_map< OUString, - ::com::sun::star::beans::PropertyValue, + css::beans::PropertyValue, OUStringHash, ::std::equal_to< OUString > > tAccParaPropValMap; class SwAccessibleParagraph : public SwClient, // #i108125# public SwAccessibleContext, - public ::com::sun::star::accessibility::XAccessibleEditableText, - public com::sun::star::accessibility::XAccessibleSelection, - public com::sun::star::accessibility::XAccessibleHypertext, - public com::sun::star::accessibility::XAccessibleTextMarkup, - public com::sun::star::accessibility::XAccessibleMultiLineText, - public ::com::sun::star::accessibility::XAccessibleTextAttributes, - public com::sun::star::accessibility::XAccessibleTextSelection, - public com::sun::star::accessibility::XAccessibleExtendedAttributes + public css::accessibility::XAccessibleEditableText, + public css::accessibility::XAccessibleSelection, + public css::accessibility::XAccessibleHypertext, + public css::accessibility::XAccessibleTextMarkup, + public css::accessibility::XAccessibleMultiLineText, + public css::accessibility::XAccessibleTextAttributes, + public css::accessibility::XAccessibleTextSelection, + public css::accessibility::XAccessibleExtendedAttributes { friend class SwAccessibleHyperlink; @@ -143,22 +143,22 @@ class SwAccessibleParagraph : // #i63870# void _getDefaultAttributesImpl( - const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, + const css::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rDefAttrSeq, const bool bOnlyCharAttrs = false ); void _getRunAttributesImpl( const sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, + const css::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rRunAttrSeq ); void _getSupplementalAttributesImpl( const sal_Int32 nIndex, - const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes, + const css::uno::Sequence< OUString >& aRequestedAttributes, tAccParaPropValMap& rSupplementalAttrSeq ); void _correctValues( const sal_Int32 nIndex, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues ); + css::uno::Sequence< css::beans::PropertyValue >& rValues ); public: SwTOXSortTabBase* GetTOXSortTabBase(); @@ -183,14 +183,14 @@ protected: // force update of new portion data void UpdatePortionData() - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); // remove the current portion data void ClearPortionData(); // get portion data; update if necessary SwAccessiblePortionData& GetPortionData() - throw( com::sun::star::uno::RuntimeException ) + throw( css::uno::RuntimeException ) { if( pPortionData == NULL ) UpdatePortionData(); @@ -199,38 +199,38 @@ protected: //helpers for word boundaries - bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetCharBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); - bool GetWordBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetWordBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); - bool GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetSentenceBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); - bool GetLineBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetLineBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); - static bool GetParagraphBoundary( com::sun::star::i18n::Boundary& rBound, + static bool GetParagraphBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); - bool GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetAttributeBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); - bool GetGlyphBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetGlyphBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos ); // get boundaries of word/sentence/etc. for specified text type // Does all argument checking, and then delegates to helper methods above. - bool GetTextBoundary( com::sun::star::i18n::Boundary& rBound, + bool GetTextBoundary( css::i18n::Boundary& rBound, const OUString& rText, sal_Int32 nPos, sal_Int16 aTextType ) throw ( - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) override; @@ -240,59 +240,59 @@ public: SwAccessibleParagraph( SwAccessibleMap& rInitMap, const SwTextFrm& rTextFrm ); - inline operator ::com::sun::star::accessibility::XAccessibleText *(); + inline operator css::accessibility::XAccessibleText *(); virtual bool HasCursor() override; // required by map to remember that object - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex ); - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex ); + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext // Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return the parents locale or throw exception if this object has no // parent yet/anymore. - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL + virtual css::uno::Reference< + css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleComponent virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // #i71385# virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Return whether the specified service is supported by this class. virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Returns a list of all supported services. In this case that is just // the AccessibleContext service. - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XInterface @@ -300,9 +300,9 @@ public: // between those inherited through SwAcessibleContext and // XAccessibleEditableText). - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -311,131 +311,131 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSelectedText( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectionStart() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectionEnd() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleHyperlink > + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // #i71360# // XAccesibleTextMarkup virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL + virtual css::accessibility::TextSegment SAL_CALL getTextMarkup( sal_Int32 nTextMarkupIndex, sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment > SAL_CALL + virtual css::uno::Sequence< css::accessibility::TextSegment > SAL_CALL getTextMarkupAtIndex( sal_Int32 nCharIndex, sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XAccessibleTextSelection - virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL scrollToPosition( const css::awt::Point& aPoint, sal_Bool isLeftTop ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSelectedPortionCount( ) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSeletedPositionStart( sal_Int32 nSelectedPortionIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getSeletedPositionEnd( sal_Int32 nSelectedPortionIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL removeSelection( sal_Int32 selectionIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL addSelection( sal_Int32 selectionIndex, sal_Int32 startOffset, sal_Int32 endOffset) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // XAccessibleExtendedAttributes - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getExtendedAttributes() + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; bool GetSelectionAtIndex(sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd); sal_Int32 GetRealHeadingLevel(); // XAccessibleComponent @@ -444,31 +444,30 @@ public: // #i89175# // XAccessibleMultiLineText virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL + virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( sal_Int32 nLineNo ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL + virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getNumberOfLineWithCaret() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // #i63870# // XAccesibleTextAttributes - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes( const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; }; -inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessibleText *() +inline SwAccessibleParagraph::operator css::accessibility::XAccessibleText *() { - return static_cast< - ::com::sun::star::accessibility::XAccessibleEditableText * >( this ); + return static_cast< css::accessibility::XAccessibleEditableText * >( this ); } #endif diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index e100e16b802b..8f55cb079b52 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -667,7 +667,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos( return nModelPos; } -bool SwAccessiblePortionData::FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos ) +bool SwAccessiblePortionData::FillBoundaryIFDateField( css::i18n::Boundary& rBound, const sal_Int32 nPos ) { if( aFieldPosition.size() < 2 ) return false; diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index a23f8b1f76b5..8a48c4d77cd4 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -77,7 +77,7 @@ class SwAccessiblePortionData : public SwPortionHandler static size_t FindLastBreak( const Positions_t& rPositions, sal_Int32 nValue ); /// fill the boundary with the values from rPositions[nPos] - static void FillBoundary(com::sun::star::i18n::Boundary& rBound, + static void FillBoundary(css::i18n::Boundary& rBound, const Positions_t& rPositions, size_t nPos ); @@ -104,7 +104,7 @@ public: virtual void Finish() override; virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) override; - bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos ); + bool FillBoundaryIFDateField( css::i18n::Boundary& rBound, const sal_Int32 nPos ); bool IsIndexInFootnode(sal_Int32 nIndex); bool IsInGrayPortion( sal_Int32 nPos ); sal_Int32 GetFieldIndex(sal_Int32 nPos); @@ -117,11 +117,11 @@ public: const OUString& GetAccessibleString() const; /// get the start & end positions of the sentence - void GetLineBoundary( com::sun::star::i18n::Boundary& rBound, + void GetLineBoundary( css::i18n::Boundary& rBound, sal_Int32 nPos ) const; // get start and end position of the last line - void GetLastLineBoundary( com::sun::star::i18n::Boundary& rBound ) const; + void GetLastLineBoundary( css::i18n::Boundary& rBound ) const; /// Determine whether this core position is valid for these portions. /// (A paragraph may be split into several frames, e.g. at page @@ -139,7 +139,7 @@ public: sal_Int32 GetLineCount() const; sal_Int32 GetLineNo( const sal_Int32 nPos ) const; void GetBoundaryOfLine( const sal_Int32 nLineNo, - com::sun::star::i18n::Boundary& rLineBound ); + css::i18n::Boundary& rLineBound ); /// get the position in the model string for a given /// (accessibility) position @@ -155,11 +155,11 @@ public: // get boundaries of words/sentences. The data structures are // created on-demand. - void GetSentenceBoundary( com::sun::star::i18n::Boundary& rBound, + void GetSentenceBoundary( css::i18n::Boundary& rBound, sal_Int32 nPos ); // get (a) boundary for attribute change - void GetAttributeBoundary( com::sun::star::i18n::Boundary& rBound, + void GetAttributeBoundary( css::i18n::Boundary& rBound, sal_Int32 nPos ) const; /// Convert start and end positions into core positions. diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 7c645f6eeeec..774aa3ecdbcc 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -67,12 +67,12 @@ Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() return css::uno::Sequence<sal_Int8>(); } -OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) { return GetResource( STR_ACCESS_PREVIEW_DOC_NAME ); } -OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (css::uno::RuntimeException, std::exception) { OUString sLclName = SwAccessibleDocumentBase::getAccessibleName(); sLclName += " "; @@ -82,7 +82,7 @@ OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (::com::sun::st void SwAccessiblePreview::_InvalidateFocus() { - FireStateChangedEvent( ::com::sun::star::accessibility::AccessibleStateType::FOCUSED, true ); + FireStateChangedEvent( css::accessibility::AccessibleStateType::FOCUSED, true ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index 46d8e96afb98..7387a2e0820b 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -43,26 +43,26 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; virtual void _InvalidateFocus() override; }; diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx index 5c189ff425c7..2dc163dbd87b 100644 --- a/sw/source/core/access/accselectionhelper.hxx +++ b/sw/source/core/access/accselectionhelper.hxx @@ -34,7 +34,7 @@ class SwAccessibleSelectionHelper SwFEShell* GetFEShell(); void throwIndexOutOfBoundsException() - throw ( ::com::sun::star::lang::IndexOutOfBoundsException ); + throw ( css::lang::IndexOutOfBoundsException ); public: SwAccessibleSelectionHelper( SwAccessibleContext& rContext ); @@ -44,26 +44,26 @@ public: void selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException ); bool isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException ); void selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); sal_Int32 getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getSelectedAccessibleChild( + throw ( css::uno::RuntimeException ); + css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException); // index has to be treated as global child index. void deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException ); }; #endif diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index fdf2bfd6250f..0c7adac6518c 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1700,7 +1700,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( } sal_Int32 SAL_CALL SwAccessibleTable::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SvxBrushItem &rBack = GetFrm()->GetAttrSet()->GetBackground(); sal_uInt32 crBack = rBack.GetColor().GetColor(); diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index b05d714b17ed..4da22af9a5a8 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -38,9 +38,9 @@ namespace sw { namespace access { class SwAccessibleTable : public SwAccessibleContext, - public ::com::sun::star::accessibility::XAccessibleTable, - public ::com::sun::star::accessibility::XAccessibleSelection, - public ::com::sun::star::accessibility::XAccessibleTableSelection, + public css::accessibility::XAccessibleTable, + public css::accessibility::XAccessibleSelection, + public css::accessibility::XAccessibleTableSelection, public SwClient { SwAccessibleTableData_Impl *mpTableData; // the table's data, prot by Sol-Mutex @@ -94,9 +94,9 @@ public: // between those inherited through SwAcessibleContext and // XAccessibleTable). - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -105,97 +105,97 @@ public: { SwAccessibleContext::release(); }; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleContext /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ; + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // XServiceInfo @@ -203,20 +203,20 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // C++ interface @@ -235,37 +235,37 @@ public: virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; typedef std::vector< ::std::pair<SwAccessibleContext*, css::uno::WeakReference<css::accessibility::XAccessible> > > Cells_t; Cells_t m_vecCellAdd; @@ -296,9 +296,9 @@ public: // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw () override { SwAccessibleContext::acquire(); }; @@ -310,24 +310,24 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return the specified child or NULL if index is invalid. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException, std::exception) override; // XAccessibleTable - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > + virtual css::uno::Reference< + css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleTable > + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo @@ -335,7 +335,7 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index fb3e0391cc85..d5026b986858 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -141,14 +141,14 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * // XInterface -com::sun::star::uno::Any SAL_CALL - SwAccessibleTextFrame::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL + SwAccessibleTextFrame::queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = SwAccessibleContext::queryInterface (rType); + css::uno::Any aReturn = SwAccessibleContext::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, - static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this) + static_cast< css::accessibility::XAccessibleSelection* >(this) ); return aReturn; } @@ -189,7 +189,7 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC { if( xContext->getAccessibleRole() == AccessibleRole::PARAGRAPH ) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleText > + uno::Reference< css::accessibility::XAccessibleText > xText(xAcc, uno::UNO_QUERY); if( xText.is() ) { diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index f16d1a19e826..d276c65656e2 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -31,7 +31,7 @@ namespace com { namespace star { } } class SwAccessibleTextFrame : public SwAccessibleFrameBase, - public ::com::sun::star::accessibility::XAccessibleSelection + public css::accessibility::XAccessibleSelection { private: // #i73249# @@ -45,51 +45,51 @@ protected: public: SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm ); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + css::uno::Type const & rType ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception ) override; // XAccessibleContext // #i73249# - Return the object's current name. virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo @@ -97,23 +97,23 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XAccessibleContext::getAccessibleRelationSet @@ -124,14 +124,12 @@ private: // helper methods for getAccessibleRelationSet: SwFlyFrm* getFlyFrm() const; - com::sun::star::accessibility::AccessibleRelation makeRelation( + css::accessibility::AccessibleRelation makeRelation( sal_Int16 nType, const SwFlyFrm* pFrm ); public: - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() + throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index d316b21ba9c2..750be3b52341 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -35,8 +35,8 @@ using namespace com::sun::star; namespace { const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode, const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException) { const SwWrongList* pTextMarkupList( 0 ); switch ( nTextMarkupType ) @@ -88,8 +88,8 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD } sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException) { sal_Int32 nTextMarkupCount( 0 ); @@ -106,12 +106,12 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp return nTextMarkupCount; } -::com::sun::star::accessibility::TextSegment +css::accessibility::TextSegment SwTextMarkupHelper::getTextMarkup( const sal_Int32 nTextMarkupIndex, const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException) { if ( nTextMarkupIndex >= getTextMarkupCount( nTextMarkupType ) || nTextMarkupIndex < 0 ) @@ -119,7 +119,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp throw lang::IndexOutOfBoundsException(); } - ::com::sun::star::accessibility::TextSegment aTextMarkupSegment; + css::accessibility::TextSegment aTextMarkupSegment; aTextMarkupSegment.SegmentStart = -1; aTextMarkupSegment.SegmentEnd = -1; @@ -152,12 +152,12 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp return aTextMarkupSegment; } -::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment > +css::uno::Sequence< css::accessibility::TextSegment > SwTextMarkupHelper::getTextMarkupAtIndex( const sal_Int32 nCharIndex, const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException) { // assumption: // value of <nCharIndex> is in range [0..length of accessible text) @@ -167,7 +167,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp // paragraph - e.g. numbering portion. if ( mrPortionData.GetAccessiblePosition( nCoreCharIndex ) > nCharIndex ) { - return uno::Sequence< ::com::sun::star::accessibility::TextSegment >(); + return uno::Sequence< css::accessibility::TextSegment >(); } // #i108125# @@ -175,7 +175,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp mpTextMarkupList ? mpTextMarkupList : getTextMarkupList( *mpTextNode, nTextMarkupType ); - ::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups; + ::std::vector< css::accessibility::TextSegment > aTmpTextMarkups; if ( pTextMarkupList ) { const OUString rText = mrPortionData.GetAccessibleString(); @@ -194,7 +194,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos ); const sal_Int32 nEndPos = mrPortionData.GetAccessiblePosition( pTextMarkup->mnPos + pTextMarkup->mnLen ); - ::com::sun::star::accessibility::TextSegment aTextMarkupSegment; + css::accessibility::TextSegment aTextMarkupSegment; aTextMarkupSegment.SegmentText = rText.copy( nStartPos, nEndPos - nStartPos ); aTextMarkupSegment.SegmentStart = nStartPos; aTextMarkupSegment.SegmentEnd = nEndPos; @@ -203,7 +203,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp } } - uno::Sequence< ::com::sun::star::accessibility::TextSegment > aTextMarkups( + uno::Sequence< css::accessibility::TextSegment > aTextMarkups( aTmpTextMarkups.size() ); ::std::copy( aTmpTextMarkups.begin(), aTmpTextMarkups.end(), aTextMarkups.begin() ); diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx index c0ae39448bc2..08491b05d707 100644 --- a/sw/source/core/access/textmarkuphelper.hxx +++ b/sw/source/core/access/textmarkuphelper.hxx @@ -42,22 +42,22 @@ class SwTextMarkupHelper ~SwTextMarkupHelper() {} sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException); - ::com::sun::star::accessibility::TextSegment getTextMarkup( + css::accessibility::TextSegment getTextMarkup( const sal_Int32 nTextMarkupIndex, const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::accessibility::TextSegment > + css::uno::Sequence< css::accessibility::TextSegment > getTextMarkupAtIndex( const sal_Int32 nCharIndex, const sal_Int32 nTextMarkupType ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException); private: SwTextMarkupHelper( const SwTextMarkupHelper& ) = delete; diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index d4be33664b5b..2fd18842489d 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -141,9 +141,9 @@ void DocumentDrawModelManager::InitDrawModel() if (!utl::ConfigManager::IsAvoidConfig()) { SAL_INFO( "sw.doc", "before create Spellchecker/Hyphenator" ); - ::com::sun::star::uno::Reference< com::sun::star::linguistic2::XSpellChecker1 > xSpell = ::GetSpellChecker(); + css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell = ::GetSpellChecker(); rOutliner.SetSpeller( xSpell ); - ::com::sun::star::uno::Reference< com::sun::star::linguistic2::XHyphenator > xHyphenator( ::GetHyphenator() ); + css::uno::Reference< css::linguistic2::XHyphenator > xHyphenator( ::GetHyphenator() ); rOutliner.SetHyphenator( xHyphenator ); SAL_INFO( "sw.doc", "after create Spellchecker/Hyphenator" ); } diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index e9cb58a73f0a..d2db518c3f5a 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -414,7 +414,7 @@ const css::i18n::ForbiddenCharacters* } void sw::DocumentSettingManager::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, - /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rFChars ) + /*[in]*/ const css::i18n::ForbiddenCharacters& rFChars ) { if( !mxForbiddenCharsTable.is() ) { diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 8525ab117881..6318c03d832c 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -175,7 +175,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF mpDocStat->nPage = m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() ? m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->GetPageNum() : 0; mpDocStat->bModified = false; - com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7); + css::uno::Sequence < css::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7); sal_Int32 n=0; aStat[n].Name = "TableCount"; aStat[n++].Value <<= (sal_Int32)mpDocStat->nTable; diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index d1a2a2f39fe1..b3aef6952bdb 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1318,13 +1318,13 @@ namespace numfunc void SetToDefault(); /** returns sequence of configuration property names */ - static com::sun::star::uno::Sequence<OUString> GetPropNames(); + static css::uno::Sequence<OUString> GetPropNames(); /** loads configuration properties and applies values to internal data */ void LoadConfig(); /** catches notification about changed configuration data */ - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; virtual void ImplCommit() override; // configuration data @@ -1357,9 +1357,9 @@ namespace numfunc mbChangeIndentOnTabAtFirstPosOfFirstListItem = true; } - com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames() + css::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames() { - com::sun::star::uno::Sequence<OUString> aPropNames(1); + css::uno::Sequence<OUString> aPropNames(1); OUString* pNames = aPropNames.getArray(); pNames[0] = "ChangeIndentOnTabAtFirstPosOfFirstListItem"; @@ -1370,10 +1370,9 @@ namespace numfunc void SwNumberingUIBehaviorConfig::LoadConfig() { - com::sun::star::uno::Sequence<OUString> aPropNames = GetPropNames(); - com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues = - GetProperties( aPropNames ); - const com::sun::star::uno::Any* pValues = aValues.getConstArray(); + css::uno::Sequence<OUString> aPropNames = GetPropNames(); + css::uno::Sequence<css::uno::Any> aValues = GetProperties( aPropNames ); + const css::uno::Any* pValues = aValues.getConstArray(); OSL_ENSURE( aValues.getLength() == aPropNames.getLength(), "<SwNumberingUIBehaviorConfig::LoadConfig()> - GetProperties failed"); if ( aValues.getLength() == aPropNames.getLength() ) @@ -1399,7 +1398,7 @@ namespace numfunc } } - void SwNumberingUIBehaviorConfig::Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) + void SwNumberingUIBehaviorConfig::Notify( const css::uno::Sequence<OUString>& aPropertyNames ) { (void) aPropertyNames; SetToDefault(); diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index fb67e0e9b30e..c910dc6d20a1 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -289,7 +289,7 @@ SwBoxAutoFormat::SwBoxAutoFormat() aBackground( RES_BACKGROUND ), aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ), m_aTextOrientation(FRMDIR_ENVIRONMENT, RES_FRAMEDIR), - m_aVerticalAlignment(0, com::sun::star::text::VertOrientation::NONE, com::sun::star::text::RelOrientation::FRAME), + m_aVerticalAlignment(0, css::text::VertOrientation::NONE, css::text::RelOrientation::FRAME), aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0), aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0), aStacked( 0 ), diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx index ef965e4ab29d..9704824e10ce 100644 --- a/sw/source/core/docnode/cancellablejob.cxx +++ b/sw/source/core/docnode/cancellablejob.cxx @@ -24,8 +24,8 @@ CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >& rThrea { } -// ::com::sun::star::util::XCancellable: -void SAL_CALL CancellableJob::cancel() throw (com::sun::star::uno::RuntimeException, std::exception) +// css::util::XCancellable: +void SAL_CALL CancellableJob::cancel() throw (css::uno::RuntimeException, std::exception) { mrThread->join(); } diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index 4a7596e0dda1..dabde55257e3 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -28,14 +28,14 @@ class ObservableThread; -class CancellableJob : public ::cppu::WeakImplHelper<com::sun::star::util::XCancellable> +class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable> { public: explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread ); virtual ~CancellableJob() {} - // ::com::sun::star::util::XCancellable: - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XCancellable: + virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override; private: CancellableJob( CancellableJob& ) = delete; diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 86dc48d07e71..93e2d8a14fcd 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -299,7 +299,7 @@ css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceN return s; } -// ::com::sun::star::util::XJobManager: +// css::util::XJobManager: void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(maMutex); @@ -353,7 +353,7 @@ void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeExcept } } -// ::com::sun::star::frame::XTerminateListener +// css::frame::XTerminateListener void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(maMutex); @@ -438,15 +438,15 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec SwThreadJoiner::ReleaseThreadJoiner(); } -// ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener) +// ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener) void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { // nothing to do, because instance doesn't hold any references of observed objects } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_util_comp_FinalThreadManager_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_util_comp_FinalThreadManager_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new FinalThreadManager(context)); } diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index 4631ef8866a1..0838761767fb 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -63,7 +63,7 @@ SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::R void SwRetrievedInputStreamDataManager::PushData( const tDataKey nDataKey, - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx index ad70921e2902..030dcfbbbf16 100644 --- a/sw/source/core/docnode/retrieveinputstream.cxx +++ b/sw/source/core/docnode/retrieveinputstream.cxx @@ -53,7 +53,7 @@ void SwAsyncRetrieveInputStreamThread::threadFunction() { osl_setThreadName("SwAsyncRetrieveInputStreamThread"); - com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 2 ); + css::uno::Sequence < css::beans::PropertyValue > xProps( 2 ); xProps[0].Name = "URL"; xProps[0].Value <<= mrLinkedURL; xProps[1].Name = "Referer"; @@ -62,11 +62,11 @@ void SwAsyncRetrieveInputStreamThread::threadFunction() aMedium.addInputStream(); - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream; + css::uno::Reference<css::io::XInputStream> xInputStream; aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream; if ( !xInputStream.is() ) { - com::sun::star::uno::Reference<com::sun::star::io::XStream> xStream; + css::uno::Reference<css::io::XStream> xStream; aMedium[utl::MediaDescriptor::PROP_STREAM()] >>= xStream; if ( xStream.is() ) { diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx index 6bfa562c2aa2..258768f34e2f 100644 --- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx +++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx @@ -54,7 +54,7 @@ void SwAsyncRetrieveInputStreamThreadConsumer::CreateThread( const OUString& rUR } void SwAsyncRetrieveInputStreamThreadConsumer::ApplyInputStream( - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ) { mrGrfNode.ApplyInputStream( xInputStream, bIsStreamReadOnly ); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 0571943a5150..c3ee22c092bd 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -79,7 +79,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; virtual const SwNode* GetAnchor() const override; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index 786dd763b9f3..cb1e380faeab 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -130,7 +130,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID, if ( bThreadFinished ) { // release thread as job from thread joiner instance - ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > rThreadJoiner( mrThreadJoiner ); + css::uno::Reference< css::util::XJobManager > rThreadJoiner( mrThreadJoiner ); if ( rThreadJoiner.is() ) { rThreadJoiner->releaseJob( aTmpThreadData.aJob ); @@ -183,7 +183,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData ) maStartedThreads.push_back( rThreadData ); // register thread as job at thread joiner instance - ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > rThreadJoiner( mrThreadJoiner ); + css::uno::Reference< css::util::XJobManager > rThreadJoiner( mrThreadJoiner ); if ( rThreadJoiner.is() ) { rThreadJoiner->registerJob( rThreadData.aJob ); diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index b8d64ff7d650..8b624ffba171 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -544,11 +544,11 @@ static inline SvtScriptType lcl_SetScriptFlags( sal_uInt16 nType ) { switch( nType ) { - case ::com::sun::star::i18n::ScriptType::LATIN: + case css::i18n::ScriptType::LATIN: return SvtScriptType::LATIN; - case ::com::sun::star::i18n::ScriptType::ASIAN: + case css::i18n::ScriptType::ASIAN: return SvtScriptType::ASIAN; - case ::com::sun::star::i18n::ScriptType::COMPLEX: + case css::i18n::ScriptType::COMPLEX: return SvtScriptType::COMPLEX; default: return SvtScriptType::NONE; diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index 473fd5a47397..5603cb9ae62b 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -131,7 +131,7 @@ bool SwEditShell::Undo(sal_uInt16 const nCount) bRet = GetDoc()->GetIDocumentUndoRedo().Undo() || bRet; } - } catch (const ::com::sun::star::uno::Exception & e) { + } catch (const css::uno::Exception & e) { SAL_WARN("sw.core", "SwEditShell::Undo(): exception caught: " << e.Message); } @@ -187,7 +187,7 @@ bool SwEditShell::Redo(sal_uInt16 const nCount) bRet = GetDoc()->GetIDocumentUndoRedo().Redo() || bRet; } - } catch (const ::com::sun::star::uno::Exception & e) { + } catch (const css::uno::Exception & e) { SAL_WARN("sw.core", "SwEditShell::Redo(): exception caught: " << e.Message); } @@ -217,7 +217,7 @@ bool SwEditShell::Repeat(sal_uInt16 const nCount) ::sw::RepeatContext context(*GetDoc(), *GetCrsr()); bRet = GetDoc()->GetIDocumentUndoRedo().Repeat( context, nCount ) || bRet; - } catch (const ::com::sun::star::uno::Exception & e) { + } catch (const css::uno::Exception & e) { SAL_WARN("sw.core", "SwEditShell::Repeat(): exception caught: " << e.Message); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index c7df4937877e..7f0d6127e899 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -420,7 +420,7 @@ bool SwAuthorityFieldType::PutValue( const Any& rAny, sal_uInt16 nWhichId ) case FIELD_PROP_LOCALE: { - com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; if( (bRet = rAny >>= aLocale )) SetLanguage( LanguageTag::convertToLanguageType( aLocale )); } diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index cb4dadd8c371..5a1b89dee044 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -50,7 +50,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; virtual const SwNode* GetAnchor() const override; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index c9a38206a615..8c563a857fe5 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -43,9 +43,9 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet() {OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 }, {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, - cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, - cppu::UnoType<com::sun::star::container::XNameContainer>::get(), 0, 0}, + cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() ); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 8d4d2695b973..b800d0aa5833 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -2053,7 +2053,7 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO const SwFormatVertOrient &rVert = pFrameFormat->GetVertOrient(); SwFormatVertOrient aVert( rVert ); aVert.SetPos( -nBaseline ); - aVert.SetVertOrient( com::sun::star::text::VertOrientation::NONE ); + aVert.SetVertOrient( css::text::VertOrientation::NONE ); pFrameFormat->LockModify(); pFrameFormat->SetFormatAttr( aVert ); diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 7f098a1f4759..8327c64fbc81 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1108,7 +1108,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream() void SwGrfNode::ApplyInputStream( - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ) { if ( IsLinkedFile() ) diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index 78a7c85713d4..4c05c29cbf81 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -43,7 +43,7 @@ public: virtual void RemoveFieldType(size_t nField) override; virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) override; virtual void InsDeletedFieldType(SwFieldType &) override; - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) override; + virtual bool PutValueToField(const SwPosition & rPos, const css::uno::Any& rVal, sal_uInt16 nWhich) override; virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) override; virtual void UpdateRefFields(SfxPoolItem* pHt) override; virtual void UpdateTableFields(SfxPoolItem* pHt) override; diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx index c15b9ec2dcd2..026e3c0dc9ed 100644 --- a/sw/source/core/inc/DocumentLayoutManager.hxx +++ b/sw/source/core/inc/DocumentLayoutManager.hxx @@ -63,7 +63,7 @@ private: SwDoc& m_rDoc; SwViewShell *mpCurrentView; //< SwDoc should get a new member mpCurrentView - SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting + SwLayouter *mpLayouter; /**< css::frame::Controller for complex layout formatting like footnote/endnote in sections */ }; diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx index cac16e282e04..dcd329978cb8 100644 --- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx +++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -49,9 +49,9 @@ public: void UpdateLinks(bool bUI) override; - bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const override; + bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const override; - bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) override; + bool SetData(const OUString& rItem, const OUString& rMimeType, const css::uno::Any& rValue) override; ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) override; diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index 30d04f6f2cb9..89bca6123a45 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -105,10 +105,10 @@ public: /*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment) override; - virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const override; + virtual const css::uno::Sequence <sal_Int8>& GetRedlinePassword() const override; virtual void SetRedlinePassword( - /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) override; + /*[in]*/const css::uno::Sequence <sal_Int8>& rNewPassword) override; //Non Interface methods; @@ -134,7 +134,7 @@ private: bool mbReadlineChecked; //< true: if the query was already shown sal_uInt16 mnAutoFormatRedlnCommentNo; /**< SeqNo for conjoining of AutoFormat-Redlines. by the UI. Managed by SwAutoFormat! */ - ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd; + css::uno::Sequence <sal_Int8 > maRedlinePasswd; }; } diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index 8a0f12db218e..db0af2fcf38f 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -161,8 +161,8 @@ public: // IDocumentSettingAccess virtual bool get(/*[in]*/ DocumentSettingId id) const override; virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) override; - virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const override; - virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) override; + virtual const css::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const override; + virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) override; virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() override; virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const override; virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const override; diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index bb1d0232c4bd..53509ab8c53e 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -31,10 +31,10 @@ private: public: SwXMLBlockListExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, SwXMLTextBlocks & rBlocks, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); + css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLBlockListExport() {} sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) override; @@ -50,10 +50,10 @@ private: public: SwXMLTextBlockExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, SwXMLTextBlocks & rBlocks, const OUString &rFileName, - com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); + css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); virtual ~SwXMLTextBlockExport() {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;} diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 31c28c15b4e6..f15e8393803d 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -45,7 +45,7 @@ protected: public: SwXMLBlockListImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, SwXMLTextBlocks &rBlocks ); SwXMLTextBlocks& getBlockList() @@ -68,13 +68,13 @@ public: bool bTextOnly; OUString &m_rText; SwXMLTextBlockImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString &rNewText, bool bNewTextOnly ); virtual ~SwXMLTextBlockImport() throw(); virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; }; enum SwXMLTextBlockToken : sal_Int32 diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index 9c7bc8639813..8f96c6d7f1d7 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -43,15 +43,15 @@ protected: void ReadInfo(); void WriteInfo(); - void InitBlockMode ( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStorage ); + void InitBlockMode ( const css::uno::Reference < css::embed::XStorage >& rStorage ); void ResetBlockMode(); public: - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xBlkRoot; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xRoot; + css::uno::Reference < css::embed::XStorage > xBlkRoot; + css::uno::Reference < css::embed::XStorage > xRoot; short nCurBlk; SwXMLTextBlocks( const OUString& rFile ); - SwXMLTextBlocks( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFile ); + SwXMLTextBlocks( const css::uno::Reference < css::embed::XStorage >&, const OUString& rFile ); void AddName( const OUString&, const OUString&, const OUString&, bool bOnlyText = false ); virtual void AddName( const OUString&, const OUString&, bool bOnlyText = false ) override; static OUString GeneratePackageName ( const OUString& rShort ); diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index 42eb62a61b2d..4e6d768f895c 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -29,9 +29,9 @@ class SwDoc; class SwXTextDefaults : public cppu::WeakImplHelper < - com::sun::star::beans::XPropertyState, - com::sun::star::beans::XPropertySet, - com::sun::star::lang::XServiceInfo + css::beans::XPropertyState, + css::beans::XPropertySet, + css::lang::XServiceInfo > { const SfxItemPropertySet* m_pPropSet; @@ -42,35 +42,35 @@ public: virtual ~SwXTextDefaults (); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XPropertyState - 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) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropertyName ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& rPropertyNames ) + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index 60c2eb67fad0..5bf395c15c91 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -84,7 +84,7 @@ public: virtual void RepeatImpl( ::sw::RepeatContext & ) override; void AddChanges( SwTextNode& rTNd, sal_Int32 nStart, sal_Int32 nLen, - ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); + css::uno::Sequence <sal_Int32>& rOffsets ); bool HasData() const { return aChanges.size() > 0; } }; diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index 8a960a5c1bd8..633dffbab771 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -102,11 +102,9 @@ namespace sw { virtual ~MarkBase(); - const ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextContent> & GetXBookmark() const + const css::uno::WeakReference< css::text::XTextContent> & GetXBookmark() const { return m_wXBookmark; } - void SetXBookmark(::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> const& xBkmk) + void SetXBookmark(css::uno::Reference< css::text::XTextContent> const& xBkmk) { m_wXBookmark = xBkmk; } protected: @@ -119,8 +117,7 @@ namespace sw { OUString m_aName; static OUString GenerateNewName(const OUString& rPrefix); - ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextContent> m_wXBookmark; + css::uno::WeakReference< css::text::XTextContent> m_wXBookmark; }; class NavigatorReminder @@ -188,8 +185,7 @@ namespace sw { virtual bool IsInClipboard() const override; virtual bool IsInUndo() const override; virtual bool IsInContent() const override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override; + virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() override; private: vcl::KeyCode m_aCode; diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 8a9c48e0e1a5..0dac71b4d0f4 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -70,7 +70,7 @@ struct SwSortElement static SwDoc* pDoc; static const FlatFndBox* pBox; static CollatorWrapper* pSortCollator; - static ::com::sun::star::lang::Locale* pLocale; + static css::lang::Locale* pLocale; static OUString* pLastAlgorithm; static LocaleDataWrapper* pLclData; diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index 06cbff670c79..7b0acb1ba17b 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -24,40 +24,40 @@ namespace sw { */ class LayoutDumpFilter : public cppu::WeakImplHelper < - com::sun::star::document::XFilter, - com::sun::star::document::XExporter, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo + css::document::XFilter, + css::document::XExporter, + css::lang::XInitialization, + css::lang::XServiceInfo > { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc; + css::uno::Reference< css::lang::XComponent > m_xSrcDoc; public: LayoutDumpFilter(); virtual ~LayoutDumpFilter(); // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) 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) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 5acb1f086394..251bc15e9d82 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -484,8 +484,8 @@ public: const bool bLowerBorder = false, const bool bOnlyTextBackground = false ) const; void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*, - const Color *pColor, const editeng::SvxBorderStyle = - ::com::sun::star::table::BorderLineStyle::SOLID ) const; + const Color *pColor, + const editeng::SvxBorderStyle = css::table::BorderLineStyle::SOLID ) const; drawinglayer::processor2d::BaseProcessor2D * CreateProcessor2D( ) const; void ProcessPrimitives( const drawinglayer::primitive2d::Primitive2DSequence& rSequence ) const; diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 784b4284281c..6a6ffbddfe28 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -65,7 +65,7 @@ typedef void (*GoSection)( SwPosition* ); typedef bool (SwPosition:: *CmpOp)( const SwPosition& ) const; typedef const SwTextAttr* (*GetHint)( const SwpHints&, sal_uInt16&, sal_Int32 ); typedef bool (utl::TextSearch:: *SearchText)( const OUString&, sal_Int32*, - sal_Int32*, ::com::sun::star::util::SearchResult* ); + sal_Int32*, css::util::SearchResult* ); typedef void (*MvSection)( SwNodeIndex * ); struct SwMoveFnCollection diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index 111e2a3247d9..209a2470402d 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -49,7 +49,7 @@ class SwRetrievedInputStreamDataManager struct tData { std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream; + css::uno::Reference<css::io::XInputStream> mxInputStream; bool mbIsStreamReadOnly; tData() @@ -68,7 +68,7 @@ class SwRetrievedInputStreamDataManager tDataKey ReserveData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer ); void PushData( const tDataKey nDataKey, - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ); bool PopData( const tDataKey nDataKey, diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx index fc9f2cc52208..b6bda40be546 100644 --- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx +++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx @@ -45,7 +45,7 @@ class SwAsyncRetrieveInputStreamThreadConsumer /** method called to provide the retrieved input stream to the thread Consumer */ void ApplyInputStream( - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ); private: diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx index a6b329895918..1bab117fb024 100644 --- a/sw/source/core/inc/swthreadjoiner.hxx +++ b/sw/source/core/inc/swthreadjoiner.hxx @@ -24,7 +24,7 @@ /** Testing */ namespace SwThreadJoiner { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& GetThreadJoiner(); + css::uno::Reference< css::util::XJobManager >& GetThreadJoiner(); void ReleaseThreadJoiner(); } diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 67e4dc4441b5..0cab5022dfc8 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -48,7 +48,7 @@ class ThreadManager { public: - explicit ThreadManager( ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& rThreadJoiner ); + explicit ThreadManager( css::uno::Reference< css::util::XJobManager >& rThreadJoiner ); virtual ~ThreadManager(); std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef(); @@ -99,7 +99,7 @@ class ThreadManager { oslInterlockedCount nThreadID; ::rtl::Reference< ObservableThread > pThread; - com::sun::star::uno::Reference< com::sun::star::util::XCancellable > aJob; + css::uno::Reference< css::util::XCancellable > aJob; tThreadData() : nThreadID( 0 ), @@ -114,7 +114,7 @@ class ThreadManager osl::Mutex maMutex; - ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XJobManager > mrThreadJoiner; + css::uno::WeakReference< css::util::XJobManager > mrThreadJoiner; std::shared_ptr< ThreadListener > mpThreadListener; diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index c0235ad5a1fd..bcb30b78a82f 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -84,28 +84,28 @@ public: ~SwTOXInternational(); sal_Int32 Compare( const TextAndReading& rTaR1, - const ::com::sun::star::lang::Locale& rLocale1, + const css::lang::Locale& rLocale1, const TextAndReading& rTaR2, - const ::com::sun::star::lang::Locale& rLocale2 ) const; + const css::lang::Locale& rLocale2 ) const; inline bool IsEqual( const TextAndReading& rTaR1, - const ::com::sun::star::lang::Locale& rLocale1, + const css::lang::Locale& rLocale1, const TextAndReading& rTaR2, - const ::com::sun::star::lang::Locale& rLocale2 ) const + const css::lang::Locale& rLocale2 ) const { return 0 == Compare( rTaR1, rLocale1, rTaR2, rLocale2 ); } inline bool IsLess( const TextAndReading& rTaR1, - const ::com::sun::star::lang::Locale& rLocale1, + const css::lang::Locale& rLocale1, const TextAndReading& rTaR2, - const ::com::sun::star::lang::Locale& rLocale2 ) const + const css::lang::Locale& rLocale2 ) const { return -1 == Compare( rTaR1, rLocale1, rTaR2, rLocale2 ); } OUString GetIndexKey( const TextAndReading& rTaR, - const ::com::sun::star::lang::Locale& rLcl ) const; + const css::lang::Locale& rLcl ) const; OUString GetFollowingText( bool bMorePages ) const; @@ -119,7 +119,7 @@ public: struct SwTOXSortTabBase { std::vector<SwTOXSource> aTOXSources; - ::com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; const SwTextNode* pTOXNd; const SwTextTOXMark* pTextMark; const SwTOXInternational* pTOXIntl; @@ -132,7 +132,7 @@ struct SwTOXSortTabBase const SwContentNode* pTOXSrc, const SwTextTOXMark* pTextMark, const SwTOXInternational* pIntl, - const ::com::sun::star::lang::Locale* pLocale = NULL ); + const css::lang::Locale* pLocale = NULL ); virtual ~SwTOXSortTabBase() {} sal_uInt16 GetType() const { return nType; } @@ -146,7 +146,7 @@ struct SwTOXSortTabBase virtual OUString GetURL() const; inline TextAndReading GetText() const; - inline const ::com::sun::star::lang::Locale& GetLocale() const; + inline const css::lang::Locale& GetLocale() const; private: mutable bool bValidText; @@ -167,7 +167,7 @@ inline TextAndReading SwTOXSortTabBase::GetText() const return m_aSort; } -inline const ::com::sun::star::lang::Locale& SwTOXSortTabBase::GetLocale() const +inline const css::lang::Locale& SwTOXSortTabBase::GetLocale() const { return aLocale; } @@ -179,7 +179,7 @@ struct SwTOXIndex : public SwTOXSortTabBase { SwTOXIndex( const SwTextNode&, const SwTextTOXMark*, sal_uInt16 nOptions, sal_uInt8 nKeyLevel, const SwTOXInternational& rIntl, - const ::com::sun::star::lang::Locale& rLocale ); + const css::lang::Locale& rLocale ); virtual ~SwTOXIndex() {} virtual void FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 nAuthField = 0 ) const override; @@ -197,7 +197,7 @@ struct SwTOXCustom : public SwTOXSortTabBase { SwTOXCustom( const TextAndReading& rKey, sal_uInt16 nLevel, const SwTOXInternational& rIntl, - const ::com::sun::star::lang::Locale& rLocale ); + const css::lang::Locale& rLocale ); virtual ~SwTOXCustom() {} virtual sal_uInt16 GetLevel() const override; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 978ba81f944c..286902d638f3 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -204,7 +204,7 @@ protected: public: - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) override; + css::uno::Sequence< css::style::TabStop > GetTabStopInfo( SwTwips CurrentPos ) override; /** * This is public, as it needs to be called by some methods in order to save the Prepare diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 612cacb898a4..01e88465599d 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -38,11 +38,11 @@ class SwDoc; typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin -, ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::container::XNamed -, ::com::sun::star::text::XTextContent +, css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::container::XNamed +, css::text::XTextContent > SwXBookmark_Base; class SwXBookmark @@ -57,16 +57,14 @@ private: protected: void attachToRangeEx( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange, + const css::uno::Reference< css::text::XTextRange > & xTextRange, IDocumentMarkAccess::MarkType eType) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException ); + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException ); virtual void attachToRange( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException); const ::sw::mark::IMark* GetBookmark() const; @@ -82,116 +80,105 @@ protected: public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> + static css::uno::Reference< css::text::XTextContent> CreateXBookmark(SwDoc & rDoc, ::sw::mark::IMark * pBookmark); /// @return IMark for this, but only if it lives in pDoc static ::sw::mark::IMark const* GetBookmarkInDoc(SwDoc const*const pDoc, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XUnoTunnel> & xUT); + const css::uno::Reference<css::lang::XUnoTunnel> & xUT); // MetadatableMixin virtual ::sfx2::Metadatable* GetCoreObject() override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > GetModel() override; + virtual css::uno::Reference< css::frame::XModel > GetModel() override; - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< + css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; }; class SwXFieldmarkParameters - : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer> + : public ::cppu::WeakImplHelper< css::container::XNameContainer> , private SwClient { public: @@ -201,26 +188,26 @@ class SwXFieldmarkParameters } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) 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) 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) 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) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; protected: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; private: - ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException); + ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (css::uno::RuntimeException); }; typedef cppu::ImplInheritanceHelper< SwXBookmark, - ::com::sun::star::text::XFormField > SwXFieldmark_Base; + css::text::XFormField > SwXFieldmark_Base; class SwXFieldmark : public SwXFieldmark_Base @@ -237,36 +224,34 @@ protected: public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> + static css::uno::Reference<css::text::XTextContent> CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark * pMark, bool isReplacementObject = false); virtual void attachToRange( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) override; + const css::uno::Reference<css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException) override; virtual OUString SAL_CALL getFieldType() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setFieldType(const OUString& description ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getParameters( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters( ) + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; }; class SwXODFCheckboxField : public SwXFieldmark diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index db01ae888c96..46c752fb2208 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -37,7 +37,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; protected: virtual ~SwHyperlinkEventDescriptor(); public: @@ -48,8 +48,7 @@ public: void copyMacrosIntoINetFormat(SwFormatINetFormat& aFormat); void copyMacrosFromNameReplace( - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> & xReplace); + css::uno::Reference<css::container::XNameReplace> & xReplace); }; // SwEventDescriptor for @@ -71,7 +70,7 @@ public: virtual ~SwFrameEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; protected: virtual void setMacroItem(const SvxMacroItem& rItem) override; @@ -91,7 +90,7 @@ public: virtual ~SwFrameStyleEventDescriptor(); virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; protected: virtual void setMacroItem(const SvxMacroItem& rItem) override; diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 7669abd6f018..549ab3021c22 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -38,10 +38,10 @@ class SwSetExpField; class SwTextAPIObject; typedef ::cppu::WeakImplHelper -< ::com::sun::star::beans::XPropertySet -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XComponent +< css::beans::XPropertySet +, css::lang::XServiceInfo +, css::lang::XUnoTunnel +, css::lang::XComponent > SwXFieldMaster_Base; class SwXFieldMaster @@ -61,8 +61,7 @@ private: public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + static css::uno::Reference<css::beans::XPropertySet> CreateXFieldMaster(SwDoc * pDoc, SwFieldType * pType, sal_uInt16 nResId = 0xFFFF); @@ -71,90 +70,83 @@ public: SwFieldType* GetFieldType(bool bDontCreate = false) const; - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakImplHelper -< ::com::sun::star::text::XDependentTextField -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::util::XUpdatable +< css::text::XDependentTextField +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::lang::XUnoTunnel +, css::util::XUpdatable > SwXTextField_Base; class SwXTextField @@ -176,119 +168,108 @@ public: sal_uInt16 GetServiceId() const; /// @return an SwXTextField, either an already existing one or a new one - static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField> + static css::uno::Reference< css::text::XTextField> CreateXTextField(SwDoc * pDoc, SwFormatField const* pFormat, sal_uInt16 nServiceId = 0xFFFF); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XUpdatable virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XDependentTextField virtual void SAL_CALL attachTextFieldMaster( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xFieldMaster) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> SAL_CALL getTextFieldMaster() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet > & xFieldMaster) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL getTextFieldMaster() + throw (css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakImplHelper -< ::com::sun::star::container::XEnumeration -, ::com::sun::star::lang::XServiceInfo +< css::container::XEnumeration +, css::lang::XServiceInfo > SwXFieldEnumeration_Base; class SwXFieldEnumeration @@ -306,21 +287,21 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index b173d03bc930..b7f6dddf467c 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -58,51 +58,46 @@ public: virtual ~SwXFlatParagraph(); // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // text::XTextMarkup: virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override; @@ -110,7 +105,7 @@ public: virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, + virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange, const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; // text::XFlatParagraph: diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index d687dbb644b2..4313a3128577 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -36,11 +36,11 @@ class SwModify; class SwFormatFootnote; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::container::XEnumerationAccess -, ::com::sun::star::text::XFootnote +< css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::container::XEnumerationAccess +, css::text::XFootnote > SwXFootnote_Base; class SwXFootnote @@ -59,10 +59,8 @@ protected: virtual const SwStartNode *GetStartNode() const override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > - CreateCursor() - throw (::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() + throw (css::uno::RuntimeException) override; virtual ~SwXFootnote(); @@ -76,135 +74,122 @@ public: bool isEndnote = false); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::container::XEnumeration > SAL_CALL + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XFootnote virtual OUString SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLabel(const OUString& rLabel) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XSimpleText - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > SAL_CALL + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextPosition) + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index 8d662c25988b..9b9eb4d252ee 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -41,12 +41,12 @@ class SwTOXType; typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin -, ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::container::XNamed -, ::com::sun::star::util::XRefreshable -, ::com::sun::star::text::XDocumentIndex +, css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::container::XNamed +, css::util::XRefreshable +, css::text::XDocumentIndex > SwXDocumentIndex_Base; class SwXDocumentIndex @@ -70,133 +70,121 @@ private: public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XDocumentIndex> + static css::uno::Reference< css::text::XDocumentIndex> CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection * pSection, TOXTypes eTypes = TOX_INDEX); // MetadatableMixin virtual ::sfx2::Metadatable* GetCoreObject() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + virtual css::uno::Reference< css::frame::XModel > GetModel() override; - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener>& xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XRefreshListener>& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener>& xListener) + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XDocumentIndex virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL update() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::text::XDocumentIndexMark +< css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::text::XDocumentIndexMark > SwXDocumentIndexMark_Base; class SwXDocumentIndexMark @@ -218,102 +206,92 @@ private: public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XDocumentIndexMark> + static css::uno::Reference< css::text::XDocumentIndexMark> CreateXDocumentIndexMark(SwDoc & rDoc, SwTOXMark * pMark, TOXTypes eType = TOX_INDEX); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XDocumentIndexMark virtual OUString SAL_CALL getMarkEntry() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setMarkEntry(const OUString& rIndexEntry) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index c80ea70f7e03..2c6f4b2794f4 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -38,7 +38,7 @@ #include <unobaseclass.hxx> typedef ::std::deque< - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > > + css::uno::Reference< css::text::XTextRange > > TextRangeList_t; class SwPaM; @@ -50,12 +50,12 @@ namespace sw { typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin -, ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::container::XChild -, ::com::sun::star::container::XEnumerationAccess -, ::com::sun::star::text::XTextContent -, ::com::sun::star::text::XText +, css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::container::XChild +, css::container::XEnumerationAccess +, css::text::XTextContent +, css::text::XText > SwXMeta_Base; class SwXMeta @@ -72,171 +72,149 @@ protected: ::sw::UnoImplPtr<Impl> m_pImpl; void SAL_CALL AttachImpl( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange, + const css::uno::Reference< css::text::XTextRange > & xTextRange, const sal_uInt16 nWhich) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException); virtual ~SwXMeta(); /// @param pDoc and pMeta != 0, but not & because of ImplInheritanceHelper SwXMeta(SwDoc *const pDoc, ::sw::Meta *const pMeta, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const& - xParentText, + css::uno::Reference< css::text::XText> const& xParentText, TextRangeList_t const*const pPortions); SwXMeta(SwDoc *const pDoc); public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > + static css::uno::Reference< css::rdf::XMetadatable > CreateXMeta( ::sw::Meta & rMeta, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> - const& xParentText = 0, - ::std::unique_ptr<TextRangeList_t const> && pPortions = - ::std::unique_ptr<TextRangeList_t const>()); + css::uno::Reference< css::text::XText> const& xParentText = 0, + ::std::unique_ptr<TextRangeList_t const> && pPortions = ::std::unique_ptr<TextRangeList_t const>()); static css::uno::Reference<css::rdf::XMetadatable> CreateXMeta(SwDoc & rDoc, bool isField); /// init params with position of the attribute content (w/out CH_TXTATR) - bool SetContentRange( - SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - GetParentText() const; + bool SetContentRange( SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const; + css::uno::Reference< css::text::XText > GetParentText() const; bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException); // MetadatableMixin virtual ::sfx2::Metadatable * GetCoreObject() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + virtual css::uno::Reference< css::frame::XModel > GetModel() override; - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& Identifier ) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XChild - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> const& xParent) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::NoSupportException, std::exception) override; + css::uno::Reference< css::uno::XInterface> const& xParent) + throw (css::uno::RuntimeException, + css::lang::NoSupportException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::container::XEnumeration > SAL_CALL + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getStart() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XText > + SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::text::XTextRange > SAL_CALL getStart() + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< + css::text::XTextRange > SAL_CALL getEnd() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getString() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString(const OUString& rString) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XSimpleText - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > SAL_CALL + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextPosition) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextPosition) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertString( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xRange, + const css::uno::Reference< css::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertControlCharacter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xRange, + const css::uno::Reference< css::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XText virtual void SAL_CALL insertTextContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xRange, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > & xContent, + const css::uno::Reference< css::text::XTextRange > & xRange, + const css::uno::Reference< css::text::XTextContent > & xContent, sal_Bool bAbsorb) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTextContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > & xContent) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent > & xContent) + throw (css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::ImplInheritanceHelper < SwXMeta -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::text::XTextField +, css::beans::XPropertySet +, css::text::XTextField > SwXMetaField_Base; class SwXMetaField @@ -247,16 +225,13 @@ private: virtual ~SwXMetaField(); - friend ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > + friend css::uno::Reference< css::rdf::XMetadatable > SwXMeta::CreateXMeta(::sw::Meta &, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> - const&, + css::uno::Reference< css::text::XText> const&, ::std::unique_ptr<TextRangeList_t const> && pPortions); SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const& - xParentText, + css::uno::Reference< css::text::XText> const& xParentText, TextRangeList_t const*const pPortions); friend css::uno::Reference<css::rdf::XMetadatable> @@ -268,95 +243,84 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw ( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XTextField virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; /// get prefix/suffix from the RDF repository. @throws RuntimeException void getPrefixAndSuffix( - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel>& xModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable>& xMetaField, + const css::uno::Reference< css::frame::XModel>& xModel, + const css::uno::Reference< css::rdf::XMetadatable>& xMetaField, OUString *const o_pPrefix, OUString *const o_pSuffix); #endif // INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index ac180a65433e..cb8e364f87c6 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -49,7 +49,7 @@ class SwRangeRedline; class SwTextRuby; typedef ::std::deque< - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > > + css::uno::Reference< css::text::XTextRange > > TextRangeList_t; enum SwTextPortionType @@ -79,14 +79,14 @@ enum SwTextPortionType class SwXTextPortion : public cppu::WeakImplHelper < - ::com::sun::star::beans::XTolerantMultiPropertySet, - ::com::sun::star::beans::XMultiPropertySet, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::text::XTextRange, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::container::XContentEnumerationAccess, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XServiceInfo + css::beans::XTolerantMultiPropertySet, + css::beans::XMultiPropertySet, + css::beans::XPropertySet, + css::text::XTextRange, + css::beans::XPropertyState, + css::container::XContentEnumerationAccess, + css::lang::XUnoTunnel, + css::lang::XServiceInfo >, public SwClient { @@ -96,24 +96,24 @@ private: ::sw::UnoImplPtr<Impl> m_pImpl; const SfxItemPropertySet * m_pPropSet; - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > + const css::uno::Reference< css::text::XText > m_xParentText; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > + css::uno::Reference< css::text::XTextContent > m_xRefMark; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > + css::uno::Reference< css::text::XTextContent > m_xTOXMark; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > + css::uno::Reference< css::text::XTextContent > m_xBookmark; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote > + css::uno::Reference< css::text::XFootnote > m_xFootnote; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > + css::uno::Reference< css::text::XTextField > m_xTextField; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > + css::uno::Reference< css::text::XTextContent > m_xMeta; - ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyText; - ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyStyle; - ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyAdjust; - ::std::unique_ptr< ::com::sun::star::uno::Any > m_pRubyIsAbove; + ::std::unique_ptr< css::uno::Any > m_pRubyText; + ::std::unique_ptr< css::uno::Any > m_pRubyStyle; + ::std::unique_ptr< css::uno::Any > m_pRubyAdjust; + ::std::unique_ptr< css::uno::Any > m_pRubyIsAbove; sw::UnoCursorPointer m_pUnoCursor; const SwDepend m_FrameDepend; @@ -127,14 +127,14 @@ private: protected: void SAL_CALL SetPropertyValues_Impl( - const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( - const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - void GetPropertyValue( ::com::sun::star::uno::Any &rVal, + const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Sequence< css::uno::Any >& aValues ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( + const css::uno::Sequence< OUString >& aPropertyNames ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + + void GetPropertyValue( css::uno::Any &rVal, const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet ); css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl( @@ -147,85 +147,78 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: - SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwTextPortionType eType ); - SwXTextPortion(const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const& rParent, SwFrameFormat& rFormat ); + SwXTextPortion(const SwUnoCrsr* pPortionCrsr, css::uno::Reference< css::text::XText > const& rParent, SwTextPortionType eType ); + SwXTextPortion(const SwUnoCrsr* pPortionCrsr, css::uno::Reference< css::text::XText > const& rParent, SwFrameFormat& rFormat ); // for Ruby SwXTextPortion(const SwUnoCrsr* pPortionCrsr, SwTextRuby const& rAttr, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - const& xParent, + css::uno::Reference< css::text::XText > const& xParent, bool bIsEnd ); //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getString() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setString(const OUString& aString) throw( css::uno::RuntimeException, std::exception ) override; //XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; //XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; //XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(const OUString& aServiceName) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - void SetRefMark( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > xMark) + void SetRefMark( css::uno::Reference< css::text::XTextContent > xMark) { m_xRefMark = xMark; } - void SetTOXMark( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > xMark) + void SetTOXMark( css::uno::Reference< css::text::XTextContent > xMark) { m_xTOXMark = xMark; } - void SetBookmark( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > xMark) + void SetBookmark( css::uno::Reference< css::text::XTextContent > xMark) { m_xBookmark = xMark; } - void SetFootnote( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XFootnote > xNote) + void SetFootnote( css::uno::Reference< css::text::XFootnote > xNote) { m_xFootnote = xNote; } - void SetTextField( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextField> xField) + void SetTextField( css::uno::Reference< css::text::XTextField> xField) { m_xTextField = xField; } - void SetMeta( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > xMeta) + void SetMeta( css::uno::Reference< css::text::XTextContent > xMeta) { m_xMeta = xMeta; } void SetCollapsed(bool bSet) { m_bIsCollapsed = bSet;} @@ -238,9 +231,9 @@ public: class SwXTextPortionEnumeration : public ::cppu::WeakImplHelper - < ::com::sun::star::container::XEnumeration - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XUnoTunnel + < css::container::XEnumeration + , css::lang::XServiceInfo + , css::lang::XUnoTunnel > { TextRangeList_t m_Portions; // contains all portions, filled by ctor @@ -254,36 +247,35 @@ protected: public: SwXTextPortionEnumeration(SwPaM& rParaCrsr, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - const & xParent, + css::uno::Reference< css::text::XText > const & xParent, const sal_Int32 nStart, const sal_Int32 nEnd ); SwXTextPortionEnumeration(SwPaM& rParaCrsr, TextRangeList_t const & rPortions ); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) override; //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() - throw( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL nextElement() + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; class SwXRedlinePortion : public SwXTextPortion @@ -291,7 +283,7 @@ class SwXRedlinePortion : public SwXTextPortion private: SwRangeRedline const& m_rRedline; - void Validate() throw (::com::sun::star::uno::RuntimeException); + void Validate() throw (css::uno::RuntimeException); using SwXTextPortion::GetPropertyValue; @@ -301,25 +293,23 @@ public: SwXRedlinePortion( SwRangeRedline const& rRedline, SwUnoCrsr const* pPortionCrsr, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > - const& xParent, + css::uno::Reference< css::text::XText > const& xParent, bool const bIsStart); - static ::com::sun::star::uno::Any GetPropertyValue( + static css::uno::Any GetPropertyValue( OUString const& PropertyName, SwRangeRedline const& rRedline) throw(); - static ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > CreateRedlineProperties( + static css::uno::Sequence< css::beans::PropertyValue > CreateRedlineProperties( SwRangeRedline const& rRedline, bool const bIsStart) throw(); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL + getImplementationId() throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index cac6f29d3dae..724a6644f3c6 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -35,11 +35,11 @@ class SwModify; class SwFormatRefMark; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::container::XNamed -, ::com::sun::star::text::XTextContent +< css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::container::XNamed +, css::text::XTextContent > SwXReferenceMark_Base; class SwXReferenceMark @@ -60,97 +60,88 @@ public: static css::uno::Reference<css::text::XTextContent> CreateXReferenceMark(SwDoc & rDoc, SwFormatRefMark * pMarkFormat); - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 31fa12473e0e..0c6ee44fb8c7 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -41,13 +41,13 @@ struct SwTextSectionProperties_Impl; typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin -, ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::beans::XPropertyState -, ::com::sun::star::beans::XMultiPropertySet -, ::com::sun::star::container::XNamed -, ::com::sun::star::text::XTextSection +, css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::beans::XPropertyState +, css::beans::XMultiPropertySet +, css::container::XNamed +, css::text::XTextSection > SwXTextSection_Base; class SwXTextSection @@ -67,172 +67,149 @@ public: SwSectionFormat* GetFormat() const; - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextSection > + static css::uno::Reference< css::text::XTextSection > CreateXTextSection(SwSectionFormat *const pFormat = 0, const bool bIndexHeader = false); // MetadatableMixin virtual ::sfx2::Metadatable* GetCoreObject() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + virtual css::uno::Reference< css::frame::XModel > GetModel() override; - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< sal_Int8 >& rIdentifier) + throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XEventListener > & xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XEventListener > & xListener) + throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) 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::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( + const css::uno::Any& rValue) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertyChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XVetoableChangeListener >& xListener) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL + virtual css::beans::PropertyState SAL_CALL getPropertyState(const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyState > SAL_CALL + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rValues) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Sequence< css::uno::Any >& rValues) + throw (css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertiesChangeListener( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertiesChangeListener( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL firePropertiesChangeEvent( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertiesChangeListener >& xListener) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener) + throw (css::uno::RuntimeException, std::exception) override; // XNamed virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(const OUString& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextContent virtual void SAL_CALL attach( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange > & xTextRange) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() + throw (css::uno::RuntimeException, std::exception) override; // XTextSection - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextSection > SAL_CALL + virtual css::uno::Reference< css::text::XTextSection > SAL_CALL getParentSection() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextSection > > SAL_CALL + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::text::XTextSection > > SAL_CALL getChildSections() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index 55ecb9036f55..2f94f8d13ebe 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -45,8 +45,8 @@ class SfxPoolItem; */ class SwXTextMarkup : public ::cppu::WeakImplHelper - < ::com::sun::star::text::XTextMarkup - , ::com::sun::star::text::XMultiTextMarkup + < css::text::XTextMarkup + , css::text::XMultiTextMarkup > { public: @@ -54,17 +54,17 @@ public: const ModelToViewHelper& rConversionMap); virtual ~SwXTextMarkup(); - // ::com::sun::star::text::XTextMarkup: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::text::XTextMarkup: + virtual css::uno::Reference< css::container::XStringKeyMap > SAL_CALL getMarkupInfoContainer() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commitStringMarkup(::sal_Int32 nType, const OUString & aIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & xRange, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > & xMarkupInfoContainer) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const css::uno::Reference< css::text::XTextRange> & xRange, + const css::uno::Reference< css::container::XStringKeyMap > & xMarkupInfoContainer) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::text::XMultiTextMarkup: - virtual void SAL_CALL commitMultiTextMarkup( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextMarkupDescriptor >& aMarkups ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + // css::text::XMultiTextMarkup: + virtual void SAL_CALL commitMultiTextMarkup( const css::uno::Sequence< css::text::TextMarkupDescriptor >& aMarkups ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; private: SwXTextMarkup( const SwXTextMarkup & ) = delete; @@ -79,22 +79,22 @@ protected: const ModelToViewHelper& GetConversionMap(); }; -/** Implementation of the ::com::sun::star::container::XStringKeyMap interface +/** Implementation of the css::container::XStringKeyMap interface */ class SwXStringKeyMap: public ::cppu::WeakImplHelper< - ::com::sun::star::container::XStringKeyMap> + css::container::XStringKeyMap> { public: SwXStringKeyMap(); - // ::com::sun::star::container::XStringKeyMap: - virtual ::com::sun::star::uno::Any SAL_CALL getValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::container::NoSuchElementException, std::exception) override; - virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertValue(const OUString & aKey, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) override; + // css::container::XStringKeyMap: + virtual css::uno::Any SAL_CALL getValue(const OUString & aKey) throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) override; + virtual sal_Bool SAL_CALL hasValue(const OUString & aKey) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertValue(const OUString & aKey, const css::uno::Any & aValue) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::container::ElementExistException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; + virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; private: SwXStringKeyMap(SwXStringKeyMap &) = delete; @@ -102,7 +102,7 @@ private: virtual ~SwXStringKeyMap() {} - std::map< OUString, ::com::sun::star::uno::Any > maMap; + std::map< OUString, css::uno::Any > maMap; }; #endif diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index bd33e0f9850c..3aefb95c6abc 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -54,7 +54,7 @@ class SwWrongArea { public: OUString maType; - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > mxPropertyBag; + css::uno::Reference< css::container::XStringKeyMap > mxPropertyBag; sal_Int32 mnPos; sal_Int32 mnLen; SwWrongList* mpSubList; @@ -64,12 +64,12 @@ public: SwWrongArea( const OUString& rType, WrongListType listType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nPos, sal_Int32 nLen); SwWrongArea( const OUString& rType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nPos, sal_Int32 nLen, SwWrongList* pSubList); @@ -77,15 +77,15 @@ private: SwWrongArea() : mnPos(0), mnLen(0), mpSubList(NULL), mColor(0,0,0), mLineType(WRONGAREA_WAVE) {} - static Color getSmartColor ( com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag) + static Color getSmartColor ( css::uno::Reference< css::container::XStringKeyMap > xPropertyBag) { try { if (xPropertyBag.is()) { const OUString colorKey("LineColor"); - com::sun::star::uno::Any aLineColor = xPropertyBag->getValue(colorKey).get< com::sun::star::uno::Any>(); - com::sun::star::util::Color lineColor = 0; + css::uno::Any aLineColor = xPropertyBag->getValue(colorKey).get< css::uno::Any>(); + css::util::Color lineColor = 0; if (aLineColor >>= lineColor) { @@ -93,44 +93,44 @@ private: } } } - catch(const ::com::sun::star::container::NoSuchElementException&) + catch(const css::container::NoSuchElementException&) { } - catch(const ::com::sun::star::uno::RuntimeException&) + catch(const css::uno::RuntimeException&) { } return SwViewOption::GetSmarttagColor( ); } - static WrongAreaLineType getSmartLineType( com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag ) + static WrongAreaLineType getSmartLineType( css::uno::Reference< css::container::XStringKeyMap > xPropertyBag ) { try { if (xPropertyBag.is()) { const OUString typeKey("LineType"); - com::sun::star::uno::Any aLineType = xPropertyBag->getValue(typeKey).get< com::sun::star::uno::Any>(); + css::uno::Any aLineType = xPropertyBag->getValue(typeKey).get< css::uno::Any>(); ::sal_Int16 lineType = 0; if (!(aLineType >>= lineType)) { return WRONGAREA_DASHED; } - if (::com::sun::star::awt::FontUnderline::WAVE == lineType) + if (css::awt::FontUnderline::WAVE == lineType) { return WRONGAREA_WAVE; } - if (::com::sun::star::awt::FontUnderline::SMALLWAVE == lineType) + if (css::awt::FontUnderline::SMALLWAVE == lineType) { return WRONGAREA_WAVE; //Code draws wave height based on space that fits. } } } - catch(const ::com::sun::star::container::NoSuchElementException&) + catch(const css::container::NoSuchElementException&) { } - catch(const ::com::sun::star::uno::RuntimeException&) + catch(const css::uno::RuntimeException&) { } @@ -138,7 +138,7 @@ private: } static Color getWrongAreaColor(WrongListType listType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag ) + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag ) { if (WRONGLIST_SPELL == listType) { @@ -157,7 +157,7 @@ private: } static WrongAreaLineType getWrongAreaLineType(WrongListType listType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag ) + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag ) { if (WRONGLIST_SPELL == listType) { @@ -241,7 +241,7 @@ public: inline sal_uInt16 Count() const { return (sal_uInt16)maList.size(); } inline void Insert( const OUString& rType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nNewPos, sal_Int32 nNewLen, sal_uInt16 nWhere ) { std::vector<SwWrongArea>::iterator i = maList.begin(); @@ -254,7 +254,7 @@ public: } void Insert( const OUString& rType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nNewPos, sal_Int32 nNewLen ); inline SwWrongList* SubList( sal_uInt16 nIdx ) const diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx index 244dac889d09..fe315d3bf7a8 100644 --- a/sw/source/core/layout/dumpfilter.cxx +++ b/sw/source/core/layout/dumpfilter.cxx @@ -163,9 +163,9 @@ namespace sw } // Namespace sw -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_LayoutDump_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_Writer_LayoutDump_get_implementation(css::uno::XComponentContext*, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new sw::LayoutDumpFilter()); } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 205f01a763cd..989ec2f29257 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1953,7 +1953,7 @@ bool SwLayIdle::_DoIdleJob( const SwContentFrm *pCnt, IdleJobType eJob ) bAllValid = false; if ( aRepaint.HasArea() ) pImp->GetShell()->InvalidateWindows( aRepaint ); - } catch( const ::com::sun::star::uno::RuntimeException& e) { + } catch( const css::uno::RuntimeException& e) { // #i122885# handle smarttag problems gracefully and provide diagnostics SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message); } diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 96b513e320f4..679f43e9e4bb 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -152,7 +152,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; bool Connect() { return GetRealObject() != NULL; } }; diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index da59db9f6b88..4a4b99e58078 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1540,7 +1540,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() // set the document locale - com::sun::star::lang::Locale aDocLocale( LanguageTag( SwEnhancedPDFExportHelper::GetDefaultLanguage() ).getLocale() ); + css::lang::Locale aDocLocale( LanguageTag( SwEnhancedPDFExportHelper::GetDefaultLanguage() ).getLocale() ); pPDFExtOutDevData->SetDocumentLocale( aDocLocale ); // Prepare the output device: diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index a767b3c40d51..3312d9a16bed 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -490,10 +490,10 @@ void SwTextFrm::AdjustFrm( const SwTwips nChgHght, bool bHasToFit ) Shrink( -nChgHght ); } -com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::GetTabStopInfo( SwTwips CurrentPos ) +css::uno::Sequence< css::style::TabStop > SwTextFrm::GetTabStopInfo( SwTwips CurrentPos ) { - com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs(1); - ::com::sun::star::style::TabStop ts; + css::uno::Sequence< css::style::TabStop > tabs(1); + css::style::TabStop ts; SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this ); SwTextFormatter aLine( this, &aInf ); @@ -508,7 +508,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::Get if( !pTS ) { - return com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >(); + return css::uno::Sequence< css::style::TabStop >(); } // copy tab stop information into a Sequence, which only contains one element. @@ -517,11 +517,11 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTextFrm::Get ts.FillChar = pTS->GetFill(); switch( pTS->GetAdjustment() ) { - case SVX_TAB_ADJUST_LEFT : ts.Alignment = ::com::sun::star::style::TabAlign_LEFT; break; - case SVX_TAB_ADJUST_CENTER : ts.Alignment = ::com::sun::star::style::TabAlign_CENTER; break; - case SVX_TAB_ADJUST_RIGHT : ts.Alignment = ::com::sun::star::style::TabAlign_RIGHT; break; - case SVX_TAB_ADJUST_DECIMAL: ts.Alignment = ::com::sun::star::style::TabAlign_DECIMAL; break; - case SVX_TAB_ADJUST_DEFAULT: ts.Alignment = ::com::sun::star::style::TabAlign_DEFAULT; break; + case SVX_TAB_ADJUST_LEFT : ts.Alignment = css::style::TabAlign_LEFT; break; + case SVX_TAB_ADJUST_CENTER : ts.Alignment = css::style::TabAlign_CENTER; break; + case SVX_TAB_ADJUST_RIGHT : ts.Alignment = css::style::TabAlign_RIGHT; break; + case SVX_TAB_ADJUST_DECIMAL: ts.Alignment = css::style::TabAlign_DECIMAL; break; + case SVX_TAB_ADJUST_DEFAULT: ts.Alignment = css::style::TabAlign_DEFAULT; break; default: break; // prevent warning } diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx index 267c7c468636..1ee872ecc5fb 100644 --- a/sw/source/core/text/guess.hxx +++ b/sw/source/core/text/guess.hxx @@ -28,7 +28,7 @@ class SwTextFormatInfo; class SwTextGuess { - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord; + css::uno::Reference< css::linguistic2::XHyphenatedWord > xHyphWord; SwHangingPortion *pHanging; // for hanging punctuation sal_Int32 nCutPos; // this character doesn't fit sal_Int32 nBreakStart; // start index of word containing line break @@ -54,7 +54,7 @@ public: inline sal_Int32 BreakStart() const { return nBreakStart; } inline sal_Int32 BreakPos() const {return nBreakPos; } inline sal_Int32 FieldDiff() const {return nFieldDiff; } - inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > HyphWord() const + inline css::uno::Reference< css::linguistic2::XHyphenatedWord > HyphWord() const { return xHyphWord; } }; diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 7637c42473c0..1eec0f6f5c8c 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -486,7 +486,7 @@ public: class SwTextFormatInfo : public SwTextPaintInfo { // temporary arguments for hyphenation - com::sun::star::beans::PropertyValues m_aHyphVals; + css::beans::PropertyValues m_aHyphVals; SwLineLayout *m_pRoot; // The Root of the current line (pCurr) SwLinePortion *m_pLast; // The last Portion @@ -663,11 +663,9 @@ public: inline void SetUnderScorePos( sal_Int32 nNew ) { m_nUnderScorePos = nNew; } // Calls HyphenateWord() of Hyphenator - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > + css::uno::Reference< css::linguistic2::XHyphenatedWord > HyphWord( const OUString &rText, const sal_Int32 nMinTrail ); - const com::sun::star::beans::PropertyValues & - GetHyphValues() const; + const css::beans::PropertyValues & GetHyphValues() const; bool CheckFootnotePortion( SwLineLayout* pCurr ) { return IsFootnoteInside() && _CheckFootnotePortion( pCurr ); } diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index c5952abf2b65..cb25bfa36f96 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -819,7 +819,7 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode, bool bRTL ) const short nScriptType = ScriptTypeDetector::getCTLScriptType( rText, nSearchStt ); sal_Int32 nNextCTLScriptStart = nSearchStt; short nCurrentScriptType = nScriptType; - while( com::sun::star::i18n::CTLScriptType::CTL_UNKNOWN == nCurrentScriptType || nScriptType == nCurrentScriptType ) + while( css::i18n::CTLScriptType::CTL_UNKNOWN == nCurrentScriptType || nScriptType == nCurrentScriptType ) { nNextCTLScriptStart = ScriptTypeDetector::endOfCTLScriptType( rText, nNextCTLScriptStart ); if( nNextCTLScriptStart >= rText.getLength() || nNextCTLScriptStart >= nChg ) diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx index cde5b7e2e874..b0a9ffe25b6a 100644 --- a/sw/source/core/text/wrong.cxx +++ b/sw/source/core/text/wrong.cxx @@ -23,7 +23,7 @@ #include <osl/diagnose.h> SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nPos, sal_Int32 nLen) : maType(rType), mxPropertyBag(xPropertyBag), mnPos(nPos), mnLen(nLen), mpSubList(0) @@ -33,7 +33,7 @@ SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType, } SwWrongArea::SwWrongArea( const OUString& rType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nPos, sal_Int32 nLen, SwWrongList* pSubList) @@ -629,7 +629,7 @@ bool SwWrongList::LookForEntry( sal_Int32 nBegin, sal_Int32 nEnd ) { } void SwWrongList::Insert( const OUString& rType, - com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, + css::uno::Reference< css::container::XStringKeyMap > xPropertyBag, sal_Int32 nNewPos, sal_Int32 nNewLen ) { std::vector<SwWrongArea>::iterator aIter = maList.begin(); diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index ddb94bd6f449..a0b93093f701 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -155,8 +155,7 @@ void SwTOXMark::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew) NotifyClients(pOld, pNew); if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which())) { // invalidate cached uno object - SetXTOXMark(::com::sun::star::uno::Reference< - ::com::sun::star::text::XDocumentIndexMark>(0)); + SetXTOXMark(css::uno::Reference<css::text::XDocumentIndexMark>(0)); } } diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index 9bb56ead2954..6aaa7f673661 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -44,7 +44,7 @@ IndexEntrySupplierWrapper::~IndexEntrySupplierWrapper() OUString IndexEntrySupplierWrapper::GetIndexKey( const OUString& rText, const OUString& rTextReading, - const ::com::sun::star::lang::Locale& rLocale ) const + const css::lang::Locale& rLocale ) const { OUString sRet; try { @@ -70,8 +70,7 @@ OUString IndexEntrySupplierWrapper::GetFollowingText( bool bMorePages ) const return sRet; } -::com::sun::star::uno::Sequence< OUString > -IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const +css::uno::Sequence< OUString > IndexEntrySupplierWrapper::GetAlgorithmList( const css::lang::Locale& rLcl ) const { uno::Sequence< OUString > sRet; @@ -86,7 +85,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local } bool IndexEntrySupplierWrapper::LoadAlgorithm( - const ::com::sun::star::lang::Locale& rLcl, + const css::lang::Locale& rLcl, const OUString& sSortAlgorithm, long nOptions ) const { bool bRet = false; @@ -102,9 +101,9 @@ bool IndexEntrySupplierWrapper::LoadAlgorithm( sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry( const OUString& rText1, const OUString& rTextReading1, - const ::com::sun::star::lang::Locale& rLocale1, + const css::lang::Locale& rLocale1, const OUString& rText2, const OUString& rTextReading2, - const ::com::sun::star::lang::Locale& rLocale2 ) const + const css::lang::Locale& rLocale2 ) const { sal_Int16 nRet = 0; try { diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 26d212917b68..d3b4528b4f02 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -714,8 +714,7 @@ bool Meta::IsInContent() const return pTextNode == nullptr || pTextNode->IsInContent(); } -::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > -Meta::MakeUnoObject() +css::uno::Reference< css::rdf::XMetadatable > Meta::MakeUnoObject() { return SwXMeta::CreateXMeta(*this); } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 633e638633b2..8cda73e9cdec 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3592,8 +3592,7 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa if (pOldValue && (RES_REMOVE_UNO_OBJECT == pOldValue->Which())) { // invalidate cached uno object - SetXParagraph(::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>(0)); + SetXParagraph(css::uno::Reference<css::text::XTextContent>(0)); } } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index c858d7a7bb2e..5a60a8de4c86 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1462,7 +1462,7 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos if ( nBegin < nEnd ) { const LanguageType aCurrLang = pNode->GetLang( nBegin ); - const com::sun::star::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang ); + const css::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang ); nBegin = g_pBreakIt->GetBreakIter()->beginOfSentence( rText, nBegin, aCurrLocale ); nEnd = g_pBreakIt->GetBreakIter()->endOfSentence(rText, nEnd, aCurrLocale); if (nEnd > rText.getLength() || nEnd < 0) @@ -1495,11 +1495,11 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos uno::Reference<text::XTextMarkup> const xTextMarkup = new SwXTextMarkup(pNode, aConversionMap); - com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController(); + css::uno::Reference< css::frame::XController > xController = pNode->GetDoc()->GetDocShell()->GetController(); SwPosition start(*pNode, nBegin); SwPosition end (*pNode, nEnd); - Reference< ::com::sun::star::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end); + Reference< css::text::XTextRange > xRange = SwXTextRange::CreateXTextRange(*pNode->GetDoc(), start, &end); rSmartTagMgr.RecognizeTextRange(xRange, xTextMarkup, xController); @@ -1512,7 +1512,7 @@ SwRect SwTextFrm::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 /*nActPos do { const LanguageType nLang = aIter.GetLanguage(); - const com::sun::star::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang ); + const css::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang ); nLangEnd = std::min<sal_Int32>( nEnd, aIter.GetChgPos() ); const sal_Int32 nExpandBegin = aConversionMap.ConvertToViewPosition( nLangBegin ); diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index b4a8a4fd9488..1a7e50bcdd09 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -47,14 +47,14 @@ using namespace com::sun::star; namespace SWUnoHelper { -sal_Int32 GetEnumAsInt32( const ::com::sun::star::uno::Any& rVal ) +sal_Int32 GetEnumAsInt32( const css::uno::Any& rVal ) { sal_Int32 eVal; try { eVal = comphelper::getEnumAsINT32( rVal ); } - catch( ::com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { eVal = 0; OSL_FAIL( "can't get EnumAsInt32" ); @@ -69,13 +69,12 @@ bool UCB_DeleteFile( const OUString& rURL ) try { ucbhelper::Content aTempContent( rURL, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aTempContent.executeCommand("delete", - ::com::sun::star::uno::makeAny( true ) ); + aTempContent.executeCommand("delete", css::uno::makeAny( true ) ); bRemoved = true; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { bRemoved = false; OSL_FAIL( "Exeception from executeCommand( delete )" ); @@ -94,19 +93,19 @@ bool UCB_CopyFile( const OUString& rURL, const OUString& rNewURL, bool bCopyIsMo const OUString sMainURL( aURL.GetMainURL(INetURLObject::NO_DECODE) ); ucbhelper::Content aTempContent( sMainURL, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), + css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny; - ::com::sun::star::ucb::TransferInfo aInfo; - aInfo.NameClash = ::com::sun::star::ucb::NameClash::ERROR; + css::uno::Any aAny; + css::ucb::TransferInfo aInfo; + aInfo.NameClash = css::ucb::NameClash::ERROR; aInfo.NewTitle = sName; aInfo.SourceURL = rURL; aInfo.MoveData = bCopyIsMove; aAny <<= aInfo; aTempContent.executeCommand( "transfer", aAny ); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( "Exeception from executeCommand( transfer )" ); bCopyCompleted = false; @@ -121,20 +120,20 @@ bool UCB_IsCaseSensitiveFileName( const OUString& rURL ) { INetURLObject aTempObj( rURL ); aTempObj.SetBase( aTempObj.GetBase().toAsciiLowerCase() ); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef1 = new + css::uno::Reference< css::ucb::XContentIdentifier > xRef1 = new ucbhelper::ContentIdentifier( aTempObj.GetMainURL( INetURLObject::NO_DECODE )); aTempObj.SetBase(aTempObj.GetBase().toAsciiUpperCase()); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > xRef2 = new + css::uno::Reference< css::ucb::XContentIdentifier > xRef2 = new ucbhelper::ContentIdentifier( aTempObj.GetMainURL( INetURLObject::NO_DECODE )); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XUniversalContentBroker > xUcb = - com::sun::star::ucb::UniversalContentBroker::create(comphelper::getProcessComponentContext()); + css::uno::Reference< css::ucb::XUniversalContentBroker > xUcb = + css::ucb::UniversalContentBroker::create(comphelper::getProcessComponentContext()); sal_Int32 nCompare = xUcb->compareContentIds( xRef1, xRef2 ); bCaseSensitive = 0 != nCompare; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { bCaseSensitive = false; OSL_FAIL( "Exeception from compareContentIds()" ); @@ -147,12 +146,12 @@ bool UCB_IsReadOnlyFileName( const OUString& rURL ) bool bIsReadOnly = false; try { - ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue("IsReadOnly"); + ucbhelper::Content aCnt( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Any aAny = aCnt.getPropertyValue("IsReadOnly"); if(aAny.hasValue()) bIsReadOnly = *static_cast<sal_Bool const *>(aAny.getValue()); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { bIsReadOnly = false; } @@ -164,10 +163,10 @@ bool UCB_IsFile( const OUString& rURL ) bool bExists = false; try { - ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + ::ucbhelper::Content aContent( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); bExists = aContent.isDocument(); } - catch (::com::sun::star::uno::Exception &) + catch (css::uno::Exception &) { } return bExists; @@ -178,10 +177,10 @@ bool UCB_IsDirectory( const OUString& rURL ) bool bExists = false; try { - ::ucbhelper::Content aContent( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + ::ucbhelper::Content aContent( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); bExists = aContent.isFolder(); } - catch (::com::sun::star::uno::Exception &) + catch (css::uno::Exception &) { } return bExists; @@ -200,11 +199,11 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, bool bOk = false; try { - ucbhelper::Content aCnt( rURL, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; + ucbhelper::Content aCnt( rURL, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Reference< css::sdbc::XResultSet > xResultSet; const sal_Int32 nSeqSize = pDateTimeList ? 2 : 1; - ::com::sun::star::uno::Sequence < OUString > aProps( nSeqSize ); + css::uno::Sequence < OUString > aProps( nSeqSize ); OUString* pProps = aProps.getArray(); pProps[ 0 ] = "Title"; if( pDateTimeList ) @@ -214,14 +213,14 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, { xResultSet = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( "create cursor failed!" ); } if( xResultSet.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > xRow( xResultSet, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::sdbc::XRow > xRow( xResultSet, css::uno::UNO_QUERY ); const sal_Int32 nExtLen = pExtension ? pExtension->getLength() : 0; try { @@ -237,7 +236,7 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, if( pDateTimeList ) { - ::com::sun::star::util::DateTime aStamp = xRow->getTimestamp(2); + css::util::DateTime aStamp = xRow->getTimestamp(2); ::DateTime* pDateTime = new ::DateTime( ::Date( aStamp.Day, aStamp.Month, @@ -254,13 +253,13 @@ bool UCB_GetFileListOfFolder( const OUString& rURL, } bOk = true; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( "Exception caught!" ); } } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( "Exception caught!" ); bOk = false; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 9fc0b2eb132f..5c264916331f 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -182,17 +182,17 @@ public: SwVbaProjectNameProvider() { } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override { return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() ); } - 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) override + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return uno::makeAny( mTemplateToProject.find( aName )->second ); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override { uno::Sequence< OUString > aElements( mTemplateToProject.size() ); StringHashMap::iterator it_end = mTemplateToProject.end(); @@ -202,7 +202,7 @@ public: return aElements; } - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, std::exception ) override + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, std::exception ) override { OUString sProjectName; @@ -212,24 +212,24 @@ public: mTemplateToProject[ aName ] = sProjectName; } - virtual void SAL_CALL removeByName( const OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) override + virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override { if ( !hasByName( Name ) ) throw container::NoSuchElementException(); mTemplateToProject.erase( Name ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, std::exception ) override + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, std::exception ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); insertByName( aName, aElement ); // insert will overwrite } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return ::cppu::UnoType<OUString>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return ( !mTemplateToProject.empty() ); @@ -246,7 +246,7 @@ public: // #FIXME #TODO is the code name for ThisDocument read anywhere? } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override { // #FIXME #TODO we really need to be checking against the codename for // ThisDocument @@ -255,7 +255,7 @@ public: return sal_False; } - ::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) override + css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -267,14 +267,14 @@ public: "Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get()); return uno::makeAny( xDocObj ); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override { uno::Sequence< OUString > aNames; return aNames; } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) override { return sal_True; } + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); } + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return sal_True; } }; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 7e351a7f591f..1062514a90de 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -376,7 +376,7 @@ namespace : public SwSimpleEnumeration_Base { private: - typedef ::std::list< ::com::sun::star::uno::Any > shapescontainer_t; + typedef ::std::list< css::uno::Any > shapescontainer_t; shapescontainer_t m_aShapes; protected: virtual ~SwXShapesEnumeration() {}; @@ -2688,8 +2688,8 @@ void SwXShape::_AdjustPositionProperties( const awt::Point& rPosition ) Writer specific position, which is the attribute position in layout direction #i59051# */ -::com::sun::star::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir( - const ::com::sun::star::awt::Point& aStartOrEndPos ) +css::awt::Point SwXShape::_ConvertStartOrEndPosToLayoutDir( + const css::awt::Point& aStartOrEndPos ) { awt::Point aConvertedPos( aStartOrEndPos ); @@ -2726,8 +2726,8 @@ void SwXShape::_AdjustPositionProperties( const awt::Point& rPosition ) return aConvertedPos; } -::com::sun::star::drawing::PolyPolygonBezierCoords SwXShape::_ConvertPolyPolygonBezierToLayoutDir( - const ::com::sun::star::drawing::PolyPolygonBezierCoords& aPath ) +css::drawing::PolyPolygonBezierCoords SwXShape::_ConvertPolyPolygonBezierToLayoutDir( + const css::drawing::PolyPolygonBezierCoords& aPath ) { drawing::PolyPolygonBezierCoords aConvertedPath( aPath ); diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index de13f04cca58..a3ba68e2e36f 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -2263,8 +2263,8 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, break; case PROPERTY_MAP_INDEX_OBJECTS: { - uno::Sequence<com::sun::star::beans::PropertyValue> aValues(1); - com::sun::star::beans::PropertyValue propertyVal; + uno::Sequence<css::beans::PropertyValue> aValues(1); + css::beans::PropertyValue propertyVal; rValue >>= aValues; propertyVal = aValues[0]; m_pImpl->m_sCitaitonText = lcl_AnyToString(propertyVal.Value); diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 8ad2a9507112..cd7b2d7f63d5 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -497,16 +497,16 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { return OUString("SwXParagraphEnumeration"); } - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, rServiceName); }; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return {"com.sun.star.text.ParagraphEnumeration"}; }; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; SwUnoCrsr& GetCursor() { return *m_pCrsr; } @@ -1476,24 +1476,24 @@ struct SwXTextRangesImpl final : public SwXTextRanges { // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { return OUString("SwXTextRanges"); }; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, rServiceName); }; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return { "com.sun.star.text.TextRanges" }; }; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextRange>::get(); }; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override { return getCount() > 0; }; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; explicit SwXTextRangesImpl(SwPaM *const pPaM) { @@ -1600,16 +1600,16 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString) struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration { // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override { return OUString("SwXParaFrameEnumeration"); }; - virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, rServiceName); }; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return {"com.sun.star.util.ContentEnumeration"}; }; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; SwXParaFrameEnumerationImpl(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat = nullptr); virtual void SAL_CALL release() throw () override diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index d424ebf43ae6..ea989c0c92da 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2309,9 +2309,9 @@ bool SwViewShell::IsNewLayout() const return GetLayout()->IsNewLayout(); } -uno::Reference< ::com::sun::star::accessibility::XAccessible > SwViewShell::CreateAccessible() +uno::Reference< css::accessibility::XAccessible > SwViewShell::CreateAccessible() { - uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc; + uno::Reference< css::accessibility::XAccessible > xAcc; // We require a layout and an XModel to be accessible. OSL_ENSURE( mpLayout, "no layout, no access" ); @@ -2323,8 +2323,7 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > SwViewShell::Crea return xAcc; } -uno::Reference< ::com::sun::star::accessibility::XAccessible > -SwViewShell::CreateAccessiblePreview() +uno::Reference< css::accessibility::XAccessible > SwViewShell::CreateAccessiblePreview() { OSL_ENSURE( IsPreview(), "Can't create accessible preview for non-preview SwViewShell" ); |