diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-26 08:43:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-26 10:47:02 +0000 |
| commit | 80735fcbb0503ff1de198d1d9936fed9f5ae77a2 (patch) | |
| tree | 7c126266aecb7561f46897bd9c997c085a3a96df /xmloff/source/draw | |
| parent | 4112ecadd53f7ae48e007dd5024f077aca305062 (diff) | |
com::sun::star->css in xmloff/
Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
Reviewed-on: https://gerrit.libreoffice.org/20192
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff/source/draw')
43 files changed, 574 insertions, 593 deletions
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 7c313375eb1a..ee7290abfc73 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -129,21 +129,18 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap, + css::uno::Reference<css::container::XIndexContainer> xMap, const sal_Char* pServiceName); void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; void EndElement() override; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; protected: @@ -152,8 +149,7 @@ protected: const OUString& rValue); virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet); + css::uno::Reference<css::beans::XPropertySet> & rPropertySet); }; @@ -320,8 +316,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap); + css::uno::Reference<css::container::XIndexContainer> xMap); virtual ~XMLImageMapRectangleContext(); @@ -331,8 +326,7 @@ protected: const OUString& rValue) override; virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet) override; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override; }; @@ -428,8 +422,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap); + css::uno::Reference<css::container::XIndexContainer> xMap); virtual ~XMLImageMapPolygonContext(); @@ -439,8 +432,7 @@ protected: const OUString& rValue) override; virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet) override; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override; }; @@ -496,7 +488,7 @@ void XMLImageMapPolygonContext::Prepare(Reference<XPropertySet> & rPropertySet) { if(aPolygon.count()) { - com::sun::star::drawing::PointSequence aPointSequence; + css::drawing::PointSequence aPointSequence; uno::Any aAny; basegfx::tools::B2DPolygonToUnoPointSequence(aPolygon, aPointSequence); @@ -524,8 +516,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexContainer> xMap); + css::uno::Reference<css::container::XIndexContainer> xMap); virtual ~XMLImageMapCircleContext(); @@ -535,8 +526,7 @@ protected: const OUString& rValue) override; virtual void Prepare( - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropertySet) override; + css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override; }; @@ -639,7 +629,7 @@ XMLImageMapContext::XMLImageMapContext( if( xInfo.is() && xInfo->hasPropertyByName( sImageMap ) ) xPropertySet->getPropertyValue(sImageMap) >>= xImageMap; } - catch(const com::sun::star::uno::Exception& e) + catch(const css::uno::Exception& e) { uno::Sequence<OUString> aSeq(0); rImport.SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, nullptr ); diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index d7872d941f01..960869917239 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -492,16 +492,16 @@ public: SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ); virtual ~SdXMLNumberFormatMemberImportContext(); 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 EndElement() override; @@ -509,7 +509,7 @@ public: }; -SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) +SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpParent( pParent ), maNumberStyle( rLocalName ), @@ -552,12 +552,12 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext() SvXMLImportContext *SdXMLNumberFormatMemberImportContext::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 mpSlaveContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); } -void SdXMLNumberFormatMemberImportContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +void SdXMLNumberFormatMemberImportContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { mpSlaveContext->StartElement( xAttrList ); } @@ -577,7 +577,7 @@ void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) } -SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) +SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), mbAutomatic( false ), mnIndex(0), @@ -711,7 +711,7 @@ void SdXMLNumberFormatImportContext::EndElement() } } -SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) ); } diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 2a80b436737a..c54b682be09e 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -262,7 +262,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet rPropSet->setPropertyValue( rPropertyName, Any( sStyleName ) ); } } - catch ( const ::com::sun::star::lang::IllegalArgumentException& e ) + catch ( const css::lang::IllegalArgumentException& e ) { Sequence<OUString> aSeq { sStyleName }; GetImport().SetError( @@ -287,7 +287,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet rPropSet->setPropertyValue( rPropertyName, rState.maValue ); } } - catch ( const ::com::sun::star::lang::IllegalArgumentException& e ) + catch ( const css::lang::IllegalArgumentException& e ) { Sequence<OUString> aSeq; GetImport().SetError( diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index f911e6741307..3140586c56e8 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -541,7 +541,7 @@ AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Refe { try { - mxExport = static_cast< ::com::sun::star::document::XFilter *>(&rExport); + mxExport = static_cast< css::document::XFilter *>(&rExport); } catch (const RuntimeException&) { @@ -1401,7 +1401,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nCommand, getAnimationsEnumMap(Animations_EnumMap_Command) ); mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, sTmp.makeStringAndClear() ); -// todo virtual ::com::sun::star::uno::Any SAL_CALL getParameter() throw (::com::sun::star::uno::RuntimeException) = 0; +// todo virtual css::uno::Any SAL_CALL getParameter() throw (css::uno::RuntimeException) = 0; SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true ); @@ -1615,7 +1615,7 @@ void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTa Reference< XInterface > xRef; - if( rTarget.getValueTypeClass() == ::com::sun::star::uno::TypeClass_INTERFACE ) + if( rTarget.getValueTypeClass() == css::uno::TypeClass_INTERFACE ) { rTarget >>= xRef; } @@ -1654,7 +1654,7 @@ void AnimationsExporterImpl::prepareValue( const Any& rValue ) for( nElement = 0; nElement < nLength; nElement++, pAny++ ) prepareValue( *pAny ); } - else if( rValue.getValueTypeClass() == ::com::sun::star::uno::TypeClass_INTERFACE ) + else if( rValue.getValueTypeClass() == css::uno::TypeClass_INTERFACE ) { Reference< XInterface> xRef( rValue, UNO_QUERY ); if( xRef.is() ) diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index f7c5e72c2739..a5951129936d 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -624,7 +624,7 @@ Any AnimationsImportHelperImpl::convertPath( const OUString& rValue ) AnimationNodeContext::AnimationNodeContext( const Reference< XAnimationNode >& xParentNode, SvXMLImport& rImport, sal_uInt16 nPrfx, 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, AnimationsImportHelperImpl* pHelper /* = NULL */ ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpHelper( pHelper ), @@ -726,7 +726,7 @@ AnimationNodeContext::~AnimationNodeContext() delete mpHelper; } -void AnimationNodeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void AnimationNodeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { // code of StartElement is moved to init_node that is now called // in c'tor before appending this node to its parent. @@ -734,7 +734,7 @@ void AnimationNodeContext::StartElement( const ::com::sun::star::uno::Reference< // set when child nodes are appended. } -void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { if( mxNode.is() ) try { @@ -1152,7 +1152,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : double fInterval = 0.0; if( rValue.match("P") ) { - ::com::sun::star::util::Duration aDuration; + css::util::Duration aDuration; if (::sax::Converter::convertDuration(aDuration, rValue)) { fInterval = ((((aDuration.Hours * 60) @@ -1240,7 +1240,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : } SvXMLImportContext * AnimationNodeContext::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 ) { if( mxNode.is()) return new AnimationNodeContext( mxNode, GetImport(), nPrefix, rLocalName, xAttrList, mpHelper ); diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 1aae82c862fd..78505e4b9af3 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -646,7 +646,7 @@ void XMLAnimationsEffectContext::EndElement() XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& ) + const css::uno::Reference< css::xml::sax::XAttributeList>& ) : SvXMLImportContext(rImport, nPrfx, rLocalName) { mpImpl = new AnimImpImpl(); @@ -658,7 +658,7 @@ XMLAnimationsContext::~XMLAnimationsContext() } SvXMLImportContext * XMLAnimationsContext::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 XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl ); } diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index f820a830c59d..cc2eca055e3f 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -28,15 +28,15 @@ class SdXMLDescriptionContext : public SvXMLImportContext { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; OUString msText; public: SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::drawing::XShape >& rxShape ); virtual ~SdXMLDescriptionContext(); virtual void EndElement() override; diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index b19b343f66ec..8e6b65bd3a60 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -73,7 +73,7 @@ SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] = class SdXMLEventContext : public SvXMLImportContext { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; public: @@ -490,7 +490,7 @@ SdXMLEventsContext::~SdXMLEventsContext() } SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, 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 SdXMLEventContext( GetImport(), nPrfx, rLocalName, xAttrList, mxShape ); } diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index c190d8ca14a9..ff875b376cc5 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -28,19 +28,19 @@ class SdXMLEventsContext : public SvXMLImportContext { private: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; + css::uno::Reference< css::drawing::XShape > mxShape; public: SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rxShape ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::drawing::XShape >& rxShape ); virtual ~SdXMLEventsContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_EVENTIMP_HXX diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 3f42d3adc61a..b923c78fa0ad 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -58,7 +58,7 @@ public: virtual void EndElement() override; private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; + css::uno::Reference< css::container::XNameAccess > mxLayerManager; OUString msName; OUStringBuffer sDescriptionBuffer; OUStringBuffer sTitleBuffer; @@ -144,7 +144,7 @@ void SdXMLLayerContext::EndElement() SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) + const css::uno::Reference< css::xml::sax::XAttributeList>&) : SvXMLImportContext(rImport, nPrfx, rLocalName) { Reference< XLayerSupplier > xLayerSupplier( rImport.GetModel(), UNO_QUERY ); @@ -158,7 +158,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext() } SvXMLImportContext * SdXMLLayerSetContext::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 SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager ); } diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index fe788f5cc2c2..6538f6a0d088 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -28,18 +28,18 @@ class SdXMLLayerSetContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; + css::uno::Reference< css::container::XNameAccess > mxLayerManager; public: SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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 ~SdXMLLayerSetContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_LAYERIMP_HXX diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index 048d05b1b596..aac3002398bd 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; // class XMLNumRulePropHdl -XMLNumRulePropHdl::XMLNumRulePropHdl( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > xNumRuleCompare ) +XMLNumRulePropHdl::XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > xNumRuleCompare ) : mxNumRuleCompare( xNumRuleCompare ) { } @@ -40,12 +40,12 @@ bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0; } -bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, css::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return false; } -bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const css::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return false; } diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx index 1242743c3b3d..99857ef04505 100644 --- a/xmloff/source/draw/numithdl.hxx +++ b/xmloff/source/draw/numithdl.hxx @@ -29,16 +29,16 @@ class XMLNumRulePropHdl : public XMLPropertyHandler { private: - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > mxNumRuleCompare; + css::uno::Reference< css::ucb::XAnyCompare > mxNumRuleCompare; public: - explicit XMLNumRulePropHdl( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > xNumRuleCompare ); + explicit XMLNumRulePropHdl( css::uno::Reference< css::ucb::XAnyCompare > xNumRuleCompare ); virtual ~XMLNumRulePropHdl(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override; /// NumRules will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) 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 // INCLUDED_XMLOFF_SOURCE_DRAW_NUMITHDL_HXX diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 0ac8bf33b074..a52be4723c5e 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -44,7 +44,7 @@ XMLDurationPropertyHdl::~XMLDurationPropertyHdl() bool XMLDurationPropertyHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const { util::Duration aDuration; @@ -67,7 +67,7 @@ bool XMLDurationPropertyHdl::importXML( bool XMLDurationPropertyHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const { double nVal = 0; @@ -100,7 +100,7 @@ XMLOpacityPropertyHdl::~XMLOpacityPropertyHdl() bool XMLOpacityPropertyHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; @@ -148,7 +148,7 @@ bool XMLOpacityPropertyHdl::importXML( bool XMLOpacityPropertyHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; @@ -175,7 +175,7 @@ XMLTextAnimationStepPropertyHdl::~XMLTextAnimationStepPropertyHdl() bool XMLTextAnimationStepPropertyHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { bool bRet = false; @@ -205,7 +205,7 @@ bool XMLTextAnimationStepPropertyHdl::importXML( bool XMLTextAnimationStepPropertyHdl::exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { bool bRet = false; @@ -244,13 +244,13 @@ XMLDateTimeFormatHdl::~XMLDateTimeFormatHdl() { } -bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& ) const { rValue <<= rStrImpValue; return true; } -bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& ) const { sal_Int32 nNumberFormat = 0; if( mpExport && (rValue >>= nNumberFormat) ) diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx index a463827d2c78..ce351d0ecb7c 100644 --- a/xmloff/source/draw/propimp0.hxx +++ b/xmloff/source/draw/propimp0.hxx @@ -28,8 +28,8 @@ class XMLDurationPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLDurationPropertyHdl(); - 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 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 SvXMLImport; @@ -40,16 +40,16 @@ private: public: explicit XMLOpacityPropertyHdl( SvXMLImport* pImport ); virtual ~XMLOpacityPropertyHdl(); - 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 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 XMLTextAnimationStepPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLTextAnimationStepPropertyHdl(); - 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 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 SvXMLExport; @@ -61,8 +61,8 @@ private: public: explicit XMLDateTimeFormatHdl( SvXMLExport* pExport ); virtual ~XMLDateTimeFormatHdl(); - 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 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 // INCLUDED_XMLOFF_SOURCE_DRAW_PROPIMP0_HXX diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 1794fceb9d75..6011498a12d3 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -734,11 +734,11 @@ class XMLCaptionEscapeRelative : public XMLPropertyHandler public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; @@ -774,11 +774,11 @@ public: virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; private: const sal_Int32 mnType; @@ -813,8 +813,8 @@ class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler public: virtual ~XMLSdHeaderFooterVisibilityTypeHdl(); - 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 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; }; XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() @@ -823,7 +823,7 @@ XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& ) const { // #i38644# @@ -1025,26 +1025,26 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_BITMAP_REFPOINT: { - pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<com::sun::star::drawing::RectanglePoint>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<css::drawing::RectanglePoint>::get()); break; } case XML_TYPE_TEXT_ANIMATION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<css::drawing::TextAnimationKind>::get()); break; case XML_TYPE_TEXT_ANIMATION_BLINKING: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationKind>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<css::drawing::TextAnimationKind>::get()); break; case XML_TYPE_TEXT_ANIMATION_DIRECTION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<com::sun::star::drawing::TextAnimationDirection>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<css::drawing::TextAnimationDirection>::get()); break; case XML_TYPE_TEXT_ANIMATION_STEPS: pHdl = new XMLTextAnimationStepPropertyHdl; break; case XML_SD_TYPE_TEXT_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextHorizontalAdjust>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get()); break; case XML_SD_TYPE_VERTICAL_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<com::sun::star::drawing::TextVerticalAdjust>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<css::drawing::TextVerticalAdjust>::get()); break; case XML_SD_TYPE_FITTOSIZE: { @@ -1052,12 +1052,12 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy <= SvtSaveOptions::ODFVER_012)) { pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12, - cppu::UnoType<com::sun::star::drawing::TextFitToSizeType>::get()); + cppu::UnoType<css::drawing::TextFitToSizeType>::get()); } else { pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum, - cppu::UnoType<com::sun::star::drawing::TextFitToSizeType>::get()); + cppu::UnoType<css::drawing::TextFitToSizeType>::get()); } } break; @@ -1065,10 +1065,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() ); break; case XML_SD_TYPE_MEASURE_HALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextHorzPos>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<css::drawing::MeasureTextHorzPos>::get()); break; case XML_SD_TYPE_MEASURE_VALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<com::sun::star::drawing::MeasureTextVertPos>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<css::drawing::MeasureTextVertPos>::get()); break; case XML_SD_TYPE_MEASURE_PLACING: { @@ -1678,7 +1678,7 @@ void XMLPageExportPropertyMapper::ContextFilter( } } - if( pTransitionFadeColor && nTransitionType != ::com::sun::star::animations::TransitionType::FADE ) + if( pTransitionFadeColor && nTransitionType != css::animations::TransitionType::FADE ) pTransitionFadeColor->mnIndex = -1; if( pDateTimeFormat && pDateTimeUpdate ) diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 7d84ffd11679..1b025704c381 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -55,13 +55,13 @@ class SvXMLImport; class XMLSdPropHdlFactory : public XMLPropertyHandlerFactory { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::frame::XModel > mxModel; SvXMLExport* mpExport; SvXMLImport* mpImport; public: - XMLSdPropHdlFactory( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >, SvXMLExport& rExport ); - XMLSdPropHdlFactory( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >, SvXMLImport& rImport ); + XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel >, SvXMLExport& rExport ); + XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel >, SvXMLImport& rImport ); virtual ~XMLSdPropHdlFactory(); virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const override; }; @@ -83,8 +83,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: XMLShapeExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLShapeExportPropertyMapper(); @@ -117,8 +116,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: XMLPageExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLPageExportPropertyMapper(); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index a614e6767c6c..ec6a0d42b640 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -389,7 +389,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI } SdXMLExport::SdXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLExportFlags nExportFlags ) : SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, @@ -1847,7 +1847,7 @@ void SdXMLExport::_ExportContent() AddAttribute ( XML_NAMESPACE_DRAW, XML_NAV_ORDER, sNavigationOrder ); rtl::Reference< xmloff::AnimationsExporter > xAnimationsExporter; - uno::Reference< ::com::sun::star::animations::XAnimationNodeSupplier > xAnimNodeSupplier; + uno::Reference< css::animations::XAnimationNodeSupplier > xAnimNodeSupplier; // prepare animation export if(IsImpress()) @@ -2707,13 +2707,13 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) { // date time - com::sun::star::util::DateTime aDate( xAnnotation->getDateTime() ); + css::util::DateTime aDate( xAnnotation->getDateTime() ); ::sax::Converter::convertDateTime(sStringBuffer, aDate, nullptr, true); SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, false ); Characters(sStringBuffer.makeStringAndClear()); } - com::sun::star::uno::Reference < com::sun::star::text::XText > xText( xAnnotation->getTextRange() ); + css::uno::Reference < css::text::XText > xText( xAnnotation->getTextRange() ); if( xText.is() ) this->GetTextParagraphExport()->exportText( xText ); } diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index e0fd5daf8a17..b6a32c9c5d15 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -77,9 +77,9 @@ struct DateTimeDeclImpl class SdXMLExport : public SvXMLExport { - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocMasterPages; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocDrawPages; + css::uno::Reference< css::container::XNameAccess > mxDocStyleFamilies; + css::uno::Reference< css::container::XIndexAccess > mxDocMasterPages; + css::uno::Reference< css::container::XIndexAccess > mxDocDrawPages; sal_Int32 mnDocMasterPageCount; sal_Int32 mnDocDrawPageCount; sal_uInt32 mnObjectCount; @@ -91,7 +91,7 @@ class SdXMLExport : public SvXMLExport ImpXMLEXPPageMasterInfo* mpHandoutPageMaster; ImpXMLAutoLayoutInfoList* mpAutoLayoutInfoList; - com::sun::star::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; + css::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; ::std::vector< OUString > maDrawPagesStyleNames; ::std::vector< OUString > maDrawNotesPagesStyleNames; @@ -124,43 +124,43 @@ class SdXMLExport : public SvXMLExport virtual void _ExportContent() override; virtual void _ExportMeta() override; - ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage ); + ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( css::uno::Reference< css::drawing::XDrawPage > xMasterPage ); void ImpPrepPageMasterInfos(); void ImpWritePageMasterInfos(); void ImpPrepAutoLayoutInfos(); - HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xDrawPage ); + HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const OUString& rName); void ImpPrepDrawPageInfos(); void ImpPrepMasterPageInfos(); void ImpWritePresentationStyles(); - OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); + OUString ImpCreatePresPageStyleName( css::uno::Reference<css::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); - bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); + bool ImpPrepAutoLayoutInfo(const css::uno::Reference< css::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); void ImplExportHeaderFooterDeclAttributes( const HeaderFooterPageSettingsImpl& aSettings ); - void exportFormsElement( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xDrawPage ); + void exportFormsElement( css::uno::Reference< css::drawing::XDrawPage > xDrawPage ); void exportPresentationSettings(); // #82003# helper function for recursive object count - sal_uInt32 ImpRecursiveObjectCount( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes); + sal_uInt32 ImpRecursiveObjectCount( css::uno::Reference< css::drawing::XShapes > xShapes); - OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + OUString getNavigationOrder( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); - void collectAnnotationAutoStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); - void exportAnnotations( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + void collectAnnotationAutoStyles( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); + void exportAnnotations( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ); protected: - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; + virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; + virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; virtual XMLFontAutoStylePool* CreateFontAutoStylePool() override; public: SdXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL ); virtual ~SdXMLExport(); @@ -168,7 +168,7 @@ public: void SetProgress(sal_Int32 nProg); // 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; // get factories and mappers XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; } diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 9a34294350d9..a4df0e843844 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -279,7 +279,7 @@ SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSetti SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, SvXMLImportFlags::SETTINGS ) SdXMLImport::SdXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLImportFlags nImportFlags ) : SvXMLImport( xContext, implementationName, nImportFlags ), @@ -751,7 +751,7 @@ SvXMLImportContext *SdXMLImport::CreateScriptContext( return pContext; } -void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) +void SdXMLImport::SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) { uno::Reference< beans::XPropertySet > xPropSet( GetModel(), uno::UNO_QUERY ); if( !xPropSet.is() ) @@ -791,7 +791,7 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: { xPropSet->setPropertyValue("VisibleArea", uno::makeAny( aVisArea ) ); } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { /* #i79978# since old documents may contain invalid view settings, this is nothing to worry the user about. uno::Sequence<OUString> aSeq(0); @@ -800,7 +800,7 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: } } -void SdXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) +void SdXMLImport::SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) { uno::Reference< lang::XMultiServiceFactory > xFac( GetModel(), uno::UNO_QUERY ); if( !xFac.is() ) diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 4f59459a88b2..3d251d55b9f2 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -169,10 +169,10 @@ typedef std::map<OUString, DateTimeDeclContextImpl> DateTimeDeclMap; class SdXMLImport: public SvXMLImport { - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocMasterPages; - com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > mxDocDrawPages; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxPageLayouts; + css::uno::Reference< css::container::XNameAccess > mxDocStyleFamilies; + css::uno::Reference< css::container::XIndexAccess > mxDocMasterPages; + css::uno::Reference< css::container::XIndexAccess > mxDocDrawPages; + css::uno::Reference< css::container::XNameAccess > mxPageLayouts; // contexts for Style and AutoStyle import SdXMLMasterStylesContext* mpMasterStylesContext; @@ -196,7 +196,7 @@ class SdXMLImport: public SvXMLImport bool mbLoadDoc; bool mbPreview; - std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId > + std::map< sal_Int32, css::uno::Reference< css::drawing::XDrawPage >, SdXMLltXDrawPageId > maDrawPageIds; OUString msPageLayouts; @@ -211,41 +211,40 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; public: SdXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLImportFlags nImportFlags ); virtual ~SdXMLImport() throw (); // 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; // 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; - 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; + virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override; + virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override; // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) SvXMLImportContext* CreateMetaContext(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* 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); SvXMLStylesContext* CreateStylesContext(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); SvXMLStylesContext* CreateAutoStylesContext(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* CreateMasterStylesContext(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 *CreateFontDeclsContext(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 ); // Styles and AutoStyles contexts @@ -263,25 +262,22 @@ public: const SvXMLTokenMap& GetPresentationPlaceholderAttrTokenMap(); // export local parameters concerning page access and similar - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess >& GetLocalDocStyleFamilies() const { return mxDocStyleFamilies; } - const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess >& GetLocalMasterPages() const { return mxDocMasterPages; } - const com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess >& GetLocalDrawPages() const { return mxDocDrawPages; } + const css::uno::Reference< css::container::XNameAccess >& GetLocalDocStyleFamilies() const { return mxDocStyleFamilies; } + const css::uno::Reference< css::container::XIndexAccess >& GetLocalMasterPages() const { return mxDocMasterPages; } + const css::uno::Reference< css::container::XIndexAccess >& GetLocalDrawPages() const { return mxDocDrawPages; } sal_Int32 GetNewPageCount() const { return mnNewPageCount; } void IncrementNewPageCount() { mnNewPageCount++; } sal_Int32 GetNewMasterPageCount() const { return mnNewMasterPageCount; } void IncrementNewMasterPageCount() { mnNewMasterPageCount++; } - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getPageLayouts() const { return mxPageLayouts; } + css::uno::Reference< css::container::XNameAccess > getPageLayouts() const { return mxPageLayouts; } bool IsDraw() const { return mbIsDraw; } bool IsImpress() const { return !mbIsDraw; } virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override; + const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override; bool IsPreview() const { return mbPreview; } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index d98b12bab154..150b7b11c3a1 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -573,7 +573,7 @@ namespace // This method exports the given XShape void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape, XMLShapeExportFlags nFeatures /* = SEF_DEFAULT */, - com::sun::star::awt::Point* pRefPoint /* = NULL */, + css::awt::Point* pRefPoint /* = NULL */, SvXMLAttributeList* pAttrList /* = NULL */ ) { SAL_INFO("xmloff", xShape->getShapeType()); @@ -1279,7 +1279,7 @@ void XMLShapeExport::ExportGraphicDefaults() } } -void XMLShapeExport::onExport( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& ) +void XMLShapeExport::onExport( const css::uno::Reference < css::drawing::XShape >& ) { } @@ -1320,7 +1320,7 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& { /* Get <TransformationInHoriL2R>, if it exist and if the document is exported into the OpenOffice.org file format. - This property only exists at service com::sun::star::text::Shape - the + This property only exists at service css::text::Shape - the Writer UNO service for shapes. This code is needed, because the positioning attributes in the OpenOffice.org file format are given in horizontal left-to-right layout @@ -1354,7 +1354,7 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& } void XMLShapeExport::ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMatrix, ::basegfx::B2DTuple& rTRScale, - double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint) + double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, css::awt::Point* pRefPoint) { // decompose matrix rMatrix.decompose(rTRScale, rTRTranslate, fTRRotate, fTRShear); @@ -1934,7 +1934,7 @@ void XMLShapeExport::ImpExportTextBoxShape( void XMLShapeExport::ImpExportRectangleShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -2479,7 +2479,7 @@ void XMLShapeExport::ImpExportConnectorShape( /* Get <StartPositionInHoriL2R> and <EndPositionInHoriL2R>, if they exist and if the document is exported into the OpenOffice.org file format. - These properties only exist at service com::sun::star::text::Shape - the + These properties only exist at service css::text::Shape - the Writer UNO service for shapes. This code is needed, because the positioning attributes in the OpenOffice.org file format are given in horizontal left-to-right layout @@ -2651,7 +2651,7 @@ void XMLShapeExport::ImpExportMeasureShape( /* Get <StartPositionInHoriL2R> and <EndPositionInHoriL2R>, if they exist and if the document is exported into the OpenOffice.org file format. - These properties only exist at service com::sun::star::text::Shape - the + These properties only exist at service css::text::Shape - the Writer UNO service for shapes. This code is needed, because the positioning attributes in the OpenOffice.org file format are given in horizontal left-to-right layout @@ -2972,7 +2972,7 @@ void XMLShapeExport::ImpExportCaptionShape( void XMLShapeExport::ImpExportFrameShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3006,7 +3006,7 @@ void XMLShapeExport::ImpExportFrameShape( void XMLShapeExport::ImpExportAppletShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3061,7 +3061,7 @@ void XMLShapeExport::ImpExportAppletShape( void XMLShapeExport::ImpExportPluginShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3308,7 +3308,7 @@ static void lcl_StoreGltfFallback( void XMLShapeExport::ImpExportMediaShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint) + XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) @@ -3609,7 +3609,7 @@ void XMLShapeExport::ImpExport3DShape( } /** helper for chart that adds all attributes of a 3d scene element to the export */ -void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) +void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ) { OUString aStr; OUStringBuffer sStringBuffer; @@ -3727,7 +3727,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen } /** helper for chart that exports all lamps from the propertyset */ -void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) +void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ) { // write lamps 1..8 as content OUString aStr; @@ -3782,11 +3782,11 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s } -// using namespace ::com::sun::star::io; +// using namespace css::io; // using namespace ::xmloff::EnhancedCustomShapeToken; -void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter ) +void ExportParameter( OUStringBuffer& rStrBuffer, const css::drawing::EnhancedCustomShapeParameter& rParameter ) { if ( !rStrBuffer.isEmpty() ) rStrBuffer.append( ' ' ); @@ -3803,42 +3803,42 @@ void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing: switch( rParameter.Type ) { - case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION : + case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { rStrBuffer.append( "?f" + OUString::number( nValue ) ); } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : + case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : { rStrBuffer.append( '$' ); rStrBuffer.append( OUString::number( nValue ) ); } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM : + case css::drawing::EnhancedCustomShapeParameterType::BOTTOM : rStrBuffer.append( GetXMLToken( XML_BOTTOM ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT : + case css::drawing::EnhancedCustomShapeParameterType::RIGHT : rStrBuffer.append( GetXMLToken( XML_RIGHT ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP : + case css::drawing::EnhancedCustomShapeParameterType::TOP : rStrBuffer.append( GetXMLToken( XML_TOP ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT : + case css::drawing::EnhancedCustomShapeParameterType::LEFT : rStrBuffer.append( GetXMLToken( XML_LEFT ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::XSTRETCH : + case css::drawing::EnhancedCustomShapeParameterType::XSTRETCH : rStrBuffer.append( GetXMLToken( XML_XSTRETCH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::YSTRETCH : + case css::drawing::EnhancedCustomShapeParameterType::YSTRETCH : rStrBuffer.append( GetXMLToken( XML_YSTRETCH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::HASSTROKE : + case css::drawing::EnhancedCustomShapeParameterType::HASSTROKE : rStrBuffer.append( GetXMLToken( XML_HASSTROKE ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::HASFILL : + case css::drawing::EnhancedCustomShapeParameterType::HASFILL : rStrBuffer.append( GetXMLToken( XML_HASFILL ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::WIDTH : + case css::drawing::EnhancedCustomShapeParameterType::WIDTH : rStrBuffer.append( GetXMLToken( XML_WIDTH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::HEIGHT : + case css::drawing::EnhancedCustomShapeParameterType::HEIGHT : rStrBuffer.append( GetXMLToken( XML_HEIGHT ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGWIDTH : + case css::drawing::EnhancedCustomShapeParameterType::LOGWIDTH : rStrBuffer.append( GetXMLToken( XML_LOGWIDTH ) ); break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT : + case css::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT : rStrBuffer.append( GetXMLToken( XML_LOGHEIGHT ) ); break; default : rStrBuffer.append( OUString::number( nValue ) ); @@ -3891,7 +3891,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert { case EAS_Position : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; + css::drawing::EnhancedCustomShapeParameterPair aPosition; if ( rPropVal.Value >>= aPosition ) { ExportParameter( aStrBuffer, aPosition.First ); @@ -3928,7 +3928,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_Polar : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar; + css::drawing::EnhancedCustomShapeParameterPair aPolar; if ( rPropVal.Value >>= aPolar ) { ExportParameter( aStrBuffer, aPolar.First ); @@ -3940,7 +3940,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RadiusRangeMinimum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; if ( rPropVal.Value >>= aRadiusRangeMinimum ) { ExportParameter( aStrBuffer, aRadiusRangeMinimum ); @@ -3951,7 +3951,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RadiusRangeMaximum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; if ( rPropVal.Value >>= aRadiusRangeMaximum ) { ExportParameter( aStrBuffer, aRadiusRangeMaximum ); @@ -3962,7 +3962,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeXMinimum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aXRangeMinimum; if ( rPropVal.Value >>= aXRangeMinimum ) { ExportParameter( aStrBuffer, aXRangeMinimum ); @@ -3973,7 +3973,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeXMaximum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aXRangeMaximum; if ( rPropVal.Value >>= aXRangeMaximum ) { ExportParameter( aStrBuffer, aXRangeMaximum ); @@ -3984,7 +3984,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeYMinimum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aYRangeMinimum; if ( rPropVal.Value >>= aYRangeMinimum ) { ExportParameter( aStrBuffer, aYRangeMinimum ); @@ -3995,7 +3995,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_RangeYMaximum : { - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aYRangeMaximum; if ( rPropVal.Value >>= aYRangeMaximum ) { ExportParameter( aStrBuffer, aYRangeMaximum ); @@ -4017,8 +4017,8 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert } void ImpExportEnhancedPath( SvXMLExport& rExport, - const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& rCoordinates, - const uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, + const uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair >& rCoordinates, + const uno::Sequence< css::drawing::EnhancedCustomShapeSegment >& rSegments, bool bExtended = false ) { @@ -4035,7 +4035,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, nSegments = 4; for ( j = i = 0; j < nSegments; j++ ) { - com::sun::star::drawing::EnhancedCustomShapeSegment aSegment; + css::drawing::EnhancedCustomShapeSegment aSegment; if ( bSimpleSegments ) { // if there are not enough segments we will default them @@ -4044,25 +4044,25 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, case 0 : { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; } break; case 1 : { aSegment.Count = (sal_Int16)std::min( nCoords - 1, (sal_Int32)32767 ); - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::LINETO; } break; case 2 : { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; } break; case 3 : { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; } break; } @@ -4076,40 +4076,40 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, sal_Int32 nParameter = 0; switch( aSegment.Command ) { - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : aStrBuffer.append( 'Z' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : + case css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : aStrBuffer.append( 'N' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : + case css::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : aStrBuffer.append( 'F' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : + case css::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : aStrBuffer.append( 'S' ); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO : aStrBuffer.append( 'M' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::LINETO : aStrBuffer.append( 'L' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : aStrBuffer.append( 'C' ); nParameter = 3; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : aStrBuffer.append( 'T' ); nParameter = 3; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : + case css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : aStrBuffer.append( 'U' ); nParameter = 3; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : aStrBuffer.append( 'A' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARC : aStrBuffer.append( 'B' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : aStrBuffer.append( 'W' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : aStrBuffer.append( 'V' ); nParameter = 4; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : + case css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : aStrBuffer.append( 'X' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : + case css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : aStrBuffer.append( 'Y' ); nParameter = 1; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO : aStrBuffer.append( 'Q' ); nParameter = 2; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO : if ( bExtended ) { aStrBuffer.append( 'G' ); nParameter = 2; @@ -4119,25 +4119,25 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, i += 2; } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN : + case css::drawing::EnhancedCustomShapeSegmentCommand::DARKEN : if ( bExtended ) aStrBuffer.append( 'H' ); else bNeedExtended = true; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS : + case css::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS : if ( bExtended ) aStrBuffer.append( 'I' ); else bNeedExtended = true; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN : + case css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN : if ( bExtended ) aStrBuffer.append( 'J' ); else bNeedExtended = true; break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS : + case css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS : if ( bExtended ) aStrBuffer.append( 'K' ); else @@ -4146,7 +4146,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, default : // ups, seems to be something wrong { aSegment.Count = 1; - aSegment.Command = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO; + aSegment.Command = css::drawing::EnhancedCustomShapeSegmentCommand::LINETO; } break; } @@ -4184,10 +4184,10 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean bool bHandles = false; uno::Sequence< beans::PropertyValues > aHandles; - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; + uno::Sequence< css::drawing::EnhancedCustomShapeSegment > aSegments; + uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aCoordinates; - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentValues; + uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentValues; OUString aStr; OUStringBuffer aStrBuffer; @@ -4294,7 +4294,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Depth : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; + css::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; if ( rProp.Value >>= aDepthParaPair ) { double fDepth = 0; @@ -4449,7 +4449,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_RotateAngle : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; + css::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; if ( rProp.Value >>= aRotateAngleParaPair ) { ExportParameter( aStrBuffer, aRotateAngleParaPair.First ); @@ -4491,7 +4491,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Skew : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; + css::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; if ( rProp.Value >>= aSkewParaPair ) { ExportParameter( aStrBuffer, aSkewParaPair.First ); @@ -4539,7 +4539,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Origin : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; + css::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; if ( rProp.Value >>= aOriginParaPair ) { ExportParameter( aStrBuffer, aOriginParaPair.First ); @@ -4587,14 +4587,14 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_TextPathMode : { - com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode; + css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode; if ( rProp.Value >>= eTextPathMode ) { switch ( eTextPathMode ) { - case com::sun::star::drawing::EnhancedCustomShapeTextPathMode_NORMAL: aStr = GetXMLToken( XML_NORMAL ); break; - case com::sun::star::drawing::EnhancedCustomShapeTextPathMode_PATH : aStr = GetXMLToken( XML_PATH ); break; - case com::sun::star::drawing::EnhancedCustomShapeTextPathMode_SHAPE : aStr = GetXMLToken( XML_SHAPE ); break; + case css::drawing::EnhancedCustomShapeTextPathMode_NORMAL: aStr = GetXMLToken( XML_NORMAL ); break; + case css::drawing::EnhancedCustomShapeTextPathMode_PATH : aStr = GetXMLToken( XML_PATH ); break; + case css::drawing::EnhancedCustomShapeTextPathMode_SHAPE : aStr = GetXMLToken( XML_SHAPE ); break; default: break; } @@ -4683,7 +4683,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_GluePoints : { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> aGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> aGluePoints; if ( rProp.Value >>= aGluePoints ) { sal_Int32 k, nElements = aGluePoints.getLength(); @@ -4707,9 +4707,9 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { switch ( nGluePointType ) { - case com::sun::star::drawing::EnhancedCustomShapeGluePointType::NONE : aStr = GetXMLToken( XML_NONE ); break; - case com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS : aStr = GetXMLToken( XML_SEGMENTS ); break; - case com::sun::star::drawing::EnhancedCustomShapeGluePointType::RECT : aStr = GetXMLToken( XML_RECTANGLE ); break; + case css::drawing::EnhancedCustomShapeGluePointType::NONE : aStr = GetXMLToken( XML_NONE ); break; + case css::drawing::EnhancedCustomShapeGluePointType::SEGMENTS : aStr = GetXMLToken( XML_SEGMENTS ); break; + case css::drawing::EnhancedCustomShapeGluePointType::RECT : aStr = GetXMLToken( XML_RECTANGLE ); break; } if ( !aStr.isEmpty() ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GLUE_POINT_TYPE, aStr ); @@ -4742,7 +4742,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_TextFrames : { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aPathTextFrames; + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > aPathTextFrames; if ( rProp.Value >>= aPathTextFrames ) { if ( (sal_uInt16)aPathTextFrames.getLength() ) @@ -4799,7 +4799,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean if ( i ) aStrBuffer.append( ' ' ); - const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue& rAdj = aAdjustmentValues[ i ]; + const css::drawing::EnhancedCustomShapeAdjustmentValue& rAdj = aAdjustmentValues[ i ]; if ( rAdj.State == beans::PropertyState_DIRECT_VALUE ) { if ( rAdj.Value.getValueTypeClass() == uno::TypeClass_DOUBLE ) @@ -4836,7 +4836,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean void XMLShapeExport::ImpExportCustomShape( const uno::Reference< drawing::XShape >& xShape, - XmlShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint ) + XmlShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint ) { const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if ( xPropSet.is() ) @@ -4872,7 +4872,7 @@ void XMLShapeExport::ImpExportCustomShape( } } -void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint ) +void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint ) { uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); uno::Reference< container::XNamed > xNamed(xShape, uno::UNO_QUERY); diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 2000a4c925dd..4bd6fe67d350 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -57,7 +57,7 @@ struct ltint32 struct ConnectionHint { - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxConnector; + css::uno::Reference< css::drawing::XShape > mxConnector; bool bStart; OUString aDestShapeId; sal_Int32 nDestGlueId; @@ -65,8 +65,8 @@ struct ConnectionHint struct XShapeCompareHelper { - bool operator()(com::sun::star::uno::Reference < com::sun::star::drawing::XShape > x1, - com::sun::star::uno::Reference < com::sun::star::drawing::XShape > x2 ) const + bool operator()(css::uno::Reference < css::drawing::XShape > x1, + css::uno::Reference < css::drawing::XShape > x2 ) const { return x1.get() < x2.get(); } @@ -75,7 +75,7 @@ struct XShapeCompareHelper /** this map store all glue point id mappings for shapes that had user defined glue points. This is needed because on insertion the glue points will get a new and unique id */ typedef std::map<sal_Int32,sal_Int32,ltint32> GluePointIdMap; -typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShape >, GluePointIdMap, XShapeCompareHelper > ShapeGluePointsMap; +typedef std::map< css::uno::Reference < css::drawing::XShape >, GluePointIdMap, XShapeCompareHelper > ShapeGluePointsMap; /** this struct is created for each startPage() call and stores information that is needed during import of shapes for one page. Since pages could be nested ( notes pages inside impress ) there @@ -95,7 +95,7 @@ struct XMLShapeImportHelperImpl // context for sorting shapes ShapeSortContext* mpSortContext; - std::map<sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >, ltint32> + std::map<sal_Int32, css::uno::Reference< css::drawing::XShape >, ltint32> maShapeIds; std::vector<ConnectionHint> maConnections; @@ -726,16 +726,16 @@ void XMLShapeImportHelper::addShape( uno::Reference< drawing::XShape >& rShape, all properties and styles are set. */ void XMLShapeImportHelper::finishShape( - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >&) + css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >&, + css::uno::Reference< css::drawing::XShapes >&) { /* Set property <PositionLayoutDir> to <PositionInHoriL2R>, if it exists and the import states that the shape positioning attributes are in horizontal left-to-right layout. This is the case for the OpenOffice.org file format. This setting is done for Writer documents, because the property - only exists at service com::sun::star::text::Shape - the Writer + only exists at service css::text::Shape - the Writer UNO service for shapes. The value indicates that the positioning attributes are given in horizontal left-to-right layout. The property is evaluated @@ -911,7 +911,7 @@ void XMLShapeImportHelper::popGroupAndSort() delete pContext; } -void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >&, sal_Int32 nZIndex ) +void XMLShapeImportHelper::shapeWithZIndexAdded( css::uno::Reference< css::drawing::XShape >&, sal_Int32 nZIndex ) { if( mpImpl->mpSortContext) { @@ -932,7 +932,7 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< } } -void XMLShapeImportHelper::addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, +void XMLShapeImportHelper::addShapeConnection( css::uno::Reference< css::drawing::XShape >& rConnectorShape, bool bStart, const OUString& rDestShapeId, sal_Int32 nDestGlueId ) @@ -1008,7 +1008,7 @@ SvXMLImportPropertyMapper* XMLShapeImportHelper::CreateShapePropMapper( const un /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting the new glue point into the core. The saved mappings can be retrieved by getGluePointId() */ -void XMLShapeImportHelper::addGluePointMapping( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, +void XMLShapeImportHelper::addGluePointMapping( css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId, sal_Int32 nDestinnationId ) { if( mpPageContext ) @@ -1017,7 +1017,7 @@ void XMLShapeImportHelper::addGluePointMapping( com::sun::star::uno::Reference< /** find mapping for given DestinationID. This allows to extract the original draw:id imported with a draw:glue-point */ sal_Int32 XMLShapeImportHelper::findGluePointMapping( - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nDestinnationId ) const { if( mpPageContext ) @@ -1045,7 +1045,7 @@ sal_Int32 XMLShapeImportHelper::findGluePointMapping( } /** moves all current DestinationId's by n */ -void XMLShapeImportHelper::moveGluePointMapping( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, const sal_Int32 n ) +void XMLShapeImportHelper::moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n ) { if( mpPageContext ) { @@ -1066,7 +1066,7 @@ void XMLShapeImportHelper::moveGluePointMapping( const com::sun::star::uno::Refe /** retrieves a mapping for a glue point identifier from the current xml file to the identifier created after inserting the new glue point into the core. The mapping must be initialized first with addGluePointMapping() */ -sal_Int32 XMLShapeImportHelper::getGluePointId( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, sal_Int32 nSourceId ) +sal_Int32 XMLShapeImportHelper::getGluePointId( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId ) { if( mpPageContext ) { @@ -1083,7 +1083,7 @@ sal_Int32 XMLShapeImportHelper::getGluePointId( const com::sun::star::uno::Refer } /** this method must be calling before the first shape is imported for the given page */ -void XMLShapeImportHelper::startPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +void XMLShapeImportHelper::startPage( css::uno::Reference< css::drawing::XShapes >& rShapes ) { XMLShapeImportPageContextImpl* pOldContext = mpPageContext; mpPageContext = new XMLShapeImportPageContextImpl(); @@ -1092,7 +1092,7 @@ void XMLShapeImportHelper::startPage( com::sun::star::uno::Reference< com::sun:: } /** this method must be calling after the last shape is imported for the given page */ -void XMLShapeImportHelper::endPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +void XMLShapeImportHelper::endPage( css::uno::Reference< css::drawing::XShapes >& rShapes ) { DBG_ASSERT( mpPageContext && (mpPageContext->mxShapes == rShapes), "wrong call to endPage(), no startPage called or wrong page" ); if( nullptr == mpPageContext ) diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 8d0e7b55c1fc..3f64864c3be4 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -1025,7 +1025,7 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver } } -bool SdXMLImExTransform3D::GetFullHomogenTransform(com::sun::star::drawing::HomogenMatrix& xHomMat) +bool SdXMLImExTransform3D::GetFullHomogenTransform(css::drawing::HomogenMatrix& xHomMat) { ::basegfx::B3DHomMatrix aFullTransform; GetFullTransform(aFullTransform); diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 105b29004d96..baf1aebd24cd 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -43,7 +43,7 @@ SdXML3DObjectContext::SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -109,7 +109,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -210,7 +210,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -308,7 +308,7 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -394,7 +394,7 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -428,7 +428,7 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index dc4080f6ce6d..f8d40969c4f2 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -36,7 +36,7 @@ class SdXML3DObjectContext : public SdXMLShapeContext protected: // the shape group this object should be created inside - com::sun::star::drawing::HomogenMatrix mxHomMat; + css::drawing::HomogenMatrix mxHomMat; bool mbSetTransform; public: @@ -44,12 +44,12 @@ public: SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DObjectContext(); - 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; }; @@ -66,12 +66,12 @@ public: SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DCubeObjectShapeContext(); - 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; }; @@ -88,12 +88,12 @@ public: SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DSphereObjectShapeContext(); - 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; }; @@ -108,12 +108,12 @@ public: SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DPolygonBasedShapeContext(); - 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; }; @@ -125,12 +125,12 @@ public: SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DLatheObjectShapeContext(); - 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; }; @@ -142,12 +142,12 @@ public: SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DExtrudeObjectShapeContext(); - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 83c20330bfb1..5cf205f1da9b 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -38,7 +38,7 @@ SdXML3DLightContext::SdXML3DLightContext( 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) : SvXMLImportContext( rImport, nPrfx, rLName), maDiffuseColor(0x00000000), maDirection(0.0, 0.0, 1.0), @@ -99,7 +99,7 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShapes) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport ) @@ -234,7 +234,7 @@ SdXML3DSceneAttributesHelper::~SdXML3DSceneAttributesHelper() } /** creates a 3d light context and adds it to the internal list for later processing */ -SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) +SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = new SdXML3DLightContext(mrImport, nPrfx, rLName, xAttrList); @@ -344,7 +344,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co } /** this sets the scene attributes at this propertyset */ -void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) +void SdXML3DSceneAttributesHelper::setSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ) { uno::Any aAny; diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 8c120acad652..18c89b385c09 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -32,7 +32,7 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt { // the shape group this group is working on // this is the scene at the same time - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; + css::uno::Reference< css::drawing::XShapes > mxChildren; public: @@ -40,17 +40,17 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXML3DSceneShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 2fea4682020f..97814fc16a64 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) , mbHadSMILNodes( false ) @@ -212,7 +212,7 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext() SvXMLImportContext *SdXMLDrawPageContext::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 = nullptr; const SvXMLTokenMap& rTokenMap = GetSdImport().GetDrawPageElemTokenMap(); diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index da659e12e32c..d7ebb8b6bd72 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -38,13 +38,13 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext public: SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLDrawPageContext(); 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; }; @@ -62,7 +62,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; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPBODY_HXX diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 21f0029f2033..bf76b5969ede 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -54,9 +54,9 @@ using namespace ::xmloff::EnhancedCustomShapeToken; XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - sal_uInt16 nPrefix, const OUString& rLocalName, - std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ) : + css::uno::Reference< css::drawing::XShape >& rxShape, + sal_uInt16 nPrefix, const OUString& rLocalName, + std::vector< css::beans::PropertyValue >& rCustomShapeGeometry ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrUnitConverter( rImport.GetMM100UnitConverter() ), mrxShape( rxShape ), @@ -72,7 +72,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] = { XML_RECTANGLE, 3 }, { XML_TOKEN_INVALID, 0 } }; -void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetBool( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { bool bAttrBool; @@ -85,7 +85,7 @@ void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetInt32( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nAttrNumber; @@ -98,7 +98,7 @@ void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetDouble( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; @@ -111,7 +111,7 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetString( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { beans::PropertyValue aProp; @@ -120,7 +120,7 @@ void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, rDest.push_back( aProp ); } -void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetEnum( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, const SvXMLEnumMapEntry& rMap ) { @@ -135,7 +135,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetDoublePercentage( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString( @@ -155,7 +155,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r } } -void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetB3DVector( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { ::basegfx::B3DVector aB3DVector; @@ -192,7 +192,7 @@ bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUStrin return bValid; } -bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) +bool GetNextParameter( css::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) return false; @@ -201,10 +201,10 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP bool bNumberRequired = true; bool bMustBePositiveWholeNumbered = false; - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::NORMAL; if ( rParaString[ nIndex ] == '$' ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; bMustBePositiveWholeNumbered = true; nIndex++; } @@ -216,7 +216,7 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::EQUATION; rParameter.Value <<= aEquationName; nIndex += aEquationName.getLength(); } @@ -226,62 +226,62 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP bNumberRequired = false; if ( rParaString.matchIgnoreAsciiCase( "left", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::LEFT; nIndex += 4; } else if ( rParaString.matchIgnoreAsciiCase( "top", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::TOP; nIndex += 3; } else if ( rParaString.matchIgnoreAsciiCase( "right", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::RIGHT; nIndex += 5; } else if ( rParaString.matchIgnoreAsciiCase( "bottom", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::BOTTOM; nIndex += 6; } else if ( rParaString.matchIgnoreAsciiCase( "xstretch", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::XSTRETCH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::XSTRETCH; nIndex += 8; } else if ( rParaString.matchIgnoreAsciiCase( "ystretch", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::YSTRETCH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::YSTRETCH; nIndex += 8; } else if ( rParaString.matchIgnoreAsciiCase( "hasstroke", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HASSTROKE; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::HASSTROKE; nIndex += 9; } else if ( rParaString.matchIgnoreAsciiCase( "hasfill", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HASFILL; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::HASFILL; nIndex += 7; } else if ( rParaString.matchIgnoreAsciiCase( "width", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::WIDTH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::WIDTH; nIndex += 5; } else if ( rParaString.matchIgnoreAsciiCase( "height", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::HEIGHT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::HEIGHT; nIndex += 6; } else if ( rParaString.matchIgnoreAsciiCase( "logwidth", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGWIDTH; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::LOGWIDTH; nIndex += 8; } else if ( rParaString.matchIgnoreAsciiCase( "logheight", nIndex ) ) { - rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT; + rParameter.Type = css::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT; nIndex += 9; } else @@ -424,7 +424,7 @@ bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rP return bValid; } -void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint +void GetPosition3D( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, SvXMLUnitConverter& rUnitConverter ) { @@ -438,7 +438,7 @@ void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions +void GetDoubleSequence( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:glue-point-leaving-directions const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< double > vDirection; @@ -463,7 +463,7 @@ void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDe } } -void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, +void GetSizeSequence( std::vector< css::beans::PropertyValue >& rDest, const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< sal_Int32 > vNum; @@ -500,11 +500,11 @@ void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest } } -void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position +void GetEnhancedParameter( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:handle-position const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; - com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; + css::drawing::EnhancedCustomShapeParameter aParameter; if ( GetNextParameter( aParameter, nIndex, rValue ) ) { beans::PropertyValue aProp; @@ -514,11 +514,11 @@ void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& } } -void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position +void GetEnhancedParameterPair( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:handle-position const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; + css::drawing::EnhancedCustomShapeParameterPair aParameterPair; if ( GetNextParameter( aParameterPair.First, nIndex, rValue ) && GetNextParameter( aParameterPair.Second, nIndex, rValue ) ) { @@ -529,11 +529,11 @@ void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue } } -sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:glue-points +sal_Int32 GetEnhancedParameterPairSequence( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:glue-points const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vParameter; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameter; + std::vector< css::drawing::EnhancedCustomShapeParameterPair > vParameter; + css::drawing::EnhancedCustomShapeParameterPair aParameter; sal_Int32 nIndex = 0; while ( GetNextParameter( aParameter.First, nIndex, rValue ) @@ -551,11 +551,11 @@ sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans:: return vParameter.size(); } -void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:text-areas +void GetEnhancedRectangleSequence( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:text-areas const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame > vTextFrame; - com::sun::star::drawing::EnhancedCustomShapeTextFrame aParameter; + std::vector< css::drawing::EnhancedCustomShapeTextFrame > vTextFrame; + css::drawing::EnhancedCustomShapeTextFrame aParameter; sal_Int32 nIndex = 0; @@ -575,17 +575,17 @@ void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyV } } -void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path +void GetEnhancedPath( std::vector< css::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path const OUString& rValue ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vCoordinates; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > vSegments; + std::vector< css::drawing::EnhancedCustomShapeParameterPair > vCoordinates; + std::vector< css::drawing::EnhancedCustomShapeSegment > vSegments; sal_Int32 nIndex = 0; sal_Int32 nParameterCount = 0; sal_Int32 nParametersNeeded = 1; - sal_Int16 nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; + sal_Int16 nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; bool bValid = true; @@ -595,147 +595,147 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest { case 'M' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; nParametersNeeded = 1; nIndex++; } break; case 'L' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::LINETO; nParametersNeeded = 1; nIndex++; } break; case 'C' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CURVETO; nParametersNeeded = 3; nIndex++; } break; case 'Z' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH; nParametersNeeded = 0; nIndex++; } break; case 'N' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH; nParametersNeeded = 0; nIndex++; } break; case 'F' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::NOFILL; nParametersNeeded = 0; nIndex++; } break; case 'S' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE; nParametersNeeded = 0; nIndex++; } break; case 'T' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO; nParametersNeeded = 3; nIndex++; } break; case 'U' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE; nParametersNeeded = 3; nIndex++; } break; case 'A' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ARCTO; nParametersNeeded = 4; nIndex++; } break; case 'B' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ARC; nParametersNeeded = 4; nIndex++; } break; case 'G' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ARCANGLETO; nParametersNeeded = 2; nIndex++; } break; case 'H' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKEN; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::DARKEN; nParametersNeeded = 0; nIndex++; } break; case 'I' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::DARKENLESS; nParametersNeeded = 0; nIndex++; } break; case 'J' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTEN; nParametersNeeded = 0; nIndex++; } break; case 'K' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::LIGHTENLESS; nParametersNeeded = 0; nIndex++; } break; case 'W' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO; nParametersNeeded = 4; nIndex++; } break; case 'V' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC; nParametersNeeded = 4; nIndex++; } break; case 'X' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX; nParametersNeeded = 1; nIndex++; } break; case 'Y' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY; nParametersNeeded = 1; nIndex++; } break; case 'Q' : { - nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO; + nLatestSegmentCommand = css::drawing::EnhancedCustomShapeSegmentCommand::QUADRATICCURVETO; nParametersNeeded = 2; nIndex++; } @@ -761,7 +761,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest case '.' : case '-' : { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPair; + css::drawing::EnhancedCustomShapeParameterPair aPair; if ( GetNextParameter( aPair.First, nIndex, rValue ) && GetNextParameter( aPair.Second, nIndex, rValue ) ) { @@ -778,7 +778,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest } if ( !nParameterCount && !nParametersNeeded ) { - com::sun::star::drawing::EnhancedCustomShapeSegment aSegment; + css::drawing::EnhancedCustomShapeSegment aSegment; aSegment.Command = nLatestSegmentCommand; aSegment.Count = 0; vSegments.push_back( aSegment ); @@ -792,7 +792,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest vSegments[ vSegments.size() -1 ].Count++; else { - com::sun::star::drawing::EnhancedCustomShapeSegment aSegment; + css::drawing::EnhancedCustomShapeSegment aSegment; aSegment.Command = nLatestSegmentCommand; aSegment.Count = 1; vSegments.push_back( aSegment ); @@ -813,16 +813,16 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest rDest.push_back( aProp ); } -void GetAdjustmentValues( std::vector< com::sun::star::beans::PropertyValue >& rDest, // draw:adjustments +void GetAdjustmentValues( std::vector< css::beans::PropertyValue >& rDest, // draw:adjustments const OUString& rValue ) { - std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; - com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; + std::vector< css::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; + css::drawing::EnhancedCustomShapeParameter aParameter; sal_Int32 nIndex = 0; while ( GetNextParameter( aParameter, nIndex, rValue ) ) { - com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue aAdj; - if ( aParameter.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL ) + css::drawing::EnhancedCustomShapeAdjustmentValue aAdj; + if ( aParameter.Type == css::drawing::EnhancedCustomShapeParameterType::NORMAL ) { aAdj.Value <<= aParameter.Value; aAdj.State = beans::PropertyState_DIRECT_VALUE; @@ -900,9 +900,9 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax case EAS_extrusion_depth : { sal_Int32 nIndex = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; - com::sun::star::drawing::EnhancedCustomShapeParameter& rDepth = aParameterPair.First; - com::sun::star::drawing::EnhancedCustomShapeParameter& rFraction = aParameterPair.Second; + css::drawing::EnhancedCustomShapeParameterPair aParameterPair; + css::drawing::EnhancedCustomShapeParameter& rDepth = aParameterPair.First; + css::drawing::EnhancedCustomShapeParameter& rFraction = aParameterPair.Second; if ( GetNextParameter( rDepth, nIndex, rValue ) ) { // try to catch the unit for the depth @@ -1068,11 +1068,11 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax break; case EAS_text_path_mode : { - com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode( com::sun::star::drawing::EnhancedCustomShapeTextPathMode_NORMAL ); + css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode( css::drawing::EnhancedCustomShapeTextPathMode_NORMAL ); if( IsXMLToken( rValue, XML_PATH ) ) - eTextPathMode = com::sun::star::drawing::EnhancedCustomShapeTextPathMode_PATH; + eTextPathMode = css::drawing::EnhancedCustomShapeTextPathMode_PATH; else if ( IsXMLToken( rValue, XML_SHAPE ) ) - eTextPathMode = com::sun::star::drawing::EnhancedCustomShapeTextPathMode_SHAPE; + eTextPathMode = css::drawing::EnhancedCustomShapeTextPathMode_SHAPE; beans::PropertyValue aProp; aProp.Name = EASGet( EAS_TextPathMode ); @@ -1102,7 +1102,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax } } -void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, +void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rPropVec, const std::vector< beans::PropertyValues >& rElement, const OUString& rElementName ) { @@ -1115,7 +1115,7 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, +void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rPropVec, const std::vector< OUString >& rElement, const OUString& rElementName ) { @@ -1128,8 +1128,8 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, - const std::vector< com::sun::star::beans::PropertyValue >& rElement, +void SdXMLCustomShapePropertyMerge( std::vector< css::beans::PropertyValue >& rPropVec, + const std::vector< css::beans::PropertyValue >& rElement, const OUString& rElementName ) { if ( !rElement.empty() ) @@ -1145,9 +1145,9 @@ typedef std::unordered_map< OUString, sal_Int32, OUStringHash > EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation will be converted from OUString to index */ -void CheckAndResolveEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) +void CheckAndResolveEquationParameter( css::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) { - if ( rPara.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) + if ( rPara.Type == css::drawing::EnhancedCustomShapeParameterType::EQUATION ) { OUString aEquationName; if ( rPara.Value >>= aEquationName ) @@ -1218,8 +1218,8 @@ void XMLEnhancedCustomShapeContext::EndElement() case EAS_Coordinates : case EAS_GluePoints : { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > const & rSeq = - *static_cast<uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > const *>( + uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > const & rSeq = + *static_cast<uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > const *>( aPathIter->Value.getValue()); for ( i = 0; i < rSeq.getLength(); i++ ) { @@ -1230,8 +1230,8 @@ void XMLEnhancedCustomShapeContext::EndElement() break; case EAS_TextFrames : { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > const & rSeq = - *static_cast<uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > const *>( + uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > const & rSeq = + *static_cast<uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > const *>( aPathIter->Value.getValue()); for ( i = 0; i < rSeq.getLength(); i++ ) { @@ -1263,7 +1263,7 @@ void XMLEnhancedCustomShapeContext::EndElement() case EAS_RadiusRangeMinimum : case EAS_RadiusRangeMaximum : { - CheckAndResolveEquationParameter( *const_cast<css::drawing::EnhancedCustomShapeParameter *>(static_cast<com::sun::star::drawing::EnhancedCustomShapeParameter const *>( + CheckAndResolveEquationParameter( *const_cast<css::drawing::EnhancedCustomShapeParameter *>(static_cast<css::drawing::EnhancedCustomShapeParameter const *>( pValues->Value.getValue())), pH ); } break; @@ -1271,9 +1271,9 @@ void XMLEnhancedCustomShapeContext::EndElement() case EAS_Position : case EAS_Polar : { - CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<com::sun::star::drawing::EnhancedCustomShapeParameterPair const *>( + CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<css::drawing::EnhancedCustomShapeParameterPair const *>( pValues->Value.getValue())).First), pH ); - CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<com::sun::star::drawing::EnhancedCustomShapeParameterPair const *>( + CheckAndResolveEquationParameter( const_cast<css::drawing::EnhancedCustomShapeParameter &>((*static_cast<css::drawing::EnhancedCustomShapeParameterPair const *>( pValues->Value.getValue())).Second), pH ); } break; @@ -1333,7 +1333,7 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 } else if ( aTokenEnum == EAS_handle ) { - std::vector< com::sun::star::beans::PropertyValue > aHandle; + std::vector< css::beans::PropertyValue > aHandle; const sal_Int16 nLength = xAttrList->getLength(); for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index cdc6c4f83a3e..74318059d52a 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -39,27 +39,27 @@ namespace com { namespace sun { namespace star { class XMLEnhancedCustomShapeContext : public SvXMLImportContext { SvXMLUnitConverter& mrUnitConverter; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& mrxShape; - std::vector< com::sun::star::beans::PropertyValue >& mrCustomShapeGeometry; + css::uno::Reference< css::drawing::XShape >& mrxShape; + std::vector< css::beans::PropertyValue >& mrCustomShapeGeometry; - std::vector< com::sun::star::beans::PropertyValue > maExtrusion; - std::vector< com::sun::star::beans::PropertyValue > maPath; - std::vector< com::sun::star::beans::PropertyValue > maTextPath; - std::vector< com::sun::star::beans::PropertyValues > maHandles; + std::vector< css::beans::PropertyValue > maExtrusion; + std::vector< css::beans::PropertyValue > maPath; + std::vector< css::beans::PropertyValue > maTextPath; + std::vector< css::beans::PropertyValues > maHandles; std::vector< OUString > maEquations; std::vector< OUString > maEquationNames; public: - XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, - const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); + XMLEnhancedCustomShapeContext( SvXMLImport& rImport, css::uno::Reference< css::drawing::XShape > &, sal_uInt16 nPrefix, + const OUString& rLocalName, std::vector< css::beans::PropertyValue >& rCustomShapeGeometry ); - 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; SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 2ac189c85d59..5e8442909319 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -31,20 +31,20 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext { // the shape group this group is working on - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; + css::uno::Reference< css::drawing::XShapes > mxChildren; public: SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index e1efa062b8ae..fac6b99382be 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -34,20 +34,20 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext { // the parent shape group this link is placed in - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxParent; + css::uno::Reference< css::drawing::XShapes > mxParent; OUString msHyperlink; public: SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLShapeLinkContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index d144f7e668a5..7f82c1f51173 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) { diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index 55c797508ab5..a27e33e52907 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -34,14 +34,14 @@ private: public: SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const OUString& rLocalName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLNotesContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 404fa163c20f..891276165390 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -59,7 +59,7 @@ class DrawAnnotationContext : public SvXMLImportContext public: DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -227,7 +227,7 @@ SdXMLGenericPageContext::~SdXMLGenericPageContext() { } -void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLGenericPageContext::StartElement( const Reference< css::xml::sax::XAttributeList >& ) { GetImport().GetShapeImport()->pushGroupForSorting( mxShapes ); diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index 8f09146431c8..a3bebae61f0d 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -32,8 +32,8 @@ class SdXMLGenericPageContext : public SvXMLImportContext { // the shape group this group is working on - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxShapes; - ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxAnnotationAccess; + css::uno::Reference< css::drawing::XShapes > mxShapes; + css::uno::Reference< css::office::XAnnotationAccess > mxAnnotationAccess; protected: OUString maPageLayoutName; @@ -62,19 +62,19 @@ protected: public: SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLGenericPageContext(); - 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 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; - const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() const + const css::uno::Reference< css::drawing::XShapes >& GetLocalShapesContext() const { return mxShapes; } - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& GetLocalShapesContext() + css::uno::Reference< css::drawing::XShapes >& GetLocalShapesContext() { return mxShapes; } }; diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 91af3ee57478..41454f109489 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -140,7 +140,7 @@ SdXMLShapeContext::SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SvXMLShapeContext( rImport, nPrfx, rLocalName, bTemporaryShape ) @@ -382,7 +382,7 @@ void SdXMLShapeContext::EndElement() aProperties[1].Name = "ClickAction"; aProperties[1].Handle = -1; - aProperties[1].Value <<= ::com::sun::star::presentation::ClickAction_DOCUMENT; + aProperties[1].Value <<= css::presentation::ClickAction_DOCUMENT; aProperties[1].State = beans::PropertyState_DIRECT_VALUE; aProperties[2].Name = "Bookmark"; @@ -397,7 +397,7 @@ void SdXMLShapeContext::EndElement() // in draw use the Bookmark property Reference< beans::XPropertySet > xSet( mxShape, UNO_QUERY_THROW ); xSet->setPropertyValue( "Bookmark", Any( msHyperlink ) ); - xSet->setPropertyValue("OnClick", Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) ); + xSet->setPropertyValue("OnClick", Any( css::presentation::ClickAction_DOCUMENT ) ); } } catch(const Exception&) @@ -1011,7 +1011,7 @@ SdXMLRectShapeContext::SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1076,7 +1076,7 @@ SdXMLLineShapeContext::SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1191,7 +1191,7 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1325,7 +1325,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbClosed( bClosed ) @@ -1410,7 +1410,7 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt aTargetRange)); } - com::sun::star::drawing::PointSequenceSequence aPointSequenceSequence; + css::drawing::PointSequenceSequence aPointSequenceSequence; uno::Any aAny; basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(basegfx::B2DPolyPolygon(aPolygon), aPointSequenceSequence); @@ -1433,7 +1433,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -1582,7 +1582,7 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -1772,7 +1772,7 @@ SdXMLControlShapeContext::SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -1836,7 +1836,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2104,7 +2104,7 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2215,7 +2215,7 @@ SdXMLPageShapeContext::SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0) @@ -2302,7 +2302,7 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2402,7 +2402,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2425,7 +2425,7 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLGraphicObjectShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { // create graphic object shape OUString service; @@ -2567,7 +2567,7 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), @@ -2658,7 +2658,7 @@ void SdXMLChartShapeContext::Characters( const OUString& rChars ) } SvXMLImportContext * SdXMLChartShapeContext::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 ) { if( mpChartContext ) return mpChartContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); @@ -2669,8 +2669,8 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { @@ -2680,7 +2680,7 @@ SdXMLObjectShapeContext::~SdXMLObjectShapeContext() { } -void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLObjectShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { // #96717# in theorie, if we don't have a url we shouldn't even // export this ole shape. But practical its to risky right now @@ -2881,8 +2881,8 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbIsScript( false ) @@ -2893,7 +2893,7 @@ SdXMLAppletShapeContext::~SdXMLAppletShapeContext() { } -void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLAppletShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { AddShape("com.sun.star.drawing.AppletShape"); @@ -2996,7 +2996,7 @@ void SdXMLAppletShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3042,8 +3042,8 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbMedia( false ) @@ -3054,7 +3054,7 @@ SdXMLPluginShapeContext::~SdXMLPluginShapeContext() { } -void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList) +void SdXMLPluginShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) { // watch for MimeType attribute to see if we have a media object @@ -3273,7 +3273,7 @@ void SdXMLPluginShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3319,8 +3319,8 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { @@ -3330,7 +3330,7 @@ SdXMLFloatingFrameShapeContext::~SdXMLFloatingFrameShapeContext() { } -void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) +void SdXMLFloatingFrameShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& ) { AddShape("com.sun.star.drawing.FrameShape"); @@ -3412,8 +3412,8 @@ void SdXMLFloatingFrameShapeContext::EndElement() SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), MultiImageImportHelper(), @@ -3706,7 +3706,7 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, 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, uno::Reference< drawing::XShapes >& rShapes, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) @@ -3922,7 +3922,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( } -SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) +SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes >& rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); @@ -3932,7 +3932,7 @@ SdXMLTableShapeContext::~SdXMLTableShapeContext() { } -void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) +void SdXMLTableShapeContext::StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { OUString service("com.sun.star.drawing.TableShape"); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 2e11cf1e06b9..b8883e56cb6e 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -43,12 +43,12 @@ class SdXMLShapeContext : public SvXMLShapeContext { protected: // the shape group this object should be created inside - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxShapes; - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > mxCursor; - com::sun::star::uno::Reference< com::sun::star::text::XTextCursor > mxOldCursor; - com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList> mxAttrList; - com::sun::star::uno::Reference< com::sun::star::container::XIdentifierContainer > mxGluePoints; - com::sun::star::uno::Reference< com::sun::star::document::XActionLockable > mxLockable; + css::uno::Reference< css::drawing::XShapes > mxShapes; + css::uno::Reference< css::text::XTextCursor > mxCursor; + css::uno::Reference< css::text::XTextCursor > mxOldCursor; + css::uno::Reference< css::xml::sax::XAttributeList> mxAttrList; + css::uno::Reference< css::container::XIdentifierContainer > mxGluePoints; + css::uno::Reference< css::document::XActionLockable > mxLockable; OUString maDrawStyleName; OUString maTextStyleName; @@ -72,10 +72,10 @@ protected: OUString maShapeDescription; SdXMLImExTransform2D mnTransform; - com::sun::star::awt::Size maSize; + css::awt::Size maSize; sal_Int16 mnRelWidth; sal_Int16 mnRelHeight; - com::sun::star::awt::Point maPosition; + css::awt::Point maPosition; basegfx::B2DHomMatrix maUsedTransformation; bool mbVisible; @@ -88,14 +88,14 @@ protected: void SetLayer(); void SetThumbnail(); - void AddShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape); + void AddShape(css::uno::Reference< css::drawing::XShape >& xShape); void AddShape(OUString const & serviceName); void SetTransformation(); SvXMLImport& GetImport() { return SvXMLImportContext::GetImport(); } const SvXMLImport& GetImport() const { return SvXMLImportContext::GetImport(); } - void addGluePoint( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + void addGluePoint( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); bool isPresentationShape() const; @@ -104,16 +104,16 @@ public: SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); @@ -133,11 +133,11 @@ public: SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLRectShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -156,11 +156,11 @@ public: SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLLineShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -182,11 +182,11 @@ public: SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLEllipseShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -204,10 +204,10 @@ public: SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -224,11 +224,11 @@ public: SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLPathShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -245,11 +245,11 @@ public: SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLTextBoxShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -266,11 +266,11 @@ public: SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLControlShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -281,31 +281,31 @@ public: class SdXMLConnectorShapeContext : public SdXMLShapeContext { private: - ::com::sun::star::awt::Point maStart; - ::com::sun::star::awt::Point maEnd; + css::awt::Point maStart; + css::awt::Point maEnd; sal_uInt16 mnType; - OUString maStartShapeId; + OUString maStartShapeId; sal_Int32 mnStartGlueId; - OUString maEndShapeId; + OUString maEndShapeId; sal_Int32 mnEndGlueId; sal_Int32 mnDelta1; sal_Int32 mnDelta2; sal_Int32 mnDelta3; - com::sun::star::uno::Any maPath; + css::uno::Any maPath; public: SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLConnectorShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -316,18 +316,18 @@ public: class SdXMLMeasureShapeContext : public SdXMLShapeContext { private: - ::com::sun::star::awt::Point maStart; - ::com::sun::star::awt::Point maEnd; + css::awt::Point maStart; + css::awt::Point maEnd; public: SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLMeasureShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list @@ -344,11 +344,11 @@ public: SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLPageShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -359,18 +359,18 @@ public: class SdXMLCaptionShapeContext : public SdXMLShapeContext { private: - com::sun::star::awt::Point maCaptionPoint; + css::awt::Point maCaptionPoint; sal_Int32 mnRadius; public: SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLCaptionShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -382,21 +382,21 @@ class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext { private: OUString maURL; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; public: SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLGraphicObjectShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -412,16 +412,16 @@ public: SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLChartShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; // draw:object and draw:object_ole context @@ -432,22 +432,22 @@ private: OUString maCLSID; OUString maHref; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; + css::uno::Reference < css::io::XOutputStream > mxBase64Stream; public: SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLObjectShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -463,22 +463,22 @@ private: OUString maHref; bool mbIsScript; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; + css::uno::Sequence< css::beans::PropertyValue > maParams; public: SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLAppletShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -493,22 +493,22 @@ private: OUString maHref; bool mbMedia; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; + css::uno::Sequence< css::beans::PropertyValue > maParams; public: SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLPluginShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -530,12 +530,12 @@ public: SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLFloatingFrameShapeContext(); - 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; // this is called from the parent group for each unparsed attribute in the attribute list @@ -560,15 +560,15 @@ public: SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); 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 EndElement() override; virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -582,22 +582,22 @@ protected: OUString maCustomShapeEngine; OUString maCustomShapeData; - std::vector< com::sun::star::beans::PropertyValue > maCustomShapeGeometry; + std::vector< css::beans::PropertyValue > maCustomShapeGeometry; public: SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape); virtual ~SdXMLCustomShapeContext(); - 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; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; @@ -611,14 +611,14 @@ public: SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes ); virtual ~SdXMLTableShapeContext(); - 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; + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index c186206e1c7f..865c508129c8 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -37,11 +37,11 @@ public: SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, 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 ~SdXMLShowsContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHOW_HXX diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a45d36af00e1..9a8396dd66d9 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -58,8 +58,7 @@ public: SdXMLDrawingPagePropertySetContext( 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, ::std::vector< XMLPropertyState > &rProps, const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); @@ -68,7 +67,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp) override; }; @@ -135,7 +134,7 @@ public: 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 = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID); virtual ~SdXMLDrawingPageStyleContext(); @@ -143,14 +142,12 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void Finish( bool bOverwrite ) override; // #i35918# - 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; }; @@ -1030,7 +1027,7 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) + const uno::Reference< css::xml::sax::XAttributeList >& xAttrList) { SvXMLStyleContext* pContext = nullptr; @@ -1548,7 +1545,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(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) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList) , mbFixed(false) { diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index dc19de9db795..c82cb06302e2 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -40,7 +40,7 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext sal_Int32 mnBorderTop; sal_Int32 mnWidth; sal_Int32 mnHeight; - com::sun::star::view::PaperOrientation meOrientation; + css::view::PaperOrientation meOrientation; const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); } SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } @@ -51,7 +51,7 @@ public: SdXMLImport& 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 ~SdXMLPageMasterStyleContext(); sal_Int32 GetBorderBottom() const { return mnBorderBottom; } @@ -60,7 +60,7 @@ public: sal_Int32 GetBorderTop() const { return mnBorderTop; } sal_Int32 GetWidth() const { return mnWidth; } sal_Int32 GetHeight() const { return mnHeight; } - com::sun::star::view::PaperOrientation GetOrientation() const { return meOrientation; } + css::view::PaperOrientation GetOrientation() const { return meOrientation; } }; // style:page-master context @@ -79,12 +79,12 @@ public: SdXMLImport& 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 ~SdXMLPageMasterContext(); 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; const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; @@ -104,13 +104,13 @@ public: SdXMLImport& 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::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); virtual ~SdXMLMasterPageContext(); 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; @@ -136,7 +136,7 @@ public: SdXMLImport& 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 ~SdXMLPresentationPlaceholderContext(); const OUString& GetName() const { return msName; } @@ -161,12 +161,12 @@ public: SdXMLImport& 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 ~SdXMLPresentationPageLayoutContext(); 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; sal_uInt16 GetTypeId() const { return mnTypeId; } @@ -186,33 +186,33 @@ class SdXMLStylesContext : public SvXMLStylesContext void ImpSetGraphicStyles() const; void ImpSetCellStyles() const; - void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles, + void ImpSetGraphicStyles( css::uno::Reference< css::container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const; 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 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: SdXMLStylesContext( SdXMLImport& 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 bIsAutoStyle); virtual ~SdXMLStylesContext(); @@ -222,7 +222,7 @@ public: void SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getPageLayouts() const; + css::uno::Reference< css::container::XNameAccess > getPageLayouts() const; }; // office:master-styles context @@ -245,7 +245,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; }; // <pres:header-decl>, <pres:footer-decl> and <pres:date-time-decl> @@ -255,7 +255,7 @@ class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext public: SdXMLHeaderFooterDeclContext( 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 bool IsTransient() const override; virtual void EndElement() override; |