diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-05 15:55:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-06 05:44:52 +0000 |
| commit | 7a401e5e83abb41b51fca92e3d92dfb2fff6d0e6 (patch) | |
| tree | 09792748ab8f1e7f976d28c2163637f8268f6d36 | |
| parent | cb27eef229ce7f3d415184e74d1cb24ec2f8510c (diff) | |
com::sun::star->css in sw/inc
Change-Id: I6ffdb1deaa32156c65f997a1a1056928b7cd863d
Reviewed-on: https://gerrit.libreoffice.org/19803
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
109 files changed, 2042 insertions, 2237 deletions
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index ccef319e05e0..d573e767fe11 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -72,7 +72,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } @retval true putting of value was successful @retval false else */ - virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) = 0; + virtual bool PutValueToField(const SwPosition & rPos, const css::uno::Any& rVal, sal_uInt16 nWhich) = 0; // Call update of expression fields. All expressions are re-evaluated. @@ -115,7 +115,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0; // In Calculator set all SetExpression fields that are valid up to the indicated position - // (Node [ + ::com::sun::star::ucb::Content]). + // (Node [ + css::ucb::Content]). // A generated list of all fields may be passed along too // (if the address != 0 and the pointer == 0 a new list will be returned). virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0; diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 8d4f4c74d47f..db7aebed2bf8 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -50,9 +50,9 @@ using rtl::OUString; /** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents. */ - virtual bool GetData(const OUString& rItem, const OUString& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0; + virtual bool GetData(const OUString& rItem, const OUString& rMimeType, css::uno::Any& rValue) const = 0; - virtual bool SetData(const OUString& rItem, const OUString& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0; + virtual bool SetData(const OUString& rItem, const OUString& rMimeType, const css::uno::Any& rValue) = 0; virtual ::sfx2::SvLinkSource* CreateLinkSource(const OUString& rItem) = 0; diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index eb37a3ac63d6..1a7d5805e8ea 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -199,10 +199,10 @@ public: /*[in]*/const SwPaM& rPam, /*[in]*/const OUString& rComment) = 0; - virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const = 0; + virtual const css::uno::Sequence <sal_Int8>& GetRedlinePassword() const = 0; virtual void SetRedlinePassword( - /*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) = 0; + /*[in]*/const css::uno::Sequence <sal_Int8>& rNewPassword) = 0; protected: virtual ~IDocumentRedlineAccess() {}; diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 73a5d547a993..08359a250212 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -131,7 +131,7 @@ enum class DocumentSettingId @returns a list of forbidden characters. */ - virtual const com::sun::star::i18n::ForbiddenCharacters* + virtual const css::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const = 0; /** Set the forbidden characters. @@ -143,7 +143,7 @@ enum class DocumentSettingId [in] the new list of forbidden characters for language lang. */ virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, - /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0; + /*[in]*/ const css::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0; /** Get the forbidden character table and creates one if necessary. diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index 998039e3c7c3..5f891b8f7c3a 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -98,7 +98,7 @@ namespace sw { namespace mark IFieldmark() = default; public: - typedef ::std::map< OUString, ::com::sun::star::uno::Any> parameter_map_t; + typedef ::std::map< OUString, css::uno::Any> parameter_map_t; //getters virtual OUString GetFieldname() const =0; virtual OUString GetFieldHelptext() const =0; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 73d2deb8d7a5..aab0a46f9194 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -109,11 +109,11 @@ class SwNoteProps: public utl::ConfigItem : ConfigItem(OUString("Office.Writer/Notes")) , bIsShowAnchor(false) { - const ::com::sun::star::uno::Sequence< OUString >& rNames = GetPropertyNames(); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues = GetProperties(rNames); - const ::com::sun::star::uno::Any* pValues = aValues.getConstArray(); - SAL_WARN_IF(aValues.getLength() != rNames.getLength(), "sw", "GetProperties failed"); - if (aValues.getLength()) + const css::uno::Sequence< OUString >& rNames = GetPropertyNames(); + css::uno::Sequence< css::uno::Any > aValues = GetProperties(rNames); + const css::uno::Any* pValues = aValues.getConstArray(); + SAL_WARN_IF(aValues.getLength() != rNames.getLength(), "sw", "GetProperties failed"); + if (aValues.getLength()) pValues[0]>>=bIsShowAnchor; } @@ -121,9 +121,9 @@ class SwNoteProps: public utl::ConfigItem { return bIsShowAnchor; } - static ::com::sun::star::uno::Sequence< OUString >& GetPropertyNames() + static css::uno::Sequence< OUString >& GetPropertyNames() { - static ::com::sun::star::uno::Sequence< OUString > aNames; + static css::uno::Sequence< OUString > aNames; if(!aNames.getLength()) { aNames.realloc(1); @@ -133,7 +133,7 @@ class SwNoteProps: public utl::ConfigItem return aNames; } - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; class SwPostItMgr: public SfxListener @@ -268,8 +268,8 @@ class SwPostItMgr: public SfxListener void CheckMetaText(); sal_uInt16 Replace(SvxSearchItem* pItem); - sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); - sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward); + sal_uInt16 SearchReplace(const SwFormatField &pField, const css::util::SearchOptions& rSearchOptions,bool bSrchForward); + sal_uInt16 FinishSearchReplace(const css::util::SearchOptions& rSearchOptions,bool bSrchForward); void AssureStdModeAtShell(); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 556de93e49bf..fb47322ee696 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -174,7 +174,7 @@ class SwSidebarWin : public vcl::Window void SetLanguage(const SvxLanguageItem& rNewItem); void ChangeSidebarItem( SwSidebarItem& rSidebarItem ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual void Draw(OutputDevice* pDev, const Point&, const Size&, DrawFlags) override; void PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& rRect); diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index 5a668be8227f..16595d1e7891 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -45,7 +45,7 @@ class SfxItemSet; class SwApplet_Impl { - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > xApplet; + css::uno::Reference < css::embed::XEmbeddedObject > xApplet; SvCommandList aCommandList; SfxItemSet aItemSet; OUString sAlt; @@ -63,7 +63,7 @@ public: void AppendParam( const OUString& rName, const OUString& rValue ); #endif void FinishApplet(); - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetApplet() { return xApplet; } + css::uno::Reference < css::embed::XEmbeddedObject > GetApplet() { return xApplet; } SfxItemSet& GetItemSet() { return aItemSet; } const OUString& GetAltText() const { return sAlt; } void SetAltText( const OUString& rAlt ) {sAlt = rAlt;} diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index 13c3399667ac..a26c1708045e 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -34,11 +34,11 @@ private: public: static SwSmartTagMgr& Get(); - // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XModifyListener + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XChangesListener + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index 95e842b8fb6a..541cb54e70b9 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -64,15 +64,15 @@ public: class SwUndoFieldFromAPI : public SwUndoField { - com::sun::star::uno::Any aOldVal, aNewVal; + css::uno::Any aOldVal, aNewVal; sal_uInt16 nWhich; void DoImpl(); public: SwUndoFieldFromAPI(const SwPosition & rPos, - const com::sun::star::uno::Any & rOldVal, - const com::sun::star::uno::Any & rNewVal, + const css::uno::Any & rOldVal, + const css::uno::Any & rNewVal, sal_uInt16 nWhich); virtual ~SwUndoFieldFromAPI(); diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 981f5aa3eabd..4eec7723e7de 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -29,13 +29,12 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: std::vector<OUString*> &rSectionList; SwXMLSectionList( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, std::vector<OUString*> &rNewSectionList ); virtual ~SwXMLSectionList ( ) @@ -50,12 +49,10 @@ public: SvXMLSectionListContext ( SwXMLSectionList& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual ~SvXMLSectionListContext(); }; diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx index 07f2472694d3..a85fa6881c8f 100644 --- a/sw/inc/TextCursorHelper.hxx +++ b/sw/inc/TextCursorHelper.hxx @@ -25,15 +25,15 @@ class SwDoc; class SwPaM; -class OTextCursorHelper : public ::cppu::ImplHelper1< ::com::sun::star::lang::XUnoTunnel> +class OTextCursorHelper : public ::cppu::ImplHelper1< css::lang::XUnoTunnel> { public: OTextCursorHelper(){} - 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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; virtual const SwPaM* GetPaM() const = 0; virtual SwPaM* GetPaM() = 0; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 749f3e5ec944..e549f42d79c8 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -92,7 +92,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, /// preview-to-display coordinates SwAccPreviewData* mpPreview; - ::com::sun::star::uno::WeakReference < ::com::sun::star::accessibility::XAccessible > mxCursorContext; + css::uno::WeakReference < css::accessibility::XAccessible > mxCursorContext; sal_Int32 mnPara; @@ -102,9 +102,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, void AppendEvent( const SwAccessibleEvent_Impl& rEvent ); - void InvalidateCursorPosition( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rAcc ); + void InvalidateCursorPosition( const css::uno::Reference<css::accessibility::XAccessible>& rAcc ); void DoInvalidateShapeSelection(bool bInvalidateFocusMode = false); void InvalidateShapeSelection(); @@ -116,8 +114,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, void _InvalidateRelationSet( const SwFrm* pFrm, bool bFrom ); - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + css::uno::Reference<css::accessibility::XAccessible> _GetDocumentView( bool bPagePreview ); /** method to build up a new data structure of the accessible paragraphs, @@ -134,11 +131,9 @@ public: SwAccessibleMap( SwViewShell *pSh ); virtual ~SwAccessibleMap(); - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> GetDocumentView(); + css::uno::Reference<css::accessibility::XAccessible> GetDocumentView(); - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> GetDocumentPreview( + css::uno::Reference<css::accessibility::XAccessible> GetDocumentPreview( const std::vector<PreviewPage*>& _rPreviewPages, const Fraction& _rScale, const SwPageFrm* _pSelectedPageFrm, @@ -147,8 +142,7 @@ public: ::rtl::Reference < SwAccessibleContext > GetContextImpl( const SwFrm *pFrm, bool bCreate = true ); - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> GetContext( + css::uno::Reference<css::accessibility::XAccessible> GetContext( const SwFrm *pFrm, bool bCreate = true ); @@ -156,8 +150,7 @@ public: const SdrObject *pObj, SwAccessibleContext *pParentImpl, bool bCreate = true ); - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> GetContext( + css::uno::Reference<css::accessibility::XAccessible> GetContext( const SdrObject *pObj, SwAccessibleContext *pParentImpl, bool bCreate = true ); @@ -168,11 +161,11 @@ public: } static bool IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh); void AddShapeContext(const SdrObject *pObj, - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccShape); + css::uno::Reference < css::accessibility::XAccessible > xAccShape); void AddGroupContext(const SdrObject *pParentObj, - ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent); - void RemoveGroupContext(const SdrObject *pParentObj, ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccParent); + css::uno::Reference < css::accessibility::XAccessible > xAccParent); + void RemoveGroupContext(const SdrObject *pParentObj, css::uno::Reference < css::accessibility::XAccessible > xAccParent); const SwRect& GetVisArea() const; @@ -267,16 +260,16 @@ public: // IAccessibleParent virtual bool ReplaceChild ( ::accessibility::AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) override; + ) throw (css::uno::RuntimeException) override; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel - (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessibleCaption ( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) - throw (::com::sun::star::uno::RuntimeException) override; + (css::beans::XPropertySet* pSet) + throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessibleCaption ( + const css::uno::Reference< css::drawing::XShape > & xShape) + throw (css::uno::RuntimeException) override; // additional Core/Pixel conversions for internal use; also works // for preview @@ -308,7 +301,7 @@ private: public: virtual bool IsDocumentSelAll() override; - ::com::sun::star::uno::WeakReference < ::com::sun::star::accessibility::XAccessible > + css::uno::WeakReference < css::accessibility::XAccessible > GetCursorContext() const { return mxCursorContext; } //Para Container for InvalidateCursorPosition diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 4240f9bd5048..8f371e84e6a3 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -80,8 +80,8 @@ public: virtual SwFieldType* Copy() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override; inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } SwDoc* GetDoc(){ return m_pDoc; } @@ -167,8 +167,8 @@ public: virtual void SetPar1(const OUString& rStr) override; virtual SwFieldType* ChgTyp( SwFieldType* ) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override; sal_IntPtr GetHandle() const { return m_nHandle; } diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 4dcba72214bd..dd2ba2dafc8f 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -33,11 +33,11 @@ enum class SvtScriptType; class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable { - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xBreak; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + mutable css::uno::Reference< css::i18n::XBreakIterator > xBreak; LanguageTag * m_pLanguageTag; ///< language tag of the current locale - com::sun::star::i18n::ForbiddenCharacters * m_pForbidden; + css::i18n::ForbiddenCharacters * m_pForbidden; LanguageType aForbiddenLang; ///< language of the current forbiddenChar struct @@ -49,32 +49,32 @@ class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable // private (see @ _Create, _Delete). explicit SwBreakIt( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext); + const css::uno::Reference< css::uno::XComponentContext > & rxContext); ~SwBreakIt(); public: // private (see @ source/core/bastyp/init.cxx). static void _Create( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext); + const css::uno::Reference< css::uno::XComponentContext > & rxContext); static void _Delete(); public: static SwBreakIt * Get(); - com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > GetBreakIter() + css::uno::Reference< css::i18n::XBreakIterator > GetBreakIter() { createBreakIterator(); return xBreak; } - const com::sun::star::lang::Locale& GetLocale( const LanguageType aLang ) + const css::lang::Locale& GetLocale( const LanguageType aLang ) { if( !m_pLanguageTag || m_pLanguageTag->getLanguageType() != aLang ) _GetLocale( aLang ); return m_pLanguageTag->getLocale(); } - const com::sun::star::lang::Locale& GetLocale( const LanguageTag& rLanguageTag ) + const css::lang::Locale& GetLocale( const LanguageTag& rLanguageTag ) { // Use LanguageType comparison instead of LanguageTag::operator!=() // because here the LanguageTag is already a known LanguageType value @@ -103,7 +103,7 @@ public: return *m_pLanguageTag; } - const com::sun::star::i18n::ForbiddenCharacters& GetForbidden( const LanguageType aLang ) + const css::i18n::ForbiddenCharacters& GetForbidden( const LanguageType aLang ) { if( !m_pForbidden || aForbiddenLang != aLang ) _GetForbidden( aLang ); diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx index 66ee3709826e..d00485dec30a 100644 --- a/sw/inc/checkit.hxx +++ b/sw/inc/checkit.hxx @@ -28,7 +28,7 @@ class SwCheckIt { public: - com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedInputSequenceChecker > xCheck; + css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > xCheck; SwCheckIt(); }; diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 637879936211..59b6c84f989f 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -73,8 +73,8 @@ public: inline OUString GetNumber() const; inline OUString GetTitle() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; } diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index ba454d9c8c0d..cda2ccf0296d 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -135,7 +135,7 @@ const int CRSR_POSOLD = 0x01, // cursor stays at old position CRSR_POSCHG = 0x02; // position changed by the layout /// Helperfunction to resolve backward references in regular expressions -OUString *ReplaceBackReferences( const com::sun::star::util::SearchOptions& rSearchOpt, SwPaM* pPam ); +OUString *ReplaceBackReferences( const css::util::SearchOptions& rSearchOpt, SwPaM* pPam ); class SW_DLLPUBLIC SwCrsrShell : public SwViewShell @@ -369,7 +369,7 @@ public: bool MoveColumn( SwWhichColumn, SwPosColumn ); bool MoveRegion( SwWhichRegion, SwPosRegion ); - sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, + sal_uLong Find( const css::util::SearchOptions& rSearchOpt, bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, @@ -384,7 +384,7 @@ public: SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, FindRanges eRng, - const com::sun::star::util::SearchOptions* pSearchOpt = 0, + const css::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); // Position the Cursor @@ -725,9 +725,9 @@ public: bool ExpandToSentenceBorders(); // get position from current cursor - bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const; - bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsStartWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const; + bool IsEndWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsInWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; bool IsStartSentence() const; bool IsEndSentence() const; bool IsSttPara() const; @@ -773,14 +773,14 @@ public: // get smart tags at point position void GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, - ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, - ::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ); + css::uno::Sequence< OUString >& rSmartTagTypes, + css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps, + css::uno::Reference<css::text::XTextRange>& rRange ); // get smart tags at current cursor position - void GetSmartTagTerm( ::com::sun::star::uno::Sequence< OUString >& rSmartTagTypes, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, - ::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ) const; + void GetSmartTagTerm( css::uno::Sequence< OUString >& rSmartTagTypes, + css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps, + css::uno::Reference<css::text::XTextRange>& rRange ) const; bool IsPageAtPos( const Point &rPt ) const; diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index e9bf810fac16..a1150e2ca29e 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -43,7 +43,7 @@ struct SwFillCrsrPos SwFillMode eMode; ///< desired fill-up rule SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) : nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ), - eOrient( com::sun::star::text::HoriOrientation::NONE ), eMode( eMd ) + eOrient( css::text::HoriOrientation::NONE ), eMode( eMd ) {} }; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 3aa70cca7fd8..080b7d5647a2 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -49,8 +49,8 @@ public: OUString GetColumnName() const {return sColumn;} const SwDBData& GetDBData() const {return aDBData;} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Classes derived from SwFields. They overlay the expand-function. @@ -105,8 +105,8 @@ public: /// DBName inline const SwDBData& GetDBData() const { return static_cast<SwDBFieldType*>(GetTyp())->GetDBData(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat, double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL ); @@ -141,8 +141,8 @@ public: virtual OUString GetFieldName() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nType) override; }; @@ -176,8 +176,8 @@ public: // Condition virtual OUString GetPar1() const override; virtual void SetPar1(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline bool SwDBNextSetField::IsCondValid() const @@ -222,8 +222,8 @@ public: virtual void SetPar2(const OUString& rStr) override; // Number of data record is in nFormat!! - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline bool SwDBNumSetField::IsCondValid() const @@ -251,8 +251,8 @@ public: virtual OUString Expand() const override; virtual SwField* Copy() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Number of data record. @@ -277,8 +277,8 @@ public: inline long GetSetNumber() const; inline void SetSetNumber(long nNum); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline long SwDBSetNumberField::GetSetNumber() const diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 4c0fe4005690..b74140d1a8e4 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -62,9 +62,9 @@ namespace svx { struct SwDBFormatData { - com::sun::star::util::Date aNullDate; - com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter> xFormatter; - com::sun::star::lang::Locale aLocale; + css::util::Date aNullDate; + css::uno::Reference< css::util::XNumberFormatter> xFormatter; + css::lang::Locale aLocale; }; namespace vcl { @@ -100,13 +100,13 @@ enum class SwDBSelect struct SwDSParam : public SwDBData { - com::sun::star::util::Date aNullDate; + css::util::Date aNullDate; - ::com::sun::star::uno::Reference<com::sun::star::util::XNumberFormatter> xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSelection; + css::uno::Reference<css::util::XNumberFormatter> xFormatter; + css::uno::Reference< css::sdbc::XConnection> xConnection; + css::uno::Reference< css::sdbc::XStatement> xStatement; + css::uno::Reference< css::sdbc::XResultSet> xResultSet; + css::uno::Sequence< css::uno::Any > aSelection; bool bScrollable; bool bEndOfDB; bool bAfterSelection; @@ -121,8 +121,8 @@ struct SwDSParam : public SwDBData {} SwDSParam(const SwDBData& rData, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& xResSet, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection) : + const css::uno::Reference< css::sdbc::XResultSet>& xResSet, + const css::uno::Sequence< css::uno::Any >& rSelection) : SwDBData(rData), xResultSet(xResSet), aSelection(rSelection), @@ -167,7 +167,7 @@ struct SwMergeDescriptor SwMailMergeConfigItem* pMailMergeConfigItem; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintOptions; + css::uno::Sequence< css::beans::PropertyValue > aPrintOptions; SwMergeDescriptor( DBManagerOptions nType, SwWrtShell& rShell, svx::ODataAccessDescriptor& rDesc ) : nMergeType(nType), @@ -272,9 +272,9 @@ public: css::uno::Reference< css::sdbc::XConnection> xConnection, const OUString& rTableName, bool bAppend = false); - static sal_uLong GetColumnFormat( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn, + static sal_uLong GetColumnFormat( css::uno::Reference< css::sdbc::XDataSource> xSource, + css::uno::Reference< css::sdbc::XConnection> xConnection, + css::uno::Reference< css::beans::XPropertySet> xColumn, SvNumberFormatter* pNFormatr, long nLanguage ); @@ -290,11 +290,11 @@ public: inline bool IsInMerge() const { return bInMerge; } void ExecuteFormLetter(SwWrtShell& rSh, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, + const css::uno::Sequence< css::beans::PropertyValue>& rProperties, bool bWithDataSourceBrowser = false); static void InsertText(SwWrtShell& rSh, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties); + const css::uno::Sequence< css::beans::PropertyValue>& rProperties); /// check if a data source is open bool IsDataSourceOpen(const OUString& rDataSource, @@ -309,7 +309,7 @@ public: OUString& rResult, double* pNumber); /** create and store or find an already stored connection to a data source for use in SwFieldMgr and SwDBTreeList */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> + css::uno::Reference< css::sdbc::XConnection> RegisterConnection(OUString const& rSource); const SwDSParam* CreateDSData(const SwDBData& rData) @@ -333,22 +333,22 @@ public: static const SwDBData& GetAddressDBName(); static OUString GetDBField( - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xColumnProp, + css::uno::Reference< css::beans::XPropertySet > xColumnProp, const SwDBFormatData& rDBFormatData, double *pNumber = NULL); - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> + static css::uno::Reference< css::sdbc::XConnection> GetConnection(const OUString& rDataSource, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rxSource); + css::uno::Reference< css::sdbc::XDataSource>& rxSource); - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> - GetColumnSupplier(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>, + static css::uno::Reference< css::sdbcx::XColumnsSupplier> + GetColumnSupplier(css::uno::Reference< css::sdbc::XConnection>, const OUString& rTableOrQuery, SwDBSelect eTableOrQuery = SwDBSelect::UNKNOWN); - static ::com::sun::star::uno::Sequence<OUString> GetExistingDatabaseNames(); + static css::uno::Sequence<OUString> GetExistingDatabaseNames(); - static DBConnURITypes GetDBunoURI(const OUString &rURI, ::com::sun::star::uno::Any &aURLAny); + static DBConnURITypes GetDBunoURI(const OUString &rURI, css::uno::Any &aURLAny); /** Loads a data source from file and registers it. @@ -365,8 +365,8 @@ public: In case of success it returns the registered name, otherwise an empty string. Optionally add a prefix to the registered DB name. */ - static OUString LoadAndRegisterDataSource(const DBConnURITypes type, const ::com::sun::star::uno::Any &rUnoURI, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > *pSettings, + static OUString LoadAndRegisterDataSource(const DBConnURITypes type, const css::uno::Any &rUnoURI, + const css::uno::Reference < css::beans::XPropertySet > *pSettings, const OUString &rURI, const OUString *pPrefix = 0, const OUString *pDestDir = 0, SwDocShell* pDocShell = 0); /** @@ -376,7 +376,7 @@ public: In case of success it returns the registered name, otherwise an empty string. */ static OUString LoadAndRegisterDataSource(const OUString& rURI, const OUString *pPrefix = 0, const OUString *pDestDir = 0, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > *pSettings = 0); + const css::uno::Reference < css::beans::XPropertySet > *pSettings = 0); /// Load the embedded data source of the document and also register it. void LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const SwDocShell& rDocShell); @@ -393,8 +393,8 @@ public: @return The data source. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> - getDataSourceAsParent(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,const OUString& _sDataSourceName); + static css::uno::Reference< css::sdbc::XDataSource> + getDataSourceAsParent(const css::uno::Reference< css::sdbc::XConnection>& _xConnection,const OUString& _sDataSourceName); /** creates a RowSet, which must be disposed after use. @param _sDataSourceName @@ -409,11 +409,11 @@ public: The new created RowSet. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> + static css::uno::Reference< css::sdbc::XResultSet> createCursor( const OUString& _sDataSourceName, const OUString& _sCommand, sal_Int32 _nCommandType, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection + const css::uno::Reference< css::sdbc::XConnection>& _xConnection ); void setEmbeddedName(const OUString& rEmbeddedName, SwDocShell& rDocShell); diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 0b8d206655ea..7b9868638ac4 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -52,8 +52,8 @@ public: virtual SwFieldType* Copy() const override; virtual OUString GetName() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; OUString GetCmd() const; void SetCmd( const OUString& aStr ); diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index cf2748be98ee..b499c57af0e7 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -46,16 +46,13 @@ namespace com { namespace sun { namespace star { class SwLinguServiceEventListener : public cppu::WeakImplHelper < - com::sun::star::linguistic2::XLinguServiceEventListener, - com::sun::star::frame::XTerminateListener + css::linguistic2::XLinguServiceEventListener, + css::frame::XTerminateListener > { - com::sun::star::uno::Reference< - com::sun::star::frame::XDesktop2 > xDesktop; - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XLinguServiceManager2 > xLngSvcMgr; - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XProofreadingIterator > xGCIterator; + css::uno::Reference<css::frame::XDesktop2 > xDesktop; + css::uno::Reference<css::linguistic2::XLinguServiceManager2 > xLngSvcMgr; + css::uno::Reference<css::linguistic2::XProofreadingIterator > xGCIterator; SwLinguServiceEventListener(const SwLinguServiceEventListener &) = delete; SwLinguServiceEventListener & operator = (const SwLinguServiceEventListener &) = delete; @@ -65,14 +62,14 @@ public: virtual ~SwLinguServiceEventListener(); /// XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override; /// XLinguServiceEventListener - virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& rLngSvcEvent ) throw(css::uno::RuntimeException, std::exception) override; /// XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& rEventObj ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 5ee4684a0b33..d72b46313a1d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -262,9 +262,9 @@ class SW_DLLPUBLIC SwDoc : SwDBData maDBData; //< database descriptor OUString msTOIAutoMarkURL; //< URL of table of index AutoMark file std::vector<OUString> m_PatternNames; //< Array for names of document-templates - com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> + css::uno::Reference<css::container::XNameContainer> mxXForms; //< container with XForms models - mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator; + mutable css::uno::Reference< css::linguistic2::XProofreadingIterator > m_xGCIterator; const std::unique_ptr< ::sw::mark::MarkManager> mpMarkManager; const std::unique_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager; @@ -341,8 +341,8 @@ class SW_DLLPUBLIC SwDoc : // table of forbidden characters of this document rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenCharsTable; - com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents; - com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache; + css::uno::Reference< css::script::vba::XVBAEventProcessor > mxVbaEvents; + css::uno::Reference<css::container::XNameContainer> m_xTemplateToProjectCache; /// Table styles (autoformats that are applied with table changes). std::unique_ptr<SwTableAutoFormatTable> mpTableStyles; @@ -623,7 +623,7 @@ public: /** Returns positions of all FlyFrames in the document. If a Pam-Pointer is passed the FlyFrames attached to paragraphes - have to be surrounded completely by ::com::sun::star::awt::Selection. + have to be surrounded completely by css::awt::Selection. ( Start < Pos < End ) !!! (Required for Writers.) */ SwPosFlyFrms GetAllFlyFormats( const SwPaM* = 0, @@ -687,14 +687,12 @@ public: /** Operations on the content of the document e.g. spell-checking/hyphenating/word-counting */ - ::com::sun::star::uno::Any - Spell( SwPaM&, ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &, + css::uno::Any + Spell( SwPaM&, css::uno::Reference< css::linguistic2::XSpellChecker1 > &, sal_uInt16* pPageCnt, sal_uInt16* pPageSt, bool bGrammarCheck, SwConversionArgs *pConvArgs = 0 ) const; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > + css::uno::Reference< css::linguistic2::XHyphenatedWord > Hyphenate( SwPaM *pPam, const Point &rCrsrPos, sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); @@ -887,7 +885,7 @@ public: Convenince function used by ReplaceDocumentProperties to skip some UNO calls. */ - void ReplaceUserDefinedDocumentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xSourceDocProps ); + void ReplaceUserDefinedDocumentProperties( const css::uno::Reference< css::document::XDocumentProperties > xSourceDocProps ); /** Replace document properties with those from rSource. @@ -1373,7 +1371,7 @@ public: SfxObjectShell* GetPersist() const; // Pointer to storage of SfxDocShells. Can be 0!!! - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetDocStorage(); + css::uno::Reference< css::embed::XStorage > GetDocStorage(); // Query / set flag indicating if document is loaded asynchronously at this moment. bool IsInLoadAsynchron() const { return mbInLoadAsynchron; } @@ -1606,10 +1604,10 @@ public: // access methods for XForms model(s) // access container for XForms model; will be NULL if !isXForms() - com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> + css::uno::Reference<css::container::XNameContainer> getXForms() const { return mxXForms;} - com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const; + css::uno::Reference< css::linguistic2::XProofreadingIterator > GetGCIterator() const; // #i31958# is this an XForms document? bool isXForms() const; @@ -1624,9 +1622,9 @@ public: void SetDefaultPageMode(bool bSquaredPageMode); bool IsSquaredPageMode() const; - com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > GetVbaEventProcessor(); - void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; }; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; + css::uno::Reference< css::script::vba::XVBAEventProcessor > GetVbaEventProcessor(); + void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; }; + css::uno::Reference< css::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); ::sw::MetaFieldManager & GetMetaFieldManager(); ::sw::UndoManager & GetUndoManager(); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 3a9199337775..a5871daa85e5 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -80,7 +80,7 @@ class SW_DLLPUBLIC SwDocShell SwWrtShell* m_pWrtShell; comphelper::EmbeddedObjectContainer* m_pOLEChildList; - sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode + sal_Int16 m_nUpdateDocMode; ///< contains the css::document::UpdateDocMode bool m_IsATemplate; ///< prevent nested calls of UpdateFontList bool m_IsRemovedInvisibleContent; @@ -95,13 +95,13 @@ class SW_DLLPUBLIC SwDocShell SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; /// FileIO - SAL_DLLPRIVATE virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override; + SAL_DLLPRIVATE virtual bool InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage ) override; SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium ) override; SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium ) override; SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium ) override; SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium ) override; SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium ) override; - SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override; + SAL_DLLPRIVATE virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage ) override; SAL_DLLPRIVATE virtual bool PrepareClose( bool bUI = true ) override; @@ -233,9 +233,9 @@ public: #if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ) override; + css::uno::Any & rValue ) override; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ) override; + const css::uno::Any & rValue ) override; #endif virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) override; virtual void ReconnectDdeLink(SfxObjectShell& rServer) override; @@ -284,7 +284,7 @@ public: void InvalidateModel(); void ReactivateModel(); - virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames() override; + virtual css::uno::Sequence< OUString > GetEventNames() override; /// #i20883# Digital Signatures and Encryption virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ) override; @@ -294,7 +294,7 @@ public: read by the binary filter: */ virtual void UpdateLinks() override; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > + css::uno::Reference< css::frame::XController > GetController(); SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef ); @@ -309,7 +309,7 @@ public: virtual bool HasChangeRecordProtection() const override; virtual void SetChangeRecording( bool bActivate ) override; virtual bool SetProtectionPassword( const OUString &rPassword ) override; - virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) override; + virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash ) override; virtual void libreOfficeKitCallback(int nType, const char* pPayload) const override; virtual bool isTiledRendering() const override; diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index df68df3488ee..a2d280ab594d 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -90,8 +90,8 @@ public: virtual void SetHidden( bool bHidden ) override; virtual bool IsHidden( ) const override; - void SetGrabBagItem(const com::sun::star::uno::Any& rVal); - void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; + void SetGrabBagItem(const css::uno::Any& rVal); + void GetGrabBagItem(css::uno::Any& rVal) const; /** add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value false, which indicates that the indent attributes at a paragraph style should diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 56f73b66f4d7..d18bf72b8a4f 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -170,8 +170,8 @@ public: virtual void SetPar2(const OUString& rStr) override; virtual sal_uInt16 GetSubType() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; OUString GetUserString() const { return sUserStr; } void SetUserString( const OUString& rS ) { sUserStr = rS; } @@ -199,8 +199,8 @@ public: inline void SetExpansion(const OUString& rStr) { aContent = rStr; } inline OUString GetContent() const { return aContent; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; class SwFileNameFieldType : public SwFieldType @@ -226,8 +226,8 @@ public: inline void SetExpansion(const OUString& rStr) { aContent = rStr; } inline OUString GetContent() const { return aContent; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; class SwTemplNameFieldType : public SwFieldType @@ -247,15 +247,15 @@ public: virtual OUString Expand() const override; virtual SwField* Copy() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Document statistics class SwDocStatFieldType : public SwFieldType { SwDoc* pDoc; - sal_Int16 nNumberingType; ///< com::sun::star::style::NumberingType + sal_Int16 nNumberingType; ///< css::style::NumberingType public: SwDocStatFieldType(SwDoc*); @@ -280,8 +280,8 @@ public: virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nSub) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; class SwHiddenTextFieldType : public SwFieldType @@ -344,8 +344,8 @@ public: virtual sal_uInt16 GetSubType() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Field that expands to an empty line (without height). @@ -374,8 +374,8 @@ public: /// Query, set condition. virtual OUString GetPar1() const override; virtual void SetPar1(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; class SwMacroFieldType : public SwFieldType @@ -416,8 +416,8 @@ public: /// Macrotext virtual OUString GetPar2() const override; virtual void SetPar2(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; static void CreateMacroString( OUString& rMacro, const OUString& rMacroName, @@ -484,8 +484,8 @@ public: sal_Int32 GetNumberOfParagraphs() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; virtual OUString GetDescription() const override; }; @@ -518,8 +518,8 @@ public: OUString GetName() const { return aName; } void SetName( const OUString& rName ) { aName = rName; } inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Extended User settings. @@ -548,8 +548,8 @@ public: inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Relative page numbers - field. @@ -585,8 +585,8 @@ public: short GetOffset() const { return nOffset; } void SetOffset( short nOff ) { nOffset = nOff; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Relative page numbers - query field. @@ -619,8 +619,8 @@ public: void SetText( const OUString& rText ) { sText = rText; } void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Field to jump to and edit. @@ -656,8 +656,8 @@ public: SwCharFormat* GetCharFormat() const { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFormat(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; class SwScriptFieldType : public SwFieldType @@ -695,8 +695,8 @@ public: bool IsCodeURL() const { return bCodeURL; } void SetCodeURL( bool bURL ) { bCodeURL = bURL; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Combined Character Fieldtype @@ -725,8 +725,8 @@ public: virtual OUString GetPar1() const override; virtual void SetPar1(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; #endif // INCLUDED_SW_INC_DOCUFLD_HXX diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index 2c53228a6ce3..a0a47ce8a719 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -50,7 +50,7 @@ public: bool RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override; + virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; protected: void lateInit(const SwDPage& rPage, SwDrawModel* pNewModel = 0); diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index 5b36a54864c2..339fbc7f9c3d 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -40,12 +40,11 @@ public: virtual SdrPage* AllocPage(bool bMasterPage) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage> GetDocumentStorage() const override; + virtual css::uno::Reference<css::embed::XStorage> GetDocumentStorage() const override; protected: /// override of <SdrModel::createUnoModel()> is needed to provide corresponding uno model. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override; + virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override; }; #endif diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 140f044c941a..de1e9022b1ee 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -670,7 +670,7 @@ public: /// restore selections. void HyphEnd(); - com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> + css::uno::Reference< css::uno::XInterface> HyphContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); void HyphIgnore(); @@ -680,13 +680,13 @@ public: const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_uInt16 nRows, sal_uInt16 nCols, - sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, + sal_Int16 eAdj = css::text::HoriOrientation::FULL, const SwTableAutoFormat* pTAFormat = 0 ); void InsertDDETable( const SwInsertTableOptions& rInsTableOpts, ///< HEADLINE_NO_BORDER SwDDEFieldType* pDDEType, sal_uInt16 nRows, sal_uInt16 nCols, - sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL ); + sal_Int16 eAdj = css::text::HoriOrientation::FULL ); void UpdateTable(); void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName ); @@ -694,7 +694,7 @@ public: SwFrameFormat *GetTableFormat(); bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_Unicode cCh, - sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL, + sal_Int16 eAdj = css::text::HoriOrientation::FULL, const SwTableAutoFormat* pTAFormat = 0 ); bool TableToText( sal_Unicode cCh ); bool IsTextToTableAvailable() const; @@ -729,7 +729,7 @@ public: /// Restore selections. void SpellEnd( SwConversionArgs *pConvArgs = 0, bool bRestoreSelection = true ); - ::com::sun::star::uno::Any SpellContinue( + css::uno::Any SpellContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt, SwConversionArgs *pConvArgs = 0 ); @@ -755,14 +755,13 @@ public: /// Is hyphenation active somewhere else? static bool HasHyphIter(); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > + css::uno::Reference< css::linguistic2::XSpellAlternatives > GetCorrection( const Point* pPt, SwRect& rSelectRect ); - bool GetGrammarCorrection( ::com::sun::star::linguistic2::ProofreadingResult /*out*/ &rResult, + bool GetGrammarCorrection( css::linguistic2::ProofreadingResult /*out*/ &rResult, sal_Int32 /*out*/ &rErrorPosInText, sal_Int32 /*out*/ &rErrorIndexInResult, - ::com::sun::star::uno::Sequence< OUString > /*out*/ &rSuggestions, + css::uno::Sequence< OUString > /*out*/ &rSuggestions, const Point* pPt, SwRect& rSelectRect ); static void IgnoreGrammarErrorAt( SwPaM& rErrorPosition ); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index b643db82b46f..58041f3269b9 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -121,8 +121,8 @@ public: virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nType) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; static sal_Int32 GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0); // #i82544# @@ -191,8 +191,8 @@ public: const SwNode* GetOutlineChgNd() const { return pOutlChgNd; } void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp ) @@ -254,8 +254,8 @@ public: /// Query formula. virtual OUString GetPar2() const override; virtual void SetPar2(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline OUString SwSetExpField::GetExpStr() const @@ -348,8 +348,8 @@ public: virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nSub) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; // Sorted list of input fields and DropDown fields @@ -416,8 +416,8 @@ public: /// The formula. virtual OUString GetPar2() const override; virtual void SetPar2(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; #endif // INCLUDED_SW_INC_EXPFLD_HXX diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index c4385177158e..a3055f05a19c 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -60,8 +60,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index fd8a78bd697c..661c030fa58b 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -207,7 +207,7 @@ private: std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom; bool m_bCheckForOLEInCaption; - SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const; + SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const; /// Terminate actions for all shells and call ChangeLink. SAL_DLLPRIVATE void EndAllActionAndCall(); @@ -328,8 +328,8 @@ public: i#22341 - adjustments for new vertical alignment at top of line */ void CalcBoundRect( SwRect& _orRect, const RndStdIds _nAnchorId, - const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME, - const sal_Int16 _eVertRelOrient = com::sun::star::text::RelOrientation::FRAME, + const sal_Int16 _eHoriRelOrient = css::text::RelOrientation::FRAME, + const sal_Int16 _eVertRelOrient = css::text::RelOrientation::FRAME, const SwPosition* _pToCharContentPos = NULL, const bool _bFollowTextFlow = false, bool _bMirror = false, @@ -428,7 +428,7 @@ public: If the values are not allowed, the formatting clips and determines scaling. See CalcAndSetScale(). The @return value is the applied size. */ - Size RequestObjectResize( const SwRect &rRect, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); + Size RequestObjectResize( const SwRect &rRect, const css::uno::Reference < css::embed::XEmbeddedObject >& ); /// The layout has been changed, so the active object has to be moved after that virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ); @@ -457,7 +457,7 @@ public: OUString GetFlyName() const; /// get reference to OLE object (if there is one) for selected FlyFrame - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef() const; + const css::uno::Reference < css::embed::XEmbeddedObject > GetOleRef() const; /// Created unique name for frame. OUString GetUniqueGrfName() const; @@ -580,7 +580,7 @@ public: // --> #i972# /** for starmath formulas anchored 'as char' it aligns it baseline to baseline changing the previous vertical orientation */ - void AlignFormulaToBaseline( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 ); + void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 ); /// aligns all formulas with anchor 'as char' to baseline void AlignAllFormulasToBaseline(); @@ -612,8 +612,8 @@ public: const SwRect& GetAnyCurRect( CurRectType eType, const Point* pPt = 0, - const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& = - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >() ) const; + const css::uno::Reference < css::embed::XEmbeddedObject >& = + css::uno::Reference < css::embed::XEmbeddedObject >() ) const; /// Page number of the page containing Point, O if no page. sal_uInt16 GetPageNumber( const Point &rPoint ) const; diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx index ba4f1cbc822c..d197de6dcd84 100644 --- a/sw/inc/finalthreadmanager.hxx +++ b/sw/inc/finalthreadmanager.hxx @@ -34,32 +34,32 @@ class CancelJobsThread; class TerminateOfficeThread; class SwPauseThreadStarting; -class FinalThreadManager : public ::cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, - com::sun::star::util::XJobManager, - com::sun::star::frame::XTerminateListener2 > +class FinalThreadManager : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, + css::util::XJobManager, + css::frame::XTerminateListener2 > { public: - explicit FinalThreadManager(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context); + explicit FinalThreadManager(css::uno::Reference< css::uno::XComponentContext > const & context); - // ::com::sun::star::lang::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; + // css::lang::XServiceInfo: + 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; - // ::com::sun::star::util::XJobManager: - virtual void SAL_CALL registerJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseJob(const com::sun::star::uno::Reference< com::sun::star::util::XCancellable > & Job) throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelAllJobs() throw (com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XJobManager: + virtual void SAL_CALL registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancelAllJobs() throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XTerminateListener2 - virtual void SAL_CALL cancelTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::frame::XTerminateListener2 + virtual void SAL_CALL cancelTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XTerminateListener (inherited via com::sun::star::frame::XTerminateListener2) - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::frame::XTerminateListener (inherited via css::frame::XTerminateListener2) + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener) - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener) + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: FinalThreadManager(FinalThreadManager &) = delete; @@ -69,11 +69,11 @@ private: void registerAsListenerAtDesktop(); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; osl::Mutex maMutex; - std::list< com::sun::star::uno::Reference< com::sun::star::util::XCancellable > > maThreads; + std::list< css::uno::Reference< css::util::XCancellable > > maThreads; CancelJobsThread* mpCancelJobsThread; TerminateOfficeThread* mpTerminateOfficeThread; SwPauseThreadStarting* mpPauseThreadStarting; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index d18dded7f501..4363fb5bc036 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -232,8 +232,7 @@ OUString FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat); class SW_DLLPUBLIC SwFieldType : public SwModify { - ::com::sun::star::uno::WeakReference< - ::com::sun::star::beans::XPropertySet> m_wXFieldMaster; + css::uno::WeakReference<css::beans::XPropertySet> m_wXFieldMaster; sal_uInt16 m_nWhich; @@ -248,11 +247,9 @@ protected: public: - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< - ::com::sun::star::beans::XPropertySet> const& GetXObject() const + SAL_DLLPRIVATE css::uno::WeakReference<css::beans::XPropertySet> const& GetXObject() const { return m_wXFieldMaster; } - SAL_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> const& xFieldMaster) + SAL_DLLPRIVATE void SetXObject(css::uno::Reference<css::beans::XPropertySet> const& xFieldMaster) { m_wXFieldMaster = xFieldMaster; } static OUString GetTypeStr( sal_uInt16 nTypeId ); @@ -260,8 +257,8 @@ public: /// Only in derived classes. virtual OUString GetName() const; virtual SwFieldType* Copy() const = 0; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ); sal_uInt16 Which() const { return m_nWhich; } @@ -350,8 +347,8 @@ public: virtual void SetPar1(const OUString& rStr); virtual void SetPar2(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ); /// Does the field possess an action on its ClickHandler? (e.g. INetFields, ...). bool HasClickHdl() const; diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index d39c7f257ac2..13a59cdb538b 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -119,8 +119,8 @@ public: void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nMId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nMId ) override; }; #endif // INCLUDED_SW_INC_FLDDAT_HXX diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index 6507aab94273..5f667842b9c6 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -167,14 +167,14 @@ public: @param rItems the new items */ - void SetItems(const com::sun::star::uno::Sequence<OUString> & rItems); + void SetItems(const css::uno::Sequence<OUString> & rItems); /** Returns the items of the dropdown box. @return the items of the dropdown box */ - com::sun::star::uno::Sequence<OUString> GetItemSequence() const; + css::uno::Sequence<OUString> GetItemSequence() const; /** Returns the selected item. @@ -248,7 +248,7 @@ public: - FIELD_PROP_PAR3 Get the help text of the field. - FIELD_PROP_PAR4 Get the tool tip of the field. */ - virtual bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const override; + virtual bool QueryValue(css::uno::Any &rVal, sal_uInt16 nWhichId) const override; /** API: Sets a property value on the dropdown field. @@ -260,7 +260,7 @@ public: - FIELD_PROP_PAR3 Set the help text of the field. - FIELD_PROP_PAR4 Set the tool tip of the field. */ - virtual bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) override; + virtual bool PutValue(const css::uno::Any &rVal, sal_uInt16 nWhichId) override; }; #endif diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 4d4926eaa60d..da2b091b1499 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -59,8 +59,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; RndStdIds GetAnchorId() const { return nAnchorId; } sal_uInt16 GetPageNum() const { return nPageNum; } diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index a5a9aa301e93..a76ff7e2f948 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -51,8 +51,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; } const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; } diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index f62148ddf9e1..336453555a38 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -109,8 +109,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const SwColumns &GetColumns() const { return m_aColumns; } SwColumns &GetColumns() { return m_aColumns; } diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 535a6e89e385..3578bb794705 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -48,7 +48,7 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); } SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); } diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 6babe6652cfe..9204f15fad2c 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -44,8 +44,7 @@ class SW_DLLPUBLIC SwFormatField friend void _InitCore(); SwFormatField( sal_uInt16 nWhich ); // for default-Attibute - ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextField> m_wXTextField; + css::uno::WeakReference<css::text::XTextField> m_wXTextField; SwField* mpField; SwTextField* mpTextField; // the TextAttribute @@ -109,11 +108,9 @@ public: bool IsFieldInDoc() const; bool IsProtect() const; - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextField> const& GetXTextField() const + SAL_DLLPRIVATE css::uno::WeakReference<css::text::XTextField> const& GetXTextField() const { return m_wXTextField; } - SAL_DLLPRIVATE void SetXTextField(::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextField> const& xTextField) + SAL_DLLPRIVATE void SetXTextField(css::uno::Reference<css::text::XTextField> const& xTextField) { m_wXTextField = xTextField; } }; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 2a9516be2925..10e56dcf0c47 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -72,8 +72,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; } void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; } diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index 493e85a57cb4..d9730b6de3b5 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -56,8 +56,8 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 293dfeaee675..528bad3ecf7d 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -59,10 +59,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const SwTextINetFormat* GetTextINetFormat() const { diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 1364906135f5..cde782f63717 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -45,8 +45,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_uLong GetStartValue() const { return nStartValue; } bool IsCount() const { return bCountLines; } diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 472460013f9d..8e2f92e448ba 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -128,8 +128,8 @@ protected: friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode friend class ::SwXMeta; ///< GetTextNode, GetTextAttr, Get/SetXMeta - ::com::sun::star::uno::WeakReference< - ::com::sun::star::rdf::XMetadatable> m_wXMeta; + css::uno::WeakReference< + css::rdf::XMetadatable> m_wXMeta; SwFormatMeta * m_pFormat; SwTextNode * m_pTextNode; @@ -143,11 +143,9 @@ protected: void NotifyChangeTextNodeImpl(); void NotifyChangeTextNode(SwTextNode *const pTextNode); - ::com::sun::star::uno::WeakReference< - ::com::sun::star::rdf::XMetadatable> const& GetXMeta() const + css::uno::WeakReference<css::rdf::XMetadatable> const& GetXMeta() const { return m_wXMeta; } - void SetXMeta(::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable> const& xMeta) + void SetXMeta(css::uno::Reference<css::rdf::XMetadatable> const& xMeta) { m_wXMeta = xMeta; } /// SwClient @@ -162,8 +160,7 @@ public: 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; }; class MetaField @@ -207,8 +204,7 @@ public: const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); /// get all meta fields - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextField> > getMetaFields(); + ::std::vector< css::uno::Reference<css::text::XTextField> > getMetaFields(); }; } // namespace sw diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 714938e9fbc7..8c9ed10935cf 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -37,8 +37,8 @@ class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem sal_Int16 m_eRelation; public: TYPEINFO_OVERRIDE(); - SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE, - sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA ); + SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = css::text::VertOrientation::NONE, + sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA ); inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. @@ -49,8 +49,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const override; SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const override; @@ -74,8 +74,8 @@ class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem bool m_bPosToggle : 1; ///< Flip position on even pages. public: TYPEINFO_OVERRIDE(); - SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE, - sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, bool bPos = false ); + SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = css::text::HoriOrientation::NONE, + sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA, bool bPos = false ); inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. @@ -86,8 +86,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_Int16 GetHoriOrient() const { return m_eOrient; } sal_Int16 GetRelationOrient() const { return m_eRelation; } diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 826129d7ce71..5a0d12bd3b14 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -62,8 +62,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SwPageDesc *GetPageDesc() { return static_cast<SwPageDesc*>(GetRegisteredIn()); } const SwPageDesc *GetPageDesc() const { return static_cast<const SwPageDesc*>(GetRegisteredIn()); } diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 78824083469c..22b1d069f905 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -51,10 +51,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const SwTextRuby* GetTextRuby() const { return pTextAttr; } diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index b92959535857..8aaa75aad533 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -47,8 +47,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SwSurround GetSurround()const { return SwSurround( GetValue() ); } bool IsAnchorOnly() const { return bAnchorOnly; } diff --git a/sw/inc/fmtsrndenum.hxx b/sw/inc/fmtsrndenum.hxx index b9e17f5be879..82bbb53ee17b 100644 --- a/sw/inc/fmtsrndenum.hxx +++ b/sw/inc/fmtsrndenum.hxx @@ -22,13 +22,13 @@ #include <com/sun/star/text/WrapTextMode.hpp> enum SwSurround { - SURROUND_NONE = com::sun::star::text::WrapTextMode_NONE, + SURROUND_NONE = css::text::WrapTextMode_NONE, SURROUND_BEGIN = SURROUND_NONE, - SURROUND_THROUGHT = com::sun::star::text::WrapTextMode_THROUGHT, - SURROUND_PARALLEL = com::sun::star::text::WrapTextMode_PARALLEL, - SURROUND_IDEAL = com::sun::star::text::WrapTextMode_DYNAMIC, - SURROUND_LEFT = com::sun::star::text::WrapTextMode_LEFT, - SURROUND_RIGHT = com::sun::star::text::WrapTextMode_RIGHT, + SURROUND_THROUGHT = css::text::WrapTextMode_THROUGHT, + SURROUND_PARALLEL = css::text::WrapTextMode_PARALLEL, + SURROUND_IDEAL = css::text::WrapTextMode_DYNAMIC, + SURROUND_LEFT = css::text::WrapTextMode_LEFT, + SURROUND_RIGHT = css::text::WrapTextMode_RIGHT, SURROUND_END }; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index ec28de2248d2..b29156c4c023 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -56,8 +56,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void SetTargetFrameName( const OUString& rStr ) { sTargetFrameName = rStr; } void SetURL(const OUString &rURL, bool bServerMap); diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index e5ff4c0ba3c0..0d72126413f2 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -34,8 +34,7 @@ public: // #i35017# - constant name has changed SwFormatWrapInfluenceOnObjPos( - sal_Int16 _nWrapInfluenceOnPosition = - com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); + sal_Int16 _nWrapInfluenceOnPosition = css::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); SwFormatWrapInfluenceOnObjPos( const SwFormatWrapInfluenceOnObjPos& _rCpy ); virtual ~SwFormatWrapInfluenceOnObjPos(); @@ -47,8 +46,8 @@ public: virtual bool operator==( const SfxPoolItem& _rAttr ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; /// direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index db1233119b61..bff32bc663f3 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -168,8 +168,8 @@ public: bool IsHidden() const { return m_bHidden; } void SetHidden( bool bValue ) { m_bHidden = bValue; } - void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; - void SetGrabBagItem(const com::sun::star::uno::Any& rVal); + void GetGrabBagItem(css::uno::Any& rVal) const; + void SetGrabBagItem(const css::uno::Any& rVal); /// Query / set bAutoUpdateFormat-flag. bool IsAutoUpdateFormat() const { return m_bAutoUpdateFormat; } diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index f1a75de3f127..352c6d458318 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -42,8 +42,7 @@ class SW_DLLPUBLIC SwFrameFormat: public SwFormat friend class SwPageDesc; ///< Is allowed to call protected CTor. friend class ::sw::DocumentLayoutManager; ///< Is allowed to call protected CTor. - ::com::sun::star::uno::WeakReference< - ::com::sun::star::uno::XInterface> m_wXObject; + css::uno::WeakReference<css::uno::XInterface> m_wXObject; //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes; @@ -127,11 +126,9 @@ public: virtual OUString GetDescription() const; - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< - ::com::sun::star::uno::XInterface> const& GetXObject() const + SAL_DLLPRIVATE css::uno::WeakReference<css::uno::XInterface> const& GetXObject() const { return m_wXObject; } - SAL_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> const& xObject) + SAL_DLLPRIVATE void SetXObject(css::uno::Reference<css::uno::XInterface> const& xObject) { m_wXObject = xObject; } DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat) @@ -251,7 +248,7 @@ protected: meLayoutDir( SwFrameFormat::HORI_L2R ), - mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), + mnPositionLayoutDir( css::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), mbPosAttrSet( false ) @@ -262,7 +259,7 @@ protected: m_pSdrObjectCached(NULL), meLayoutDir( SwFrameFormat::HORI_L2R ), - mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), + mnPositionLayoutDir( css::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), mbPosAttrSet( false ) {} diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index bd3cdc06dbea..ce8031a0f7ba 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -63,9 +63,9 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) @@ -110,9 +110,9 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const Size& GetUnrotatedSize() const { return aUnrotatedSize; } @@ -218,9 +218,9 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; const double& GetValue() const { return nValue; } @@ -257,9 +257,9 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; @@ -281,9 +281,9 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 6da69ddec718..587cc747f139 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion const sal_Int32 nUnitEnd ); void ChangeText( const OUString &rNewText, const OUString& rOrigText, - const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, + const css::uno::Sequence< sal_Int32 > *pOffsets, SwPaM *pCrsr ); void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ); @@ -82,7 +82,7 @@ protected: const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, const OUString& rOrigText, const OUString& rReplaceWith, - const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, + const css::uno::Sequence< sal_Int32 > &rOffsets, ReplacementAction eAction, LanguageType *pNewUnitLanguage ) override; @@ -91,7 +91,7 @@ protected: public: SwHHCWrapper( SwView* pView, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, LanguageType nSourceLanguage, LanguageType nTargetLanguage, const vcl::Font *pTargetFont, sal_Int32 nConvOptions, bool bIsInteractive, diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index ea1faf96d3d0..84ee60fc1f2d 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -93,7 +93,7 @@ public: static const SfxFilter* GetFileFilter(const OUString& rFileName); static bool IsValidStgFilter( SotStorage& , const SfxFilter& ); - static bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); + static bool IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter); static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, rtl_TextEncoding *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 46771c355bd9..4c47284b14db 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -75,7 +75,7 @@ class SwRevisionConfig : public utl::ConfigItem sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark Color aMarkColor; //Revision/LinesChanged/Color - static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; @@ -83,7 +83,7 @@ public: SwRevisionConfig(); virtual ~SwRevisionConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -99,7 +99,7 @@ class SwCompareConfig : public utl::ConfigItem bool bIgnorePieces; //Compare/Settings/Ignore pieces of length sal_uInt16 nPieceLen; //Compare/Settings/Ignore pieces of length - static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; @@ -107,7 +107,7 @@ public: SwCompareConfig(); virtual ~SwCompareConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) override { }; + virtual void Notify( const css::uno::Sequence< OUString >& ) override { }; void Load(); void SetModified() {ConfigItem::SetModified(); } }; @@ -127,7 +127,7 @@ class SwInsertConfig : public utl::ConfigItem SwInsertTableOptions aInsTableOpts; bool bIsWeb; - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; @@ -135,7 +135,7 @@ public: SwInsertConfig(bool bWeb); virtual ~SwInsertConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -154,7 +154,7 @@ class SwTableConfig : public utl::ConfigItem bool bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. bool bInsTableAlignNum; // Table/Input/Alignment // Align numbers. - static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; @@ -162,7 +162,7 @@ public: SwTableConfig(bool bWeb); virtual ~SwTableConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; @@ -184,7 +184,7 @@ class SwMiscConfig : public utl::ConfigItem OUString sMailingPath; // FormLetter/FileOutput/Path OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) - static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; @@ -192,7 +192,7 @@ public: SwMiscConfig(); virtual ~SwMiscConfig(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); void SetModified(){ConfigItem::SetModified();} }; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 3fed0de26d11..ac02f976f068 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; bool mbLinkedInputStreamReady; - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream; + css::uno::Reference<css::io::XInputStream> mxInputStream; bool mbIsStreamReadOnly; SwGrfNode( const SwNodeIndex& rWhere, @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode after its usage. Could be NULL, if the stream isn't found. */ SvStream* _GetStreamForEmbedGrf( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _refPics, + const css::uno::Reference< css::embed::XStorage >& _refPics, const OUString& rStreamName ) const; /** helper method to get a substorage of the document storage for readonly access. @@ -109,7 +109,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode @return XStorage reference to substorage or the root storage */ - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > _GetDocSubstorageOrRoot( + css::uno::Reference< css::embed::XStorage > _GetDocSubstorageOrRoot( const OUString& aStgName ) const; /// allow reaction on change of content of GraphicObject, so always call @@ -196,7 +196,7 @@ public: bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ); void UpdateLinkWithInputStream(); bool IsAsyncRetrieveInputStreamPossible() const; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index ce1870104158..d9776327bcb9 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -51,13 +51,13 @@ public: ~SwOLEObj(); bool UnloadObject(); - static bool UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, + static bool UnloadObject( css::uno::Reference< css::embed::XEmbeddedObject > xObj, const SwDoc* pDoc, sal_Int64 nAspect ); OUString GetDescription(); - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef(); + const css::uno::Reference < css::embed::XEmbeddedObject > GetOleRef(); svt::EmbeddedObjectRef& GetObject(); OUString GetCurrentPersistName() const { return aName; } OUString GetStyleString(); diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 95ce85f1765d..285f3d01c14f 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -112,8 +112,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable ::std::unique_ptr< OUString > m_pNumStringCache; - ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextContent> m_wXParagraph; + css::uno::WeakReference<css::text::XTextContent> m_wXParagraph; //UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes; @@ -350,7 +349,7 @@ public: const OUString & rText ); void ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen, const OUString& rText, - const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets ); + const css::uno::Sequence<sal_Int32>& rOffsets ); /// Virtual methods from ContentNode. virtual SwContentFrm *MakeFrm( SwFrm* ) override; @@ -781,11 +780,9 @@ public: sal_uInt16 GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd ) const; - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextContent> const& GetXParagraph() const + SAL_DLLPRIVATE css::uno::WeakReference<css::text::XTextContent> const& GetXParagraph() const { return m_wXParagraph; } - SAL_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> const& xParagraph) + SAL_DLLPRIVATE void SetXParagraph(css::uno::Reference<css::text::XTextContent> const& xParagraph) { m_wXParagraph = xParagraph; } /// sfx2::Metadatable @@ -793,8 +790,7 @@ public: 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; bool IsCollapse() const; diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 5c35820479a1..ace92d0bcb4e 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -272,8 +272,8 @@ public: void Validate(); void dumpAsXml(xmlTextWriterPtr w) const; - void GetGrabBagItem(com::sun::star::uno::Any& rVal) const; - void SetGrabBagItem(const com::sun::star::uno::Any& rVal); + void GetGrabBagItem(css::uno::Any& rVal) const; + void SetGrabBagItem(const css::uno::Any& rVal); }; /// namespace for static functions and methods for numbering and bullets diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 8c32cebc90a1..8a6c3d555f08 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -194,7 +194,7 @@ public: SwGoInDoc fnGo = fnGoContent ); /// Search. - bool Find( const com::sun::star::util::SearchOptions& rSearchOpt, + bool Find( const css::util::SearchOptions& rSearchOpt, bool bSearchInNotes, utl::TextSearch& rSText, SwMoveFn fnMove = fnMoveForward, @@ -209,7 +209,7 @@ public: SwMoveFn fnMove, const SwPaM *pPam, bool bInReadOnly, bool bMoveFirst ); - bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSText, + bool DoSearch( const css::util::SearchOptions& rSearchOpt, utl::TextSearch& rSText, SwMoveFn fnMove, bool bSrchForward, bool bRegSearch, bool bChkEmptyPara, bool bChkParaEnd, sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam); diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index b570e9cc7b7e..46c8267296c0 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -83,8 +83,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; inline sal_uInt8 GetLines() const { return nLines; } inline sal_uInt8 &GetLines() { return nLines; } @@ -166,8 +166,8 @@ public: OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index bb4314b64b63..5a074e091a4b 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -188,7 +188,7 @@ public: SwPrintUIOptions( sal_uInt16 nCurrentPage, bool bWeb, bool bSwSrcView, bool bHasSelection, bool bHasPostIts, const SwPrintData &rDefaultPrintData ); virtual ~SwPrintUIOptions(); - bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp ); + bool processPropertiesAndCheckFormat( const css::uno::Sequence< css::beans::PropertyValue >& i_rNewProp ); bool IsPrintFormControls() const { return getBoolValue( "PrintControls", m_rDefaultPrintData.bPrintControl ); } bool IsPrintPageBackground() const { return getBoolValue( "PrintPageBackground", m_rDefaultPrintData.bPrintPageBackground ); } diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index 1c99618ec190..52c83b37be97 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -27,7 +27,7 @@ class SwPrintOptions : public SwPrintData, public utl::ConfigItem private: bool bIsWeb; - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + css::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() override; @@ -35,7 +35,7 @@ public: SwPrintOptions(bool bWeb); virtual ~SwPrintOptions(); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; virtual void doSetModified( ) override { bModified = true; SetModified();} SwPrintOptions& operator=(const SwPrintData& rData) diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 592fa846de34..4ed183749aae 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -135,13 +135,13 @@ public: virtual OUString GetPar1() const override; virtual void SetPar1(const OUString& rStr) override; - virtual OUString GetPar2() const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override; + virtual OUString GetPar2() const override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override; void ConvertProgrammaticToUIName(); - virtual OUString GetDescription() const override; + virtual OUString GetDescription() const override; }; #endif /// INCLUDED_SW_INC_REFFLD_HXX diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index d72ab200a70d..a07dd06382a6 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -67,7 +67,7 @@ private: OUString m_sCondition; OUString m_sLinkFileName; OUString m_sLinkFilePassword; // Must be changed to Sequence. - ::com::sun::star::uno::Sequence <sal_Int8> m_Password; + css::uno::Sequence <sal_Int8> m_Password; /// It seems this flag caches the current final "hidden" state. bool m_bHiddenFlag : 1; @@ -125,9 +125,9 @@ public: OUString GetLinkFilePassword() const { return m_sLinkFilePassword; } void SetLinkFilePassword(OUString const& rS){ m_sLinkFilePassword = rS; } - ::com::sun::star::uno::Sequence<sal_Int8> const& GetPassword() const + css::uno::Sequence<sal_Int8> const& GetPassword() const { return m_Password; } - void SetPassword(::com::sun::star::uno::Sequence<sal_Int8> const& rNew) + void SetPassword(css::uno::Sequence<sal_Int8> const& rNew) { m_Password = rNew; } bool IsLinkType() const { return (DDE_LINK_SECTION == m_eType) || (FILE_LINK_SECTION == m_eType); } @@ -211,7 +211,7 @@ public: { m_Data.SetLinkFilePassword(rS); } // Get / set password of this section - ::com::sun::star::uno::Sequence<sal_Int8> const& GetPassword() const + css::uno::Sequence<sal_Int8> const& GetPassword() const { return m_Data.GetPassword(); } // Data server methods. @@ -283,8 +283,7 @@ class SW_DLLPUBLIC SwSectionFormat in case of an index, both a SwXDocumentIndex and a SwXTextSection register at this SwSectionFormat, so we need to have two refs. */ - ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextSection> m_wXTextSection; + css::uno::WeakReference<css::text::XTextSection> m_wXTextSection; SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed. @@ -327,11 +326,9 @@ public: // Is section a valid one for global document? const SwSection* GetGlobalDocSection() const; - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XTextSection> const& GetXTextSection() const + SAL_DLLPRIVATE css::uno::WeakReference<css::text::XTextSection> const& GetXTextSection() const { return m_wXTextSection; } - SAL_DLLPRIVATE void SetXTextSection(::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextSection> const& xTextSection) + SAL_DLLPRIVATE void SetXTextSection(css::uno::Reference<css::text::XTextSection> const& xTextSection) { m_wXTextSection = xTextSection; } // sfx2::Metadatable @@ -339,8 +336,7 @@ public: 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; void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 942df36332b4..9e8938eee4e9 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwReader: public SwDocFac { SvStream* pStrm; tools::SvRef<SotStorage> pStg; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; + css::uno::Reference < css::embed::XStorage > xStg; SfxMedium* pMedium; // Who wants to obtain a Medium (W4W). SwPaM* pCrsr; @@ -167,7 +167,7 @@ public: // Document and position in document are taken from SwPaM. SwReader( SvStream&, const OUString& rFilename, const OUString& rBaseURL, SwPaM& ); SwReader( SfxMedium&, const OUString& rFilename, SwPaM& ); - SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString& rFilename, SwPaM& ); + SwReader( const css::uno::Reference < css::embed::XStorage >&, const OUString& rFilename, SwPaM& ); // The only export interface is SwReader::Read(...)!!! sal_uLong Read( const Reader& ); @@ -203,7 +203,7 @@ class SW_DLLPUBLIC Reader protected: SvStream* pStrm; tools::SvRef<SotStorage> pStg; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; + css::uno::Reference < css::embed::XStorage > xStg; SfxMedium* pMedium; // Who wants to obtain a Medium (W4W). SwgReaderOption aOpt; @@ -414,7 +414,7 @@ public: virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ); sal_uLong Write( SwPaM&, SvStream&, const OUString* = 0 ); - virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ); + virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ); virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ); virtual void SetupFilterOptions(SfxMedium& rMedium); @@ -462,7 +462,7 @@ class SW_DLLPUBLIC StgWriter : public Writer protected: OUString aFltName; tools::SvRef<SotStorage> pStg; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; + css::uno::Reference < css::embed::XStorage > xStg; // Create error at call. virtual sal_uLong WriteStream() override; @@ -476,7 +476,7 @@ public: virtual bool IsStgWriter() const override; - virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) override; + virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) override; virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ) override; SotStorage& GetStorage() const { return *pStg; } @@ -488,7 +488,7 @@ class SW_DLLPUBLIC SwWriter { SvStream* pStrm; tools::SvRef<SotStorage> pStg; - com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; + css::uno::Reference < css::embed::XStorage > xStg; SfxMedium* pMedium; SwPaM* pOutPam; @@ -504,7 +504,7 @@ public: SwWriter( SvStream&, SwDoc & ); SwWriter( SvStream&, SwPaM &, bool bWriteAll = false ); - SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& ); + SwWriter( const css::uno::Reference < css::embed::XStorage >&, SwDoc& ); SwWriter( SfxMedium&, SwCrsrShell &, bool bWriteAll = false ); SwWriter( SfxMedium&, SwDoc & ); diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index cce7388ff0e6..f0fc06f3638e 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -84,16 +84,14 @@ struct SwConversionArgs : SwArgsBase struct SwSpellArgs : SwArgsBase { - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpeller; + css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellAlternatives > xSpellAlt; + css::uno::Reference< css::linguistic2::XSpellAlternatives > xSpellAlt; bool bIsGrammarCheck; - SwSpellArgs(::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &rxSplChk, + SwSpellArgs(css::uno::Reference< + css::linguistic2::XSpellChecker1 > &rxSplChk, SwTextNode* pStart, SwIndex& rStart, SwTextNode* pEnd, SwIndex& rEnd, bool bGrammar ) diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 6353462c8eda..4e2064c36a57 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -89,7 +89,7 @@ namespace com{namespace sun{namespace star{ } }}} -typedef void (*SwLabDlgMethod) (::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, const SwLabItem& rItem); +typedef void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel>& xModel, const SwLabItem& rItem); typedef OUString (*GlossaryGetCurrGroup)(); typedef void (*GlossarySetActGroup)(const OUString& rNewGroup); @@ -144,8 +144,8 @@ class AbstractMailMergeDlg : public VclAbstractDialog public: virtual DBManagerOptions GetMergeType() = 0; virtual const OUString& GetSaveFilter() const = 0; - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0; + virtual const css::uno::Sequence< css::uno::Any > GetSelection() const = 0; + virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const = 0; virtual bool IsSaveSingleDoc() const = 0; virtual bool IsGenerateFromDataBase() const = 0; virtual OUString GetColumnName() const = 0; @@ -232,10 +232,10 @@ class AbstractSwInsertDBColAutoPilot : public VclAbstractDialog { public: - virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) = 0; + virtual void DataToDoc( const css::uno::Sequence< css::uno::Any >& rSelection, + css::uno::Reference< css::sdbc::XDataSource> rxSource, + css::uno::Reference< css::sdbc::XConnection> xConnection, + css::uno::Reference< css::sdbc::XResultSet > xResultSet) = 0; }; class AbstractDropDownFieldDialog : public VclAbstractDialog @@ -282,8 +282,8 @@ class AbstractSwRenameXNamedDlg : public VclAbstractDialog public: virtual void SetForbiddenChars( const OUString& rSet ) = 0; virtual void SetAlternativeAccess( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) = 0; + css::uno::Reference< css::container::XNameAccess > & xSecond, + css::uno::Reference< css::container::XNameAccess > & xThird ) = 0; }; class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog @@ -321,11 +321,11 @@ class SwAbstractDialogFactory public: static SwAbstractDialogFactory* Create(); - virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, - const SfxItemSet& rAttr, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, - sal_uInt32 nResId - ) = 0; + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, + const SfxItemSet& rAttr, + const css::uno::Reference< css::frame::XFrame >& _rxFrame, + sal_uInt32 nResId + ) = 0; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) = 0; @@ -342,8 +342,8 @@ public: virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, - com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, + css::uno::Reference< css::sdbc::XDataSource> rxSource, + css::uno::Reference<css::sdbcx::XColumnsSupplier> xColSupp, const SwDBData& rData) = 0; virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; @@ -382,8 +382,8 @@ public: virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0; virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) = 0; virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0; + css::uno::Reference< css::container::XNamed > & xNamed, + css::uno::Reference< css::container::XNameAccess > & xNameAccess) = 0; virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0; virtual VclAbstractDialog* CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0; @@ -421,8 +421,8 @@ public: const OUString& rSourceName, const OUString& rTableName, sal_Int32 nCommandType, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0; + const css::uno::Reference< css::sdbc::XConnection>& xConnection, + css::uno::Sequence< css::uno::Any >* pSelection = 0 ) = 0; virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0; virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0; virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0; diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index bec06f078bc4..e9c41853eeae 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -38,12 +38,12 @@ protected: // rShort is stream-name - encrypted! virtual bool GetLongText( const OUString& rShort, OUString& rLong ) override; - virtual void refreshBlockList( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& ) override; + virtual void refreshBlockList( const css::uno::Reference < css::embed::XStorage >& ) override; // Text with attributes (only SWG-format!). // rShort is stream-name - encrypted! - virtual bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, - const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ) override; + virtual bool PutText( const css::uno::Reference < css::embed::XStorage >&, + const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ) override; public: SwAutoCorrect( const SvxAutoCorrect& rACorr ); diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index 9e10394e6ce3..6660a2dd17e2 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -44,7 +44,7 @@ public: virtual ~SwBaseLink(); 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 void Closed() override; diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index be7a5d157d60..e8ed1cb4e5bc 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -31,8 +31,7 @@ class SwCalendarWrapper : public CalendarWrapper sal_uInt16 nLang; public: - SwCalendarWrapper( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & rxContext = ::comphelper::getProcessComponentContext() ) + SwCalendarWrapper( const css::uno::Reference< css::uno::XComponentContext > & rxContext = ::comphelper::getProcessComponentContext() ) : CalendarWrapper( rxContext ), nLang( LANGUAGE_SYSTEM ) {} diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index a7fc3d1d7014..012acef8a8db 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -103,7 +103,7 @@ public: SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions, SwPaM* ) const; - sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt, + sal_uLong Find( const css::util::SearchOptions& rSearchOpt, bool bSearchInNotes, SwDocPositions nStart, SwDocPositions nEnde, bool& bCancel, @@ -118,13 +118,13 @@ public: SwDocPositions nStart, SwDocPositions nEnde, bool& bCancel, FindRanges = FND_IN_BODY, - const com::sun::star::util::SearchOptions* pSearchOpt = 0, + const css::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); // UI versions - bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsStartWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsEndWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; + bool IsInWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; bool IsStartEndSentence( bool bEnd ) const; bool GoStartWord(); bool GoEndWord(); diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx index 6d91e2b85558..9a47e89990d5 100644 --- a/sw/inc/swdbdata.hxx +++ b/sw/inc/swdbdata.hxx @@ -27,7 +27,7 @@ struct SwDBData { OUString sDataSource; OUString sCommand; //table, query or statement - sal_Int32 nCommandType; //com::sun::star::sdb::CommandType + sal_Int32 nCommandType; //css::sdb::CommandType SwDBData() : nCommandType(0){} void dumpAsXml(struct _xmlTextWriter* pWriter) const; diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx index 5e013c6f4e34..54ce72226752 100644 --- a/sw/inc/swfltopt.hxx +++ b/sw/inc/swfltopt.hxx @@ -32,7 +32,7 @@ public: void GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, sal_uInt32* pValues ); - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; }; #endif diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index db7c33733a85..9ccb175bb1ab 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -97,12 +97,9 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C std::vector<OUString>* m_pAuthorNames; // DictionaryList listener to trigger spellchecking or hyphenation - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener > m_xLinguServiceEventListener; - ::com::sun::star::uno::Reference< - ::com::sun::star::scanner::XScannerManager2 > m_xScannerManager; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLanguageGuessing > m_xLanguageGuesser; + css::uno::Reference< css::linguistic2::XLinguServiceEventListener > m_xLinguServiceEventListener; + css::uno::Reference< css::scanner::XScannerManager2 > m_xScannerManager; + css::uno::Reference< css::linguistic2::XLanguageGuessing > m_xLanguageGuesser; bool m_bAuthorInitialised : 1; bool m_bEmbeddedLoadSave : 1; @@ -230,22 +227,18 @@ public: static void CheckSpellChanges( bool bOnlineSpelling, bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool bSmartTags ); - inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener > + inline css::uno::Reference< css::linguistic2::XLinguServiceEventListener > GetLngSvcEvtListener(); void CreateLngSvcEvtListener(); - ::com::sun::star::uno::Reference< - ::com::sun::star::scanner::XScannerManager2 > + css::uno::Reference< css::scanner::XScannerManager2 > GetScannerManager(); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLanguageGuessing > + css::uno::Reference< css::linguistic2::XLanguageGuessing > GetLanguageGuesser(); }; -inline ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceEventListener > +inline css::uno::Reference< css::linguistic2::XLinguServiceEventListener > SwModule::GetLngSvcEvtListener() { return m_xLinguServiceEventListener; diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 1ff0dd1a497e..c4199f324b23 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -60,7 +60,7 @@ public: } virtual ~SwServerObject(); - virtual bool GetData( ::com::sun::star::uno::Any & rData, + virtual bool GetData( css::uno::Any & rData, const OUString & rMimeType, bool bSynchron = false ) override; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 14d285945d06..5bff42792be2 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -158,14 +158,10 @@ extern ResMgr* pSwResMgr; // Is in swapp0.cxx. #define SW_RES(i) ResId(i,*pSwResMgr) #define SW_RESSTR(i) SW_RES(i).toString() -::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > GetSpellChecker(); -::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > GetHyphenator(); -::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > GetThesaurus(); -::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguProperties > GetLinguPropertySet(); +css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpellChecker(); +css::uno::Reference< css::linguistic2::XHyphenator > GetHyphenator(); +css::uno::Reference< css::linguistic2::XThesaurus > GetThesaurus(); +css::uno::Reference< css::linguistic2::XLinguProperties > GetLinguPropertySet(); // Returns the twip size of this graphic. SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev ); @@ -228,12 +224,12 @@ SW_DLLPUBLIC const LanguageTag& GetAppLanguageTag(); #if 0 // I18N doesn't get this right, can't specify more than one to ignore #define SW_COLLATOR_IGNORES ( \ - ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE | \ - ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_KANA | \ - ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_WIDTH ) + css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE | \ + css::i18n::CollatorOptions::CollatorOptions_IGNORE_KANA | \ + css::i18n::CollatorOptions::CollatorOptions_IGNORE_WIDTH ) #else #define SW_COLLATOR_IGNORES ( \ - ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ) + css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ) #endif SW_DLLPUBLIC CollatorWrapper& GetAppCollator(); diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 40f8f88e0975..a5281c7b4833 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -42,7 +42,7 @@ namespace SWUnoHelper { // calls over the compherl the getEnumAsInt32 function and handle the // exceptions. -sal_Int32 GetEnumAsInt32( const com::sun::star::uno::Any& rVal ); +sal_Int32 GetEnumAsInt32( const css::uno::Any& rVal ); // methods for UCB actions: // delete the file under this URL diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index b37e061057ed..cad07df1059f 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -58,8 +58,8 @@ public: SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper* pIntl = 0 ) const override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; SwTextGridItem& operator=( const SwTextGridItem& ); diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 145d02538698..99d7436b3f7d 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -74,8 +74,7 @@ class SW_DLLPUBLIC SwTOXMark bool m_bAutoGenerated : 1; // generated using a concordance file bool m_bMainEntry : 1; // main entry emphasized by character style - ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark; + css::uno::WeakReference<css::text::XDocumentIndexMark> m_wXDocumentIndexMark; SwTOXMark(); // to create the default attribute in _InitCore @@ -139,11 +138,9 @@ public: const SwTextTOXMark* GetTextTOXMark() const { return m_pTextAttr; } SwTextTOXMark* GetTextTOXMark() { return m_pTextAttr; } - SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference< - ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const + SAL_DLLPRIVATE css::uno::WeakReference<css::text::XDocumentIndexMark> const& GetXTOXMark() const { return m_wXDocumentIndexMark; } - SAL_DLLPRIVATE void SetXTOXMark(::com::sun::star::uno::Reference< - ::com::sun::star::text::XDocumentIndexMark> const& xMark) + SAL_DLLPRIVATE void SetXTOXMark(css::uno::Reference<css::text::XDocumentIndexMark> const& xMark) { m_wXDocumentIndexMark = xMark; } void DeRegister() { GetRegisteredInNonConst()->Remove( this ); } void RegisterToTOXType( SwTOXType& rMark ); diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index b83e34906146..820aaad32a99 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -36,30 +36,30 @@ namespace lang { class SW_DLLPUBLIC IndexEntrySupplierWrapper { - ::com::sun::star::lang::Locale aLcl; - ::com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedIndexEntrySupplier > xIES; + css::lang::Locale aLcl; + css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES; public: IndexEntrySupplierWrapper(); ~IndexEntrySupplierWrapper(); - void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; } + void SetLocale( const css::lang::Locale& rLocale ) { aLcl = rLocale; } OUString GetIndexKey( const OUString& rText, const OUString& rTextReading, - const ::com::sun::star::lang::Locale& rLocale ) const; + const css::lang::Locale& rLocale ) const; OUString GetFollowingText( bool bMorePages ) const; - ::com::sun::star::uno::Sequence< OUString > - GetAlgorithmList( const ::com::sun::star::lang::Locale& rLcl ) const; + css::uno::Sequence< OUString > + GetAlgorithmList( const css::lang::Locale& rLcl ) const; - bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl, + bool LoadAlgorithm( const css::lang::Locale& rLcl, const OUString& sSortAlgorithm, long nOptions ) const; sal_Int16 CompareIndexEntry( const OUString& rText1, const OUString& rTextReading1, - const ::com::sun::star::lang::Locale& rLcl1, + const css::lang::Locale& rLcl1, const OUString& rText2, const OUString& rTextReading2, - const ::com::sun::star::lang::Locale& rLcl2 ) const; + const css::lang::Locale& rLcl2 ) const; }; #endif diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index da3b000a69f6..8cc22f416205 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -32,8 +32,8 @@ class SwDoc; class SwUnoTableCrsr; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::container::XEnumeration +< css::lang::XServiceInfo +, css::container::XEnumeration > SwSimpleEnumeration_Base; @@ -104,9 +104,7 @@ namespace sw { using UnoImplPtr = ::std::unique_ptr<T, UnoImplPtrDeleter<T> >; template< class C > C * - UnoTunnelGetImplementation( - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XUnoTunnel > const & xUnoTunnel) + UnoTunnelGetImplementation( css::uno::Reference< css::lang::XUnoTunnel > const & xUnoTunnel) { if (!xUnoTunnel.is()) { return 0; } C *const pC( reinterpret_cast< C* >( @@ -116,7 +114,7 @@ namespace sw { } template< class C > sal_Int64 - UnoTunnelImpl(const ::com::sun::star::uno::Sequence< sal_Int8 > & rId, + UnoTunnelImpl(const css::uno::Sequence< sal_Int8 > & rId, C *const pThis) { if ((rId.getLength() == 16) && @@ -129,7 +127,7 @@ namespace sw { return 0; } - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > GetSupportedServiceNamesImpl( size_t const nServices, char const*const pServices[]); diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index b926379ac7a5..69adac560756 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -94,10 +94,10 @@ public: typedef cppu::WeakImplHelper < - ::com::sun::star::chart2::data::XDataProvider, - ::com::sun::star::chart2::data::XRangeXMLConversion, - ::com::sun::star::lang::XComponent, - ::com::sun::star::lang::XServiceInfo + css::chart2::data::XDataProvider, + css::chart2::data::XRangeXMLConversion, + css::lang::XComponent, + css::lang::XServiceInfo > SwChartDataProviderBaseClass; @@ -110,14 +110,14 @@ class SwChartDataProvider : // see set definition below... struct lt_DataSequenceRef { - bool operator()( ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > xWRef1, ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > xWRef2 ) const + bool operator()( css::uno::WeakReference< css::chart2::data::XDataSequence > xWRef1, css::uno::WeakReference< css::chart2::data::XDataSequence > xWRef2 ) const { - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > xRef1( xWRef1 ); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > xRef2( xWRef2 ); + css::uno::Reference< css::chart2::data::XDataSequence > xRef1( xWRef1 ); + css::uno::Reference< css::chart2::data::XDataSequence > xRef2( xWRef2 ); return xRef1.get() < xRef2.get(); } }; - typedef std::set< ::com::sun::star::uno::WeakReference < ::com::sun::star::chart2::data::XDataSequence >, lt_DataSequenceRef > Set_DataSequenceRef_t; + typedef std::set< css::uno::WeakReference < css::chart2::data::XDataSequence >, lt_DataSequenceRef > Set_DataSequenceRef_t; // map of data-sequence sets for each table struct lt_SwTable_Ptr @@ -142,13 +142,13 @@ class SwChartDataProvider : SwChartDataProvider( const SwChartDataProvider & ) = delete; SwChartDataProvider & operator = ( const SwChartDataProvider & ) = delete; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, bool bTestOnly = false ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception); static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation ); @@ -162,12 +162,12 @@ public: virtual ~SwChartDataProvider(); // XDataProvider - virtual sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL createDataSourcePossible( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL createDataSequenceByValueArray( @@ -176,23 +176,23 @@ public: // XRangeXMLConversion virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::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; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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; - void AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence ); - void RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence ); + void AddDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence ); + void RemoveDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence ); // will send modifdied events for all data-sequences of the table void InvalidateTable( const SwTable *pTable ); @@ -205,46 +205,45 @@ public: typedef cppu::WeakImplHelper < - ::com::sun::star::chart2::data::XDataSource, - ::com::sun::star::lang::XServiceInfo + css::chart2::data::XDataSource, + css::lang::XServiceInfo > SwChartDataSourceBaseClass; class SwChartDataSource : public SwChartDataSourceBaseClass { - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::chart2::data::XLabeledDataSequence > > aLDS; + css::uno::Sequence< + css::uno::Reference< css::chart2::data::XLabeledDataSequence > > aLDS; SwChartDataSource( const SwChartDataSource & ) = delete; SwChartDataSource & operator = ( const SwChartDataSource & ) = delete; public: - SwChartDataSource( const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::data::XLabeledDataSequence > > &rLDS ); + SwChartDataSource( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > &rLDS ); virtual ~SwChartDataSource(); // XDataSource - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) 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; }; typedef cppu::WeakImplHelper < - ::com::sun::star::chart2::data::XDataSequence, - ::com::sun::star::chart2::data::XTextualDataSequence, - ::com::sun::star::chart2::data::XNumericalDataSequence, - ::com::sun::star::util::XCloneable, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::util::XModifiable, - ::com::sun::star::lang::XEventListener, - ::com::sun::star::lang::XComponent + css::chart2::data::XDataSequence, + css::chart2::data::XTextualDataSequence, + css::chart2::data::XNumericalDataSequence, + css::util::XCloneable, + css::beans::XPropertySet, + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::util::XModifiable, + css::lang::XEventListener, + css::lang::XComponent > SwChartDataSequenceBaseClass; @@ -252,16 +251,16 @@ class SwChartDataSequence : public SwChartDataSequenceBaseClass, public SwClient { - ::cppu::OInterfaceContainerHelper aEvtListeners; - ::cppu::OInterfaceContainerHelper aModifyListeners; - ::com::sun::star::chart2::data::DataSequenceRole aRole; + ::cppu::OInterfaceContainerHelper aEvtListeners; + ::cppu::OInterfaceContainerHelper aModifyListeners; + css::chart2::data::DataSequenceRole aRole; OUString aRowLabelText; OUString aColLabelText; // holds a reference to the data-provider to guarantee its lifetime last as // long as the pointer may be used. - ::com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataProvider > xDataProvider; + css::uno::Reference< css::chart2::data::XDataProvider > xDataProvider; SwChartDataProvider * pDataProvider; sw::UnoCursorPointer pTableCrsr; // cursor spanned over cells to use @@ -283,65 +282,65 @@ public: std::shared_ptr<SwUnoCrsr> pTableCursor ); virtual ~SwChartDataSequence(); - 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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // XDataSequence - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin eLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( css::chart2::data::LabelOrigin eLabelOrigin ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() + throw (css::uno::RuntimeException, std::exception) override; // XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() + throw (css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) 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; // 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; // XModifiable - virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::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; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } bool DeleteBox( const SwTableBox &rBox ); @@ -353,10 +352,10 @@ public: typedef cppu::WeakImplHelper < - ::com::sun::star::chart2::data::XLabeledDataSequence2, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::util::XModifyListener, - ::com::sun::star::lang::XComponent + css::chart2::data::XLabeledDataSequence2, + css::lang::XServiceInfo, + css::util::XModifyListener, + css::lang::XComponent > SwChartLabeledDataSequenceBaseClass; @@ -366,50 +365,48 @@ class SwChartLabeledDataSequence : ::cppu::OInterfaceContainerHelper aEvtListeners; ::cppu::OInterfaceContainerHelper aModifyListeners; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > xData; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XDataSequence > xLabels; + css::uno::Reference< css::chart2::data::XDataSequence > xData; + css::uno::Reference< css::chart2::data::XDataSequence > xLabels; bool bDisposed; SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) = delete; SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) = delete; - void SetDataSequence( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxDest, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& rxSource ); + void SetDataSequence( css::uno::Reference< css::chart2::data::XDataSequence >& rxDest, const css::uno::Reference< css::chart2::data::XDataSequence >& rxSource ); public: SwChartLabeledDataSequence(); virtual ~SwChartLabeledDataSequence(); // XLabeledDataSequence - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValues( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabel( const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) throw (css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) 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; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::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; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; }; #endif diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index e75edcb3a1c2..f4cc3c8caae6 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -249,19 +249,19 @@ class SwUnoCollection class SwXServiceProvider { public: - static OUString GetProviderName(sal_uInt16 nObjectType); + static OUString GetProviderName(sal_uInt16 nObjectType); static sal_uInt16 GetProviderType(const OUString& rServiceName); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance(sal_uInt16 nObjectType, SwDoc & rDoc); - static ::com::sun::star::uno::Sequence<OUString> GetAllServiceNames(); + static css::uno::Reference< css::uno::XInterface > MakeInstance(sal_uInt16 nObjectType, SwDoc & rDoc); + static css::uno::Sequence<OUString> GetAllServiceNames(); }; typedef cppu::WeakImplHelper < - ::com::sun::star::container::XNameAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XNameAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo > SwCollectionBaseClass; class SW_DLLPUBLIC SwXTextTables : public SwCollectionBaseClass, @@ -273,22 +273,22 @@ public: SwXTextTables(SwDoc* pDoc); //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; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) 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; //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; static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat); }; @@ -296,10 +296,10 @@ public: typedef cppu::WeakImplHelper < - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XNameAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XEnumerationAccess, + css::container::XNameAccess, + css::container::XIndexAccess, + css::lang::XServiceInfo > SwXFramesBaseClass; class SW_DLLPUBLIC SwXFrames : public SwXFramesBaseClass, @@ -312,25 +312,25 @@ public: SwXFrames(SwDoc* pDoc, FlyCntType eSet); //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; //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; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) 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; //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; }; class SwXTextFrames : public SwXFrames @@ -341,9 +341,9 @@ public: SwXTextFrames(SwDoc* pDoc); //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; }; @@ -355,9 +355,9 @@ public: SwXTextGraphicObjects(SwDoc* pDoc); //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; }; @@ -369,9 +369,9 @@ public: SwXTextEmbeddedObjects(SwDoc* pDoc); //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; }; @@ -384,24 +384,24 @@ public: SwXTextSections(SwDoc* pDoc); //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; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) 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; //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; - static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFormat& rFormat ); + static css::uno::Reference< css::text::XTextSection> GetObject( SwSectionFormat& rFormat ); }; class SwXBookmarks : public SwCollectionBaseClass, @@ -413,28 +413,28 @@ class SwXBookmarks : public SwCollectionBaseClass, SwXBookmarks(SwDoc* pDoc); //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; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) 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; //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; }; class SwXNumberingRulesCollection : public cppu::WeakImplHelper < - ::com::sun::star::container::XIndexAccess + css::container::XIndexAccess >, public SwUnoCollection { @@ -445,19 +445,19 @@ public: SwXNumberingRulesCollection( SwDoc* pDoc ); //XIndexAccess - virtual sal_Int32 SAL_CALL 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 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; //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; }; typedef cppu::WeakImplHelper < - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XIndexAccess, + css::lang::XServiceInfo > SwSimpleIndexAccessBaseClass; @@ -472,19 +472,19 @@ public: SwXFootnotes(bool bEnd, SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL 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 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; //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; //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; - static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat ); + static css::uno::Reference< css::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat ); }; class SwXReferenceMarks : public SwCollectionBaseClass, @@ -496,22 +496,22 @@ public: SwXReferenceMarks(SwDoc* pDoc); //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; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) 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; //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; }; diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 4dc6ffd12acb..5c59c67b9896 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -70,21 +70,21 @@ namespace SwUnoCursorHelper { private: // keep Any's mapped by (WhichId << 16 ) + (MemberId) - std::map<sal_uInt32, com::sun::star::uno::Any> m_Map; + std::map<sal_uInt32, css::uno::Any> m_Map; public: - void SetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any& rAny ); - bool FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any*& pAny ); + void SetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const css::uno::Any& rAny ); + bool FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const css::uno::Any*& pAny ); }; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > + css::uno::Reference< css::text::XTextContent > GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex, bool const bParent); bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry , SwPaM& rPam - , com::sun::star::uno::Any *pAny - , com::sun::star::beans::PropertyState& eState + , css::uno::Any *pAny + , css::beans::PropertyState& eState , const SwTextNode* pNode = 0 ); void GetCurPageStyle(SwPaM& rPaM, OUString &rString); @@ -98,39 +98,39 @@ namespace SwUnoCursorHelper void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam); void InsertFile(SwUnoCrsr* pUnoCrsr, const OUString& rURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rOptions) - throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, + const css::uno::Sequence< css::beans::PropertyValue >& rOptions) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception); void getNumberingProperty( SwPaM& rPam, - com::sun::star::beans::PropertyState& eState, - com::sun::star::uno::Any *pAny ); + css::beans::PropertyState& eState, + css::uno::Any *pAny ); void setNumberingProperty( - const com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, SwPaM& rPam); sal_Int16 IsNodeNumStart( SwPaM& rPam, - com::sun::star::beans::PropertyState& eState); + css::beans::PropertyState& eState); bool DocInsertStringSplitCR( SwDoc &rDoc, const SwPaM &rNewCursor, const OUString &rText, const bool bForceExpandHints ); void makeRedline( SwPaM& rPaM, const OUString& RedlineType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); void makeTableRowRedline( SwTableLine& rTableLine, const OUString& RedlineType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); SW_DLLPUBLIC void makeTableCellRedline( SwTableBox& rTableBox, const OUString& RedlineType, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); /// @param bTableMode: attributes should be applied to a table selection void SetCrsrAttr(SwPaM & rPam, const SfxItemSet & rSet, @@ -145,11 +145,10 @@ namespace SwUnoCursorHelper void SelectPam(SwPaM & rPam, const bool bExpand); void SetString(SwCursor & rCursor, const OUString & rString); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > + css::uno::Sequence< css::beans::PropertyValue > CreateSortDescriptor(const bool bFromTable); bool ConvertSortProperties( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rDescriptor, + const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor, SwSortOptions & rSortOpt); /// @param bTableMode: attributes should be applied to a table selection @@ -157,19 +156,19 @@ namespace SwUnoCursorHelper SwPaM& rPaM, const SfxItemPropertySet & rPropSet, const OUString & rPropertyName, - const ::com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, const SetAttrMode nAttrMode = SetAttrMode::DEFAULT, const bool bTableMode = false) - 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); + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException); /// @param bTableMode: attributes should be applied to a table selection void SetPropertyValues( SwPaM& rPaM, const SfxItemPropertySet & rPropSet, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & + const css::uno::Sequence< css::beans::PropertyValue > & rPropertyValues, const SetAttrMode nAttrMode = SetAttrMode::DEFAULT, const bool bTableMode = false) @@ -179,53 +178,52 @@ namespace SwUnoCursorHelper css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any GetPropertyValue( + css::uno::Any GetPropertyValue( SwPaM& rPaM, const SfxItemPropertySet & rPropSet, const OUString & rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyState > GetPropertyStates( + css::uno::Sequence< css::beans::PropertyState > GetPropertyStates( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, - const ::com::sun::star::uno::Sequence< OUString >& + const css::uno::Sequence< OUString >& rPropertyNames, const SwGetPropertyStatesCaller eCaller = SW_PROPERTY_STATE_CALLER_DEFAULT) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception); - ::com::sun::star::beans::PropertyState GetPropertyState( + css::beans::PropertyState GetPropertyState( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, const OUString & rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException); void SetPropertyToDefault( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, const OUString & rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Any GetPropertyDefault( + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception); + css::uno::Any GetPropertyDefault( SwPaM & rPaM, const SfxItemPropertySet & rPropSet, const OUString & rPropertyName) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + throw (css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException); bool SetPageDesc( - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, SwDoc & rDoc, SfxItemSet & rSet); - void SetTextFormatColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM) + void SetTextFormatColl(const css::uno::Any & rAny, SwPaM & rPaM) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); bool SetCursorPropertyValue( SfxItemPropertySimpleEntry const& rEntry, - ::com::sun::star::uno::Any const& rValue, + css::uno::Any const& rValue, SwPaM & rPam, SfxItemSet & rItemSet) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, css::uno::DeploymentException, std::exception); @@ -234,16 +232,14 @@ namespace SwUnoCursorHelper /// at most one of the out parameters gets assigned a non-null value /// o_rpPaM is newly allocated and must be deleted; other parameters not SW_DLLPUBLIC void GetSelectableFromAny( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> const& xIfc, + css::uno::Reference<css::uno::XInterface> const& xIfc, SwDoc & rTargetDoc, SwPaM *& o_rpPaM, std::pair<OUString, FlyCntType> & o_rFrame, OUString & o_rTableName, SwUnoTableCrsr const*& o_rpTableCursor, ::sw::mark::IMark const*& o_rpMark, std::vector<SdrObject *> & o_rSdrObjects); - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XFlatParagraphIterator> + css::uno::Reference<css::text::XFlatParagraphIterator> CreateFlatParagraphIterator(SwDoc &, sal_Int32, bool); } // namespace SwUnoCursorHelper diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index ec6d9fdce129..81ba5ec5dc66 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -45,73 +45,73 @@ class SwFmDrawPage : public SvxFmDrawPage protected: // Create a SdrObject according to a description. Can be used by derived classes to - // support own ::com::sun::star::drawing::Shapes (e.g. controls). - virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) + // support own css::drawing::Shapes (e.g. controls). + virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape ) throw (css::uno::RuntimeException, std::exception) override; public: SwFmDrawPage( SdrPage* pPage ); virtual ~SwFmDrawPage() throw (); - const SdrMarkList& PreGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rShapes); - void PreUnGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& rShapeGroup); + const SdrMarkList& PreGroup(const css::uno::Reference< css::drawing::XShapes >& rShapes); + void PreUnGroup(const css::uno::Reference< css::drawing::XShapeGroup >& rShapeGroup); SdrView* GetDrawView() {return mpView;} SdrPageView* GetPageView(); void RemovePageView(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface( SdrObject* pObj ); + static css::uno::Reference< css::uno::XInterface > GetInterface( SdrObject* pObj ); // The following method is called when a SvxShape-object is to be created. // Derived classes may obtain at this point a derivation or an object // that is aggregating a SvxShape. - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; }; typedef cppu::WeakAggImplHelper4 < - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::drawing::XDrawPage, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::drawing::XShapeGrouper + css::container::XEnumerationAccess, + css::drawing::XDrawPage, + css::lang::XServiceInfo, + css::drawing::XShapeGrouper > SwXDrawPageBaseClass; class SwXDrawPage : public SwXDrawPageBaseClass { SwDoc* pDoc; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xPageAgg; + css::uno::Reference< css::uno::XAggregation > xPageAgg; SwFmDrawPage* pDrawPage; public: SwXDrawPage(SwDoc* pDoc); virtual ~SwXDrawPage(); //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; - 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 ::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::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; //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; //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; //XShapes - virtual void SAL_CALL add(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL remove(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL add(const css::uno::Reference< css::drawing::XShape > & xShape) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL remove(const css::uno::Reference< css::drawing::XShape > & xShape) throw( css::uno::RuntimeException, std::exception ) override; //XShapeGrouper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::drawing::XShapeGroup > SAL_CALL group(const css::uno::Reference< css::drawing::XShapes > & xShapes) + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL ungroup(const css::uno::Reference< css::drawing::XShapeGroup > & aGroup) 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; SwFmDrawPage* GetSvxPage(); // renamed and outlined to detect where it's called @@ -126,12 +126,12 @@ class SwXGroupShape; typedef cppu::WeakAggImplHelper6 < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::text::XTextContent, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::drawing::XShape + css::beans::XPropertySet, + css::beans::XPropertyState, + css::text::XTextContent, + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::drawing::XShape > SwXShapeBaseClass; class SwXShape : public SwXShapeBaseClass, @@ -140,10 +140,10 @@ class SwXShape : public SwXShapeBaseClass, friend class SwXGroupShape; friend class SwXDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xShapeAgg; + css::uno::Reference< css::uno::XAggregation > xShapeAgg; // reference to <XShape>, determined in the // constructor by <queryAggregation> at <xShapeAgg>. - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; const SfxItemPropertySet* m_pPropSet; const SfxItemPropertyMapEntry* m_pPropertyMapEntries; @@ -164,14 +164,14 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - com::sun::star::awt::Point _GetAttrPosition(); + css::awt::Point _GetAttrPosition(); /** method to convert the position (translation) of the drawing object to the layout direction horizontal left-to-right. @author OD */ - ::com::sun::star::awt::Point _ConvertPositionToHoriL2R( + css::awt::Point _ConvertPositionToHoriL2R( const css::awt::Point& rObjPos, const css::awt::Size& rObjSize ); @@ -199,25 +199,25 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - ::com::sun::star::awt::Point _ConvertStartOrEndPosToLayoutDir( - const ::com::sun::star::awt::Point& aStartOrEndPos ); + css::awt::Point _ConvertStartOrEndPosToLayoutDir( + const css::awt::Point& aStartOrEndPos ); /** method to convert PolyPolygonBezier of the drawing object to the Writer specific position, which is the attribute position in layout direction @author OD */ - ::com::sun::star::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir( - const ::com::sun::star::drawing::PolyPolygonBezierCoords& aPath ); + css::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir( + const css::drawing::PolyPolygonBezierCoords& aPath ); /** method to get property from aggregation object @author OD */ - ::com::sun::star::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName ) - throw( ::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + css::uno::Any _getPropAtAggrObj( const OUString& _rPropertyName ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException); protected: virtual ~SwXShape(); @@ -225,55 +225,55 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: - SwXShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); + SwXShape(css::uno::Reference< css::uno::XInterface > & xShape); TYPEINFO_OVERRIDE(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - 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 ::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; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::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; //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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) 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; //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; + virtual void SAL_CALL attach(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; //XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) 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; - virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType( ) throw (css::uno::RuntimeException, std::exception) override; SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;} SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;} + css::uno::Reference< css::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;} // helper static void AddExistingShapeToFormat( SdrObject& _rObj ); @@ -281,28 +281,28 @@ public: class SwXGroupShape : public SwXShape, - public ::com::sun::star::drawing::XShapes + public css::drawing::XShapes { protected: virtual ~SwXGroupShape(); public: - SwXGroupShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); + SwXGroupShape(css::uno::Reference< css::uno::XInterface > & xShape); - 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; virtual void SAL_CALL release( ) throw() override; //XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; //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; //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; }; #endif diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index 3bb0ad204e2b..722960cc9df5 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -29,8 +29,8 @@ class SwFieldType; typedef ::cppu::WeakImplHelper -< ::com::sun::star::container::XNameAccess -, ::com::sun::star::lang::XServiceInfo +< css::container::XNameAccess +, css::lang::XServiceInfo > SwXTextFieldMasters_Base; class SwXTextFieldMasters @@ -47,37 +47,37 @@ 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; // 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; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( + virtual css::uno::Any SAL_CALL getByName( const OUString& rName) - 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; + 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& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakImplHelper -< ::com::sun::star::container::XEnumerationAccess -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::util::XRefreshable +< css::container::XEnumerationAccess +, css::lang::XServiceInfo +, css::util::XRefreshable > SwXTextFieldTypes_Base; class SwXTextFieldTypes @@ -99,37 +99,37 @@ 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; // 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; // 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; }; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index f33a466ffa86..4a3eb3718d79 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -45,12 +45,12 @@ class SwFlyFrameFormat; class BaseFrameProperties_Impl; class SwXFrame : public cppu::WeakImplHelper < - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::drawing::XShape, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XUnoTunnel + css::lang::XServiceInfo, + css::beans::XPropertySet, + css::beans::XPropertyState, + css::drawing::XShape, + css::container::XNamed, + css::lang::XUnoTunnel >, public SwClient { @@ -71,8 +71,8 @@ private: SwPaM* m_pCopySource; protected: - com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData; - com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily; + css::uno::Reference< css::beans::XPropertySet > mxStyleData; + css::uno::Reference< css::container::XNameAccess > mxStyleFamily; virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; virtual ~SwXFrame(); @@ -88,56 +88,56 @@ protected: CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat); public: - 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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; TYPEINFO_OVERRIDE(); //XNamed - virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName(const OUString& Name_) 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; //XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; //XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getShapeType() throw( css::uno::RuntimeException, std::exception ) override; //Base implementation //XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - 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); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getAnchor() throw( css::uno::RuntimeException, std::exception ); //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; - void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); - void 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); + void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + void attach( const css::uno::Reference< css::text::XTextRange >& xTextRange ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); const SwFrameFormat* GetFrameFormat() const { @@ -158,9 +158,9 @@ public: typedef cppu::WeakImplHelper < - ::com::sun::star::text::XTextFrame, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::document::XEventsSupplier + css::text::XTextFrame, + css::container::XEnumerationAccess, + css::document::XEventsSupplier > SwXTextFrameBaseClass; @@ -173,10 +173,9 @@ protected: virtual const SwStartNode *GetStartNode() const override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > + virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; virtual ~SwXTextFrame(); @@ -190,50 +189,50 @@ public: // FIXME: EVIL HACK: make available for SwXFrame::attachToRange void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); }; - 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; virtual void SAL_CALL release( ) throw() override; //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; //XTextFrame - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() 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; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::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 createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; //XEnumerationAccess - frueher XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() 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; //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; + virtual void SAL_CALL attach( 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; //XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::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; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) 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; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; //XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XPropertySet - 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 css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); @@ -241,8 +240,8 @@ public: typedef cppu::WeakImplHelper < - ::com::sun::star::text::XTextContent, - ::com::sun::star::document::XEventsSupplier + css::text::XTextContent, + css::document::XEventsSupplier > SwXTextGraphicObjectBaseClass; class SwXTextGraphicObject : public SwXTextGraphicObjectBaseClass, @@ -261,30 +260,30 @@ public: static css::uno::Reference<css::text::XTextContent> CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat); - 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; virtual void SAL_CALL release( ) throw() override; //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; //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; + virtual void SAL_CALL attach(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; //XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) 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; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); }; @@ -292,9 +291,9 @@ public: class SwOLENode; typedef cppu::WeakImplHelper < - ::com::sun::star::text::XTextContent, - ::com::sun::star::document::XEmbeddedObjectSupplier2, - ::com::sun::star::document::XEventsSupplier + css::text::XTextContent, + css::document::XEmbeddedObjectSupplier2, + css::document::XEventsSupplier >SwXTextEmbeddedObjectBaseClass; class SwXTextEmbeddedObject : public SwXTextEmbeddedObjectBaseClass, @@ -314,60 +313,60 @@ public: static css::uno::Reference<css::text::XTextContent> CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat); - 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; virtual void SAL_CALL release( ) throw() override; //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; //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; + virtual void SAL_CALL attach(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; //XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; //XEmbeddedObjectSupplier2 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::lang::XComponent > SAL_CALL getEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( css::uno::RuntimeException, std::exception ) override; + virtual ::sal_Int64 SAL_CALL getAspect() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getReplacementGraphic() 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; // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; void * SAL_CALL operator new( size_t ) throw(); void SAL_CALL operator delete( void * ) throw(); }; class SwXOLEListener : public cppu::WeakImplHelper < - ::com::sun::star::util::XModifyListener + css::util::XModifyListener >, public SwClient { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel; + css::uno::Reference< css::frame::XModel > xOLEModel; SwFormat* GetFormat() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } public: - SwXOLEListener(SwFormat& rOLEFormat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); + SwXOLEListener(SwFormat& rOLEFormat, css::uno::Reference< css::frame::XModel > xOLE); virtual ~SwXOLEListener(); TYPEINFO_OVERRIDE(); -// ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::lang::XEventListener + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::util::XModifyListener + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx index 3308a70fc83b..033c2c4f307a 100644 --- a/sw/inc/unoidxcoll.hxx +++ b/sw/inc/unoidxcoll.hxx @@ -36,38 +36,38 @@ 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; // 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; // 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; + 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; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( + virtual css::uno::Any SAL_CALL getByName( const OUString& rName) - 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; + 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& rName) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 7d08dcf746b7..d9fa41e6b5bc 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -49,16 +49,16 @@ class SwXText; 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::beans::XTolerantMultiPropertySet -, ::com::sun::star::container::XEnumerationAccess -, ::com::sun::star::container::XContentEnumerationAccess -, ::com::sun::star::text::XTextContent -, ::com::sun::star::text::XTextRange +, css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::beans::XPropertyState +, css::beans::XMultiPropertySet +, css::beans::XTolerantMultiPropertySet +, css::container::XEnumerationAccess +, css::container::XContentEnumerationAccess +, css::text::XTextContent +, css::text::XTextRange > SwXParagraph_Base; class SwXParagraph @@ -72,8 +72,7 @@ private: virtual ~SwXParagraph(); - SwXParagraph(::com::sun::star::uno::Reference< - ::com::sun::star::text::XText > const & xParent, + SwXParagraph(css::uno::Reference< css::text::XText > const & xParent, SwTextNode & rTextNode, const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1); @@ -82,11 +81,10 @@ private: public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> + static css::uno::Reference<css::text::XTextContent> CreateXParagraph(SwDoc & rDoc, SwTextNode * pTextNode, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> - const& xParentText = 0, + css::uno::Reference< css::text::XText> + const& xParentText = 0, const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1); const SwTextNode * GetTextNode() const; @@ -98,207 +96,178 @@ public: // 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; // XTolerantMultiPropertySet - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL + virtual css::uno::Sequence< css::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rValues) - 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 + const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Sequence< css::uno::Any >& rValues) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL + const css::uno::Sequence< OUString >& rPropertyNames) + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< + css::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( - 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; // 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; // XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::container::XEnumeration > SAL_CALL + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(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 getAvailableServiceNames() - 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 > + virtual css::uno::Reference< css::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; + 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; }; @@ -307,7 +276,7 @@ struct SwXParagraphEnumeration : public SwSimpleEnumeration_Base { static SwXParagraphEnumeration* Create( - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const & xParent, + css::uno::Reference< css::text::XText > const & xParent, std::shared_ptr<SwUnoCrsr> pCursor, const CursorType eType, SwStartNode const*const pStartNode = 0, diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 9c4cb5ea2a5e..2c0cadfc0522 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -31,7 +31,7 @@ class SwRangeRedline; class SwXRedlineText : public SwXText, public cppu::OWeakObject, - public ::com::sun::star::container::XEnumerationAccess + public css::container::XEnumerationAccess { SwNodeIndex aNodeIndex; virtual const SwStartNode *GetStartNode() const override; @@ -39,29 +39,29 @@ class SwXRedlineText : public: SwXRedlineText(SwDoc* pDoc, SwNodeIndex aNodeIndex); - 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 {OWeakObject::acquire();} virtual void SAL_CALL release( ) throw() override {OWeakObject::release();} - 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; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::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 createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; //XElementAccess (via XEnumerationAccess) - 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; }; typedef cppu::WeakImplHelper < - ::com::sun::star::container::XEnumerationAccess + css::container::XEnumerationAccess > SwXRedlineBaseClass; class SwXRedline : @@ -77,32 +77,32 @@ public: TYPEINFO_OVERRIDE(); - 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 {OWeakObject::acquire();} virtual void SAL_CALL release( ) throw() override {OWeakObject::release();} - 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; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::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 createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) 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; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() 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; const SwRangeRedline* GetRedline() const {return pRedline;} protected: diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 572a6a2c74df..ccb197bfc623 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -32,9 +32,9 @@ namespace com{ namespace sun{ namespace star{ typedef cppu::WeakImplHelper < - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::lang::XServiceInfo + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::lang::XServiceInfo > SwRedlinesBaseClass; class SwXRedlines : public SwRedlinesBaseClass, @@ -46,22 +46,22 @@ public: SwXRedlines(SwDoc* pDoc); //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; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() 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; //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; - static ::com::sun::star::beans::XPropertySet* GetObject( SwRangeRedline& rRedline, SwDoc& rDoc ); + static css::beans::XPropertySet* GetObject( SwRangeRedline& rRedline, SwDoc& rDoc ); }; class SwXRedlineEnumeration @@ -76,13 +76,13 @@ public: SwXRedlineEnumeration(SwDoc& rDoc); //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; //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; protected: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index c133f6bdb745..e9cf05ae6839 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -41,8 +41,8 @@ class SwNumFormat; class SwXFootnoteProperties : public cppu::WeakAggImplHelper2 < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo + css::beans::XPropertySet, + css::lang::XServiceInfo > { SwDoc* pDoc; @@ -53,26 +53,26 @@ public: SwXFootnoteProperties(SwDoc* pDoc); //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; //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; void Invalidate() {pDoc = 0;} }; class SwXEndnoteProperties : public cppu::WeakAggImplHelper2 < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo + css::beans::XPropertySet, + css::lang::XServiceInfo > { SwDoc* pDoc; @@ -83,26 +83,26 @@ public: SwXEndnoteProperties(SwDoc* pDoc); //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; //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; void Invalidate() {pDoc = 0;} }; class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2 < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo + css::beans::XPropertySet, + css::lang::XServiceInfo > { SwDoc* pDoc; @@ -113,29 +113,29 @@ public: SwXLineNumberingProperties(SwDoc* pDoc); //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; //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; void Invalidate() {pDoc = 0;} }; class SwXNumberingRules : public cppu::WeakAggImplHelper5 < - ::com::sun::star::container::XIndexReplace, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo + css::container::XIndexReplace, + css::lang::XUnoTunnel, + css::beans::XPropertySet, + css::container::XNamed, + css::lang::XServiceInfo >, public SwClient { @@ -158,44 +158,43 @@ public: SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc = NULL); // NumRule for paragraphs, numbering styles SwXNumberingRules(SwDoc& rDoc); //create a new instance - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + static const css::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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; //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; //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; //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; //XNamed - virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName(const OUString& Name_) 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; - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> + css::uno::Sequence< css::beans::PropertyValue> GetNumberingRuleByIndex(const SwNumRule& rNumRule, sal_Int32 nIndex)const; void SetNumberingRuleByIndex(SwNumRule& rNumRule, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties, sal_Int32 nIndex) + const css::uno::Sequence< css::beans::PropertyValue>& rProperties, sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); const OUString* GetNewCharStyleNames() const {return m_sNewCharStyleNames;} @@ -230,24 +229,24 @@ public: void Invalidate() {SwXNumberingRules::Invalidate();} //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; }; class SwXTextColumns : public cppu::WeakAggImplHelper4 < - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::text::XTextColumns, - ::com::sun::star::lang::XServiceInfo + css::lang::XUnoTunnel, + css::beans::XPropertySet, + css::text::XTextColumns, + css::lang::XServiceInfo > { sal_Int32 nReference; - ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn> aTextColumns; - bool bIsAutomaticWidth; + css::uno::Sequence< css::text::TextColumn> aTextColumns; + bool bIsAutomaticWidth; sal_Int32 nAutoDistance; const SfxItemPropertySet* m_pPropSet; @@ -257,7 +256,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4 sal_Int32 nSepLineColor; sal_Int8 nSepLineHeightRelative; sal_Int8 nSepLineVertAlign;//style::VerticalAlignment - bool bSepLineIsOn; + bool bSepLineIsOn; sal_Int8 nSepLineStyle; protected: @@ -266,40 +265,40 @@ public: SwXTextColumns(sal_uInt16 nColCount); SwXTextColumns(const SwFormatCol& rFormatCol); - 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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XTextColumns - virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getColumnCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::text::TextColumn >& Columns ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getReferenceValue( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getColumnCount( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumnCount( sal_Int16 nColumns ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::text::TextColumn > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumns( const css::uno::Sequence< css::text::TextColumn >& Columns ) 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; //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; sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} sal_Int32 GetSepLineColor() const {return nSepLineColor;} sal_Int8 GetSepLineHeightRelative() const {return nSepLineHeightRelative;} sal_Int8 GetSepLineVertAlign() const {return nSepLineVertAlign;} - bool GetSepLineIsOn() const {return bSepLineIsOn;} + bool GetSepLineIsOn() const {return bSepLineIsOn;} sal_Int8 GetSepLineStyle() const {return nSepLineStyle;} - bool IsAutomaticWidth() const {return bIsAutomaticWidth;} + bool IsAutomaticWidth() const {return bIsAutomaticWidth;} }; #endif diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index b1cf646f4a39..9f0536be412b 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -36,9 +36,9 @@ namespace com{namespace sun{namespace star{namespace util{ class SwXTextSearch : public cppu::WeakImplHelper < - ::com::sun::star::util::XPropertyReplace, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel + css::util::XPropertyReplace, + css::lang::XServiceInfo, + css::lang::XUnoTunnel > { friend class SwXTextDocument; @@ -68,40 +68,40 @@ protected: public: SwXTextSearch(); - 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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchString( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override; //XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getReplaceString() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) 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; //XPropertyReplace - virtual sal_Bool SAL_CALL getValueSearch() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setSearchAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL getValueSearch() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getSearchAttributes() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setSearchAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) throw( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getReplaceAttributes() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setReplaceAttributes(const css::uno::Sequence< css::beans::PropertyValue >& aSearchAttribs) throw( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, 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; void FillSearchItemSet(SfxItemSet& rSet) const; void FillReplaceItemSet(SfxItemSet& rSet) const; @@ -109,7 +109,7 @@ public: bool HasSearchAttributes() const; bool HasReplaceAttributes() const; - void FillSearchOptions( ::com::sun::star::util::SearchOptions& + void FillSearchOptions( css::util::SearchOptions& rSearchOpt ) const; }; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index c83f40fd9a99..5f2b64d4a440 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -53,57 +53,57 @@ typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t; class SwXStyleFamilies : public cppu::WeakImplHelper < - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XNameAccess, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::style::XStyleLoader + css::container::XIndexAccess, + css::container::XNameAccess, + css::lang::XServiceInfo, + css::style::XStyleLoader >, public SwUnoCollection { SwDocShell* m_pDocShell; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xCharStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xParaStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xFrameStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPageStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xNumberingStyles; + css::uno::Reference< css::container::XNameContainer > m_xCharStyles; + css::uno::Reference< css::container::XNameContainer > m_xParaStyles; + css::uno::Reference< css::container::XNameContainer > m_xFrameStyles; + css::uno::Reference< css::container::XNameContainer > m_xPageStyles; + css::uno::Reference< css::container::XNameContainer > m_xNumberingStyles; protected: virtual ~SwXStyleFamilies(); public: SwXStyleFamilies(SwDocShell& rDocShell); //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( css::uno::RuntimeException, std::exception ) override; //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; //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; //XStyleLoader - virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) - throw (::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL loadStylesFromURL(const OUString& rURL, const css::uno::Sequence< css::beans::PropertyValue >& aOptions) + throw (css::io::IOException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() 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; }; class SwXStyleFamily : public cppu::WeakImplHelper < - ::com::sun::star::container::XNameContainer, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::beans::XPropertySet + css::container::XNameContainer, + css::lang::XServiceInfo, + css::container::XIndexAccess, + css::beans::XPropertySet >, public SfxListener { @@ -117,50 +117,50 @@ public: virtual ~SwXStyleFamily(); //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; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( css::uno::RuntimeException, std::exception ) override; //XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& Element) 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 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& Name, const css::uno::Any& Element) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& Element) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, 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; //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; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) 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; }; class SwXStyle : public cppu::WeakImplHelper < - ::com::sun::star::style::XStyle, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XMultiPropertySet, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::beans::XMultiPropertyStates + css::style::XStyle, + css::beans::XPropertySet, + css::beans::XMultiPropertySet, + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::beans::XPropertyState, + css::beans::XMultiPropertyStates >, public SfxListener, public SwClient @@ -185,17 +185,17 @@ protected: void SetStyleName(const OUString& rSet){ m_sStyleName = rSet;} SwStyleProperties_Impl* GetPropImpl(){return m_pPropertiesImpl;} - com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData; - com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily; - - 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, + css::uno::Reference< css::beans::XPropertySet > mxStyleData; + css::uno::Reference< css::container::XNameAccess > mxStyleFamily; + + void SAL_CALL SetPropertyValues_Impl( 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, std::exception); - ::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, std::exception); + 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, std::exception); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: @@ -208,52 +208,52 @@ public: TYPEINFO_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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XNamed - virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; //XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL isInUse() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getParentStyle() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isUserDefined() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isInUse() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getParentStyle() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( css::container::NoSuchElementException, 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; //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; //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; //XMultiPropertyStates - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) 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; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -274,7 +274,7 @@ public: }; class SwXFrameStyle : public SwXStyle, - public com::sun::star::document::XEventsSupplier + public css::document::XEventsSupplier { public: SwXFrameStyle(SfxStyleSheetBasePool& rPool, @@ -287,10 +287,10 @@ public: virtual void SAL_CALL acquire( ) throw() override {SwXStyle::acquire();} virtual void SAL_CALL release( ) throw() override {SwXStyle::release();} - 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::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) 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::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; friend class SwFrameStyleEventDescriptor; }; @@ -298,14 +298,14 @@ public: class SwXPageStyle : public SwXStyle { 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, + void SAL_CALL SetPropertyValues_Impl( 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, std::exception); - ::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, std::exception); + 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, std::exception); public: SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam, @@ -313,46 +313,46 @@ public: SwXPageStyle(SwDocShell* pDocSh); virtual ~SwXPageStyle(); - 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 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 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 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; }; // access to all automatic style families class SwXAutoStyles : - public cppu::WeakImplHelper< ::com::sun::star::style::XAutoStyles >, + public cppu::WeakImplHelper< css::style::XAutoStyles >, public SwUnoCollection { SwDocShell *m_pDocShell; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoCharStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoRubyStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoParaStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyleFamily > m_xAutoNotxtStyles; + css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles; + css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles; + css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles; + css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoNotxtStyles; virtual ~SwXAutoStyles(); public: SwXAutoStyles(SwDocShell& rDocShell); //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; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; //XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName(const OUString& Name) 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& Name) throw( css::uno::RuntimeException, std::exception ) override; }; // access to a family of automatic styles (character or paragraph or ...) -class SwXAutoStyleFamily : public cppu::WeakImplHelper< com::sun::star::style::XAutoStyleFamily >, +class SwXAutoStyleFamily : public cppu::WeakImplHelper< css::style::XAutoStyleFamily >, public SwClient { SwDocShell *m_pDocShell; @@ -366,18 +366,18 @@ public: virtual ~SwXAutoStyleFamily(); //XAutoStyleFamily - virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyle > SAL_CALL insertStyle( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Values ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) throw (css::uno::RuntimeException, std::exception) override; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; //XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; }; -class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration >, +class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< css::container::XEnumeration >, public SwClient { SwAutoStylesEnumImpl *m_pImpl; @@ -386,8 +386,8 @@ public: virtual ~SwXAutoStylesEnumerator(); //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; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; @@ -395,9 +395,9 @@ protected: // an automatic style class SwXAutoStyle : public cppu::WeakImplHelper < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::beans::XPropertyState, - ::com::sun::star::style::XAutoStyle + css::beans::XPropertySet, + css::beans::XPropertyState, + css::style::XAutoStyle >, public SwClient { @@ -406,7 +406,7 @@ private: IStyleAccess::SwAutoStyleFamily meFamily; SwDoc& mrDoc; - ::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); + 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); public: @@ -414,34 +414,34 @@ public: virtual ~SwXAutoStyle(); //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; //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; //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; //XMultiPropertyStates - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // Special - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 68ac78adc58e..c5fc850c94cc 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -55,10 +55,10 @@ class SwFrameFormat; typedef cppu::WeakImplHelper < - ::com::sun::star::table::XCell, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::container::XEnumerationAccess + css::table::XCell, + css::lang::XServiceInfo, + css::beans::XPropertySet, + css::container::XEnumerationAccess > SwXCellBaseClass; class SwXCell final : public SwXCellBaseClass, @@ -80,10 +80,9 @@ class SwXCell final : public SwXCellBaseClass, protected: virtual const SwStartNode *GetStartNode() const override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > + virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; bool IsValid() const; @@ -99,56 +98,56 @@ public: TYPEINFO_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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - 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; virtual void SAL_CALL release( ) throw() override; //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; //XCell - virtual OUString SAL_CALL getFormula( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getValue( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getValue( ) const throw(::com::sun::star::uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getFormula( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFormula( const OUString& aFormula ) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getValue( ) const throw(css::uno::RuntimeException, std::exception) { return const_cast<SwXCell*>(this)->getValue(); }; - virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::table::CellContentType SAL_CALL getType( ) const throw(::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL setValue( double nValue ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellContentType SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::table::CellContentType SAL_CALL getType( ) const throw(css::uno::RuntimeException, std::exception) { return const_cast<SwXCell*>(this)->getType(); }; - virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getError( ) throw(css::uno::RuntimeException, std::exception) override; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::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 createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) 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::XTextCursor > SAL_CALL createTextCursor() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange(const css::uno::Reference< css::text::XTextRange > & aTextPosition) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setString(const OUString& aString) 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; //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; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() 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; SwTableBox* GetTableBox() const { return pBox; } static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = nullptr ); @@ -160,8 +159,8 @@ public: class SwXTextTableRow final : public cppu::WeakImplHelper < - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::lang::XServiceInfo + css::beans::XPropertySet, + css::lang::XServiceInfo >, public SwClient { @@ -182,33 +181,33 @@ public: TYPEINFO_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, + 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 ::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::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; //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; const SwTableLine* GetTableRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); }; typedef cppu::WeakImplHelper< - ::com::sun::star::text::XTextTableCursor, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XPropertySet + css::text::XTextTableCursor, + css::lang::XServiceInfo, + css::beans::XPropertySet > SwXTextTableCursor_Base; class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base ,public SwClient @@ -224,45 +223,45 @@ public: //XTextTableCursor virtual OUString SAL_CALL getRangeName() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL gotoCellByName( const OUString& aCellName, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL goUp( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL mergeRange() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal ) - throw (::com::sun::star::uno::RuntimeException, + 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, + 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 ::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, + 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 ::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 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; //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; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -293,24 +292,24 @@ struct SwRangeDescriptor class SwTableProperties_Impl; class SwXTextTable : public cppu::WeakImplHelper < - ::com::sun::star::text::XTextTable, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::table::XCellRange, - ::com::sun::star::chart::XChartDataArray, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::container::XNamed, - ::com::sun::star::table::XAutoFormattable, - ::com::sun::star::util::XSortable, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::sheet::XCellRangeData + css::text::XTextTable, + css::lang::XServiceInfo, + css::table::XCellRange, + css::chart::XChartDataArray, + css::beans::XPropertySet, + css::container::XNamed, + css::table::XAutoFormattable, + css::util::XSortable, + css::lang::XUnoTunnel, + css::sheet::XCellRangeData >, public SwClient { private: class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; - ::com::sun::star::uno::WeakReference< ::com::sun::star::table::XTableRows > m_xRows; - ::com::sun::star::uno::WeakReference< ::com::sun::star::table::XTableColumns > m_xColumns; + css::uno::WeakReference< css::table::XTableRows > m_xRows; + css::uno::WeakReference< css::table::XTableColumns > m_xColumns; const SfxItemPropertySet* m_pPropSet; @@ -332,105 +331,105 @@ public: static css::uno::Reference<css::text::XTextTable> CreateXTextTable(SwFrameFormat * pFrameFormat); - SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + SW_DLLPUBLIC 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; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; TYPEINFO_OVERRIDE(); //XTextTable - virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL getRows( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) - throw (::com::sun::star::uno::RuntimeException, + virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByName( const OUString& aCellName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getCellNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextTableCursor > SAL_CALL createCursorByCellName( const OUString& aCellName ) + 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; + virtual void SAL_CALL attach(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; //XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) override; //XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw (com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) + throw (css::uno::RuntimeException, std::exception) override; //XChartDataArray - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) throw(css::uno::RuntimeException, std::exception) override; //XChartData - virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getNotANumber( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(css::uno::RuntimeException, std::exception) override; //XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) + throw (css::uno::RuntimeException, std::exception) override; //XAutoFormattable virtual void SAL_CALL autoFormat(const OUString& aName) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, + throw (css::lang::IllegalArgumentException, + 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, + 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 ::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, + 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 ::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 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; //XNamed - virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName(const OUString& Name_) throw( css::uno::RuntimeException, std::exception ) override; //XCellRangeData - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) 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; - 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, std::exception ); + void attachToRange(const css::uno::Reference< css::text::XTextRange > & xTextRange)throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); sal_uInt16 getRowCount(); sal_uInt16 getColumnCount(); - static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable, + static css::uno::Reference< css::table::XCellRange > GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable, const OUString& sTLName, const OUString& sBRName, SwRangeDescriptor& rDesc); @@ -444,13 +443,13 @@ public: class SwXCellRange : public cppu::WeakImplHelper < - ::com::sun::star::table::XCellRange, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::beans::XPropertySet, - ::com::sun::star::chart::XChartDataArray, - ::com::sun::star::util::XSortable, - ::com::sun::star::sheet::XCellRangeData + css::table::XCellRange, + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::beans::XPropertySet, + css::chart::XChartDataArray, + css::util::XSortable, + css::sheet::XCellRangeData >, public SwClient { @@ -477,66 +476,66 @@ public: TYPEINFO_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 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; //XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) 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, + 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 ::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, + 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 ::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 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; //XChartData - virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getNotANumber( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(css::uno::RuntimeException, std::exception) override; //XChartDataArray - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) throw(css::uno::RuntimeException, std::exception) override; //XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) - throw (::com::sun::star::uno::RuntimeException, + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL sort(const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) + throw (css::uno::RuntimeException, std::exception) override; //XCellRangeData - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL getDataArray( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDataArray( const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aArray ) 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; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -550,8 +549,8 @@ public: class SwXTableRows final : public cppu::WeakImplHelper < - ::com::sun::star::table::XTableRows, - ::com::sun::star::lang::XServiceInfo + css::table::XTableRows, + css::lang::XServiceInfo >, public SwClient @@ -566,25 +565,25 @@ public: TYPEINFO_OVERRIDE(); //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; //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; //XTableRows virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (::com::sun::star::uno::RuntimeException, + 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; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -592,8 +591,8 @@ public: class SwXTableColumns : public cppu::WeakImplHelper < - ::com::sun::star::table::XTableColumns, - ::com::sun::star::lang::XServiceInfo + css::table::XTableColumns, + css::lang::XServiceInfo >, public SwClient @@ -607,25 +606,25 @@ public: TYPEINFO_OVERRIDE(); //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; //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; //XTableColumns virtual void SAL_CALL insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) - throw (::com::sun::star::uno::RuntimeException, + 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; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index 46c1aa428db5..0271e308c654 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -45,14 +45,14 @@ class OTextCursorHelper; class SwXTextRange; class SwXText - : public ::com::sun::star::lang::XTypeProvider - , public ::com::sun::star::lang::XUnoTunnel - , public ::com::sun::star::beans::XPropertySet - , public ::com::sun::star::text::XTextAppendAndConvert - , public ::com::sun::star::text::XTextCopy - , public ::com::sun::star::text::XTextRangeCompare - , public ::com::sun::star::text::XRelativeTextContentInsert - , public ::com::sun::star::text::XRelativeTextContentRemove + : public css::lang::XTypeProvider + , public css::lang::XUnoTunnel + , public css::beans::XPropertySet + , public css::text::XTextAppendAndConvert + , public css::text::XTextCopy + , public css::text::XTextRangeCompare + , public css::text::XRelativeTextContentInsert + , public css::text::XRelativeTextContentRemove { private: @@ -61,13 +61,12 @@ private: ::sw::UnoImplPtr<Impl> m_pImpl; virtual void PrepareForAttach( - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xRange, + css::uno::Reference< css::text::XTextRange > & xRange, SwPaM const & rPam); virtual 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); protected: @@ -87,162 +86,134 @@ public: const SwDoc* GetDoc() const; SwDoc* GetDoc(); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > + virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); // 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; // 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; + 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; // 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; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > + virtual css::uno::Reference< css::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; + 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 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; // XParagraphAppend - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraph( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties) - 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 + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL finishParagraphInsert( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& - xInsertPosition) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties, + const css::uno::Reference< css::text::XTextRange >& xInsertPosition) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XTextPortionAppend - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL appendTextPortion( const OUString& rText, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties) + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL insertTextPortion( const OUString& rText, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& - rTextRange) + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties, + const css::uno::Reference< css::text::XTextRange >& rTextRange) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, @@ -250,115 +221,92 @@ public: std::exception) override; // XTextContentAppend - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > SAL_CALL + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL appendTextContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xTextContent, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties) - 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 + const css::uno::Reference< css::text::XTextContent >& xTextContent, + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::text::XTextRange > SAL_CALL insertTextContentWithProperties( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent >& xTextContent, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& - rCharacterAndParagraphProperties, - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xInsertPosition) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent >& xTextContent, + const css::uno::Sequence< css::beans::PropertyValue >& rCharacterAndParagraphProperties, + const css::uno::Reference< css::text::XTextRange >& xInsertPosition) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XTextConvert - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > SAL_CALL + virtual css::uno::Reference< css::text::XTextContent > SAL_CALL convertToTextFrame( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xStart, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xEnd, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& xFrameProperties) + const css::uno::Reference< css::text::XTextRange >& xStart, + const css::uno::Reference< css::text::XTextRange >& xEnd, + const css::uno::Sequence< css::beans::PropertyValue >& xFrameProperties) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextTable > SAL_CALL + virtual css::uno::Reference< + css::text::XTextTable > SAL_CALL convertToTable( - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > > > > const& + css::uno::Sequence< + css::uno::Sequence< + css::uno::Sequence< + css::uno::Reference< + css::text::XTextRange > > > > const& rTableRanges, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > > > const& + css::uno::Sequence< + css::uno::Sequence< + css::uno::Sequence< + css::beans::PropertyValue > > > const& rCellProperties, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > > const& + css::uno::Sequence< + css::uno::Sequence< + css::beans::PropertyValue > > const& rRowProperties, - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > const& + css::uno::Sequence< + css::beans::PropertyValue > const& rTableProperties) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XTextCopy virtual void SAL_CALL copyText( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCopy >& xSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextCopy >& xSource ) + throw (css::uno::RuntimeException, std::exception) override; // XTextRangeCompare sal_Int16 SAL_CALL compareRegionStarts( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xR1, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xR2) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange >& xR1, + const css::uno::Reference< css::text::XTextRange >& xR2) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; sal_Int16 SAL_CALL compareRegionEnds( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xR1, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xR2) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextRange >& xR1, + const css::uno::Reference< css::text::XTextRange >& xR2) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XRelativeTextContentInsert virtual void SAL_CALL insertTextContentBefore( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>& xNewContent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>& xSuccessor) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xNewContent, + const css::uno::Reference< css::text::XTextContent>& xSuccessor) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertTextContentAfter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>& xNewContent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>& xPredecessor) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xNewContent, + const css::uno::Reference< css::text::XTextContent>& xPredecessor) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; // XRelativeTextContentRemove virtual void SAL_CALL removeTextContentBefore( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>& xSuccessor) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xSuccessor) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeTextContentAfter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent>& xPredecessor) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::text::XTextContent>& xPredecessor) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SW_INC_UNOTEXT_HXX diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index de8e580a4468..d7cbf58a4303 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -34,8 +34,8 @@ class SwFrameFormat; class SwXTextCursor; typedef ::cppu::WeakAggImplHelper2 -< ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::container::XEnumerationAccess +< css::lang::XServiceInfo +, css::container::XEnumerationAccess > SwXBodyText_Base; class SwXBodyText @@ -54,64 +54,60 @@ public: SwXTextCursor * CreateTextCursor(const bool bIgnoreTables = 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(); } // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( - const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( + const css::uno::Type& rType) + throw (css::uno::RuntimeException, std::exception) override; // 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; // 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; // 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; // 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; }; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::container::XEnumerationAccess +< css::lang::XServiceInfo +, css::container::XEnumerationAccess > SwXHeadFootText_Base; class SwXHeadFootText @@ -127,10 +123,9 @@ private: protected: virtual const SwStartNode *GetStartNode() const override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > + virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; virtual ~SwXHeadFootText(); @@ -138,58 +133,54 @@ protected: public: - static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > + static css::uno::Reference< css::text::XText > CreateXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader); static bool IsXHeadFootText(SwClient *const pClient); // 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; // 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; // 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; // 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/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index 1668cc3a72de..0394b1b0ab7a 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -48,20 +48,20 @@ struct SwPosition; class SwUnoCrsr; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::beans::XPropertyState -, ::com::sun::star::beans::XMultiPropertySet -, ::com::sun::star::beans::XMultiPropertyStates -, ::com::sun::star::container::XEnumerationAccess -, ::com::sun::star::container::XContentEnumerationAccess -, ::com::sun::star::util::XSortable -, ::com::sun::star::document::XDocumentInsertable -, ::com::sun::star::text::XSentenceCursor -, ::com::sun::star::text::XWordCursor -, ::com::sun::star::text::XParagraphCursor -, ::com::sun::star::text::XRedline -, ::com::sun::star::text::XMarkingAccess +< css::lang::XServiceInfo +, css::beans::XPropertySet +, css::beans::XPropertyState +, css::beans::XMultiPropertySet +, css::beans::XMultiPropertyStates +, css::container::XEnumerationAccess +, css::container::XContentEnumerationAccess +, css::util::XSortable +, css::document::XDocumentInsertable +, css::text::XSentenceCursor +, css::text::XWordCursor +, css::text::XParagraphCursor +, css::text::XRedline +, css::text::XMarkingAccess > SwXTextCursor_Base; class SwXTextCursor @@ -80,14 +80,12 @@ public: SwXTextCursor( SwDoc & rDoc, - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText > const& xParent, + css::uno::Reference< css::text::XText > const& xParent, const enum CursorType eType, SwPosition const& rPos, SwPosition const*const pMark = 0); SwXTextCursor( - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText > const& xParent, + css::uno::Reference< css::text::XText > const& xParent, SwPaM const& rSourceCursor, const enum CursorType eType = CURSOR_ALL); @@ -105,265 +103,251 @@ public: DECLARE_XINTERFACE() - 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; // 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 >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + 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 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL - getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) + 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 ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + 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 ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + 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 >& aPropertyNames, - const ::com::sun::star::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) + const css::uno::Sequence< OUString >& aPropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XMultiPropertyStates virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertiesToDefault( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames) - throw (::com::sun::star::beans::UnknownPropertyException, - ::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) + throw (css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( - const ::com::sun::star::uno::Sequence< OUString >& - rPropertyNames) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& rPropertyNames) + 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; // XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::container::XEnumeration > SAL_CALL + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(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 getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XSortable - virtual ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue > SAL_CALL + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL createSortDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL sort( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& xDescriptor) - throw (::com::sun::star::uno::RuntimeException, + const css::uno::Sequence< css::beans::PropertyValue >& xDescriptor) + throw (css::uno::RuntimeException, std::exception) override; // XDocumentInsertable virtual void SAL_CALL insertDocumentFromURL( const OUString& rURL, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rOptions) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rOptions) + throw (css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > + virtual css::uno::Reference< css::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; + 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; // XTextCursor virtual void SAL_CALL collapseToStart() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapseToEnd() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isCollapsed() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoStart(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoEnd(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL gotoRange( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange >& xRange, + const css::uno::Reference< css::text::XTextRange >& xRange, sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XWordCursor virtual sal_Bool SAL_CALL isStartOfWord() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isEndOfWord() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XSentenceCursor virtual sal_Bool SAL_CALL isStartOfSentence() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isEndOfSentence() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XParagraphCursor virtual sal_Bool SAL_CALL isStartOfParagraph() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isEndOfParagraph() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XRedline virtual void SAL_CALL makeRedline( const OUString& rRedlineType, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& RedlineProperties) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; //XMarkingAccess virtual void SAL_CALL invalidateMarkings(::sal_Int32 nType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 8a2a5a4d6184..13b020957f0b 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -58,26 +58,25 @@ namespace sw { void DeepCopyPaM(SwPaM const & rSource, SwPaM & rTarget); SW_DLLPUBLIC bool XTextRangeToSwPaM(SwUnoInternalPaM& rToFill, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & xTextRange); + const css::uno::Reference< css::text::XTextRange > & xTextRange); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > + css::uno::Reference< css::text::XText > CreateParentXText(SwDoc & rDoc, const SwPosition& rPos); - bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny, + bool GetDefaultTextContentValue(css::uno::Any& rAny, const OUString& rPropertyName, sal_uInt16 nWID = 0); } // namespace sw typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::beans::XPropertySet -, ::com::sun::star::beans::XPropertyState -, ::com::sun::star::container::XEnumerationAccess -, ::com::sun::star::container::XContentEnumerationAccess -, ::com::sun::star::text::XTextRange -, ::com::sun::star::text::XRedline +< css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::beans::XPropertySet +, css::beans::XPropertyState +, css::container::XEnumerationAccess +, css::container::XContentEnumerationAccess +, css::text::XTextRange +, css::text::XRedline > SwXTextRange_Base; class SW_DLLPUBLIC SwXTextRange @@ -93,7 +92,7 @@ private: enum RangePosition { - RANGE_IN_TEXT, // "ordinary" ::com::sun::star::text::TextRange + RANGE_IN_TEXT, // "ordinary" css::text::TextRange RANGE_IN_CELL, // position created with a cell that has no uno object RANGE_IS_TABLE, // anchor of a table }; @@ -102,7 +101,7 @@ private: //TODO: new exception type for protected content void DeleteAndInsert( const OUString& rText, const bool bForceExpandHints) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); void Invalidate(); virtual ~SwXTextRange(); @@ -110,8 +109,7 @@ private: public: SwXTextRange(SwPaM& rPam, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText > & xParent, + const css::uno::Reference< css::text::XText > & xParent, const enum RangePosition eRange = RANGE_IN_TEXT); // only for RANGE_IS_TABLE SwXTextRange(SwFrameFormat& rTableFormat); @@ -120,154 +118,143 @@ public: SwDoc& GetDoc(); bool GetPositions(SwPaM & rToFill) const; - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > CreateXTextRange( + static css::uno::Reference< css::text::XTextRange > CreateXTextRange( SwDoc & rDoc, const SwPosition& rPos, const SwPosition *const pMark); - 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; // 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; // 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; // XContentEnumerationAccess - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::container::XEnumeration > SAL_CALL + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createContentEnumeration(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 getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > + virtual css::uno::Reference< css::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; + 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; // XRedline virtual void SAL_CALL makeRedline( const OUString& rRedlineType, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& RedlineProperties) - throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& RedlineProperties) + throw (css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; }; typedef ::cppu::WeakImplHelper -< ::com::sun::star::lang::XUnoTunnel -, ::com::sun::star::lang::XServiceInfo -, ::com::sun::star::container::XIndexAccess +< css::lang::XUnoTunnel +, css::lang::XServiceInfo +, css::container::XIndexAccess > SwXTextRanges_Base; struct SwXTextRanges : public SwXTextRanges_Base { virtual SwUnoCrsr* GetCursor() =0; static SwXTextRanges* Create(SwPaM* const pCrsr); - static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); + static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; #endif // INCLUDED_SW_INC_UNOTEXTRANGE_HXX diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index e4ea69448a74..438ca6e2cf2a 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -129,7 +129,7 @@ class SW_DLLPUBLIC SwXTextDocument : public SwXTextDocumentBaseClass, public SvxFmMSFactory, public SfxBaseModel, public vcl::ITiledRenderable, - public ::com::sun::star::tiledrendering::XTiledRenderable + public css::tiledrendering::XTiledRenderable { private: class Impl; @@ -392,8 +392,8 @@ public: // css::text::XFlatParagraphIteratorProvider: virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XCloneable + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; /// @see vcl::ITiledRenderable::paintTile(). virtual void paintTile( VirtualDevice &rDevice, @@ -436,7 +436,7 @@ public: /// @see vcl::ITiledRenderable::isMimeTypeSupported(). virtual bool isMimeTypeSupported() override; - // ::com::sun::star::tiledrendering::XTiledRenderable + // css::tiledrendering::XTiledRenderable virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, ::std::exception) override; void Invalidate(); diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index db636f7e0136..8f57b78c4787 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -59,8 +59,8 @@ public: bool IsDeleted() const { return bDeleted; } void SetDeleted( bool b ) { bDeleted = b; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nMId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nMId ) override; protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; @@ -97,7 +97,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField public: SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFormat = 0); - virtual sal_uInt16 GetSubType() const override; + virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nSub) override; virtual double GetValue() const override; @@ -106,13 +106,13 @@ public: virtual OUString GetFieldName() const override; // Name cannot be changed. - virtual OUString GetPar1() const override; + virtual OUString GetPar1() const override; // Content. - virtual OUString GetPar2() const override; + virtual OUString GetPar2() const override; virtual void SetPar2(const OUString& rStr) override; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override; + virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override; + virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override; }; #endif // INCLUDED_SW_INC_USRFLD_HXX diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index bad258ab1670..b9fa19564af3 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -387,7 +387,7 @@ public: SfxPrinterChangeFlags nDiff = SFX_PRINTER_ALL, bool bIsAPI=false) override; ShellModes GetShellMode(); - com::sun::star::view::XSelectionSupplier* GetUNOObject(); + css::view::XSelectionSupplier* GetUNOObject(); OUString GetSelectionTextParam( bool bCompleteWords, bool bEraseTrail ); @@ -403,7 +403,7 @@ public: OUString GetThesaurusLookUpText( bool bSelection ) const; // immediately switch shell -> for GetSelectionObject - void StopShellTimer(); + void StopShellTimer(); inline SwWrtShell& GetWrtShell () const { return *m_pWrtShell; } inline SwWrtShell* GetWrtShellPtr() const { return m_pWrtShell; } @@ -412,7 +412,7 @@ public: inline const SwEditWin &GetEditWin () const { return *m_pEditWin; } #if defined WNT || defined UNX - void ScannerEventHdl( const ::com::sun::star::lang::EventObject& rEventObject ); + void ScannerEventHdl( const css::lang::EventObject& rEventObject ); #endif // hand the handler for text blocks to the shell; create if applicable @@ -470,10 +470,10 @@ public: void SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly = false ); void ShowHScrollbar(bool bShow); - bool IsHScrollbarVisible()const; + bool IsHScrollbarVisible()const; void ShowVScrollbar(bool bShow); - bool IsVScrollbarVisible()const; + bool IsVScrollbarVisible()const; void EnableHScrollbar(bool bEnable); void EnableVScrollbar(bool bEnable); @@ -569,8 +569,8 @@ public: virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) override; - virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) override; - virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ) override; + virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override; void SetCrsrAtTop( bool bFlag, bool bCenter = false ) { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; } diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 70dfa75d50bf..6e93657ee0dd 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -499,11 +499,9 @@ public: sal_Int32 GetBrowseWidth() const; void SetBrowseBorder( const Size& rNew ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > - CreateAccessiblePreview(); + css::uno::Reference< css::accessibility::XAccessible > CreateAccessiblePreview(); void ShowPreviewSelection( sal_uInt16 nSelPage ); void InvalidateAccessibleFocus(); |