sw/inc/IDocumentFieldsAccess.hxx | 4 sw/inc/IDocumentLinksAdministration.hxx | 4 sw/inc/IDocumentRedlineAccess.hxx | 4 sw/inc/IDocumentSettingAccess.hxx | 4 sw/inc/IMark.hxx | 2 sw/inc/PostItMgr.hxx | 20 - sw/inc/SidebarWin.hxx | 2 sw/inc/SwAppletImpl.hxx | 4 sw/inc/SwSmartTagMgr.hxx | 8 sw/inc/SwUndoField.hxx | 6 sw/inc/SwXMLSectionList.hxx | 11 sw/inc/TextCursorHelper.hxx | 6 sw/inc/accmap.hxx | 43 +-- sw/inc/authfld.hxx | 8 sw/inc/breakit.hxx | 18 - sw/inc/checkit.hxx | 2 sw/inc/chpfld.hxx | 4 sw/inc/crsrsh.hxx | 24 - sw/inc/crstate.hxx | 2 sw/inc/dbfld.hxx | 28 +- sw/inc/dbmgr.hxx | 64 ++-- sw/inc/ddefld.hxx | 4 sw/inc/dlelstnr.hxx | 21 - sw/inc/doc.hxx | 32 +- sw/inc/docsh.hxx | 16 - sw/inc/docstyle.hxx | 4 sw/inc/docufld.hxx | 66 ++-- sw/inc/dpage.hxx | 2 sw/inc/drawdoc.hxx | 5 sw/inc/editsh.hxx | 17 - sw/inc/expfld.hxx | 20 - sw/inc/fchrfmt.hxx | 4 sw/inc/fesh.hxx | 16 - sw/inc/finalthreadmanager.hxx | 42 +-- sw/inc/fldbas.hxx | 17 - sw/inc/flddat.hxx | 4 sw/inc/flddropdown.hxx | 8 sw/inc/fmtanchr.hxx | 4 sw/inc/fmtautofmt.hxx | 4 sw/inc/fmtclds.hxx | 4 sw/inc/fmtcnct.hxx | 2 sw/inc/fmtfld.hxx | 9 sw/inc/fmtfsize.hxx | 4 sw/inc/fmtftntx.hxx | 4 sw/inc/fmtinfmt.hxx | 6 sw/inc/fmtline.hxx | 4 sw/inc/fmtmeta.hxx | 16 - sw/inc/fmtornt.hxx | 16 - sw/inc/fmtpdsc.hxx | 4 sw/inc/fmtruby.hxx | 6 sw/inc/fmtsrnd.hxx | 4 sw/inc/fmtsrndenum.hxx | 12 sw/inc/fmturl.hxx | 4 sw/inc/fmtwrapinfluenceonobjpos.hxx | 7 sw/inc/format.hxx | 4 sw/inc/frmfmt.hxx | 13 sw/inc/grfatr.hxx | 20 - sw/inc/hhcwrp.hxx | 6 sw/inc/iodetect.hxx | 2 sw/inc/modcfg.hxx | 20 - sw/inc/ndgrf.hxx | 8 sw/inc/ndole.hxx | 4 sw/inc/ndtxt.hxx | 14 - sw/inc/numrule.hxx | 4 sw/inc/pam.hxx | 4 sw/inc/paratr.hxx | 8 sw/inc/printdata.hxx | 2 sw/inc/prtopt.hxx | 4 sw/inc/reffld.hxx | 8 sw/inc/section.hxx | 20 - sw/inc/shellio.hxx | 16 - sw/inc/splargs.hxx | 10 sw/inc/swabstdlg.hxx | 40 +- sw/inc/swacorr.hxx | 6 sw/inc/swbaslnk.hxx | 2 sw/inc/swcalwrp.hxx | 3 sw/inc/swcrsr.hxx | 10 sw/inc/swdbdata.hxx | 2 sw/inc/swfltopt.hxx | 2 sw/inc/swmodule.hxx | 21 - sw/inc/swserv.hxx | 2 sw/inc/swtypes.hxx | 20 - sw/inc/swunohelper.hxx | 2 sw/inc/tgrditem.hxx | 4 sw/inc/tox.hxx | 9 sw/inc/toxwrap.hxx | 18 - sw/inc/unobaseclass.hxx | 12 sw/inc/unochart.hxx | 217 +++++++-------- sw/inc/unocoll.hxx | 172 ++++++------ sw/inc/unocrsrhelper.hxx | 106 +++---- sw/inc/unodraw.hxx | 168 ++++++------ sw/inc/unofieldcoll.hxx | 72 ++--- sw/inc/unoframe.hxx | 207 +++++++------- sw/inc/unoidxcoll.hxx | 38 +- sw/inc/unoparagraph.hxx | 271 ++++++++----------- sw/inc/unoredline.hxx | 50 +-- sw/inc/unoredlines.hxx | 34 +- sw/inc/unosett.hxx | 183 ++++++------- sw/inc/unosrch.hxx | 52 +-- sw/inc/unostyle.hxx | 306 ++++++++++----------- sw/inc/unotbl.hxx | 447 +++++++++++++++----------------- sw/inc/unotext.hxx | 334 ++++++++++------------- sw/inc/unotextbodyhf.hxx | 113 +++----- sw/inc/unotextcursor.hxx | 300 ++++++++++----------- sw/inc/unotextrange.hxx | 191 ++++++------- sw/inc/unotxdoc.hxx | 8 sw/inc/usrfld.hxx | 14 - sw/inc/view.hxx | 14 - sw/inc/viewsh.hxx | 6 109 files changed, 2042 insertions(+), 2237 deletions(-)
New commits: commit 7a401e5e83abb41b51fca92e3d92dfb2fff6d0e6 Author: Noel Grandin <[email protected]> Date: Thu Nov 5 15:55:58 2015 +0200 com::sun::star->css in sw/inc Change-Id: I6ffdb1deaa32156c65f997a1a1056928b7cd863d Reviewed-on: https://gerrit.libreoffice.org/19803 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index ccef319..d573e76 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 8d4f4c7..db7aebe 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 eb37a3a..1a7d580 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 73a5d54..08359a2 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 998039e..5f891b8 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 73d2deb..aab0a46 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 556de93..fb47322 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 5a668be..16595d1 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 13c3399..a26c170 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 95e842b8..541cb54 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 981f5aa..4eec772 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 07f2472..a85fa68 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 749f3e5..e549f42 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 4240f9b..8f371e8 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 4dcba72..dd2ba2d 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 66ee370..d00485d 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 6378799..59b6c84 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 ba454d9..cda2ccf 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 e9bf810..a1150e2 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 3aa70cc..080b7d5 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 4c0fe40..b74140d 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 0b8d206..7b98686 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 cf2748b..b499c57 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 5ee4684..d72b463 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 3a91993..a5871da 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 df68df3..a2d280a 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 56f73b6..d18bf72 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 2c53228..a0a47ce 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 5b36a54..339fbc7 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 140f044..de1e902 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 b643db8..58041f3 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 c438517..a3055f0 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 fd8a78b..661c030 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 ba4f1cb..d197de6 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 d18dded..4363fb5 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 d39c7f2..13a59cd 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 6507aab..5f66784 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 4d4926e..da2b091 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 a5a9aa3..a76ff7e 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 f62148d..3364535 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 535a6e8..3578bb7 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 6babe66..9204f15 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 2a9516b..10e56dc 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 493e85a..d9730b6 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 293dfea..528bad3 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 1364906..cde782f 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 4724600..8e2f92e 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 714938e..8c9ed10 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, ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
