diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-26 08:43:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-26 10:47:02 +0000 |
| commit | 80735fcbb0503ff1de198d1d9936fed9f5ae77a2 (patch) | |
| tree | 7c126266aecb7561f46897bd9c997c085a3a96df /xmloff/source/text | |
| parent | 4112ecadd53f7ae48e007dd5024f077aca305062 (diff) | |
com::sun::star->css in xmloff/
Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff/source/text')
74 files changed, 300 insertions, 482 deletions
diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index 019b0e95eb38..f08cf2563c56 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -31,14 +31,14 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; static bool convert( const OUString& rStrImpValue, - ::com::sun::star::text::TextContentAnchorType& rType ); + css::text::TextContentAnchorType& rType ); }; #endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLANCHORTYPEPROPHDL_HXX diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx index c98a8eec656b..2ed06823fcad 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.hxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx @@ -47,8 +47,7 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; #endif diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 382e558625d6..1f30f00e513d 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -37,8 +37,7 @@ namespace com { namespace sun { namespace star { class XMLAutoTextContainerEventImport : public SvXMLImportContext { /// the parent auto text container - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> & rEvents; + const css::uno::Reference<css::container::XNameReplace> & rEvents; public: @@ -47,8 +46,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace > & rEvents ); + const css::uno::Reference<css::container::XNameReplace > & rEvents ); virtual ~XMLAutoTextContainerEventImport(); @@ -58,8 +56,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 69c793650e56..e1a9a71d72ae 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -60,7 +60,7 @@ using ::com::sun::star::xml::sax::XDocumentHandler; XMLAutoTextEventExport::XMLAutoTextEventExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ) : SvXMLExport(util::MeasureUnit::INCH, xContext, implementationName, XML_AUTO_TEXT, nFlags) @@ -129,7 +129,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) SetDocHandler( xTmpDocHandler ); } } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index 3c1a84eb8070..4ee3b518f212 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -46,24 +46,22 @@ namespace com { namespace sun { namespace star { */ class XMLAutoTextEventExport : public SvXMLExport { - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess> xEvents; + css::uno::Reference<css::container::XNameAccess> xEvents; public: XMLAutoTextEventExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ); virtual ~XMLAutoTextEventExport(); // XInitialization virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments ) + const css::uno::Sequence<css::uno::Any> & rArguments ) throw( - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; protected: diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 2f84a86708d4..64682909af88 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -46,7 +46,7 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_AUTO_TEXT_EVENTS; XMLAutoTextEventImport::XMLAutoTextEventImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext) throw() + const css::uno::Reference< css::uno::XComponentContext >& xContext) throw() : SvXMLImport(xContext, "") { } diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx index 1a20c8c964f2..e94bbdf3c14b 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextEventImport.hxx @@ -40,49 +40,45 @@ namespace com { namespace sun { namespace star { class XMLAutoTextEventImport : public SvXMLImport { - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> xEvents; + css::uno::Reference<css::container::XNameReplace> xEvents; public: explicit XMLAutoTextEventImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext + const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw(); virtual ~XMLAutoTextEventImport() throw(); // XInitialization virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments ) + const css::uno::Sequence<css::uno::Any> & rArguments ) throw( - ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Exception, + css::uno::RuntimeException, std::exception) override; protected: 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; }; // global functions to support the component -::com::sun::star::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw(); OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw(); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL +css::uno::Reference< css::uno::XInterface > SAL_CALL XMLAutoTextEventImport_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory > & ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & ) + throw( css::uno::Exception ); #endif diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 1a2a588af874..d699313d2e2c 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -40,8 +40,7 @@ using namespace ::xmloff::token; XMLCalculationSettingsContext::XMLCalculationSettingsContext( SvXMLImport& rImport, sal_uInt16 p_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 ) : SvXMLImportContext ( rImport, p_nPrefix, rLocalName ) , nYear( 1930 ) { diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx index 2df6250ebfcd..425f5270b006 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.hxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx @@ -29,8 +29,7 @@ public: XMLCalculationSettingsContext( SvXMLImport& 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 ~XMLCalculationSettingsContext(); virtual void EndElement() override; diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 3ee0bd4e7f58..5e6967edba46 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -72,12 +72,11 @@ public: 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; // Start- and EndElement are needed here to set the inside_deleted_section // flag at the corresponding TextImportHelper - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index da97ddf420a3..3c0afa1e0106 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -66,8 +66,7 @@ public: virtual ~XMLChangeImportContext(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; #endif diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index 729aa7a810b8..e58a6dc34038 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -62,14 +62,12 @@ public: virtual ~XMLChangeInfoContext(); virtual void StartElement( - 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 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 void EndElement() override; diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 6a81cf0d0f45..d858118f5256 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -42,8 +42,7 @@ class XMLChangedRegionImportContext : public SvXMLImportContext { /// if we replace the current XTextCursor/XText by the ones for /// the redline, we remember the old cursor here. - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> xOldCursor; + css::uno::Reference<css::text::XTextCursor> xOldCursor; /// redline-ID OUString sID; @@ -62,14 +61,12 @@ public: virtual ~XMLChangedRegionImportContext(); virtual void StartElement( - 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 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 void EndElement() override; diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index bdfcb73749e5..0d800b61f1ef 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -48,8 +48,7 @@ protected: 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; }; diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index 49aa57b868f5..49b0f23beb7c 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -41,8 +41,7 @@ class XMLFootnoteImportContext : public SvXMLImportContext const OUString sPropertyReferenceId; /// old document cursor - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> xOldCursor; + css::uno::Reference<css::text::XTextCursor> xOldCursor; /// old list item and block (#89891#) bool mbListContextPushed; @@ -51,8 +50,7 @@ class XMLFootnoteImportContext : public SvXMLImportContext XMLTextImportHelper& rHelper; /// the footnote - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XFootnote> xFootnote; + css::uno::Reference<css::text::XFootnote> xFootnote; public: @@ -66,8 +64,7 @@ public: protected: virtual void StartElement( - 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 void Characters( const OUString& rChars) override; @@ -77,8 +74,7 @@ protected: 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; }; diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index 71620c156cfb..b194a2fd6f16 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -107,7 +107,7 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute( sMainEntryStyleName = rValue; OUString sDisplayStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_TEXT, sMainEntryStyleName ); - const Reference < ::com::sun::star::container::XNameContainer >& + const Reference < css::container::XNameContainer >& rStyles = GetImport().GetTextImport()->GetTextStyles(); bMainEntryStyleNameOK = rStyles.is() && rStyles->hasByName( sDisplayStyleName ); } diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 042e1054eb48..730c6f99ad3e 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -71,8 +71,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexAlphabeticalSourceContext(); @@ -87,8 +86,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index f775857c77fe..1ad8c07315c4 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -148,8 +148,7 @@ void XMLIndexBibliographyEntryContext::EndElement() } void XMLIndexBibliographyEntryContext::FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) + css::uno::Sequence<css::beans::PropertyValue> & rValues) { // entry name and (optionally) style name in parent class XMLIndexSimpleEntryContext::FillPropertyValues(rValues); diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index 3c44bd3ea5f1..f30b7135cfb6 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -58,16 +58,14 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** call FillPropertyValues and insert into template */ virtual void EndElement() override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index 2d648093242f..4cf6ee1e047c 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -43,8 +43,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexBibliographySourceContext(); @@ -59,8 +58,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 94364694092e..81771086311a 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -57,8 +57,7 @@ protected: 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; }; inline bool XMLIndexBodyContext::HasContent() diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 9124d142df6c..50c02bcf1a83 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -169,8 +169,7 @@ void XMLIndexChapterInfoEntryContext::StartElement( } void XMLIndexChapterInfoEntryContext::FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) + css::uno::Sequence<css::beans::PropertyValue> & rValues) { // entry name and (optionally) style name in parent class XMLIndexSimpleEntryContext::FillPropertyValues(rValues); diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index a1e8a655ebcb..efa29ed3a5c0 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -59,13 +59,11 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; #endif diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index 1d0d47377a24..d43bc2c4648c 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -45,8 +45,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexIllustrationSourceContext(); @@ -55,8 +54,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index b4060212ed1e..6ea0376d9e06 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -69,33 +69,28 @@ public: * collapsed. */ void ExportIndexMark( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference<css::beans::XPropertySet> & rPropSet, bool bAutoStyles); protected: /// export attributes of table-of-content index marks void ExportTOCMarkAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export attributes of user index marks void ExportUserIndexMarkAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export attributes of alphabetical index marks void ExportAlphabeticalIndexMarkAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// create a numerical ID for this index mark /// (represented by its properties) static void GetID( OUStringBuffer& sBuffer, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); }; diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 71273e4808c9..da3333c76858 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -54,8 +54,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexObjectSourceContext(); @@ -70,8 +69,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index 3267404f54ba..74622065b1b8 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -73,7 +73,7 @@ void XMLIndexSimpleEntryContext::StartElement( OUString sDisplayStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_TEXT, sCharStyleName ); // #142494#: Check if style exists - const Reference < ::com::sun::star::container::XNameContainer > & rStyles = + const Reference < css::container::XNameContainer > & rStyles = GetImport().GetTextImport()->GetTextStyles(); if( rStyles.is() && rStyles->hasByName( sDisplayStyleName ) ) bCharStyleNameOK = true; @@ -99,8 +99,7 @@ void XMLIndexSimpleEntryContext::EndElement() } void XMLIndexSimpleEntryContext::FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) + css::uno::Sequence<css::beans::PropertyValue> & rValues) { // due to the limited number of subclasses, we fill the values // directly into the slots. Subclasses will have to know they can diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 2bc713c7e8d2..820f493e9632 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -67,16 +67,14 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** call FillPropertyValues and insert into template */ virtual void EndElement() override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + css::uno::Sequence<css::beans::PropertyValue> & rValues); }; diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index 2e80e476a94b..455ef7b67f5c 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -86,8 +86,7 @@ class XMLIndexSourceBaseContext : public SvXMLImportContext protected: /// property set of index; must be accessible to subclasses - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rIndexPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rIndexPropertySet; public: @@ -96,8 +95,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, bool bLevelFormats); virtual ~XMLIndexSourceBaseContext(); @@ -105,8 +103,7 @@ public: protected: virtual void StartElement( - 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 void ProcessAttribute( enum IndexSourceParamEnum eParam, @@ -117,8 +114,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index a3010e117818..ac9936e377ae 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -55,8 +55,7 @@ protected: /// add Text PropertyValue virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index 0c4cba2479a3..78a5f0f56258 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -58,8 +58,7 @@ class XMLIndexTOCContext : public SvXMLImportContext const OUString sName; /** XPropertySet of the index */ - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xTOCPropertySet; + css::uno::Reference<css::beans::XPropertySet> xTOCPropertySet; enum IndexTypeEnum eIndexType; @@ -80,16 +79,14 @@ public: protected: virtual void StartElement( - 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 void EndElement() override; 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; }; #endif diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index 12f7b81f0e41..10aa610b5f18 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -52,8 +52,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexTOCSourceContext(); @@ -68,8 +67,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index ae9654b73c05..8131d03a0f4b 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -45,8 +45,7 @@ class XMLIndexTOCStylesContext : public SvXMLImportContext const OUString sLevelParagraphStyles; /// XPropertySet of the index - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rTOCPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rTOCPropertySet; /// style names for this level ::std::vector< OUString > aStyleNames; @@ -59,8 +58,7 @@ public: XMLIndexTOCStylesContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName ); @@ -69,16 +67,14 @@ public: protected: virtual void StartElement( - 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 void EndElement() override; 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; }; #endif diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index 6960c6b97bf6..fe0f0b41b09c 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -58,13 +58,11 @@ public: protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** fill property values for this template entry */ virtual void FillPropertyValues( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues) override; + css::uno::Sequence<css::beans::PropertyValue> & rValues) override; }; #endif diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index fe42e7fb64aa..a4f407dbbfc0 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -53,8 +53,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexTableSourceContext(); @@ -69,8 +68,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 0e47d86ccc9b..c94a753a5f12 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -205,7 +205,7 @@ void XMLIndexTemplateContext::EndElement() XML_STYLE_FAMILY_TEXT_PARAGRAPH, sStyleName ); // #i50288#: Check if style exists - const Reference < ::com::sun::star::container::XNameContainer > & rStyles = + const Reference < css::container::XNameContainer > & rStyles = GetImport().GetTextImport()->GetParaStyles(); if( rStyles.is() && rStyles->hasByName( sDisplayStyleName ) ) diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 31b7f690fccd..208f66b36094 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -66,7 +66,7 @@ extern const sal_Bool aAllowedTokenTypesTable[]; class XMLIndexTemplateContext : public SvXMLImportContext { // pick up PropertyValues to be turned into a sequence. - ::std::vector< ::com::sun::star::beans::PropertyValues > aValueVector; + ::std::vector< css::beans::PropertyValues > aValueVector; OUString sStyleName; @@ -81,8 +81,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext bool bTOC; // PropertySet of current index - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet; public: @@ -114,8 +113,7 @@ public: XMLIndexTemplateContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName, const SvXMLEnumMapEntry* aLevelNameMap, @@ -128,21 +126,19 @@ public: /** add template; to be called by child template entry contexts */ void addTemplateEntry( - const ::com::sun::star::beans::PropertyValues& aValues); + const css::beans::PropertyValues& aValues); protected: virtual void StartElement( - 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 void EndElement() override; 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; }; #endif diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 4a7e2267d585..9233e1380334 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -69,7 +69,7 @@ void XMLIndexTitleTemplateContext::StartElement( sStyleName = xAttrList->getValueByIndex(nAttr); OUString sDisplayStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sStyleName ); - const Reference < ::com::sun::star::container::XNameContainer >& + const Reference < css::container::XNameContainer >& rStyles = GetImport().GetTextImport()->GetParaStyles(); bStyleNameOK = rStyles.is() && rStyles->hasByName( sDisplayStyleName ); } diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 612c3306922e..266d671bc660 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -49,16 +49,14 @@ class XMLIndexTitleTemplateContext : public SvXMLImportContext OUStringBuffer sContent; // TOC property set - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rTOCPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rTOCPropertySet; public: XMLIndexTitleTemplateContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + css::uno::Reference<css::beans::XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName); @@ -68,8 +66,7 @@ protected: /** process parameters */ virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; /** set values */ virtual void EndElement() override; diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 2cf1a6e5de2c..00d5b8bc2fb1 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -60,8 +60,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + css::uno::Reference<css::beans::XPropertySet> & rPropSet); virtual ~XMLIndexUserSourceContext(); @@ -76,8 +75,7 @@ protected: 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; }; #endif diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx index 406b38b79ad4..a668ec68214c 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx @@ -52,8 +52,8 @@ public: protected: virtual void StartElement( - 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 void Characters( const OUString& rChars ) override; diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 9396ade5999e..aaa641deff76 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -72,8 +72,7 @@ class XMLPropertyBackpatcher /// backpatch list type typedef ::std::vector< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> > BackpatchListType; + css::uno::Reference<css::beans::XPropertySet> > BackpatchListType; /* use void* instead of BackpatchListType to avoid linker problems with long typenames. The real typename (commented out) contains @@ -104,14 +103,12 @@ public: /// Use this whenever the value should be set, even if it is not yet known. /// const version void SetProperty( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet, + const css::uno::Reference<css::beans::XPropertySet> & xPropSet, const OUString& sName); /// non-const version of SetProperty void SetProperty( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet, + css::uno::Reference<css::beans::XPropertySet> & xPropSet, const OUString& sName); /// set default (if bDefaultHandling) for unresolved names diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index eccbff1b8c6e..5ef3d2e9de24 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -38,12 +38,11 @@ namespace com { namespace sun { namespace star { // store a list of redline properties typedef ::std::list< - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> > ChangesListType; + css::uno::Reference<css::beans::XPropertySet> > ChangesListType; // store a list of redline properties for each XText typedef ::std::map< - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>, + css::uno::Reference< css::text::XText>, ChangesListType* > ChangesMapType; @@ -102,8 +101,7 @@ public: /// export a change void ExportChange( /// PropertySet of RedlinePortion - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference<css::beans::XPropertySet> & rPropSet, bool bAutoStyle); /// export the list of changes (complete list minus recorded changed) @@ -111,15 +109,13 @@ public: /// export the list of changes (recorded changes for this XText only) void ExportChangesList( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText> & rText, + const css::uno::Reference<css::text::XText> & rText, bool bAutoStyles); /// set the current XText for which changes should be recorded. /// An empty XText means: don't record changes void SetCurrentXText( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText> & rText); + const css::uno::Reference<css::text::XText> & rText); /// Do not record changes. /// Same as SetCurrentXText(Reference<XText>) with empty argument. @@ -128,22 +124,20 @@ public: /// export redline marks which start or end at start nodes, /// i.e. that include the complete paragraph/table/section void ExportStartOrEndRedline( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference< + css::beans::XPropertySet> & rPropSet, bool bStart); /// start or end of text entity (e.g. paragraph)? /// convenience method, calls XPropertySet-version of this method void ExportStartOrEndRedline( /// XTextContent; must also be an XPropertySet - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> & rContent, + const css::uno::Reference<css::text::XTextContent> & rContent, bool bStart); /// convenience method, calls XPropertySet-version of this method void ExportStartOrEndRedline( /// XTextSection; must also be an XPropertySet - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextSection> & rSection, + const css::uno::Reference<css::text::XTextSection> & rSection, bool bStart); private: @@ -151,14 +145,12 @@ private: /// export the change mark contained in the text body void ExportChangeInline( /// PropertySet of RedlinePortion - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export the auto styles used in this change void ExportChangeAutoStyle( /// PropertySet of RedlinePortion - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export the changes list (<text:tracked-changes>) void ExportChangesListElements(); @@ -168,26 +160,22 @@ private: /// export the changed-region element void ExportChangedRegion( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export an change-info element (from a PropertySet) void ExportChangeInfo( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// export an change-info element (from PropertyValues) void ExportChangeInfo( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + const css::uno::Sequence<css::beans::PropertyValue> & rValues); /// convert the change type from API to XML names const OUString ConvertTypeName(const OUString& sApiName); /// Get ID string! const OUString GetRedlineID( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet); + const css::uno::Reference<css::beans::XPropertySet> & rPropSet); /// write a comment string as sequence of <text:p> elements void WriteComment(const OUString& rComment); diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 5a4d47bba2f7..012e8a551507 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -145,16 +145,14 @@ public: * appropriate section or index method. */ void ExportSectionStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection, + const css::uno::Reference < css::text::XTextSection > & rSection, bool bAutoStyles); /** * export section or index end elements */ void ExportSectionEnd( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection, + const css::uno::Reference < css::text::XTextSection > & rSection, bool bAutoStyles); /** @@ -162,16 +160,14 @@ public: * (E.g. linked sections in global documents are not always exported) */ bool IsMuteSection( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection) const; + const css::uno::Reference < css::text::XTextSection > & rSection) const; /** * XTextContent-version of IsMuteSection(Reference<XTextSection>&) * returns *true* for all non-section elements */ bool IsMuteSection( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rSection, + const css::uno::Reference < css::text::XTextContent > & rSection, /// return value if this content doesn't support the section property bool bDefault) const; @@ -180,10 +176,8 @@ public: * current section of rContent can not be determined, return bDefault. */ bool IsInSection( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rEnclosingSection, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rContent, + const css::uno::Reference < css::text::XTextSection > & rEnclosingSection, + const css::uno::Reference < css::text::XTextContent > & rContent, /// return value if this content doesn't support the section property bool bDefault); @@ -212,53 +206,43 @@ protected: /// export an index start element. void ExportIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XDocumentIndex > & rSection); + const css::uno::Reference < css::text::XDocumentIndex > & rSection); /// export an index header start element. void ExportIndexHeaderStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection); + const css::uno::Reference < css::text::XTextSection > & rSection); /// export a proper section (and source elements) void ExportRegularSectionStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection); + const css::uno::Reference < css::text::XTextSection > & rSection); /// export a table of content (and source element) void ExportTableOfContentStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export a table index (and source element) void ExportTableIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export an object index (and source element) void ExportObjectIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export an illustration index (and source element) void ExportIllustrationIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export an alphabetical/keyword index (and source element) void ExportAlphabeticalIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export a user index (and source element) void ExportUserIndexStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export the bibliography (and source element) void ExportBibliographyStart( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rIndex); + const css::uno::Reference < css::beans::XPropertySet > & rIndex); // helper methods: @@ -272,10 +256,8 @@ protected: * return sal_True, xIndex is empty: index header section * return sal_True, xIndex is set: index section */ bool GetIndex( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rSection, - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XDocumentIndex > & rIndex) const; + const css::uno::Reference < css::text::XTextSection > & rSection, + css::uno::Reference < css::text::XDocumentIndex > & rIndex) const; /// map service name to section type static enum SectionTypeEnum MapSectionType(const OUString& rSectionName); @@ -288,8 +270,7 @@ protected: */ void ExportBaseIndexStart( ::xmloff::token::XMLTokenEnum eElement, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /** * Export the index source element (common for all index types). @@ -299,16 +280,15 @@ protected: */ void ExportBaseIndexSource( SectionTypeEnum eType, /// index type - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < + css::beans::XPropertySet > & rSection); /** * Export the index body (common for all index types). */ void ExportBaseIndexBody( SectionTypeEnum eType, /// index type - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /** @@ -316,35 +296,30 @@ protected: * illustration indices */ void ExportTableAndIllustrationIndexSourceAttributes( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rSection); + const css::uno::Reference < css::beans::XPropertySet > & rSection); /// export one template for the specific index type bool ExportIndexTemplate( SectionTypeEnum eType, /// index type sal_Int32 nLevel, /// outline level (if applicable) - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> > & rValues); + const css::uno::Reference< css::beans::XPropertySet> & rPropSet, + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue> > & rValues); /// export a single template element (e.g. span or tab-stop) void ExportIndexTemplateElement( SectionTypeEnum eType, //i90246, needed for ODF 1.0, 1.0 and 1.2 management - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + css::uno::Sequence< + css::beans::PropertyValue> & rValues); /// export level paragraph styles void ExportLevelParagraphStyles( - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace> & xStyles); + css::uno::Reference< + css::container::XIndexReplace> & xStyles); /// helper to export boolean properties void ExportBoolean( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference<css::beans::XPropertySet> & rPropSet, const OUString& sPropertyName, enum ::xmloff::token::XMLTokenEnum eAttributeName, bool bDefault, diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 9b878ef3ebd7..2248f612ae82 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -40,7 +40,7 @@ using namespace ::xmloff::token; using ::std::vector; -using ::com::sun::star::style::NumberingType::ARABIC; +using css::style::NumberingType::ARABIC; void XMLSectionFootnoteConfigExport::exportXML( diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index d00d5259065c..342844b4fd7a 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -56,8 +56,7 @@ public: virtual ~XMLSectionFootnoteConfigImport(); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 838a0ecac027..0a1a2de53154 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -40,16 +40,13 @@ namespace com { namespace sun { namespace star { class XMLSectionImportContext : public SvXMLImportContext { /// start position; ranges acquired via getStart(),getEnd() don't move - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> xStartRange; + css::uno::Reference<css::text::XTextRange> xStartRange; /// end position - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> xEndRange; + css::uno::Reference<css::text::XTextRange> xEndRange; /// TextSection (as XPropertySet) for passing down to data source elements - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xSectionPropertySet; + css::uno::Reference<css::beans::XPropertySet> xSectionPropertySet; const OUString sTextSection; const OUString sIndexHeaderSection; @@ -63,7 +60,7 @@ class XMLSectionImportContext : public SvXMLImportContext OUString sStyleName; OUString sName; OUString sCond; - ::com::sun::star::uno::Sequence<sal_Int8> aSequence; + css::uno::Sequence<sal_Int8> aSequence; bool bProtect; bool bCondOK; bool bIsVisible; @@ -87,20 +84,17 @@ public: protected: virtual void StartElement( - 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 void EndElement() override; 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; void ProcessAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ); }; #endif diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index 7f090083c015..be7ee1887cc0 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { class XMLSectionSourceDDEImportContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectionPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rSectionPropertySet; const OUString sDdeCommandFile; const OUString sDdeCommandType; @@ -45,24 +44,21 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectPropSet); + css::uno::Reference<css::beans::XPropertySet> & rSectPropSet); virtual ~XMLSectionSourceDDEImportContext(); protected: virtual void StartElement( - 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 void EndElement() override; 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; }; #endif diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index 21f9e148286c..859dfce412bb 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { class XMLSectionSourceImportContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectionPropertySet; + css::uno::Reference<css::beans::XPropertySet> & rSectionPropertySet; public: @@ -40,24 +39,21 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rSectPropSet); + css::uno::Reference<css::beans::XPropertySet> & rSectPropSet); virtual ~XMLSectionSourceImportContext(); protected: virtual void StartElement( - 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 void EndElement() override; 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; }; #endif diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx index 96b9d3088b6d..4c41d9db361d 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx @@ -39,9 +39,8 @@ public: XMLTextCharStyleNamesElementExport( SvXMLExport& rExp, bool bDoSomething, bool bAllStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const OUString& rPropName ); + const css::uno::Reference < css::beans::XPropertySet > & rPropSet, + const OUString& rPropName ); ~XMLTextCharStyleNamesElementExport(); }; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 2b4727e0c218..81b3b185d1e6 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -152,9 +152,8 @@ public: XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_uInt16 nType, ParamMap &rParamMap); virtual ~XMLTextFrameParam_Impl(); @@ -167,9 +166,8 @@ XMLTextFrameParam_Impl::~XMLTextFrameParam_Impl() XMLTextFrameParam_Impl::XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_uInt16 /*nType*/, ParamMap &rParamMap): SvXMLImportContext( rImport, nPrfx, rLName ) @@ -208,9 +206,8 @@ public: XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const OUString& rLName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const Reference < XPropertySet >& rPropSet, bool bPath ); virtual ~XMLTextFrameContourContext_Impl(); @@ -318,7 +315,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl( aTargetRange)); } - com::sun::star::drawing::PointSequenceSequence aPointSequenceSequence; + css::drawing::PointSequenceSequence aPointSequenceSequence; basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(aPolyPolygon, aPointSequenceSequence); aAny <<= aPointSequenceSequence; xPropSet->setPropertyValue( sContourPolyPolygon, aAny ); @@ -348,12 +345,9 @@ XMLTextFrameContourContext_Impl::~XMLTextFrameContourContext_Impl() class XMLTextFrameContext_Impl : public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > xPropSet; - ::com::sun::star::uno::Reference < - ::com::sun::star::io::XOutputStream > xBase64Stream; + css::uno::Reference < css::text::XTextCursor > xOldTextCursor; + css::uno::Reference < css::beans::XPropertySet > xPropSet; + css::uno::Reference < css::io::XOutputStream > xBase64Stream; /// old list item and block (#89891#) bool mbListContextPushed; @@ -410,7 +404,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext sal_Int16 nRelHeight; sal_uInt16 nType; - ::com::sun::star::text::TextContentAnchorType eAnchorType; + css::text::TextContentAnchorType eAnchorType; bool bMayScript : 1; bool bMinWidth : 1; @@ -431,12 +425,10 @@ public: XMLTextFrameContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rAttrList, - ::com::sun::star::text::TextContentAnchorType eAnchorType, + const css::uno::Reference<css::xml::sax::XAttributeList > & rAttrList, + css::text::TextContentAnchorType eAnchorType, sal_uInt16 nType, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & rFrameAttrList ); + const css::uno::Reference<css::xml::sax::XAttributeList > & rFrameAttrList ); virtual ~XMLTextFrameContext_Impl(); virtual void EndElement() override; @@ -445,8 +437,7 @@ public: 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; void SetHyperlink( const OUString& rHRef, const OUString& rName, @@ -460,10 +451,9 @@ public: void SetName(); - ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } + css::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& GetPropSet() const { return xPropSet; } + const css::uno::Reference < css::beans::XPropertySet >& GetPropSet() const { return xPropSet; } }; @@ -1201,7 +1191,7 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext( UNO_QUERY ); OSL_ENSURE( xEOS.is(), "no embedded object supplier for own object" ); - Reference<com::sun::star::lang::XComponent> aXComponent(xEOS->getEmbeddedObject()); + Reference<css::lang::XComponent> aXComponent(xEOS->getEmbeddedObject()); pEContext->SetComponent( aXComponent ); } } @@ -1356,8 +1346,7 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc ) } -bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet ) +bool XMLTextFrameContext::CreateIfNotThere( css::uno::Reference < css::beans::XPropertySet >& rPropSet ) { SvXMLImportContext *pContext = &m_xImplContext; XMLTextFrameContext_Impl *pImpl = dynamic_cast< XMLTextFrameContext_Impl*>( pContext ); diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index fea47ae5423d..4e297abfafa8 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -32,8 +32,7 @@ class XMLTextFrameContextHyperlink_Impl; class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHelper { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; + css::uno::Reference< css::xml::sax::XAttributeList > m_xAttrList; SvXMLImportContextRef m_xImplContext; SvXMLImportContextRef m_xReplImplContext; @@ -43,7 +42,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHe OUString m_sTitle; OUString m_sDesc; - ::com::sun::star::text::TextContentAnchorType m_eDefaultAnchorType; + css::text::TextContentAnchorType m_eDefaultAnchorType; /* The <draw:name> can longer be used to distinguish Writer graphic/text box objects and Draw graphic/text box objects. @@ -54,8 +53,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHe bool m_HasAutomaticStyleWithoutParentStyle; bool m_bSupportsReplacement; - bool CreateIfNotThere( ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet ); + bool CreateIfNotThere( css::uno::Reference < css::beans::XPropertySet >& rPropSet ); protected: /// helper to get the created xShape instance, needs to be overridden @@ -68,31 +66,28 @@ public: XMLTextFrameContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - ::com::sun::star::text::TextContentAnchorType eDfltAnchorType ); + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, + css::text::TextContentAnchorType eDfltAnchorType ); virtual ~XMLTextFrameContext(); virtual void EndElement() override; 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; void SetHyperlink( const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, bool bMap ); - ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; + css::text::TextContentAnchorType GetAnchorType() const; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > GetTextContent() const; + css::uno::Reference < css::text::XTextContent > GetTextContent() const; // Frame "to character": anchor moves from first to last char after saving (#i33242#) - ::com::sun::star::uno::Reference < - ::com::sun::star::drawing::XShape > GetShape() const; + css::uno::Reference < css::drawing::XShape > GetShape() const; }; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index bbc091bdd0c7..5a265ad07e4f 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -34,8 +34,8 @@ class XMLTextFrameHyperlinkContext : public SvXMLImportContext OUString sHRef; OUString sName; OUString sTargetFrameName; - ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType; - SvXMLImportContextRef xFrameContext; + css::text::TextContentAnchorType eDefaultAnchorType; + SvXMLImportContextRef xFrameContext; bool bMap; public: @@ -44,26 +44,22 @@ public: XMLTextFrameHyperlinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - ::com::sun::star::text::TextContentAnchorType eDefaultAnchorType ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + css::text::TextContentAnchorType eDefaultAnchorType ); virtual ~XMLTextFrameHyperlinkContext(); virtual void EndElement() override; 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; - ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; + css::text::TextContentAnchorType GetAnchorType() const; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > GetTextContent() const; + css::uno::Reference < css::text::XTextContent > GetTextContent() const; // Frame "to character": anchor moves from first to last char after saving (#i33242#) - ::com::sun::star::uno::Reference < - ::com::sun::star::drawing::XShape > GetShape() const; + css::uno::Reference < css::drawing::XShape > GetShape() const; }; diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index 2f01606ebfca..d3fbbc8b8d44 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -29,8 +29,7 @@ class XMLTextListBlockContext : public SvXMLImportContext { XMLTextImportHelper& mrTxtImport; - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > mxNumRules; + css::uno::Reference< css::container::XIndexReplace > mxNumRules; // text:style-name property of <list> element OUString msListStyleName; @@ -56,8 +55,7 @@ public: XMLTextImportHelper& rTxtImp, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bRestartNumberingAtSubList = false ); virtual ~XMLTextListBlockContext(); @@ -65,16 +63,14 @@ public: 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; const OUString& GetListStyleName() const { return msListStyleName; } sal_Int16 GetLevel() const { return mnLevel; } bool IsRestartNumbering() const { return mbRestartNumbering; } void ResetRestartNumbering() { mbRestartNumbering = false; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRules() const + const css::uno::Reference < css::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } const OUString& GetListId() const { return msListId;} diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index f52e4c40082f..97b4bb11d5eb 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -33,8 +33,7 @@ class XMLTextListItemContext : public SvXMLImportContext // quantity of <text:list> child elements sal_Int16 mnSubListCount; // list style instance for text::style-override property - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > mxNumRulesOverride; + css::uno::Reference< css::container::XIndexReplace > mxNumRulesOverride; public: @@ -44,8 +43,7 @@ public: XMLTextImportHelper& rTxtImp, const sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bIsHeader = false ); virtual ~XMLTextListItemContext(); @@ -53,8 +51,7 @@ public: 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; bool HasStartValue() const { return -1 != nStartValue; } sal_Int16 GetStartValue() const { return nStartValue; } @@ -63,8 +60,7 @@ public: { return mxNumRulesOverride.is(); } - inline const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRulesOverride() const + inline const css::uno::Reference < css::container::XIndexReplace >& GetNumRulesOverride() const { return mxNumRulesOverride; } diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index e28170c1ee71..2ebef98d77d6 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -64,7 +64,7 @@ XMLFieldParamImportContext::XMLFieldParamImportContext( } -void XMLFieldParamImportContext::StartElement(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList) +void XMLFieldParamImportContext::StartElement(const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) { SvXMLImport& rImport = GetImport(); OUString sName; @@ -217,7 +217,7 @@ void XMLTextMarkImportContext::EndElement() if ((lcl_MarkType)nTmp==TypeFieldmark) { if (xContent.is() && bImportAsField) { // setup fieldmark... - Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); + Reference< css::text::XFormField> xFormField(xContent, UNO_QUERY); xFormField->setFieldType(OUString::createFromAscii(formFieldmarkName)); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { m_rHelper.setCurrentFieldParamsTo(xFormField); @@ -324,7 +324,7 @@ void XMLTextMarkImportContext::EndElement() if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) { if (xContent.is() && bImportAsField) { // setup fieldmark... - Reference< ::com::sun::star::text::XFormField> xFormField(xContent, UNO_QUERY); + Reference< css::text::XFormField> xFormField(xContent, UNO_QUERY); if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) { xFormField->setFieldType(fieldmarkTypeName); @@ -355,7 +355,7 @@ void XMLTextMarkImportContext::EndElement() SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) + const css::uno::Reference< css::xml::sax::XAttributeList >& ) { return new XMLFieldParamImportContext(GetImport(), m_rHelper, nPrefix, rLocalName); @@ -415,7 +415,7 @@ Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark( return xTextContent; } - catch (com::sun::star::lang::IllegalArgumentException &) + catch (css::lang::IllegalArgumentException &) { OSL_FAIL("CreateAndInsertMark: cannot insert?"); return nullptr; diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index faa963feed28..b768c3567221 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -47,8 +47,7 @@ public: const OUString& rLocalName ); virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; }; @@ -85,28 +84,24 @@ public: protected: virtual void StartElement( - 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 void EndElement() override; 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; public: - static ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent > CreateAndInsertMark( + static css::uno::Reference< css::text::XTextContent > CreateAndInsertMark( SvXMLImport& rImport, const OUString& sServiceName, const OUString& sMarkName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> & rRange, + const css::uno::Reference<css::text::XTextRange> & rRange, const OUString& i_rXmlId = OUString()); bool FindName( SvXMLImport& rImport, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList); + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList); }; #endif diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 4d09587f1aa6..f98001fdec6d 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -235,7 +235,7 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( 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, const bool bFooter, const bool bLeft, const bool bFirst ) diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 571c59d181ed..a31f13dc2a8f 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -61,8 +61,7 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo() // Written OpenDocument file format doesn't fit to the created text document (#i69627#) void XMLTextNumRuleInfo::Set( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & xTextContent, + const css::uno::Reference < css::text::XTextContent > & xTextContent, const bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, const bool bExportTextNumberElement ) diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index e5cbeaef175a..b898bb9f4191 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -50,8 +50,7 @@ class XMLTextNumRuleInfo const OUString msListLabelStringProp; // numbering rules instance and its name - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > mxNumRules; + css::uno::Reference < css::container::XIndexReplace > mxNumRules; OUString msNumRulesName; // paragraph's list attributes @@ -76,8 +75,7 @@ public: inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo ); - void Set( const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContnt, + void Set( const css::uno::Reference < css::text::XTextContent > & rTextContnt, const bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, const bool bExportTextNumberElement ); diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index 2ee7fcf1b42c..411df93cdd04 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -33,11 +33,10 @@ class XMLTextPropertySetContext : public SvXMLPropertySetContext public: XMLTextPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, - ::std::vector< XMLPropertyState > &rProps, - const rtl::Reference < SvXMLImportPropertyMapper > &rMap, + ::std::vector< XMLPropertyState > &rProps, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, OUString& rDopCapTextStyleName ); virtual ~XMLTextPropertySetContext(); @@ -45,7 +44,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( 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, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp) override; }; diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index b47d1a296012..e553d40290ba 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -46,14 +46,12 @@ public: virtual ~XMLTrackedChangesImportContext(); virtual void StartElement( - 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 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; }; #endif diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx index 10cdcbf7afc4..a921a82e3bc1 100644 --- a/xmloff/source/text/txtdrope.hxx +++ b/xmloff/source/text/txtdrope.hxx @@ -33,7 +33,7 @@ public: explicit XMLTextDropCapExport( SvXMLExport& rExport ); ~XMLTextDropCapExport(); - void exportXML( const ::com::sun::star::uno::Any& rAny, + void exportXML( const css::uno::Any& rAny, bool bWholeWord, const OUString& rStyleName ); }; diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 0ea6bd3ad67b..5aa29dfe070b 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -31,16 +31,14 @@ class XMLTextDropCapImportContext :public XMLElementPropertyContext private: void ProcessAttrs( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); public: XMLTextDropCapImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const XMLPropertyState& rProp, sal_Int32 nWholeWOrdIdx, ::std::vector< XMLPropertyState > &rProps ); diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index 9ebd8825fc44..f89dd022cb74 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -59,8 +59,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const override; + css::uno::Reference< css::beans::XPropertySet > rPropSet ) const override; const SvXMLExport& GetExport() const { return rExport; } public: diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 1b41b6b4fd2c..af5c290c6114 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1773,13 +1773,13 @@ void XMLTextFieldExport::ExportFieldHelper( } } - com::sun::star::uno::Reference < com::sun::star::text::XText > xText; + css::uno::Reference < css::text::XText > xText; try { - com::sun::star::uno::Any aRet = rPropSet->getPropertyValue(sPropertyTextRange); + css::uno::Any aRet = rPropSet->getPropertyValue(sPropertyTextRange); aRet >>= xText; } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) {} if ( xText.is() ) diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 002fee83985b..f26039b2843b 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -1962,8 +1962,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute( } void XMLUserDocInfoImportContext::PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropertySet) + const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) { uno::Any aAny; if ( !aName.isEmpty() ) @@ -3259,8 +3258,7 @@ void XMLPageNameFieldImportContext::ProcessAttribute( sal_uInt16, /// prepare XTextField for insertion into document void XMLPageNameFieldImportContext::PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> &) + const css::uno::Reference<css::beans::XPropertySet> &) { } @@ -4136,8 +4134,8 @@ void XMLDateTimeFieldImportContext::ProcessAttribute( sal_uInt16, /// prepare XTextField for insertion into document void XMLDateTimeFieldImportContext::PrepareField( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> &) + const css::uno::Reference< + css::beans::XPropertySet> &) { } diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 8de29693ec40..9000846aa927 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2575,7 +2575,7 @@ bool XMLTextImportHelper::hasCurrentFieldCtx() return !m_xImpl->m_FieldStack.empty(); } -void XMLTextImportHelper::setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField) +void XMLTextImportHelper::setCurrentFieldParamsTo(css::uno::Reference< css::text::XFormField> &xFormField) { assert(!m_xImpl->m_FieldStack.empty()); if (!m_xImpl->m_FieldStack.empty() && xFormField.is()) diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 4472cbac24aa..2e0139d3fecc 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -206,7 +206,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( if( !pFontFamily ) { - aAny <<= (sal_Int16)com::sun::star::awt::FontFamily::DONTKNOW; + aAny <<= (sal_Int16)css::awt::FontFamily::DONTKNOW; #if OSL_DEBUG_LEVEL > 0 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( @@ -219,7 +219,7 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( if( !pFontPitch ) { - aAny <<= (sal_Int16)com::sun::star::awt::FontPitch::DONTKNOW; + aAny <<= (sal_Int16)css::awt::FontPitch::DONTKNOW; #if OSL_DEBUG_LEVEL > 0 sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( pFontFamilyName->mnIndex + 3 ); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index ce9e90bd1485..895c0f08802a 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2271,7 +2271,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( } else if (sType.equals(sTextFieldStart)) { - Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); + Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); /* As of now, textmarks are a proposed extension to the OpenDocument standard. */ if (!bAutoStyles) @@ -2302,7 +2302,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if (xFormField.is()) { OUString sName; - Reference< ::com::sun::star::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); + Reference< css::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); if (xParameters.is() && xParameters->hasByName("Name")) { const Any aValue = xParameters->getByName("Name"); @@ -2340,7 +2340,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { if (!bAutoStyles) { - Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); + Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); if ( GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) { @@ -2353,7 +2353,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if (xFormField.is()) { OUString sName; - Reference< ::com::sun::star::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); + Reference< css::container::XNameAccess > xParameters(xFormField->getParameters(), UNO_QUERY); if (xParameters.is() && xParameters->hasByName("Name")) { const Any aValue = xParameters->getByName("Name"); @@ -2385,7 +2385,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xBookmark->getName()); } - Reference< ::com::sun::star::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); + Reference< css::text::XFormField > xFormField(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); if (xFormField.is()) { GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType()); @@ -3315,7 +3315,7 @@ bool XMLTextParagraphExport::addHyperlinkAttributes( } void XMLTextParagraphExport::exportTextRangeSpan( - const com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange, + const css::uno::Reference< css::text::XTextRange > & rTextRange, Reference< XPropertySet > & xPropSet, Reference < XPropertySetInfo > & xPropSetInfo, const bool bIsUICharStyle, diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index efbb8d69dea5..7c59418cfba7 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -35,25 +35,24 @@ namespace xml { namespace sax { class XAttributeList; } } class XMLParaContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextRange > xStart; + css::uno::Reference < css::text::XTextRange > xStart; OUString sStyleName; OUString m_sXmlId; OUString m_sAbout; OUString m_sProperty; OUString m_sContent; OUString m_sDatatype; - bool m_bHaveAbout; - sal_Int8 nOutlineLevel; - XMLHints_Impl *pHints; + bool m_bHaveAbout; + sal_Int8 nOutlineLevel; + XMLHints_Impl *pHints; // Lost outline numbering in master document (#i73509#) - bool mbOutlineLevelAttrFound; - bool bIgnoreLeadingSpace; - bool bHeading; - bool bIsListHeader; - bool bIsRestart; - sal_Int16 nStartValue; - sal_uInt8 nStarFontsConvFlags; + bool mbOutlineLevelAttrFound; + bool bIgnoreLeadingSpace; + bool bHeading; + bool bIsListHeader; + bool bIsRestart; + sal_Int16 nStartValue; + sal_uInt8 nStarFontsConvFlags; public: @@ -61,16 +60,14 @@ public: XMLParaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bHeading ); virtual ~XMLParaContext(); 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 void Characters( const OUString& rChars ) override; @@ -87,8 +84,7 @@ class XMLNumberedParaContext : public SvXMLImportContext /// text:list-id OUString m_ListId; /// text:style-name - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > m_xNumRules; + css::uno::Reference< css::container::XIndexReplace > m_xNumRules; public: @@ -96,8 +92,7 @@ public: XMLNumberedParaContext( SvXMLImport& i_rImport, sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ); virtual ~XMLNumberedParaContext(); @@ -105,12 +100,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & i_xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ) override; sal_Int16 GetLevel() const { return m_Level; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRules() const + const css::uno::Reference< css::container::XIndexReplace >& GetNumRules() const { return m_xNumRules; } const OUString& GetListId() const { return m_ListId; } sal_Int16 GetStartValue() const { return m_StartValue; } diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index e3430fe6721d..88562059ed2a 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -263,17 +263,17 @@ public: virtual ~XMLDropCapPropHdl_Impl (); virtual bool equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const override; + const css::uno::Any& r1, + const css::uno::Any& r2 ) const override; /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -320,11 +320,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -370,11 +370,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -420,11 +420,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -484,11 +484,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -538,11 +538,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -727,11 +727,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -780,11 +780,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -874,11 +874,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -975,11 +975,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1019,11 +1019,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1074,11 +1074,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1121,11 +1121,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; @@ -1184,11 +1184,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const override; }; diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 877efefc2d82..ef5282da8c4d 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -44,8 +44,7 @@ using namespace ::com::sun::star::beans; using namespace ::xmloff::token; void XMLTextParagraphExport::exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) + const css::uno::Reference< css::style::XStyle > & rStyle ) { OUString sName; Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY ); diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 17a4b0ce5e14..148e85390dce 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -588,7 +588,7 @@ void XMLTextStyleContext::FillPropertySet( rPropSet->setPropertyValue(rPropertyName,Any(sStyleName)); } } - catch(::com::sun::star::lang::IllegalArgumentException& e) + catch(css::lang::IllegalArgumentException& e) { Sequence<OUString> aSeq { sStyleName }; GetImport().SetError(XMLERROR_STYLE_PROP_VALUE | XMLERROR_FLAG_WARNING, aSeq, e.Message, nullptr); |