diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-27 14:20:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-28 09:22:34 +0200 |
| commit | 16246ed7b280f51a39a01ded24c0d7bd59d59365 (patch) | |
| tree | e506c24eeae16b384555f08818e0b62ba41e0285 /sc/source/filter/xml | |
| parent | 5d3c37b99e8bfa9256f12015152439bf4e5ebbb4 (diff) | |
com::sun::star->css in sc
Change-Id: I7774890f46f9343e944e34db27af8bce3b1d0915
Diffstat (limited to 'sc/source/filter/xml')
75 files changed, 860 insertions, 1243 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 7f350bca78fd..f2dfa3f7c8f7 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -35,8 +35,7 @@ using namespace xmloff::token; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& 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) : SvXMLImportContext( rImport, nPrfx, rLName ), fIterationEpsilon(0.001), nIterationCount(100), @@ -103,8 +102,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext() SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -152,8 +150,7 @@ void ScXMLCalculationSettingsContext::EndElement() ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& 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, ScXMLCalculationSettingsContext* pCalcSet) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -185,8 +182,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext() SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -200,8 +196,7 @@ void ScXMLNullDateContext::EndElement() ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& 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, ScXMLCalculationSettingsContext* pCalcSet) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -243,8 +238,7 @@ ScXMLIterationContext::~ScXMLIterationContext() SvXMLImportContext *ScXMLIterationContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index e5a21029165e..0d18153c7c8d 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -27,7 +27,7 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext { - com::sun::star::util::Date aNullDate; + css::util::Date aNullDate; double fIterationEpsilon; sal_Int32 nIterationCount; sal_uInt16 nYear2000; @@ -43,17 +43,15 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext public: ScXMLCalculationSettingsContext( ScXMLImport& 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); virtual ~ScXMLCalculationSettingsContext(); 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 SetNullDate(const com::sun::star::util::Date& aDate) { aNullDate = aDate; } + void SetNullDate(const css::util::Date& aDate) { aNullDate = aDate; } void SetIterationStatus(const bool bValue) { bIsIterationEnabled = bValue; } void SetIterationCount(const sal_Int32 nValue) { nIterationCount = nValue; } void SetIterationEpsilon(const double fValue) { fIterationEpsilon = fValue; } @@ -67,15 +65,13 @@ class ScXMLNullDateContext : public SvXMLImportContext public: ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext(); 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; }; @@ -87,15 +83,13 @@ class ScXMLIterationContext : public SvXMLImportContext public: ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext(); 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/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 0f35c6e53c19..3b790dd7ef7d 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -48,7 +48,7 @@ public: ScXMLImport& 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, ScMyImpCellRangeSource* pCellRangeSource ); virtual ~ScXMLCellRangeSourceContext(); @@ -56,7 +56,7 @@ public: 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 ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index 64ae6020e63c..75c9075facc3 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -45,7 +45,7 @@ class ScChangeTrackingExportHelper ScEditEngineTextObj* pEditTextObj; ScChangeActionMap* pDependings; OUString sChangeIDPrefix; - com::sun::star::uno::Reference<com::sun::star::text::XText> xText; + css::uno::Reference<css::text::XText> xText; OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 31dff197bd04..95cd28a3ab19 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -31,7 +31,7 @@ struct ScMyActionInfo { OUString sUser; OUString sComment; - com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; }; struct ScMyCellInfo @@ -172,17 +172,17 @@ typedef std::list<ScMyBaseAction*> ScMyActions; class ScXMLChangeTrackingImportHelper { - std::set<OUString> aUsers; + std::set<OUString> aUsers; ScMyActions aActions; - com::sun::star::uno::Sequence<sal_Int8> aProtect; + css::uno::Sequence<sal_Int8> aProtect; ScDocument* pDoc; ScChangeTrack* pTrack; ScMyBaseAction* pCurrentAction; - OUString sIDPrefix; + OUString sIDPrefix; sal_uInt32 nPrefixLength; sal_Int16 nMultiSpanned; sal_Int16 nMultiSpannedSlaveCount; - bool bChangeTrack; + bool bChangeTrack; private: void ConvertInfo(const ScMyActionInfo& aInfo, OUString& rUser, DateTime& aDateTime); @@ -199,7 +199,7 @@ public: ~ScXMLChangeTrackingImportHelper(); void SetChangeTrack(bool bValue) { bChangeTrack = bValue; } - void SetProtection(const com::sun::star::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } + void SetProtection(const css::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } void StartChangeAction(const ScChangeActionType nActionType); sal_uInt32 GetIDFromString(const OUString& sID); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 78d18e7f6bf5..3cd6459cf152 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -25,13 +25,13 @@ class ScDocument; -class XMLCodeNameProvider : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess > +class XMLCodeNameProvider : public ::cppu::WeakImplHelper< css::container::XNameAccess > { ScDocument* mpDoc; OUString msDocName; OUString msCodeNameProp; - static bool _getCodeName( const ::com::sun::star::uno::Any& aAny, + static bool _getCodeName( const css::uno::Any& aAny, OUString& rCodeName ); public: @@ -39,23 +39,23 @@ public: virtual ~XMLCodeNameProvider(); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception ) override; + throw (css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception ) override; + throw (css::uno::RuntimeException, std::exception ) override; - static void set( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); + static void set( const css::uno::Reference< css::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; #endif diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 57225c6c7c87..eb7c1d852575 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -45,14 +45,14 @@ public: ScXMLImport& 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 ); virtual ~ScXMLConsolidationContext(); 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 ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index cac22847bc0a..b150da76182d 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -42,10 +42,10 @@ public: // helper methods static ScDocument* GetScDocument( - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ); + css::uno::Reference< css::frame::XModel > xModel ); // IMPORT: GeneralFunction / ScSubTotalFunc - static ::com::sun::star::sheet::GeneralFunction + static css::sheet::GeneralFunction GetFunctionFromString( const OUString& rString ); static ScSubTotalFunc GetSubTotalFuncFromString( @@ -54,7 +54,7 @@ public: // EXPORT: GeneralFunction / ScSubTotalFunc static void GetStringFromFunction( OUString& rString, - const ::com::sun::star::sheet::GeneralFunction eFunction, + const css::sheet::GeneralFunction eFunction, bool bAppendStr = false ); static void GetStringFromFunction( OUString& rString, @@ -62,14 +62,14 @@ public: bool bAppendStr = false ); // IMPORT: DataPilotFieldOrientation - static ::com::sun::star::sheet::DataPilotFieldOrientation + static css::sheet::DataPilotFieldOrientation GetOrientationFromString( const OUString& rString ); // EXPORT: DataPilotFieldOrientation static void GetStringFromOrientation( OUString& rString, - const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, + const css::sheet::DataPilotFieldOrientation eOrientation, bool bAppendStr = false ); // IMPORT: Detective @@ -123,12 +123,12 @@ enum ScXMLConditionToken struct ScXMLConditionParseResult { ScXMLConditionToken meToken; /// The leading condition token. - ::com::sun::star::sheet::ValidationType + css::sheet::ValidationType meValidation; /// A data validation type if existing. - ::com::sun::star::sheet::ConditionOperator + css::sheet::ConditionOperator meOperator; /// A comparison operator if existing. - OUString maOperand1; /// First operand of the token or comparison value. - OUString maOperand2; /// Second operand of 'between' conditions. + OUString maOperand1; /// First operand of the token or comparison value. + OUString maOperand2; /// Second operand of 'between' conditions. sal_Int32 mnEndIndex; /// Index of first character following the condition. }; diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 0f964f94b2a3..ceb7eba48a52 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -34,8 +34,7 @@ using namespace xmloff::token; ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& 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 */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // here are no attributes @@ -49,8 +48,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -70,8 +68,7 @@ void ScXMLDDELinksContext::EndElement() ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& 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 */ ) : SvXMLImportContext( rImport, nPrfx, rLName ), aDDELinkTable(), aDDELinkRow(), @@ -92,8 +89,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext() SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -195,9 +191,8 @@ void ScXMLDDELinkContext::EndElement() ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink) { @@ -239,8 +234,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext() SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -255,9 +249,8 @@ void ScXMLDDESourceContext::EndElement() ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink) { @@ -270,8 +263,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext() SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = NULL; @@ -296,9 +288,8 @@ void ScXMLDDETableContext::EndElement() ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink) { @@ -329,8 +320,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); @@ -344,9 +334,8 @@ void ScXMLDDEColumnContext::EndElement() ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), pDDELink(pTempDDELink), nRows(1) @@ -377,8 +366,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext() SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = NULL; @@ -400,9 +388,8 @@ void ScXMLDDERowContext::EndElement() ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDDELinkContext* pTempDDELink) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDDELinkContext* pTempDDELink) : SvXMLImportContext( rImport, nPrfx, rLName ), sValue(), fValue(), @@ -461,8 +448,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext() SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index aee1a06fbc35..cc2fb2c4c02f 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -31,15 +31,13 @@ class ScXMLDDELinksContext : public SvXMLImportContext public: ScXMLDDELinksContext( ScXMLImport& 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); virtual ~ScXMLDDELinksContext(); 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; }; @@ -71,15 +69,13 @@ class ScXMLDDELinkContext : public SvXMLImportContext public: ScXMLDDELinkContext( ScXMLImport& 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); virtual ~ScXMLDDELinkContext(); 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 SetApplication(const OUString& sValue) { sApplication = sValue; } void SetTopic(const OUString& sValue) { sTopic = sValue; } @@ -103,16 +99,14 @@ class ScXMLDDESourceContext : public SvXMLImportContext public: ScXMLDDESourceContext( ScXMLImport& 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, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDESourceContext(); 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; }; @@ -126,16 +120,14 @@ class ScXMLDDETableContext : public SvXMLImportContext public: ScXMLDDETableContext( ScXMLImport& 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, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDETableContext(); 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; }; @@ -149,16 +141,14 @@ class ScXMLDDEColumnContext : public SvXMLImportContext public: ScXMLDDEColumnContext( ScXMLImport& 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, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDEColumnContext(); 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; }; @@ -173,23 +163,21 @@ class ScXMLDDERowContext : public SvXMLImportContext public: ScXMLDDERowContext( ScXMLImport& 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, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDERowContext(); 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; }; class ScXMLDDECellContext : public SvXMLImportContext { - OUString sValue; + OUString sValue; double fValue; sal_Int32 nCells; bool bString; @@ -203,16 +191,14 @@ class ScXMLDDECellContext : public SvXMLImportContext public: ScXMLDDECellContext( ScXMLImport& 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, ScXMLDDELinkContext* pDDELink); virtual ~ScXMLDDECellContext(); 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/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index dc2d0b071337..4c4ac911e1b7 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -92,7 +92,7 @@ public: 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 ) override; virtual void EndElement() override; }; @@ -112,7 +112,7 @@ public: ScXMLImport& 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, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); virtual ~ScXMLDetectiveHighlightedContext(); @@ -120,7 +120,7 @@ public: 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 ) override; virtual void EndElement() override; }; @@ -139,14 +139,14 @@ public: ScXMLImport& 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 ); virtual ~ScXMLDetectiveOperationContext(); 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 ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index 05032da72793..e5b905356551 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -33,8 +33,7 @@ ScXMLEmptyContext::~ScXMLEmptyContext() SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = new ScXMLEmptyContext(GetScImport(), nPrefix, rLName); diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index b6b6597cc43d..9cfe5ffe45a9 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -37,8 +37,7 @@ 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; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index 9e6d77464e15..cf1cb4083ad4 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -34,7 +34,7 @@ class ScXMLExportDDELinks public: ScXMLExportDDELinks(ScXMLExport& rExport); ~ScXMLExportDDELinks(); - void WriteDDELinks(::com::sun::star::uno::Reference < ::com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); + void WriteDDELinks(css::uno::Reference < css::sheet::XSpreadsheetDocument >& xSpreadDoc); }; #endif diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 7a605a4f3bfc..5c5338040c76 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -513,37 +513,37 @@ void ScXMLExportDataPilot::WriteDatePart(sal_Int32 nPart) { switch(nPart) { - case com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS : + case css::sheet::DataPilotFieldGroupBy::SECONDS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_SECONDS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES : + case css::sheet::DataPilotFieldGroupBy::MINUTES : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_MINUTES); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::HOURS : + case css::sheet::DataPilotFieldGroupBy::HOURS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_HOURS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS : + case css::sheet::DataPilotFieldGroupBy::DAYS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_DAYS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS : + case css::sheet::DataPilotFieldGroupBy::MONTHS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_MONTHS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS : + case css::sheet::DataPilotFieldGroupBy::QUARTERS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_QUARTERS); } break; - case com::sun::star::sheet::DataPilotFieldGroupBy::YEARS : + case css::sheet::DataPilotFieldGroupBy::YEARS : { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUPED_BY, XML_YEARS); } diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index e7fbf755407b..ab93df6fcca1 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -65,7 +65,7 @@ class ScXMLExportDataPilot public: ScXMLExportDataPilot(ScXMLExport& rExport); ~ScXMLExportDataPilot(); - void WriteDataPilots(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreaDoc); + void WriteDataPilots(const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreaDoc); }; #endif diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 90f646531e91..31a232a76235 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -47,7 +47,7 @@ class ScFormatRangeStyles; class ScMyIteratorBase { protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) = 0; public: ScMyIteratorBase(); @@ -56,7 +56,7 @@ public: virtual void SetCellData( ScMyCell& rMyCell ) = 0; virtual void Sort() = 0; - void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + void UpdateAddress( css::table::CellAddress& rCellAddress ); }; struct ScMyShape @@ -65,7 +65,7 @@ struct ScMyShape ScAddress aEndAddress; sal_Int32 nEndX; sal_Int32 nEndY; - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; + css::uno::Reference<css::drawing::XShape> xShape; bool operator<(const ScMyShape& aShape) const; }; @@ -77,7 +77,7 @@ class ScMyShapesContainer : ScMyIteratorBase private: ScMyShapeList aShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyShapesContainer(); virtual ~ScMyShapesContainer(); @@ -93,7 +93,7 @@ public: struct ScMyNoteShape { - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; + css::uno::Reference<css::drawing::XShape> xShape; ScAddress aPos; bool operator<(const ScMyNoteShape& aNote) const; @@ -106,7 +106,7 @@ class ScMyNoteShapesContainer : ScMyIteratorBase private: ScMyNoteShapeList aNoteShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyNoteShapesContainer(); virtual ~ScMyNoteShapesContainer(); @@ -121,7 +121,7 @@ public: struct ScMyMergedRange { - com::sun::star::table::CellRangeAddress aCellRange; + css::table::CellRangeAddress aCellRange; sal_Int32 nRows; bool bIsFirst; bool operator<(const ScMyMergedRange& aRange) const; @@ -134,11 +134,11 @@ class ScMyMergedRangesContainer : ScMyIteratorBase private: ScMyMergedRangeList aRangeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); - void AddRange(const com::sun::star::table::CellRangeAddress& rMergedRange); + void AddRange(const css::table::CellRangeAddress& rMergedRange); using ScMyIteratorBase::UpdateAddress; virtual void SetCellData( ScMyCell& rMyCell ) override; @@ -152,7 +152,7 @@ struct ScMyAreaLink OUString sFilterOptions; OUString sURL; OUString sSourceStr; - ::com::sun::star::table::CellRangeAddress aDestRange; + css::table::CellRangeAddress aDestRange; sal_Int32 nRefresh; inline ScMyAreaLink() : nRefresh( 0 ) {} @@ -171,7 +171,7 @@ class ScMyAreaLinksContainer : ScMyIteratorBase private: ScMyAreaLinkList aAreaLinkList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer(); @@ -185,9 +185,9 @@ public: void SkipTable(SCTAB nSkip); }; -struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress +struct ScMyCellRangeAddress : css::table::CellRangeAddress { - ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange); + ScMyCellRangeAddress(const css::table::CellRangeAddress& rRange); bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; }; @@ -198,11 +198,11 @@ class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase private: ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer(); - void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); + void AddNewEmptyDatabaseRange(const css::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; virtual void SetCellData( ScMyCell& rMyCell ) override; @@ -212,10 +212,10 @@ public: struct ScMyDetectiveObj { - ::com::sun::star::table::CellAddress aPosition; - ::com::sun::star::table::CellRangeAddress aSourceRange; - ScDetectiveObjType eObjType; - bool bHasError; + css::table::CellAddress aPosition; + css::table::CellRangeAddress aSourceRange; + ScDetectiveObjType eObjType; + bool bHasError; bool operator<(const ScMyDetectiveObj& rDetObj) const; }; @@ -227,7 +227,7 @@ class ScMyDetectiveObjContainer : ScMyIteratorBase private: ScMyDetectiveObjList aDetectiveObjList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyDetectiveObjContainer(); virtual ~ScMyDetectiveObjContainer(); @@ -247,9 +247,9 @@ public: struct ScMyDetectiveOp { - ::com::sun::star::table::CellAddress aPosition; - ScDetOpType eOpType; - sal_Int32 nIndex; + css::table::CellAddress aPosition; + ScDetOpType eOpType; + sal_Int32 nIndex; bool operator<(const ScMyDetectiveOp& rDetOp) const; }; @@ -261,7 +261,7 @@ class ScMyDetectiveOpContainer : ScMyIteratorBase private: ScMyDetectiveOpList aDetectiveOpList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) override; + virtual bool GetFirstAddress( css::table::CellAddress& rCellAddress ) override; public: ScMyDetectiveOpContainer(); virtual ~ScMyDetectiveOpContainer(); @@ -279,9 +279,9 @@ struct ScMyCell { ScAddress maCellAddress; /// Use this instead of the UNO one. - com::sun::star::table::CellAddress aCellAddress; - com::sun::star::table::CellRangeAddress aMergeRange; - com::sun::star::table::CellRangeAddress aMatrixRange; + css::table::CellAddress aCellAddress; + css::table::CellRangeAddress aMergeRange; + css::table::CellRangeAddress aMatrixRange; ScMyAreaLink aAreaLink; ScMyShapeList aShapeList; @@ -293,7 +293,7 @@ struct ScMyCell sal_Int32 nValidationIndex; sal_Int32 nStyleIndex; sal_Int32 nNumberFormat; - com::sun::star::table::CellContentType nType; + css::table::CellContentType nType; ScRefCellValue maBaseCell; @@ -317,9 +317,9 @@ struct ScMyCell class ScMyNotEmptyCellsIterator : boost::noncopyable { - com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable; - com::sun::star::uno::Reference<com::sun::star::table::XCellRange> xCellRange; - com::sun::star::table::CellAddress aLastAddress; + css::uno::Reference<css::sheet::XSpreadsheet> xTable; + css::uno::Reference<css::table::XCellRange> xCellRange; + css::table::CellAddress aLastAddress; ScMyShapesContainer* pShapes; ScMyNoteShapesContainer* pNoteShapes; @@ -336,7 +336,7 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable SCROW nCellRow; SCTAB nCurrentTable; - void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); + void UpdateAddress( css::table::CellAddress& rAddress ); void SetCellData( ScMyCell& rMyCell, const css::table::CellAddress& rAddress ); void HasAnnotation( ScMyCell& aCell ); @@ -362,7 +362,7 @@ public: { pDetectiveOp = pNewDetectiveOp; } void SetCurrentTable(const SCTAB nTable, - com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable); + css::uno::Reference<css::sheet::XSpreadsheet>& rxTable); void SkipTable(SCTAB nSkip); bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index a665358baa54..02dd6675d53b 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -28,13 +28,13 @@ struct ScMyDrawPage { - com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage; + css::uno::Reference<css::drawing::XDrawPage> xDrawPage; bool bHasForms; ScMyDrawPage() : bHasForms(false) {} }; -typedef std::list< com::sun::star::uno::Reference<com::sun::star::drawing::XShape> > ScMyTableXShapes; +typedef std::list< css::uno::Reference<css::drawing::XShape> > ScMyTableXShapes; typedef std::vector<ScMyTableXShapes> ScMyTableShapes; typedef std::vector<ScMyDrawPage> ScMyDrawPages; @@ -63,17 +63,17 @@ public: sal_Int32 GetLastRow(const sal_Int32 nTable) const; void AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 nTable); void SetDrawPageHasForms(const sal_Int32 nTable, bool bHasForms); - com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable); + css::uno::Reference<css::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable); bool HasDrawPage() const { return pDrawPages != NULL; } - bool HasForm(const sal_Int32 nTable, com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& xDrawPage); + bool HasForm(const sal_Int32 nTable, css::uno::Reference<css::drawing::XDrawPage>& xDrawPage); void AddNewShape(const ScMyShape& aMyShape); void SortShapesContainer(); ScMyShapesContainer* GetShapesContainer() { return pShapesContainer; } bool HasShapes(); - void AddTableShape(const sal_Int32 nTable, const com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& xShape); + void AddTableShape(const sal_Int32 nTable, const css::uno::Reference<css::drawing::XShape>& xShape); ScMyTableShapes* GetTableShapes() { return pTableShapes; } ScMyDetectiveObjContainer* GetDetectiveObjContainer() { return pDetectiveObjContainer; } - void AddNoteObj(const com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& xShape, const ScAddress& rPos); + void AddNoteObj(const css::uno::Reference<css::drawing::XShape>& xShape, const ScAddress& rPos); void SortNoteShapes(); ScMyNoteShapesContainer* GetNoteShapes() { return pNoteShapes; } }; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index ad2288e04ebc..12420877d49a 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -44,10 +44,10 @@ struct ScMyValidation OUString sImputTitle; OUString sFormula1; OUString sFormula2; - com::sun::star::table::CellAddress aBaseCell; - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; + css::table::CellAddress aBaseCell; + css::sheet::ValidationAlertStyle aAlertStyle; + css::sheet::ValidationType aValidationType; + css::sheet::ConditionOperator aOperator; sal_Int16 nShowList; bool bShowErrorMessage; bool bShowImputMessage; @@ -86,10 +86,10 @@ private: public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); - bool AddValidation(const com::sun::star::uno::Any& aAny, + bool AddValidation(const css::uno::Any& aAny, sal_Int32& nValidationIndex); static OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - static OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + static OUString GetBaseCellAddress(ScDocument* pDoc, const css::table::CellAddress& aCell); static void WriteMessage(ScXMLExport& rExport, const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); @@ -168,11 +168,11 @@ typedef std::vector<OUString*> ScMyOUStringVec; struct ScMyFormatRange { - com::sun::star::table::CellRangeAddress aRangeAddress; - sal_Int32 nStyleNameIndex; - sal_Int32 nValidationIndex; - sal_Int32 nNumberFormat; - bool bIsAutoStyle; + css::table::CellRangeAddress aRangeAddress; + sal_Int32 nStyleNameIndex; + sal_Int32 nValidationIndex; + sal_Int32 nNumberFormat; + bool bIsAutoStyle; ScMyFormatRange(); bool operator< (const ScMyFormatRange& rRange) const; @@ -204,7 +204,7 @@ public: bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow); void GetFormatRanges(const sal_Int32 nStartColumn, const sal_Int32 nEndColumn, const sal_Int32 nRow, const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); - void AddRangeStyleName(const com::sun::star::table::CellRangeAddress& rCellRangeAddress, const sal_Int32 nStringIndex, + void AddRangeStyleName(const css::table::CellRangeAddress& rCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 737ec96f7e68..fa747e4e3435 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -30,20 +30,16 @@ namespace com { namespace sun { namespace star { class XMLTableHeaderFooterContext: public SvXMLImportContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xTextCursor; - ::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::sheet::XHeaderFooterContent > xHeaderFooterContent; + css::uno::Reference< css::text::XTextCursor > xTextCursor; + css::uno::Reference< css::text::XTextCursor > xOldTextCursor; + css::uno::Reference< css::beans::XPropertySet > xPropSet; + css::uno::Reference< css::sheet::XHeaderFooterContent > xHeaderFooterContent; const OUString sOn; const OUString sShareContent; const OUString sContent; const OUString sContentLeft; - OUString sCont; + OUString sCont; bool bDisplay; bool bLeft; @@ -56,10 +52,8 @@ public: XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPageStylePropSet, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::beans::XPropertySet > & rPageStylePropSet, bool bFooter, bool bLft ); virtual ~XMLTableHeaderFooterContext(); @@ -67,7 +61,7 @@ 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; virtual void EndElement() override; }; @@ -75,26 +69,23 @@ public: class XMLHeaderFooterRegionContext: public SvXMLImportContext { private: - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& xTextCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldTextCursor; + css::uno::Reference< css::text::XTextCursor >& xTextCursor; + css::uno::Reference< css::text::XTextCursor > xOldTextCursor; public: TYPEINFO_OVERRIDE(); XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor >& xCursor ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, + css::uno::Reference< css::text::XTextCursor >& xCursor ); virtual ~XMLHeaderFooterRegionContext(); 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/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index ef5bbb0e595c..3bf60088bc51 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx @@ -58,7 +58,7 @@ void XMLTableMasterPageExport::exportHeaderFooterContent( } } -void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Reference < com::sun::star::sheet::XHeaderFooterContent >& xHeaderFooter, +void XMLTableMasterPageExport::exportHeaderFooter(const css::uno::Reference < css::sheet::XHeaderFooterContent >& xHeaderFooter, const XMLTokenEnum aName, const bool bDisplay) { diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 4c8db3b83174..33a42186ab10 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -33,19 +33,17 @@ namespace com { namespace sun { namespace star { class XMLTableMasterPageExport : public XMLTextMasterPageExport { - void exportHeaderFooter(const com::sun::star::uno::Reference < com::sun::star::sheet::XHeaderFooterContent >& xHeaderFooter, + void exportHeaderFooter(const css::uno::Reference < css::sheet::XHeaderFooterContent >& xHeaderFooter, const xmloff::token::XMLTokenEnum aName, const bool bDisplay); protected: virtual void exportHeaderFooterContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText >& rText, + const css::uno::Reference< css::text::XText >& rText, bool bAutoStyles, bool bProgress ) override; virtual void exportMasterPageContent( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, bool bAutoStyles ) override; public: diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index e94e3bb4d411..4ecc44db4af7 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -28,7 +28,7 @@ class ScXMLAnnotationContext; class XMLTableShapeImportHelper : public XMLShapeImportHelper { - ::com::sun::star::table::CellAddress aStartCell; + css::table::CellAddress aStartCell; ScXMLAnnotationContext* pAnnotationContext; bool bOnTable; @@ -37,12 +37,12 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); virtual ~XMLTableShapeImportHelper(); - static void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); - virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) override; + static void SetLayer(css::uno::Reference<css::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); + virtual void finishShape(css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes) override; - void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } + void SetCell (const css::table::CellAddress& rAddress) { aStartCell = rAddress; } void SetOnTable (const bool bTempOnTable) { bOnTable = bTempOnTable; } void SetAnnotation(ScXMLAnnotationContext* pAnnotation) { pAnnotationContext = pAnnotation; } diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index b0e7a28b92f7..aec8c79f7593 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -31,7 +31,7 @@ class ScDocument; struct ScMyToFixupOLE { - com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape; + css::uno::Reference <css::drawing::XShape> xShape; OUString sRangeList; }; @@ -50,8 +50,8 @@ public: ScMyOLEFixer(ScXMLImport& rImport); ~ScMyOLEFixer(); - static bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape); - void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + static bool IsOLE(css::uno::Reference< css::drawing::XShape >& rShape); + void AddOLE(css::uno::Reference <css::drawing::XShape>& rShape, const OUString &rRangeList); void FixupOLEs(); }; diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 7062aa4c74b8..2650de14dfc0 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -28,8 +28,7 @@ using namespace com::sun::star; ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& 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 */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // here are no attributes @@ -41,8 +40,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext() SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index bf62f5f4bd76..d813709c9395 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -30,15 +30,13 @@ class ScXMLTableShapesContext : public SvXMLImportContext public: ScXMLTableShapesContext( ScXMLImport& 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); virtual ~ScXMLTableShapesContext(); 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/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index ecb6d7b207b4..d66733e3f9b1 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -34,8 +34,7 @@ using namespace xmloff::token; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& 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) : SvXMLImportContext( rImport, nPrfx, rLName ), sLink(), sTableName(), @@ -86,8 +85,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index e3ea662a5341..4a34619bc584 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -30,23 +30,21 @@ class ScXMLTableSourceContext : public SvXMLImportContext OUString sTableName; OUString sFilterName; OUString sFilterOptions; - sal_Int32 nRefresh; - com::sun::star::sheet::SheetLinkMode nMode; + sal_Int32 nRefresh; + css::sheet::SheetLinkMode nMode; const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } public: ScXMLTableSourceContext( ScXMLImport& 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); virtual ~ScXMLTableSourceContext(); 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/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index db152cede361..368326371fda 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -51,15 +51,13 @@ class ScXMLChangeInfoContext : public SvXMLImportContext public: ScXMLChangeInfoContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeInfoContext(); 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; }; @@ -72,15 +70,13 @@ class ScXMLBigRangeContext : public SvXMLImportContext public: ScXMLBigRangeContext( ScXMLImport& 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, ScBigRange& rBigRange); virtual ~ScXMLBigRangeContext(); 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; }; @@ -108,15 +104,13 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext public: ScXMLCellContentDeletionContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCellContentDeletionContext(); 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; }; @@ -129,15 +123,13 @@ class ScXMLDependenceContext : public SvXMLImportContext public: ScXMLDependenceContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependenceContext(); 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; }; @@ -150,15 +142,13 @@ class ScXMLDependingsContext : public SvXMLImportContext public: ScXMLDependingsContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependingsContext(); 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; }; @@ -171,15 +161,13 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext public: ScXMLChangeDeletionContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeDeletionContext(); 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; }; @@ -192,15 +180,13 @@ class ScXMLDeletionsContext : public SvXMLImportContext public: ScXMLDeletionsContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionsContext(); 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; }; @@ -209,12 +195,12 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - OUString sLName; - OUStringBuffer sText; + css::uno::Reference< css::xml::sax::XAttributeList> xAttrList; + OUString sLName; + OUStringBuffer sText; ScXMLChangeCellContext* pChangeCellContext; SvXMLImportContext* pTextPContext; - sal_uInt16 nPrefix; + sal_uInt16 nPrefix; ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -222,16 +208,14 @@ public: ScXMLChangeTextPContext( ScXMLImport& 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, ScXMLChangeCellContext* pChangeCellContext); virtual ~ScXMLChangeTextPContext(); 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; @@ -257,8 +241,7 @@ class ScXMLChangeCellContext : public SvXMLImportContext public: ScXMLChangeCellContext( ScXMLImport& 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, ScCellValue& rOldCell, OUString& sAddress, OUString& rFormula, OUString& rFormulaNmsp, formula::FormulaGrammar::Grammar& rGrammar, @@ -268,8 +251,7 @@ 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; void CreateTextPContext(bool bIsNewParagraph); bool IsEditCell() { return pEditTextObj != 0; } @@ -298,15 +280,13 @@ class ScXMLPreviousContext : public SvXMLImportContext public: ScXMLPreviousContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLPreviousContext(); 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; }; @@ -320,15 +300,13 @@ class ScXMLContentChangeContext : public SvXMLImportContext public: ScXMLContentChangeContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLContentChangeContext(); 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; }; @@ -340,15 +318,13 @@ class ScXMLInsertionContext : public SvXMLImportContext public: ScXMLInsertionContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionContext(); 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; }; @@ -360,15 +336,13 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext public: ScXMLInsertionCutOffContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionCutOffContext(); 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; }; @@ -380,15 +354,13 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext public: ScXMLMovementCutOffContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementCutOffContext(); 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; }; @@ -400,15 +372,13 @@ class ScXMLCutOffsContext : public SvXMLImportContext public: ScXMLCutOffsContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCutOffsContext(); 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; }; @@ -420,15 +390,13 @@ class ScXMLDeletionContext : public SvXMLImportContext public: ScXMLDeletionContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionContext(); 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; }; @@ -442,15 +410,13 @@ class ScXMLMovementContext : public SvXMLImportContext public: ScXMLMovementContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementContext(); 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; }; @@ -462,15 +428,13 @@ class ScXMLRejectionContext : public SvXMLImportContext public: ScXMLRejectionContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLRejectionContext(); 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; }; @@ -515,8 +479,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext() SvXMLImportContext *ScXMLTrackedChangesContext::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 ) { SvXMLImportContext *pContext(0); @@ -556,9 +519,9 @@ void ScXMLTrackedChangesContext::EndElement() ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, + const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, - ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : + ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), aInfo(), pChangeTrackingImportHelper(pTempChangeTrackingImportHelper), @@ -593,8 +556,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext() SvXMLImportContext *ScXMLChangeInfoContext::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 ) { SvXMLImportContext *pContext(0); @@ -706,8 +668,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext() SvXMLImportContext *ScXMLBigRangeContext::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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -756,8 +717,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext() SvXMLImportContext *ScXMLCellContentDeletionContext::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 ) { SvXMLImportContext *pContext(0); @@ -826,8 +786,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext() SvXMLImportContext *ScXMLDependenceContext::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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -853,8 +812,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext() SvXMLImportContext *ScXMLDependingsContext::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 ) { SvXMLImportContext *pContext(0); @@ -908,8 +866,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext() SvXMLImportContext *ScXMLChangeDeletionContext::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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -935,8 +892,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext() SvXMLImportContext *ScXMLDeletionsContext::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 ) { SvXMLImportContext *pContext(0); @@ -961,8 +917,7 @@ void ScXMLDeletionsContext::EndElement() ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList, ScXMLChangeCellContext* pTempChangeCellContext) : SvXMLImportContext( rImport, nPrfx, rLName ), xAttrList(xTempAttrList), @@ -982,8 +937,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext() SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) + const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList ) { SvXMLImportContext *pContext(0); @@ -1154,8 +1108,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext() SvXMLImportContext *ScXMLChangeCellContext::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 ) { SvXMLImportContext *pContext(0); @@ -1291,8 +1244,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext() SvXMLImportContext *ScXMLPreviousContext::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 ) { SvXMLImportContext *pContext(0); @@ -1365,8 +1317,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext() SvXMLImportContext *ScXMLContentChangeContext::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 ) { SvXMLImportContext *pContext(0); @@ -1481,8 +1432,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext() SvXMLImportContext *ScXMLInsertionContext::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 ) { SvXMLImportContext *pContext(0); @@ -1549,8 +1499,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext() SvXMLImportContext *ScXMLInsertionCutOffContext::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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -1613,8 +1562,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext() SvXMLImportContext *ScXMLMovementCutOffContext::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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } @@ -1640,8 +1588,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext() SvXMLImportContext *ScXMLCutOffsContext::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 ) { SvXMLImportContext *pContext(0); @@ -1745,8 +1692,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext() SvXMLImportContext *ScXMLDeletionContext::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 ) { SvXMLImportContext *pContext(0); @@ -1832,8 +1778,7 @@ ScXMLMovementContext::~ScXMLMovementContext() SvXMLImportContext *ScXMLMovementContext::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 ) { SvXMLImportContext *pContext(0); @@ -1918,8 +1863,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext() SvXMLImportContext *ScXMLRejectionContext::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 ) { SvXMLImportContext *pContext(0); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 14d0d73ee84a..af0972a57be2 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -37,15 +37,13 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext public: ScXMLTrackedChangesContext( ScXMLImport& 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, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext(); 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/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx index 3112e31bcbc9..65487b8fb6b8 100644 --- a/sc/source/filter/xml/celltextparacontext.hxx +++ b/sc/source/filter/xml/celltextparacontext.hxx @@ -25,11 +25,11 @@ class ScXMLCellTextParaContext : public ScXMLImportContext public: ScXMLCellTextParaContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLTableRowCellContext& rParent); - 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; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; void PushSpan(const OUString& rSpan, const OUString& rStyleName); void PushFieldSheetName(const OUString& rStyleName); @@ -49,11 +49,11 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext public: ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLCellTextParaContext& rParent); - 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; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -68,11 +68,11 @@ public: void SetStyleName(const OUString& rStyleName); - 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; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -87,11 +87,11 @@ public: void SetStyleName(const OUString& rStyleName); - 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; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -106,11 +106,11 @@ public: void SetStyleName(const OUString& rStyleName); - 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; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -127,11 +127,11 @@ public: void SetStyleName(const OUString& rStyleName); - 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; virtual void Characters(const OUString& rChars) override; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; /** @@ -149,10 +149,10 @@ public: void SetStyleName(const OUString& rStyleName); - 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; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) override; }; #endif diff --git a/sc/source/filter/xml/datastreamimport.cxx b/sc/source/filter/xml/datastreamimport.cxx index 3c5f17de5a61..a764718e0c33 100644 --- a/sc/source/filter/xml/datastreamimport.cxx +++ b/sc/source/filter/xml/datastreamimport.cxx @@ -21,8 +21,7 @@ using namespace xmloff::token; ScXMLDataStreamContext::ScXMLDataStreamContext( ScXMLImport& 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 ) : ScXMLImportContext(rImport, nPrefix, rLocalName), mbRefreshOnEmpty(false), meInsertPos(sc::ImportPostProcessData::DataStream::InsertBottom) diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx index 711cc7cda9aa..cae132bc4435 100644 --- a/sc/source/filter/xml/datastreamimport.hxx +++ b/sc/source/filter/xml/datastreamimport.hxx @@ -25,8 +25,7 @@ class ScXMLDataStreamContext : public ScXMLImportContext public: ScXMLDataStreamContext( ScXMLImport& 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 ~ScXMLDataStreamContext(); diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 10d161fa3e85..9063d4a4920f 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -111,7 +111,7 @@ ScXMLAnnotationContext::~ScXMLAnnotationContext() { } -void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) +void ScXMLAnnotationContext::StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) { if (pShapeContext) pShapeContext->StartElement(xAttrList); @@ -119,8 +119,7 @@ void ScXMLAnnotationContext::StartElement(const com::sun::star::uno::Reference< SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 9f6a364f7f6b..50cd2964e34f 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -45,9 +45,9 @@ struct ScXMLAnnotationStyleEntry struct ScXMLAnnotationData { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Reference< css::drawing::XShape > mxShape; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > mxShapes; OUString maAuthor; OUString maCreateDate; @@ -68,8 +68,7 @@ public: ScXMLAnnotationContext( ScXMLImport& 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, ScXMLAnnotationData& rAnnotationData, ScXMLTableRowCellContext* pCellContext); @@ -77,18 +76,17 @@ 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; - 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 Characters( const OUString& rChars ) override; virtual void EndElement() override; void SetShape( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, + const css::uno::Reference< css::drawing::XShape >& rxShape, + const css::uno::Reference< css::drawing::XShapes >& rxShapes, const OUString& rStyleName, const OUString& rTextStyle ); void AddContentStyle( sal_uInt16 nFamily, const OUString& rName, const ESelection& rSelection ); diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index a8db60e04e09..03da40290d6c 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -128,8 +128,7 @@ ScXMLBodyContext::~ScXMLBodyContext() SvXMLImportContext *ScXMLBodyContext::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 ) { ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index ce2450102e3c..4755f23f75c2 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -42,13 +42,12 @@ class ScXMLBodyContext : public SvXMLImportContext public: ScXMLBodyContext( ScXMLImport& 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 ); virtual ~ScXMLBodyContext(); 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; virtual void Characters( const OUString& rChars ) override; }; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 3612f38c2ace..b0e48691458f 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -133,8 +133,7 @@ ScXMLTableRowCellContext::Field::~Field() ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& 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 bool bTempIsCovered, const sal_Int32 nTempRepeatedRows ) : ScXMLImportContext(rImport, nPrfx, rLName), @@ -667,8 +666,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd() SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -731,7 +729,7 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr XMLTableShapeImportHelper* pTableShapeImport = static_cast< XMLTableShapeImportHelper* >( rXMLImport.GetShapeImport().get() ); pTableShapeImport->SetOnTable(false); - com::sun::star::table::CellAddress aCellAddress; + css::table::CellAddress aCellAddress; ScUnoConversion::FillApiAddress( aCellAddress, aCellPos ); pTableShapeImport->SetCell(aCellAddress); pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext( diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 69df58e3c624..e11a07f38803 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -130,16 +130,14 @@ public: ScXMLTableRowCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const bool bIsCovered, const sal_Int32 nRepeatedRows ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + const bool bIsCovered, const sal_Int32 nRepeatedRows ); virtual ~ScXMLTableRowCellContext(); 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 PushParagraphSpan(const OUString& rSpan, const OUString& rStyleName); void PushParagraphFieldDate(const OUString& rStyleName); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 956de1c60c87..7399136a9fa2 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -43,8 +43,7 @@ using namespace xmloff::token; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& 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 ) : SvXMLImportContext( rImport, nPrfx, rLName ), sVisibility(GetXMLToken(XML_VISIBLE)) { @@ -93,8 +92,7 @@ ScXMLTableColContext::~ScXMLTableColContext() SvXMLImportContext *ScXMLTableColContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -163,8 +161,7 @@ void ScXMLTableColContext::EndElement() ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& 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 bool bTempHeader, const bool bTempGroup) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartCol(0), @@ -205,8 +202,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext() SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 9e3771ec3ff3..4f551a715e75 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -38,15 +38,13 @@ public: ScXMLTableColContext( ScXMLImport& 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 ); virtual ~ScXMLTableColContext(); 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; }; @@ -68,16 +66,14 @@ public: ScXMLTableColsContext( ScXMLImport& 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 bool bHeader, const bool bGroup); virtual ~ScXMLTableColsContext(); 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/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 4f067cb37d4f..28744a53208d 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -30,8 +30,7 @@ ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rIm SvXMLImportContext* ScXMLConditionalFormatsContext::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 ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetCondFormatsTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -58,7 +57,7 @@ void ScXMLConditionalFormatsContext::EndElement() } ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& 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): SvXMLImportContext( rImport, nPrfx, rLName ) { OUString sRange; @@ -92,8 +91,7 @@ ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImpo SvXMLImportContext* ScXMLConditionalFormatContext::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 ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetCondFormatTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -149,8 +147,7 @@ ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport SvXMLImportContext* ScXMLColorScaleFormatContext::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 ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetColorScaleTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -168,7 +165,7 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16 } ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& 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, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpDataBarFormat(NULL), @@ -292,8 +289,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ SvXMLImportContext* ScXMLDataBarFormatContext::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 ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetFormattingTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -324,8 +320,7 @@ SvXMLImportContext* ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& 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, ScConditionalFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -384,8 +379,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u SvXMLImportContext* ScXMLIconSetFormatContext::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 ) { const SvXMLTokenMap& rTokenMap = GetScImport().GetFormattingTokenMap(); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLocalName); @@ -569,7 +563,8 @@ void GetConditionData(const OUString& rValue, ScConditionMode& eMode, OUString& } ScXMLCondContext::ScXMLCondContext( ScXMLImport& 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, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -643,7 +638,8 @@ void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const O } ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& 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, ScColorScaleFormat* pFormat): SvXMLImportContext( rImport, nPrfx, rLName ), mpFormatEntry( NULL ) @@ -694,7 +690,8 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor } ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& 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, ScColorScaleEntry*& pColorScaleEntry): SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -770,7 +767,8 @@ condformat::ScCondFormatDateType getDateFromString(const OUString& rString) } ScXMLDateContext::ScXMLDateContext( ScXMLImport& 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, ScConditionalFormat* pFormat ): SvXMLImportContext( rImport, nPrfx, rLName ) { diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 4a3c2a80ca1a..ca42c0b6eed5 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -33,8 +33,7 @@ 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; virtual void EndElement() override; }; @@ -46,15 +45,13 @@ class ScXMLConditionalFormatContext : public SvXMLImportContext public: ScXMLConditionalFormatContext( ScXMLImport& 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); virtual ~ScXMLConditionalFormatContext(); 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; private: @@ -77,8 +74,7 @@ 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; private: ScColorScaleFormat* pColorScaleFormat; @@ -91,16 +87,14 @@ class ScXMLDataBarFormatContext : public SvXMLImportContext public: ScXMLDataBarFormatContext( ScXMLImport& 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, ScConditionalFormat* pFormat); virtual ~ScXMLDataBarFormatContext() {} 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; private: ScDataBarFormat* mpDataBarFormat; @@ -118,16 +112,14 @@ public: ScXMLIconSetFormatContext( ScXMLImport& 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, ScConditionalFormat* pFormat); virtual ~ScXMLIconSetFormatContext() {} 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; }; class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext @@ -137,8 +129,7 @@ class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext public: ScXMLColorScaleFormatEntryContext( ScXMLImport& 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, ScColorScaleFormat* pFormat); virtual ~ScXMLColorScaleFormatEntryContext() {} @@ -154,8 +145,7 @@ class ScXMLFormattingEntryContext : public SvXMLImportContext public: ScXMLFormattingEntryContext( ScXMLImport& 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, ScColorScaleEntry*& pData); virtual ~ScXMLFormattingEntryContext() {} @@ -168,8 +158,7 @@ class ScXMLCondContext : public SvXMLImportContext public: ScXMLCondContext( ScXMLImport& 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, ScConditionalFormat* pFormat); virtual ~ScXMLCondContext() {} @@ -182,8 +171,7 @@ class ScXMLDateContext : public SvXMLImportContext public: ScXMLDateContext( ScXMLImport& 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, ScConditionalFormat* pFormat); virtual ~ScXMLDateContext() {} diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 7f5ba32ff476..dcbf27324a8c 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -32,8 +32,7 @@ using namespace xmloff::token; ScXMLContentContext::ScXMLContentContext( ScXMLImport& 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 */, OUStringBuffer& sTempValue) : SvXMLImportContext( rImport, nPrfx, rLName ), sOUText(), @@ -47,8 +46,7 @@ ScXMLContentContext::~ScXMLContentContext() SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 913ab765cbe8..26ce61ae8b9b 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -35,16 +35,14 @@ public: ScXMLContentContext( ScXMLImport& 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, OUStringBuffer& sValue); virtual ~ScXMLContentContext(); 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; diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 01f393d980ae..4a083dca5999 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -54,7 +54,7 @@ class ScXMLContentValidationContext : public SvXMLImportContext const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } - com::sun::star::sheet::ValidationAlertStyle GetAlertStyle() const; + css::sheet::ValidationAlertStyle GetAlertStyle() const; void SetFormula( OUString& rFormula, OUString& rFormulaNmsp, FormulaGrammar::Grammar& reGrammar, const OUString& rCondition, const OUString& rGlobNmsp, FormulaGrammar::Grammar eGlobGrammar, bool bHasNmsp ) const; void GetCondition( ScMyImportValidation& rValidation ) const; @@ -63,15 +63,13 @@ public: ScXMLContentValidationContext( ScXMLImport& 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); virtual ~ScXMLContentValidationContext(); 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; @@ -95,16 +93,14 @@ public: ScXMLHelpMessageContext( ScXMLImport& 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, ScXMLContentValidationContext* pValidationContext); virtual ~ScXMLHelpMessageContext(); 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; }; @@ -125,16 +121,14 @@ public: ScXMLErrorMessageContext( ScXMLImport& 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, ScXMLContentValidationContext* pValidationContext); virtual ~ScXMLErrorMessageContext(); 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; }; @@ -152,24 +146,21 @@ public: ScXMLErrorMacroContext( ScXMLImport& 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, ScXMLContentValidationContext* pValidationContext); virtual ~ScXMLErrorMacroContext(); 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; }; ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& 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 */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // here are no attributes @@ -181,8 +172,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext() SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -207,8 +197,7 @@ void ScXMLContentValidationsContext::EndElement() ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& 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) : SvXMLImportContext( rImport, nPrfx, rLName ), nShowList(sheet::TableValidationVisibility::UNSORTED), bAllowEmptyCell(true), @@ -271,8 +260,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext() SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -478,8 +466,7 @@ void ScXMLContentValidationContext::SetErrorMacro(const bool bExecute) ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& 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, ScXMLContentValidationContext* pTempValidationContext) : SvXMLImportContext( rImport, nPrfx, rLName ), sTitle(), @@ -516,8 +503,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext() SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -548,8 +534,7 @@ void ScXMLHelpMessageContext::EndElement() ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& 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, ScXMLContentValidationContext* pTempValidationContext) : SvXMLImportContext( rImport, nPrfx, rLName ), sTitle(), @@ -590,8 +575,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext() SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -622,8 +606,7 @@ void ScXMLErrorMessageContext::EndElement() ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& 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, ScXMLContentValidationContext* pTempValidationContext) : SvXMLImportContext( rImport, nPrfx, rLName ), sName(), @@ -658,8 +641,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext() SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = NULL; diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index d2a6afe0882b..7465cd366a8b 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -36,15 +36,13 @@ public: ScXMLContentValidationsContext( ScXMLImport& 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); virtual ~ScXMLContentValidationsContext(); 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/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 0ee00a0320fc..a50915277e7a 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -57,8 +57,7 @@ using ::com::sun::star::xml::sax::XAttributeList; ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& 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 */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // has no Attributes @@ -72,8 +71,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext() SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -104,8 +102,7 @@ ScXMLDataPilotTableContext::GrandTotalItem::GrandTotalItem() : ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& 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) : SvXMLImportContext( rImport, nPrfx, rLName ), pDoc(GetScImport().GetDocument()), pDPObject(NULL), @@ -223,8 +220,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -594,9 +590,8 @@ void ScXMLDataPilotTableContext::SetGrandTotal( ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -637,8 +632,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -655,9 +649,8 @@ void ScXMLDPSourceSQLContext::EndElement() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -693,8 +686,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -711,9 +703,8 @@ void ScXMLDPSourceTableContext::EndElement() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -749,8 +740,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -767,9 +757,8 @@ void ScXMLDPSourceQueryContext::EndElement() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -820,8 +809,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -913,9 +901,8 @@ void ScXMLDataPilotGrandTotalContext::EndElement() ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable) { @@ -952,8 +939,8 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext() SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -978,9 +965,8 @@ void ScXMLSourceCellRangeContext::EndElement() ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTable) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTable) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTable), pDim(NULL), @@ -1078,8 +1064,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext() SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -1257,9 +1242,8 @@ ScXMLDataPilotFieldReferenceContext::~ScXMLDataPilotFieldReferenceContext() ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { @@ -1295,8 +1279,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext() SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -1332,8 +1315,7 @@ void ScXMLDataPilotLevelContext::EndElement() ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -1383,8 +1365,7 @@ ScXMLDataPilotDisplayInfoContext::~ScXMLDataPilotDisplayInfoContext() ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -1432,8 +1413,7 @@ ScXMLDataPilotSortInfoContext::~ScXMLDataPilotSortInfoContext() ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ) { @@ -1477,9 +1457,8 @@ ScXMLDataPilotLayoutInfoContext::~ScXMLDataPilotLayoutInfoContext() ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField), nFunctionCount(0), @@ -1496,8 +1475,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext() SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -1550,9 +1528,8 @@ void ScXMLDataPilotSubTotalsContext::SetDisplayName(const OUString& rName) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotSubTotals(pTempDataPilotSubTotals) { @@ -1588,8 +1565,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -1606,9 +1582,8 @@ void ScXMLDataPilotSubTotalContext::EndElement() ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { @@ -1621,8 +1596,8 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext() SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -1647,9 +1622,8 @@ void ScXMLDataPilotMembersContext::EndElement() ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField), bDisplay( true ), @@ -1700,8 +1674,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext() SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -1727,17 +1700,16 @@ void ScXMLDataPilotMemberContext::EndElement() ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { - OUString sGroupSource; - double fStart(0.0); - double fEnd(0.0); - double fStep(0.0); - sal_Int32 nGroupPart(0); + OUString sGroupSource; + double fStart(0.0); + double fEnd(0.0); + double fStep(0.0); + sal_Int32 nGroupPart(0); bool bDateValue(false); bool bAutoStart(true); bool bAutoEnd(true); @@ -1804,19 +1776,19 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport, else if (IsXMLToken(aLocalName, XML_GROUPED_BY)) { if (IsXMLToken(sValue, XML_SECONDS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::SECONDS; else if (IsXMLToken(sValue, XML_MINUTES)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES; + nGroupPart = css::sheet::DataPilotFieldGroupBy::MINUTES; else if (IsXMLToken(sValue, XML_HOURS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::HOURS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::HOURS; else if (IsXMLToken(sValue, XML_DAYS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::DAYS; else if (IsXMLToken(sValue, XML_MONTHS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::MONTHS; else if (IsXMLToken(sValue, XML_QUARTERS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::QUARTERS; else if (IsXMLToken(sValue, XML_YEARS)) - nGroupPart = com::sun::star::sheet::DataPilotFieldGroupBy::YEARS; + nGroupPart = css::sheet::DataPilotFieldGroupBy::YEARS; } } pDataPilotField->SetGrouping(sGroupSource, fStart, fEnd, fStep, nGroupPart, bDateValue, bAutoStart, bAutoEnd); @@ -1828,8 +1800,7 @@ ScXMLDataPilotGroupsContext::~ScXMLDataPilotGroupsContext() SvXMLImportContext *ScXMLDataPilotGroupsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -1852,9 +1823,8 @@ void ScXMLDataPilotGroupsContext::EndElement() ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotFieldContext* pTempDataPilotField) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotFieldContext* pTempDataPilotField) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotField(pTempDataPilotField) { @@ -1881,8 +1851,7 @@ ScXMLDataPilotGroupContext::~ScXMLDataPilotGroupContext() SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -1906,9 +1875,8 @@ void ScXMLDataPilotGroupContext::EndElement() ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotGroupContext* pTempDataPilotGroup) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotGroupContext* pTempDataPilotGroup) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotGroup(pTempDataPilotGroup) { @@ -1935,8 +1903,7 @@ ScXMLDataPilotGroupMemberContext::~ScXMLDataPilotGroupMemberContext() SvXMLImportContext *ScXMLDataPilotGroupMemberContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index b54681b6d7d4..17e5a327e5e9 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -56,15 +56,13 @@ public: ScXMLDataPilotTablesContext( ScXMLImport& 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); virtual ~ScXMLDataPilotTablesContext(); 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; }; @@ -125,15 +123,13 @@ public: ScXMLDataPilotTableContext( ScXMLImport& 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); virtual ~ScXMLDataPilotTableContext(); 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; @@ -169,16 +165,14 @@ public: ScXMLDPSourceSQLContext( ScXMLImport& 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, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDPSourceSQLContext(); 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; }; @@ -194,16 +188,14 @@ public: ScXMLDPSourceTableContext( ScXMLImport& 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, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDPSourceTableContext(); 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; }; @@ -219,16 +211,14 @@ public: ScXMLDPSourceQueryContext( ScXMLImport& 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, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDPSourceQueryContext(); 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; }; @@ -244,16 +234,14 @@ public: ScXMLSourceServiceContext( ScXMLImport& 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, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLSourceServiceContext(); 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; }; @@ -265,23 +253,21 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ScXMLImport& GetScImport(); ScXMLDataPilotTableContext* mpTableContext; - OUString maDisplayName; + OUString maDisplayName; Orientation meOrientation; bool mbVisible; public: ScXMLDataPilotGrandTotalContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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, ScXMLDataPilotTableContext* pTableContext ); virtual ~ScXMLDataPilotGrandTotalContext(); 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; }; @@ -297,16 +283,14 @@ public: ScXMLSourceCellRangeContext( ScXMLImport& 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, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLSourceCellRangeContext(); 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; }; @@ -347,16 +331,14 @@ public: ScXMLDataPilotFieldContext( ScXMLImport& 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, ScXMLDataPilotTableContext* pDataPilotTable); virtual ~ScXMLDataPilotFieldContext(); 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; @@ -365,10 +347,10 @@ public: void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } void AddMember(ScDPSaveMember* pMember); void SetSubTotalName(const OUString& rName); - void SetFieldReference(const com::sun::star::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } - void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } - void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } - void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } + void SetFieldReference(const css::sheet::DataPilotFieldReference& aRef) { if (pDim) pDim->SetReferenceValue(&aRef); } + void SetAutoShowInfo(const css::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } + void SetSortInfo(const css::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } + void SetLayoutInfo(const css::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } void SetGrouping(const OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, bool bDate, bool bAutoSt, bool bAutoE) { @@ -387,7 +369,7 @@ public: class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldReference aReference; +// css::sheet::DataPilotFieldReference aReference; const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -396,8 +378,7 @@ public: ScXMLDataPilotFieldReferenceContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotFieldReferenceContext(); @@ -414,24 +395,20 @@ public: ScXMLDataPilotLevelContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotLevelContext(); 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; }; class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldAutoShowInfo aInfo; - const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -439,8 +416,7 @@ public: ScXMLDataPilotDisplayInfoContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotDisplayInfoContext(); @@ -448,8 +424,6 @@ public: class ScXMLDataPilotSortInfoContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldSortInfo aInfo; - const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -457,8 +431,7 @@ public: ScXMLDataPilotSortInfoContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotSortInfoContext(); @@ -466,8 +439,6 @@ public: class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext { -// com::sun::star::sheet::DataPilotFieldLayoutInfo aInfo; - const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -475,8 +446,7 @@ public: ScXMLDataPilotLayoutInfoContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotLayoutInfoContext(); @@ -488,7 +458,7 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext sal_Int16 nFunctionCount; sal_uInt16* pFunctions; - OUString maDisplayName; + OUString maDisplayName; const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); } ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); } @@ -496,16 +466,14 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext public: ScXMLDataPilotSubTotalsContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotSubTotalsContext(); 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; void AddFunction(sal_Int16 nFunction); @@ -523,16 +491,14 @@ public: ScXMLDataPilotSubTotalContext( ScXMLImport& 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, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); virtual ~ScXMLDataPilotSubTotalContext(); 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; }; @@ -548,16 +514,14 @@ public: ScXMLDataPilotMembersContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotMembersContext(); 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; }; @@ -579,16 +543,14 @@ public: ScXMLDataPilotMemberContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotMemberContext(); 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; }; @@ -604,16 +566,14 @@ public: ScXMLDataPilotGroupsContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotGroupsContext(); 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; }; @@ -632,16 +592,14 @@ public: ScXMLDataPilotGroupContext( ScXMLImport& 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, ScXMLDataPilotFieldContext* pDataPilotField); virtual ~ScXMLDataPilotGroupContext(); 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; @@ -661,16 +619,14 @@ public: ScXMLDataPilotGroupMemberContext( ScXMLImport& 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, ScXMLDataPilotGroupContext* pDataPilotGroup); virtual ~ScXMLDataPilotGroupMemberContext(); 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/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 935fdda49af4..c12fea50426c 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -61,8 +61,7 @@ using namespace xmloff::token; ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& 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 */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { // has no attributes @@ -76,8 +75,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext() SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -105,8 +103,7 @@ void ScXMLDatabaseRangesContext::EndElement() ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& 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) : SvXMLImportContext( rImport, nPrfx, rLName ), mpQueryParam(new ScQueryParam), sDatabaseRangeName(STR_DB_LOCAL_NONAME), @@ -225,8 +222,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext() SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -491,9 +487,8 @@ void ScXMLDatabaseRangeContext::EndElement() ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -535,8 +530,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext() SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -564,9 +558,8 @@ void ScXMLSourceSQLContext::EndElement() ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -603,8 +596,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext() SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -632,9 +624,8 @@ void ScXMLSourceTableContext::EndElement() ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -671,8 +662,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext() SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -700,9 +690,8 @@ void ScXMLSourceQueryContext::EndElement() ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext( pTempDatabaseRangeContext ) { @@ -732,8 +721,7 @@ ScXMLConResContext::~ScXMLConResContext() SvXMLImportContext *ScXMLConResContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -750,9 +738,8 @@ void ScXMLConResContext::EndElement() ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -793,8 +780,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext() SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -828,9 +814,8 @@ void ScXMLSubTotalRulesContext::EndElement() ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -894,8 +879,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext() SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; @@ -912,9 +896,8 @@ void ScXMLSortGroupsContext::EndElement() ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { @@ -945,8 +928,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext() SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext = 0; @@ -976,9 +958,8 @@ void ScXMLSubTotalRuleContext::EndElement() ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSubTotalRuleContext* pTempSubTotalRuleContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pSubTotalRuleContext(pTempSubTotalRuleContext) { @@ -1014,8 +995,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext() SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { SvXMLImportContext *pContext = 0; diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index b197e2b03182..004ad961b187 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -47,15 +47,13 @@ public: ScXMLDatabaseRangesContext( ScXMLImport& 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); virtual ~ScXMLDatabaseRangesContext(); 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; }; @@ -63,21 +61,21 @@ public: struct ScSubTotalRule { sal_Int16 nSubTotalRuleGroupFieldNumber; - com::sun::star::uno::Sequence <com::sun::star::sheet::SubTotalColumn> aSubTotalColumns; + css::uno::Sequence <css::sheet::SubTotalColumn> aSubTotalColumns; }; class ScXMLDatabaseRangeContext : public SvXMLImportContext { std::unique_ptr<ScQueryParam> mpQueryParam; - ScRange maRange; - OUString sDatabaseRangeName; - OUString sConnectionResource; - OUString sDatabaseName; - OUString sSourceObject; - com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; + ScRange maRange; + OUString sDatabaseRangeName; + OUString sConnectionResource; + OUString sDatabaseName; + OUString sSourceObject; + css::uno::Sequence <css::beans::PropertyValue> aSortSequence; std::vector < ScSubTotalRule > aSubTotalRules; - com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; - com::sun::star::sheet::DataImportMode nSourceType; + css::table::CellRangeAddress aFilterConditionSourceRangeAddress; + css::sheet::DataImportMode nSourceType; sal_Int32 nRefresh; sal_Int16 nSubTotalsUserListIndex; bool mbValidRange; @@ -109,22 +107,20 @@ public: ScXMLDatabaseRangeContext( ScXMLImport& 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); virtual ~ScXMLDatabaseRangeContext(); 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; void SetDatabaseName(const OUString& sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } void SetConnectionResource(const OUString& sTempConRes) { sConnectionResource = sTempConRes; } void SetSourceObject(const OUString& sTempSourceObject) { sSourceObject = sTempSourceObject; } - void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } + void SetSourceType(const css::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } void SetNative(const bool bTempNative) { bNative = bTempNative; } void SetSubTotalsBindFormatsToContent(const bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } void SetSubTotalsIsCaseSensitive(const bool bTemp) { bSubTotalsIsCaseSensitive = bTemp; } @@ -134,8 +130,8 @@ public: void SetSubTotalsAscending(const bool bTemp) { bSubTotalsAscending = bTemp; } void SetSubTotalsSortGroups(const bool bTemp) { bSubTotalsSortGroups = bTemp; } void AddSubTotalRule(const ScSubTotalRule& rRule) { aSubTotalRules.push_back(rRule); } - void SetSortSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& aTempSortSequence) { aSortSequence = aTempSortSequence; } - void SetFilterConditionSourceRangeAddress(const com::sun::star::table::CellRangeAddress& aTemp) { aFilterConditionSourceRangeAddress = aTemp; + void SetSortSequence(const css::uno::Sequence <css::beans::PropertyValue>& aTempSortSequence) { aSortSequence = aTempSortSequence; } + void SetFilterConditionSourceRangeAddress(const css::table::CellRangeAddress& aTemp) { aFilterConditionSourceRangeAddress = aTemp; bFilterConditionSourceRange = true; } }; @@ -151,16 +147,14 @@ public: ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSourceSQLContext(); 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; }; @@ -177,16 +171,14 @@ public: ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSourceTableContext(); 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; }; @@ -203,16 +195,14 @@ public: ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSourceQueryContext(); 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; }; @@ -228,16 +218,14 @@ public: ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLConResContext(); 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; }; @@ -253,16 +241,15 @@ public: ScXMLSubTotalRulesContext( ScXMLImport& 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, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSubTotalRulesContext(); 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; }; @@ -278,16 +265,14 @@ public: ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSortGroupsContext(); 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; }; @@ -304,20 +289,18 @@ public: ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSubTotalRuleContext(); 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; - void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn& rSubTotalColumn) + void AddSubTotalColumn(const css::sheet::SubTotalColumn& rSubTotalColumn) { aSubTotalRule.aSubTotalColumns.realloc(aSubTotalRule.aSubTotalColumns.getLength() + 1); aSubTotalRule.aSubTotalColumns[aSubTotalRule.aSubTotalColumns.getLength() - 1] = rSubTotalColumn; } }; @@ -335,16 +318,14 @@ public: ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSubTotalRuleContext* pSubTotalRuleContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSubTotalRuleContext* pSubTotalRuleContext); virtual ~ScXMLSubTotalFieldContext(); 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/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index ea9401bcb39e..6b13abc7d94d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -337,7 +337,7 @@ sal_Int16 ScXMLExport::GetMeasureUnit() } ScXMLExport::ScXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) : SvXMLExport( GetMeasureUnit(), rContext, implementationName, XML_SPREADSHEET, nExportFlag ), @@ -4973,8 +4973,8 @@ void SAL_CALL ScXMLExport::setSourceDocument( const uno::Reference<lang::XCompon } // XFilter -sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScXMLExport::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -4986,7 +4986,7 @@ sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< :: } void SAL_CALL ScXMLExport::cancel() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDoc) @@ -4995,16 +4995,16 @@ void SAL_CALL ScXMLExport::cancel() } // XInitialization -void SAL_CALL ScXMLExport::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScXMLExport::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvXMLExport::initialize(aArguments); } // XUnoTunnel -sal_Int64 SAL_CALL ScXMLExport::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL ScXMLExport::getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return SvXMLExport::getSomething(aIdentifier); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index beb35f3db0bf..2d91646b0925 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -73,10 +73,10 @@ class CompileFormulaContext; class ScXMLExport : public SvXMLExport { ScDocument* pDoc; - com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable; - com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange; + css::uno::Reference <css::sheet::XSpreadsheet> xCurrentTable; + css::uno::Reference <css::table::XCellRange> xCurrentTableCellRange; - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream; + css::uno::Reference<css::io::XInputStream> xSourceStream; sal_Int32 nSourceStreamPos; mutable std::unique_ptr<ScXMLEditAttributeMap> mpEditAttrMap; @@ -95,12 +95,12 @@ class ScXMLExport : public SvXMLExport typedef std::unordered_map<sal_Int32, sal_Int32> NumberFormatIndexMap; NumberFormatIndexMap aNumFmtIndexMap; ScMySharedData* pSharedData; - ScColumnStyles* pColumnStyles; - ScRowStyles* pRowStyles; + ScColumnStyles* pColumnStyles; + ScRowStyles* pRowStyles; ScFormatRangeStyles* pCellStyles; ScRowFormatRanges* pRowFormatRanges; - std::vector<OUString> aTableStyles; - com::sun::star::table::CellRangeAddress aRowHeaderRange; + std::vector<OUString> aTableStyles; + css::table::CellRangeAddress aRowHeaderRange; ScMyOpenCloseColumnRowGroup* pGroupColumns; ScMyOpenCloseColumnRowGroup* pGroupRows; ScMyDefaultStyles* pDefaults; @@ -143,9 +143,9 @@ class ScXMLExport : public SvXMLExport virtual void _ExportContent() override; virtual void _ExportMeta() override; - void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); + void CollectInternalShape( css::uno::Reference< css::drawing::XShape > xShape ); - static com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, + static css::table::CellRangeAddress GetEndAddress(const css::uno::Reference<css::sheet::XSpreadsheet>& xTable, const sal_Int32 nTable); // ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); void GetAreaLinks( ScMyAreaLinksContainer& rAreaLinks ); @@ -156,7 +156,7 @@ class ScXMLExport : public SvXMLExport const sal_Int32 nStyleIndex, const bool bIsVisible); void OpenHeaderColumn(); void CloseHeaderColumn(); - void ExportColumns(const sal_Int32 nTable, const com::sun::star::table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader); + void ExportColumns(const sal_Int32 nTable, const css::table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader); void ExportExternalRefCacheStyles(); void ExportCellTextAutoStyles(sal_Int32 nTable); void ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 nStartRow, @@ -171,23 +171,23 @@ class ScXMLExport : public SvXMLExport bool bHidden, bool bFiltered); void OpenRow(const sal_Int32 nTable, const sal_Int32 nStartRow, const sal_Int32 nRepeatRow, ScXMLCachedRowAttrAccess& rRowAttr); void CloseRow(const sal_Int32 nRow); - void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, - bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, + void GetColumnRowHeader(bool& bHasColumnHeader, css::table::CellRangeAddress& aColumnHeaderRange, + bool& bHasRowHeader, css::table::CellRangeAddress& aRowHeaderRange, OUString& rPrintRanges) const; static void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); - bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, - const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable); + bool GetMerged (const css::table::CellRangeAddress* pCellRange, + const css::uno::Reference <css::sheet::XSpreadsheet>& xTable); - void WriteTable(sal_Int32 nTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet>& xTable); + void WriteTable(sal_Int32 nTable, const css::uno::Reference< css::sheet::XSpreadsheet>& xTable); void WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount); void WriteEditCell(const EditTextObject* pText); void WriteMultiLineFormulaResult(const ScFormulaCell* pCell); void WriteAreaLink(const ScMyCell& rMyCell); void WriteAnnotation(ScMyCell& rMyCell); void WriteDetective(const ScMyCell& rMyCell); - void ExportShape(const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, com::sun::star::awt::Point* pPoint); + void ExportShape(const css::uno::Reference < css::drawing::XShape >& xShape, css::awt::Point* pPoint); void WriteShapes(const ScMyCell& rMyCell); void WriteTableShapes(); void SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgress); @@ -196,11 +196,11 @@ class ScXMLExport : public SvXMLExport static bool IsEditCell(ScMyCell& rCell); bool IsCellEqual(ScMyCell& aCell1, ScMyCell& aCell2); - void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); + void WriteCalculationSettings(const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteTableSource(); void WriteScenario(); // core implementation - void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); - void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, bool bColumn ); + void WriteTheLabelRanges(const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xSpreadDoc); + void WriteLabelRanges( const css::uno::Reference< css::container::XIndexAccess >& xRangesIAccess, bool bColumn ); void WriteNamedExpressions(); void WriteDataStream(); void WriteNamedRange(ScRangeName* pRangeName); @@ -211,14 +211,14 @@ class ScXMLExport : public SvXMLExport void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib); void AddStyleFromCells( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xProperties, - const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheet >& xTable, + const css::uno::Reference< css::beans::XPropertySet >& xProperties, + const css::uno::Reference< css::sheet::XSpreadsheet >& xTable, sal_Int32 nTable, const OUString* pOldName ); void AddStyleFromColumn( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties, + const css::uno::Reference< css::beans::XPropertySet >& xColumnProperties, const OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); void AddStyleFromRow( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties, + const css::uno::Reference< css::beans::XPropertySet >& xRowProperties, const OUString* pOldName, sal_Int32& rIndex ); void IncrementProgressBar(bool bFlush, sal_Int32 nInc = 1); @@ -234,7 +234,7 @@ protected: virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override; public: ScXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag); virtual ~ScXMLExport(); @@ -243,18 +243,18 @@ public: inline ScDocument* GetDocument() { return pDoc; } inline const ScDocument* GetDocument() const { return pDoc; } bool IsMatrix (const ScAddress& aCell, - com::sun::star::table::CellRangeAddress& aCellAddress, bool& bIsFirst) const; + css::table::CellRangeAddress& aCellAddress, bool& bIsFirst) const; rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() { return xCellStylesPropertySetMapper; } rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() { return xTableStylesPropertySetMapper; } - void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream ); + void SetSourceStream( const css::uno::Reference<css::io::XInputStream>& xNewStream ); - void GetChangeTrackViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) override; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) override; + void GetChangeTrackViewSettings(css::uno::Sequence<css::beans::PropertyValue>& rProps); + virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& rProps) override; + virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& rProps) override; - virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape) override; + virtual void exportAnnotationMeta( const css::uno::Reference < css::drawing::XShape >& xShape) override; void CreateSharedData(const sal_Int32 nTableCount); void SetSharedData(ScMySharedData* pTemp) { pSharedData = pTemp; } @@ -265,17 +265,17 @@ public: virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; virtual void DisposingModel() override; }; diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index fc90e5d28f2c..9193c491fd61 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -247,7 +247,7 @@ ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( mfCellValue(0.0), mnRepeatCount(1), mnNumberFormat(-1), - mnCellType(::com::sun::star::util::NumberFormat::UNDEFINED), + mnCellType(css::util::NumberFormat::UNDEFINED), mbIsNumeric(false), mbIsEmpty(true) { diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 51a0006a077c..7e6246de4304 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -31,16 +31,14 @@ class ScXMLExternalRefTabSourceContext : public SvXMLImportContext public: ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefTabSourceContext(); 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; private: @@ -58,16 +56,14 @@ class ScXMLExternalRefRowsContext : public SvXMLImportContext public: ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefRowsContext(); 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; private: @@ -80,16 +76,14 @@ class ScXMLExternalRefRowContext : public SvXMLImportContext public: ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefRowContext(); 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; private: @@ -103,16 +97,14 @@ class ScXMLExternalRefCellContext : public SvXMLImportContext public: ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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, ScXMLExternalTabData& rRefInfo ); virtual ~ScXMLExternalRefCellContext(); 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; @@ -135,16 +127,14 @@ class ScXMLExternalRefCellTextContext : public SvXMLImportContext public: ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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, ScXMLExternalRefCellContext& rParent ); virtual ~ScXMLExternalRefCellTextContext(); 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& rChar) override; diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index f500690c9ed1..2c718ed11541 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -104,8 +104,7 @@ ScXMLFilterContext::~ScXMLFilterContext() SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -215,8 +214,7 @@ ScXMLAndContext::~ScXMLAndContext() SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -250,8 +248,7 @@ void ScXMLAndContext::EndElement() ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, + const Reference<css::xml::sax::XAttributeList>& /* xAttrList */, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -267,8 +264,7 @@ ScXMLOrContext::~ScXMLOrContext() SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -531,9 +527,8 @@ void ScXMLSetItemContext::EndElement() ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTableContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTableContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDataPilotTable(pTempDataPilotTableContext), aFilterFields(), @@ -598,8 +593,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext() SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -657,9 +651,8 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDPFilterContext* pTempFilterContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDPFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ) { pFilterContext = pTempFilterContext; @@ -672,8 +665,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext() SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -707,9 +699,8 @@ void ScXMLDPAndContext::EndElement() ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */, - ScXMLDPFilterContext* pTempFilterContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */, + ScXMLDPFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pFilterContext(pTempFilterContext) { @@ -722,8 +713,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext() SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -758,9 +748,8 @@ void ScXMLDPOrContext::EndElement() ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pFilterContext(pTempFilterContext), sDataType(GetXMLToken(XML_TEXT)), @@ -815,8 +804,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext() SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 75415b1555d3..5c14bbe49773 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -49,8 +49,8 @@ class ScXMLFilterContext : public SvXMLImportContext ScQueryParam& mrQueryParam; ScXMLDatabaseRangeContext* pDatabaseRangeContext; - com::sun::star::table::CellAddress aOutputPosition; - com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress; + css::table::CellAddress aOutputPosition; + css::table::CellRangeAddress aConditionSourceRangeAddress; bool bSkipDuplicates; bool bCopyOutputData; bool bConditionSourceRange; @@ -63,8 +63,7 @@ public: ScXMLFilterContext( ScXMLImport& 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, ScQueryParam& rParam, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -72,8 +71,7 @@ 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; virtual void EndElement() override; @@ -94,8 +92,7 @@ public: ScXMLAndContext( ScXMLImport& 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, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -103,8 +100,7 @@ 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; virtual void EndElement() override; }; @@ -121,8 +117,7 @@ public: ScXMLOrContext( ScXMLImport& 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, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -130,8 +125,7 @@ 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; virtual void EndElement() override; }; @@ -155,8 +149,7 @@ public: ScXMLConditionContext( ScXMLImport& 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, ScQueryParam& rParam, ScXMLFilterContext* pTempFilterContext); @@ -164,8 +157,7 @@ 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; virtual void EndElement() override; @@ -180,8 +172,7 @@ class ScXMLSetItemContext : public SvXMLImportContext public: ScXMLSetItemContext(ScXMLImport& 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, ScXMLConditionContext& rParent); virtual ~ScXMLSetItemContext(); @@ -189,8 +180,7 @@ 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; virtual void EndElement() override; }; @@ -221,16 +211,14 @@ public: ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDataPilotTableContext* pTempDataPilotTableContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDataPilotTableContext* pTempDataPilotTableContext); virtual ~ScXMLDPFilterContext(); 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; @@ -274,16 +262,14 @@ public: ScXMLDPAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPAndContext(); 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; }; @@ -299,16 +285,14 @@ public: ScXMLDPOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPOrContext(); 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; }; @@ -330,16 +314,14 @@ public: ScXMLDPConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDPFilterContext* pTempFilterContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDPFilterContext* pTempFilterContext); virtual ~ScXMLDPConditionContext(); 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; static void getOperatorXML( const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 5d03cea81f69..b7902b3e900d 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1977,7 +1977,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, } ScXMLImport::ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag) : SvXMLImport( rContext, implementationName, nImportFlag ), pDoc( NULL ), @@ -2443,7 +2443,7 @@ void ScXMLImport::ExamineDefaultStyle() } } -void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps) +void ScXMLImport::SetChangeTrackingViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& rChangeProps) { if (pDoc) { @@ -2951,8 +2951,8 @@ void ScXMLImport::SetStylesToRangesFinished() } // XImporter -void SAL_CALL ScXMLImport::setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) -throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScXMLImport::setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) +throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::setTargetDocument( xDoc ); @@ -2972,9 +2972,9 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R xActionLockable->addActionLock(); } -// ::com::sun::star::xml::sax::XDocumentHandler +// css::xml::sax::XDocumentHandler void SAL_CALL ScXMLImport::startDocument() -throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) +throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) { ScXMLImport::MutexGuard aGuard(*this); SvXMLImport::startDocument(); @@ -3188,8 +3188,8 @@ void ScXMLImport::SetStringRefSyntaxIfMissing() } void SAL_CALL ScXMLImport::endDocument() - throw(::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw(css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) { ScXMLImport::MutexGuard aGuard(*this); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index b7e98b37737b..7ff29c70af15 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -805,15 +805,15 @@ struct ScMyImportValidation OUString sFormulaNmsp1; OUString sFormulaNmsp2; OUString sBaseCellAddress; // string is used directly - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; - formula::FormulaGrammar::Grammar eGrammar1; - formula::FormulaGrammar::Grammar eGrammar2; - sal_Int16 nShowList; - bool bShowErrorMessage; - bool bShowImputMessage; - bool bIgnoreBlanks; + css::sheet::ValidationAlertStyle aAlertStyle; + css::sheet::ValidationType aValidationType; + css::sheet::ConditionOperator aOperator; + formula::FormulaGrammar::Grammar eGrammar1; + formula::FormulaGrammar::Grammar eGrammar2; + sal_Int16 nShowList; + bool bShowErrorMessage; + bool bShowImputMessage; + bool bIgnoreBlanks; }; typedef std::vector<ScMyImportValidation> ScMyImportValidations; @@ -949,10 +949,10 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable std::vector<OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; - com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats; - com::sun::star::uno::Reference <com::sun::star::util::XNumberFormatTypes> xNumberFormatTypes; + css::uno::Reference <css::util::XNumberFormats> xNumberFormats; + css::uno::Reference <css::util::XNumberFormatTypes> xNumberFormatTypes; - com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges; + css::uno::Reference <css::sheet::XSheetCellRangeContainer> xSheetCellRanges; OUString sPrevStyleName; OUString sPrevCurrency; @@ -973,13 +973,12 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override; virtual XMLShapeImportHelper* CreateShapeImport() override; public: ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag); virtual ~ScXMLImport() throw(); @@ -994,17 +993,17 @@ public: SvXMLImportContext *CreateMetaContext( const OUString& rLocalName ); SvXMLImportContext *CreateFontDeclsContext(const 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); SvXMLImportContext *CreateScriptContext( const OUString& rLocalName ); SvXMLImportContext *CreateStylesContext(const OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, bool bAutoStyles ); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + bool bAutoStyles ); SvXMLImportContext *CreateBodyContext( 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 void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override; + virtual void SetStatistics( const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override; ScDocumentImport& GetDoc(); @@ -1141,15 +1140,15 @@ public: ScXMLChangeTrackingImportHelper* GetChangeTrackingImportHelper(); void InsertStyles(); - void SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override; - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override; + void SetChangeTrackingViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& rChangeProps); + virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override; + virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override; void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency); bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol); - void SetType(com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet>& rProperties, + void SetType(css::uno::Reference <css::beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, const OUString& rCurrency); @@ -1160,7 +1159,7 @@ public: bool HasNewCondFormatData() { return mbHasNewCondFormatData; } private: - void AddStyleRange(const com::sun::star::table::CellRangeAddress& rCellRange); + void AddStyleRange(const css::table::CellRangeAddress& rCellRange); void SetStyleToRanges(); void ExamineDefaultStyle(); @@ -1174,13 +1173,13 @@ public: void SetStylesToRangesFinished(); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw(::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw(css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void DisposingModel() override; diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index d12155e5203d..917e265c42dd 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -33,14 +33,14 @@ public: ScXMLImport& rImport, sal_uInt16 nPrefix, 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 ); virtual ~ScXMLLabelRangesContext(); 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 ) override; virtual void EndElement() override; }; @@ -60,14 +60,14 @@ public: ScXMLImport& rImport, sal_uInt16 nPrefix, 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 ); virtual ~ScXMLLabelRangeContext(); 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 ) override; virtual void EndElement() override; }; diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index acd373ec346c..57a92722f208 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -63,8 +63,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext() SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -155,8 +154,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext() SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } @@ -217,8 +215,8 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext() SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName );; } diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index dae6c93ad68d..5495378eecbd 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -73,16 +73,14 @@ public: ScXMLNamedExpressionsContext( ScXMLImport& 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, Inserter* pInserter ); virtual ~ScXMLNamedExpressionsContext(); 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; @@ -99,16 +97,14 @@ public: ScXMLNamedRangeContext( ScXMLImport& 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, ScXMLNamedExpressionsContext::Inserter* pInserter ); virtual ~ScXMLNamedRangeContext(); 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; @@ -125,16 +121,14 @@ public: ScXMLNamedExpressionContext( ScXMLImport& 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, ScXMLNamedExpressionsContext::Inserter* pInserter ); virtual ~ScXMLNamedExpressionContext(); 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/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index bf0565dd3ec9..a3b30baf4f72 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -48,8 +48,7 @@ using namespace xmloff::token; ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& 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 ) : SvXMLImportContext( rImport, nPrfx, rLName ), sVisibility(GetXMLToken(XML_VISIBLE)), nRepeatedRows(1), @@ -106,8 +105,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext() SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -214,9 +212,9 @@ void ScXMLTableRowContext::EndElement() ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const bool bTempHeader, const bool bTempGroup ) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + const bool bTempHeader, + const bool bTempGroup ) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartRow(0), nGroupStartRow(0), @@ -256,8 +254,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index e8bdabec4604..3532944e01cc 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -39,15 +39,13 @@ public: ScXMLTableRowContext( ScXMLImport& 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 ); virtual ~ScXMLTableRowContext(); 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; }; @@ -67,16 +65,14 @@ public: ScXMLTableRowsContext( ScXMLImport& 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 bool bHeader, const bool bGroup); virtual ~ScXMLTableRowsContext(); 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/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 5bd4935a5929..b5a4625b5896 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -46,15 +46,13 @@ public: ScXMLTableScenarioContext( ScXMLImport& 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 ); virtual ~ScXMLTableScenarioContext(); 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/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 0c6ceabfe93b..9c84b14bbfde 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -35,9 +35,9 @@ using namespace xmloff::token; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : + const css::uno::Reference< + css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext), sAlgorithm(), @@ -105,8 +105,7 @@ ScXMLSortContext::~ScXMLSortContext() SvXMLImportContext *ScXMLSortContext::CreateChildContext( sal_uInt16 nPrefix, 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 ) { SvXMLImportContext *pContext(0); @@ -200,9 +199,8 @@ void ScXMLSortContext::AddSortField(const OUString& sFieldNumber, const OUString ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSortContext* pTempSortContext) : + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSortContext* pTempSortContext) : SvXMLImportContext( rImport, nPrfx, rLName ), pSortContext(pTempSortContext), sDataType(GetXMLToken(XML_AUTOMATIC)), @@ -245,8 +243,7 @@ ScXMLSortByContext::~ScXMLSortByContext() SvXMLImportContext *ScXMLSortByContext::CreateChildContext( sal_uInt16 nPrefix, 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 */ ) { return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 0f1db462a628..d91632e58738 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -33,10 +33,10 @@ class ScXMLSortContext : public SvXMLImportContext { ScXMLDatabaseRangeContext* pDatabaseRangeContext; - com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; - com::sun::star::table::CellAddress aOutputPosition; + css::uno::Sequence <css::util::SortField> aSortFields; + css::table::CellAddress aOutputPosition; LanguageTagODF maLanguageTagODF; - OUString sAlgorithm; + OUString sAlgorithm; sal_Int16 nUserListIndex; bool bCopyOutputData; bool bBindFormatsToContent; @@ -50,16 +50,14 @@ public: ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); virtual ~ScXMLSortContext(); 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; @@ -81,16 +79,14 @@ public: ScXMLSortByContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ScXMLSortContext* pTempSortContext); + const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList, + ScXMLSortContext* pTempSortContext); virtual ~ScXMLSortByContext(); 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/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index ba5294caf0dc..aa8d133e5a40 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -675,7 +675,7 @@ void ScXMLAutoStylePoolP::exportStyleAttributes( } void ScXMLAutoStylePoolP::exportStyleContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, sal_Int32 nFamily, const std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp @@ -805,8 +805,7 @@ ScXMLAutoStylePoolP::~ScXMLAutoStylePoolP() } void ScXMLStyleExport::exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) + const css::uno::Reference< css::style::XStyle > & rStyle ) { uno::Reference< beans::XPropertySet > xPropSet( rStyle, uno::UNO_QUERY ); if (xPropSet.is()) @@ -828,9 +827,7 @@ void ScXMLStyleExport::exportStyleAttributes( } } -void ScXMLStyleExport::exportStyleContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & /* rStyle */ ) +void ScXMLStyleExport::exportStyleContent( const css::uno::Reference<css::style::XStyle > & /* rStyle */ ) { } @@ -949,8 +946,8 @@ XmlScPropHdl_CellProtection::~XmlScPropHdl_CellProtection() } bool XmlScPropHdl_CellProtection::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { util::CellProtection aCellProtection1, aCellProtection2; @@ -965,7 +962,7 @@ bool XmlScPropHdl_CellProtection::equals( bool XmlScPropHdl_CellProtection::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1038,7 +1035,7 @@ bool XmlScPropHdl_CellProtection::importXML( bool XmlScPropHdl_CellProtection::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1085,8 +1082,8 @@ XmlScPropHdl_PrintContent::~XmlScPropHdl_PrintContent() } bool XmlScPropHdl_PrintContent::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { util::CellProtection aCellProtection1, aCellProtection2; @@ -1099,7 +1096,7 @@ bool XmlScPropHdl_PrintContent::equals( bool XmlScPropHdl_PrintContent::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1129,7 +1126,7 @@ bool XmlScPropHdl_PrintContent::importXML( bool XmlScPropHdl_PrintContent::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1151,8 +1148,8 @@ XmlScPropHdl_JustifyMethod::~XmlScPropHdl_JustifyMethod() } bool XmlScPropHdl_JustifyMethod::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 nVal1(0), nVal2(0); @@ -1163,7 +1160,7 @@ bool XmlScPropHdl_JustifyMethod::equals( bool XmlScPropHdl_JustifyMethod::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval = false; @@ -1189,7 +1186,7 @@ bool XmlScPropHdl_JustifyMethod::importXML( bool XmlScPropHdl_JustifyMethod::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal(0); @@ -1225,8 +1222,8 @@ XmlScPropHdl_HoriJustify::~XmlScPropHdl_HoriJustify() } bool XmlScPropHdl_HoriJustify::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellHoriJustify aHoriJustify1, aHoriJustify2; @@ -1237,7 +1234,7 @@ bool XmlScPropHdl_HoriJustify::equals( bool XmlScPropHdl_HoriJustify::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1279,7 +1276,7 @@ bool XmlScPropHdl_HoriJustify::importXML( bool XmlScPropHdl_HoriJustify::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellHoriJustify nVal; @@ -1329,8 +1326,8 @@ XmlScPropHdl_HoriJustifySource::~XmlScPropHdl_HoriJustifySource() } bool XmlScPropHdl_HoriJustifySource::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellHoriJustify aHoriJustify1, aHoriJustify2; @@ -1341,7 +1338,7 @@ bool XmlScPropHdl_HoriJustifySource::equals( bool XmlScPropHdl_HoriJustifySource::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1362,7 +1359,7 @@ bool XmlScPropHdl_HoriJustifySource::importXML( bool XmlScPropHdl_HoriJustifySource::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellHoriJustify nVal; @@ -1390,8 +1387,8 @@ XmlScPropHdl_HoriJustifyRepeat::~XmlScPropHdl_HoriJustifyRepeat() } bool XmlScPropHdl_HoriJustifyRepeat::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellHoriJustify aHoriJustify1, aHoriJustify2; @@ -1402,7 +1399,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::equals( bool XmlScPropHdl_HoriJustifyRepeat::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1423,7 +1420,7 @@ bool XmlScPropHdl_HoriJustifyRepeat::importXML( bool XmlScPropHdl_HoriJustifyRepeat::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellHoriJustify nVal; @@ -1451,8 +1448,8 @@ XmlScPropHdl_Orientation::~XmlScPropHdl_Orientation() } bool XmlScPropHdl_Orientation::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { table::CellOrientation aOrientation1, aOrientation2; @@ -1463,7 +1460,7 @@ bool XmlScPropHdl_Orientation::equals( bool XmlScPropHdl_Orientation::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1487,7 +1484,7 @@ bool XmlScPropHdl_Orientation::importXML( bool XmlScPropHdl_Orientation::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { table::CellOrientation nVal; @@ -1520,8 +1517,8 @@ XmlScPropHdl_RotateAngle::~XmlScPropHdl_RotateAngle() } bool XmlScPropHdl_RotateAngle::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 aAngle1 = 0, aAngle2 = 0; @@ -1532,7 +1529,7 @@ bool XmlScPropHdl_RotateAngle::equals( bool XmlScPropHdl_RotateAngle::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1550,7 +1547,7 @@ bool XmlScPropHdl_RotateAngle::importXML( bool XmlScPropHdl_RotateAngle::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal = 0; @@ -1572,8 +1569,8 @@ XmlScPropHdl_RotateReference::~XmlScPropHdl_RotateReference() } bool XmlScPropHdl_RotateReference::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 aReference1(0), aReference2(0); @@ -1584,7 +1581,7 @@ bool XmlScPropHdl_RotateReference::equals( bool XmlScPropHdl_RotateReference::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1620,7 +1617,7 @@ bool XmlScPropHdl_RotateReference::importXML( bool XmlScPropHdl_RotateReference::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal(0); @@ -1669,8 +1666,8 @@ XmlScPropHdl_VertJustify::~XmlScPropHdl_VertJustify() } bool XmlScPropHdl_VertJustify::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { sal_Int32 aReference1(0), aReference2(0); @@ -1681,7 +1678,7 @@ bool XmlScPropHdl_VertJustify::equals( bool XmlScPropHdl_VertJustify::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1723,7 +1720,7 @@ bool XmlScPropHdl_VertJustify::importXML( bool XmlScPropHdl_VertJustify::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { sal_Int32 nVal(0); @@ -1778,8 +1775,8 @@ XmlScPropHdl_BreakBefore::~XmlScPropHdl_BreakBefore() } bool XmlScPropHdl_BreakBefore::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { bool aBreak1 = false, aBreak2 = false; @@ -1790,7 +1787,7 @@ bool XmlScPropHdl_BreakBefore::equals( bool XmlScPropHdl_BreakBefore::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1814,7 +1811,7 @@ bool XmlScPropHdl_BreakBefore::importXML( bool XmlScPropHdl_BreakBefore::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1838,15 +1835,15 @@ XmlScPropHdl_IsTextWrapped::~XmlScPropHdl_IsTextWrapped() } bool XmlScPropHdl_IsTextWrapped::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { return (::cppu::any2bool(r1) == ::cppu::any2bool(r2)); } bool XmlScPropHdl_IsTextWrapped::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1867,7 +1864,7 @@ bool XmlScPropHdl_IsTextWrapped::importXML( bool XmlScPropHdl_IsTextWrapped::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1887,7 +1884,7 @@ bool XmlScPropHdl_IsTextWrapped::exportXML( } bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, - ::com::sun::star::uno::Any& /* rValue */, + css::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { OSL_FAIL("should never be called"); @@ -1895,7 +1892,7 @@ bool XmlScPropHdl_IsEqual::importXML( const OUString& /* rStrImpValue */, } bool XmlScPropHdl_IsEqual::exportXML( OUString& /* rStrExpValue */, - const ::com::sun::star::uno::Any& /* rValue */, + const css::uno::Any& /* rValue */, const SvXMLUnitConverter& /* rUnitConverter */ ) const { OSL_FAIL("should never be called"); @@ -1907,15 +1904,15 @@ XmlScPropHdl_Vertical::~XmlScPropHdl_Vertical() } bool XmlScPropHdl_Vertical::equals( - const ::com::sun::star::uno::Any& r1, - const ::com::sun::star::uno::Any& r2 ) const + const css::uno::Any& r1, + const css::uno::Any& r2 ) const { return (::cppu::any2bool(r1) == ::cppu::any2bool(r2)); } bool XmlScPropHdl_Vertical::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); @@ -1936,7 +1933,7 @@ bool XmlScPropHdl_Vertical::importXML( bool XmlScPropHdl_Vertical::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& /* rUnitConverter */ ) const { bool bRetval(false); diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index cf2fc4089c11..7b50eaf3f036 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -109,8 +109,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; public: ScXMLCellExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); @@ -139,8 +138,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; public: ScXMLRowExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); @@ -196,7 +194,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP ) const override; virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp @@ -212,11 +210,9 @@ public: class ScXMLStyleExport : public XMLStyleExport { virtual void exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) override; + const css::uno::Reference< css::style::XStyle > & rStyle ) override; virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) override; + const css::uno::Reference< css::style::XStyle > & rStyle ) override; public: ScXMLStyleExport( SvXMLExport& rExp, @@ -237,126 +233,126 @@ class XmlScPropHdl_CellProtection : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_CellProtection(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_PrintContent(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_JustifyMethod(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifySource(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Orientation(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateAngle(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateReference(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_VertJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_BreakBefore(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsTextWrapped(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsEqual() {} - virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const override { return true; } - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& /* r1 */, const css::uno::Any& /* r2 */ ) const override { return true; } + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Vertical(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index c23b949954fc..3bcfc6745bd5 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -1003,7 +1003,7 @@ SvXMLImportContext *ScMasterPageContext::CreateChildContext( SvXMLImportContext *ScMasterPageContext::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/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index d03227c94052..c2531750b471 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -93,21 +93,21 @@ public: XMLTableStyleContext( ScXMLImport& 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, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTableStyleContext(); 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 FillPropertySet(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + virtual void FillPropertySet(const css::uno::Reference< + css::beans::XPropertySet > & rPropSet ) override; virtual void SetDefaults() override; - void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); + void AddProperty(sal_Int16 nContextID, const css::uno::Any& aValue); XMLPropertyState* FindProperty(const sal_Int16 nContextID); sal_Int32 GetNumberFormat();// { return nNumberFormat; } @@ -115,7 +115,7 @@ public: SCTAB GetLastSheet() const { return nLastSheet; } void SetLastSheet(SCTAB nNew) { nLastSheet = nNew; } - void ApplyCondFormat( const com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>& xCellRanges ); + void ApplyCondFormat( const css::uno::Sequence<css::table::CellRangeAddress>& xCellRanges ); private: using XMLPropStyleContext::SetStyle; @@ -123,14 +123,10 @@ private: class XMLTableStylesContext : public SvXMLStylesContext { - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xCellStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xColumnStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xRowStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > xTableStyles; + css::uno::Reference< css::container::XNameContainer > xCellStyles; + css::uno::Reference< css::container::XNameContainer > xColumnStyles; + css::uno::Reference< css::container::XNameContainer > xRowStyles; + css::uno::Reference< css::container::XNameContainer > xTableStyles; const OUString sCellStyleServiceName; const OUString sColumnStyleServiceName; const OUString sRowStyleServiceName; @@ -156,19 +152,18 @@ protected: sal_uInt16 nFamily, 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 SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, 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: XMLTableStylesContext( 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 bool bAutoStyles ); virtual ~XMLTableStylesContext(); @@ -176,8 +171,7 @@ public: virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const override; - virtual ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > + virtual css::uno::Reference< css::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const override; virtual OUString GetServiceName( sal_uInt16 nFamily ) const override; @@ -189,13 +183,11 @@ class ScXMLMasterStylesContext : public SvXMLStylesContext protected: virtual SvXMLStyleContext *CreateStyleChildContext( 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 SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, 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 bool InsertStyleFamily( sal_uInt16 nFamily ) const override; @@ -204,8 +196,7 @@ public: ScXMLMasterStylesContext( 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); virtual ~ScXMLMasterStylesContext(); virtual void EndElement() override; @@ -217,7 +208,7 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; + css::uno::Reference<css::beans::XPropertySet> xPropSet; bool bContainsRightHeader; bool bContainsRightFooter; @@ -228,20 +219,19 @@ public: ScMasterPageContext( 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 bOverwrite ); virtual ~ScMasterPageContext(); 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 SvXMLImportContext *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 ) override; @@ -259,16 +249,14 @@ class ScCellTextStyleContext : public XMLTextStyleContext public: ScCellTextStyleContext( 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, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~ScCellTextStyleContext(); // override FillPropertySet to store style information virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; }; #endif diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 89d6d55c6e90..5ee58283bbc8 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -54,10 +54,10 @@ private: ScMyOLEFixer aFixupOLEs; - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > xCurrentSheet; - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; - ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; + css::uno::Reference< css::sheet::XSpreadsheet > xCurrentSheet; + css::uno::Reference< css::table::XCellRange > xCurrentCellRange; + css::uno::Reference< css::drawing::XDrawPage > xDrawPage; + css::uno::Reference < css::drawing::XShapes > xShapes; OUString sCurrentSheetName; ScAddress maCurrentCellPos; ScRangeList maMatrixRangeList; @@ -76,25 +76,25 @@ public: void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } - static bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) + static bool IsOLE(css::uno::Reference< css::drawing::XShape >& rShape) { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; void AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - OUString GetCurrentSheetName() const { return sCurrentSheetName; } + OUString GetCurrentSheetName() const { return sCurrentSheetName; } SCTAB GetCurrentSheet() const { return (maCurrentCellPos.Tab() >= 0) ? maCurrentCellPos.Tab() : 0; } SCCOL GetCurrentColCount() const { return std::min<sal_Int32>(nCurrentColCount, MAXCOL); } SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; } - ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > + css::uno::Reference< css::sheet::XSpreadsheet > GetCurrentXSheet() const { return xCurrentSheet; } - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > GetCurrentXDrawPage(); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > GetCurrentXShapes(); bool HasDrawPage(); bool HasXShapes(); - void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + void AddOLE(css::uno::Reference <css::drawing::XShape>& rShape, const OUString &rRangeList); void AddMatrixRange( const SCCOL nStartColumn, diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index fb8ea43bba95..fa7d491335d8 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -138,8 +138,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() : ScXMLTableContext::ScXMLTableContext( ScXMLImport& 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 ) : SvXMLImportContext( rImport, nPrfx, rLName ), nStartOffset(-1), bStartFormPage(false), @@ -221,8 +220,7 @@ ScXMLTableContext::~ScXMLTableContext() SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, 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 SvXMLTokenMap& rTokenMap(GetScImport().GetTableElemTokenMap()); sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLName); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 6217427ec0ad..c92309a85a2c 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -52,15 +52,13 @@ public: ScXMLTableContext( ScXMLImport& 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 ); virtual ~ScXMLTableContext(); 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; }; @@ -72,15 +70,13 @@ class ScXMLTableProtectionContext : public SvXMLImportContext public: ScXMLTableProtectionContext( ScXMLImport& rImport, sal_uInt16 nPrefix, 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 ); virtual ~ScXMLTableProtectionContext(); 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/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 77afa8384287..7d9e8716b921 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -329,20 +329,19 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError ) /** property map for export info set */ comphelper::PropertyMapEntry const aImportInfoMap[] = { - { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("NumberStyles"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("PrivateData"), 0, cppu::UnoType<uno::XInterface>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("VBACompatibilityMode"), 0, cppu::UnoType<bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("ScriptConfiguration"), 0, cppu::UnoType<container::XNameAccess>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("OrganizerMode"), 0, cppu::UnoType<bool>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("NumberStyles"), 0, cppu::UnoType<container::XNameAccess>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("PrivateData"), 0, cppu::UnoType<uno::XInterface>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("VBACompatibilityMode"), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ScriptConfiguration"), 0, cppu::UnoType<container::XNameAccess>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("OrganizerMode"), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(SC_UNO_ODS_LOCK_SOLAR_MUTEX), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(SC_UNO_ODS_IMPORT_STYLES), 0, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -770,17 +769,17 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) /** property map for export info set */ comphelper::PropertyMapEntry const aExportInfoMap[] = { - { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("WrittenNumberStyles"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("UsePrettyPrinting"), 0, ::cppu::UnoType<sal_Bool>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StyleNames"), 0, cppu::UnoType<uno::Sequence<OUString>>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StyleFamilies"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("WrittenNumberStyles"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("UsePrettyPrinting"), 0, ::cppu::UnoType<sal_Bool>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StyleNames"), 0, cppu::UnoType<uno::Sequence<OUString>>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StyleFamilies"), 0, cppu::UnoType<uno::Sequence<sal_Int32>>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("TargetStorage"), 0, cppu::UnoType<embed::XStorage>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) ); |