diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /xmloff/source/draw | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'xmloff/source/draw')
57 files changed, 462 insertions, 526 deletions
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index ba70abd924c5..6f9c520e0211 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -180,7 +180,7 @@ static const TokenTable pTokenTableArray[] = { "NotFound", EAS_NotFound } }; -EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& rShapeType ) +EnhancedCustomShapeTokenEnum EASGet( const OUString& rShapeType ) { if ( !pHashMap ) { // init hash map @@ -208,12 +208,12 @@ EnhancedCustomShapeTokenEnum EASGet( const rtl::OUString& rShapeType ) return eRetValue; } -rtl::OUString EASGet( const EnhancedCustomShapeTokenEnum eToken ) +OUString EASGet( const EnhancedCustomShapeTokenEnum eToken ) { sal_uInt32 i = eToken >= EAS_Last ? (sal_uInt32)EAS_NotFound : (sal_uInt32)eToken; - return rtl::OUString::createFromAscii( pTokenTableArray[ i ].pS ); + return OUString::createFromAscii( pTokenTableArray[ i ].pS ); } } diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index f66dcd655e31..761b07005b47 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -27,8 +27,6 @@ #include "XMLShapePropertySetContext.hxx" #include <xmloff/XMLGraphicsDefaultStyle.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 5f63f6e9a534..efa3b48c18ab 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; using ::com::sun::star::container::XIndexContainer; @@ -102,26 +100,26 @@ class XMLImageMapObjectContext : public SvXMLImportContext protected: - const ::rtl::OUString sBoundary; - const ::rtl::OUString sCenter; - const ::rtl::OUString sTitle; - const ::rtl::OUString sDescription; - const ::rtl::OUString sImageMap; - const ::rtl::OUString sIsActive; - const ::rtl::OUString sName; - const ::rtl::OUString sPolygon; - const ::rtl::OUString sRadius; - const ::rtl::OUString sTarget; - const ::rtl::OUString sURL; + const OUString sBoundary; + const OUString sCenter; + const OUString sTitle; + const OUString sDescription; + const OUString sImageMap; + const OUString sIsActive; + const OUString sName; + const OUString sPolygon; + const OUString sRadius; + const OUString sTarget; + const OUString sURL; Reference<XIndexContainer> xImageMap; /// the image map Reference<XPropertySet> xMapEntry; /// one map-entry (one area) - ::rtl::OUString sUrl; - ::rtl::OUString sTargt; - ::rtl::OUStringBuffer sDescriptionBuffer; - ::rtl::OUStringBuffer sTitleBuffer; - ::rtl::OUString sNam; + OUString sUrl; + OUString sTargt; + OUStringBuffer sDescriptionBuffer; + OUStringBuffer sTitleBuffer; + OUString sNam; sal_Bool bIsActive; sal_Bool bValid; @@ -132,7 +130,7 @@ public: XMLImageMapObjectContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap, const sal_Char* pServiceName); @@ -145,7 +143,7 @@ public: SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); @@ -153,7 +151,7 @@ protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -326,7 +324,7 @@ public: XMLImageMapRectangleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -335,7 +333,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -424,8 +422,8 @@ void XMLImageMapRectangleContext::Prepare( class XMLImageMapPolygonContext : public XMLImageMapObjectContext { - ::rtl::OUString sViewBoxString; - ::rtl::OUString sPointsString; + OUString sViewBoxString; + OUString sPointsString; sal_Bool bViewBoxOK; sal_Bool bPointsOK; @@ -436,7 +434,7 @@ public: XMLImageMapPolygonContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -445,7 +443,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< @@ -537,7 +535,7 @@ public: XMLImageMapCircleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> xMap); @@ -546,7 +544,7 @@ public: protected: virtual void ProcessAttribute( enum XMLImageMapToken eToken, - const ::rtl::OUString& rValue); + const OUString& rValue); virtual void Prepare( ::com::sun::star::uno::Reference< diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 80efd4a1c955..c6e40115597a 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Sequence; diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index b748383a158f..26dd94a1063d 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -31,7 +31,6 @@ using namespace ::xmloff::token; -using ::rtl::OUString; struct SdXMLDataStyleNumber { @@ -500,26 +499,26 @@ public: SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ); virtual ~SdXMLNumberFormatMemberImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; TYPEINIT1( SdXMLNumberFormatMemberImportContext, SvXMLImportContext ); -SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpParent( pParent ), maNumberStyle( rLocalName ), @@ -561,7 +560,7 @@ SdXMLNumberFormatMemberImportContext::~SdXMLNumberFormatMemberImportContext() } SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) { return mpSlaveContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); @@ -580,7 +579,7 @@ void SdXMLNumberFormatMemberImportContext::EndElement() mpParent->add( maNumberStyle, mbLong, mbTextual, mbDecimal02, maText ); } -void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) { mpSlaveContext->Characters( rChars ); maText += rChars; @@ -589,7 +588,7 @@ void SdXMLNumberFormatMemberImportContext::Characters( const ::rtl::OUString& rC TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); -SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), mbAutomatic( sal_False ), mnIndex(0), @@ -723,7 +722,7 @@ void SdXMLNumberFormatImportContext::EndElement() } } -SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) ); } diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx index f91d0d3c7b5a..e087873b14e4 100644 --- a/xmloff/source/draw/XMLNumberStylesExport.hxx +++ b/xmloff/source/draw/XMLNumberStylesExport.hxx @@ -37,8 +37,8 @@ public: static sal_Int32 getDateStyleCount() { return SdXMLDateFormatCount; } static sal_Int32 getTimeStyleCount() { return SdXMLTimeFormatCount; } - static rtl::OUString getTimeStyleName(const sal_Int32 nTimeFormat ); - static rtl::OUString getDateStyleName(const sal_Int32 nDateFormat ); + static OUString getTimeStyleName(const sal_Int32 nTimeFormat ); + static OUString getDateStyleName(const sal_Int32 nDateFormat ); }; #endif // _XMLOFF_NUMBERSTYLESEXPORT_HXX diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index a03e74c950d2..a8c1b340555c 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -26,7 +26,6 @@ #include <xmloff/XMLBase64ImportContext.hxx> #include "XMLReplacementImageContext.hxx" -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::makeAny; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index ae013324ab1b..22aacdf9cfdf 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -26,8 +26,6 @@ #include "sdpropls.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index ca735da1a56d..d144656e7a34 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -34,8 +34,6 @@ #include "sdpropls.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -65,7 +63,7 @@ XMLShapeStyleContext::~XMLShapeStyleContext() { } -void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) { if (m_sControlDataStyleName.isEmpty() && (::xmloff::token::GetXMLToken(::xmloff::token::XML_DATA_STYLE_NAME) == rLocalName)) { diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 8d6efb698e28..f3ba9647105e 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -67,8 +67,6 @@ #include "animations.hxx" #include <xmloff/animationexport.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -1053,7 +1051,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >& if( 0 == ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ) ) { // issue 146582 - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, fTemp / (24*60*60)); mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, buf.makeStringAndClear()); diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 0f237bbc6a79..67e4f44a1cc6 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -67,8 +67,6 @@ #include "animations.hxx" #include "animationimport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -630,7 +628,7 @@ TYPEINIT1( AnimationNodeContext, SvXMLImportContext ); AnimationNodeContext::AnimationNodeContext( const Reference< XAnimationNode >& xParentNode, - SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, AnimationsImportHelperImpl* pHelper /* = NULL */ ) : SvXMLImportContext(rImport, nPrfx, rLocalName), @@ -1245,7 +1243,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< : } } -SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( mxNode.is()) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index e14541f2481e..90cc84697499 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -36,8 +36,6 @@ #include <xmloff/shapeexport.hxx> #include "anim.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 53269439fae3..f6964886d45e 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -37,8 +37,6 @@ #include "anim.hxx" #include "animimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -662,7 +660,7 @@ void XMLAnimationsEffectContext::EndElement() TYPEINIT1( XMLAnimationsContext, SvXMLImportContext ); -XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, +XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& ) : SvXMLImportContext(rImport, nPrfx, rLocalName) { @@ -674,7 +672,7 @@ XMLAnimationsContext::~XMLAnimationsContext() delete mpImpl; } -SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl ); diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 63081f3c1be0..3d1417af3ca7 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -27,8 +27,6 @@ #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -75,7 +73,7 @@ void SdXMLDescriptionContext::EndElement() // This method is called for all characters that are contained in the // current element. The default is to ignore them. -void SdXMLDescriptionContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLDescriptionContext::Characters( const OUString& rChars ) { msText += rChars; } diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index cab44cf6eaf3..5b77fa96b9c0 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -30,13 +30,13 @@ class SdXMLDescriptionContext : public SvXMLImportContext { private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; - ::rtl::OUString msText; + OUString msText; public: TYPEINFO(); SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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 ); virtual ~SdXMLDescriptionContext(); @@ -45,7 +45,7 @@ public: // This method is called for all characters that are contained in the // current element. The default is to ignore them. - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); }; #endif // _XMLOFF_EVENTIMP_HXX diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index fb711d8a1fef..ba288e63b02b 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -38,8 +38,6 @@ #include "eventimp.hxx" #include "anim.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; @@ -265,7 +263,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons } else { - const rtl::OUString &rTmp = + const OUString &rTmp = rImp.GetAbsoluteReference(sValue); INetURLObject::translateToInternal( rTmp, msBookmark, INetURLObject::DECODE_UNAMBIGUOUS, @@ -509,7 +507,7 @@ SdXMLEventsContext::~SdXMLEventsContext() { } -SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::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 6663767cfc3d..8704d9978fcf 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -36,12 +36,12 @@ public: SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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 ); virtual ~SdXMLEventsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index e7b0de74e955..2069915cb39e 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -28,8 +28,6 @@ #include <xmloff/nmspmap.hxx> #include "layerexp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::com::sun::star::uno::Reference; using namespace ::cppu; diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 8404552cb551..dd5731775231 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -31,8 +31,6 @@ #include <xmloff/nmspmap.hxx> #include "layerimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; #include "XMLStringBufferImportContext.hxx" @@ -55,14 +53,14 @@ public: SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ); virtual ~SdXMLLayerContext(); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); virtual void EndElement(); private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; - ::rtl::OUString msName; - ::rtl::OUStringBuffer sDescriptionBuffer; - ::rtl::OUStringBuffer sTitleBuffer; + OUString msName; + OUStringBuffer sDescriptionBuffer; + OUStringBuffer sTitleBuffer; }; SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ) @@ -91,7 +89,7 @@ SdXMLLayerContext::~SdXMLLayerContext() { } -SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const Reference< XAttributeList >& ) +SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) { if( (XML_NAMESPACE_SVG == nPrefix) && IsXMLToken(rLocalName, XML_TITLE) ) { @@ -145,7 +143,7 @@ void SdXMLLayerContext::EndElement() TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext ); -SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, +SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) : SvXMLImportContext(rImport, nPrfx, rLocalName) { @@ -159,7 +157,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext() { } -SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::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 09464a995deb..c6754e179c04 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -36,11 +36,11 @@ public: SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLLayerSetContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index c381e69be389..96043fa6be7e 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -41,12 +41,12 @@ bool XMLNumRulePropHdl::equals( const uno::Any& r1, const uno::Any& r2 ) const return mxNumRuleCompare.is() && mxNumRuleCompare->compare( r1, r2 ) == 0; } -sal_Bool XMLNumRulePropHdl::importXML( const ::rtl::OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +sal_Bool XMLNumRulePropHdl::importXML( const OUString& /*rStrImpValue*/, ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return sal_False; } -sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const +sal_Bool XMLNumRulePropHdl::exportXML( OUString& /*rStrExpValue*/, const ::com::sun::star::uno::Any& /*rValue*/, const SvXMLUnitConverter& /*rUnitConverter*/ ) const { return sal_False; } diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx index a9f40177452d..2acaa39bad78 100644 --- a/xmloff/source/draw/numithdl.hxx +++ b/xmloff/source/draw/numithdl.hxx @@ -37,8 +37,8 @@ public: virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; /// NumRules will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place. - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; #endif // _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 3d6dc4a59d83..51394da2e074 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -28,8 +28,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; @@ -247,13 +245,13 @@ XMLDateTimeFormatHdl::~XMLDateTimeFormatHdl() { } -sal_Bool XMLDateTimeFormatHdl::importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +sal_Bool XMLDateTimeFormatHdl::importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { rValue <<= rStrImpValue; return true; } -sal_Bool XMLDateTimeFormatHdl::exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const +sal_Bool XMLDateTimeFormatHdl::exportXML( OUString& rStrExpValue, const ::com::sun::star::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 4ba946d66e83..0324a7e41a69 100644 --- a/xmloff/source/draw/propimp0.hxx +++ b/xmloff/source/draw/propimp0.hxx @@ -29,8 +29,8 @@ class XMLDurationPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLDurationPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class SvXMLImport; @@ -41,16 +41,16 @@ private: public: XMLOpacityPropertyHdl( SvXMLImport* pImport ); virtual ~XMLOpacityPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class XMLTextAnimationStepPropertyHdl : public XMLPropertyHandler { public: virtual ~XMLTextAnimationStepPropertyHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; class SvXMLExport; @@ -62,8 +62,8 @@ private: public: XMLDateTimeFormatHdl( SvXMLExport* pExport ); virtual ~XMLDateTimeFormatHdl(); - virtual sal_Bool importXML( const rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 273517bccb0a..9fa89b35f7d7 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -68,8 +68,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -740,11 +738,11 @@ class XMLCaptionEscapeRelative : public XMLPropertyHandler { public: virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; @@ -782,11 +780,11 @@ public: XMLMoveSizeProtectHdl( sal_Int32 nType ) : mnType( nType ) {} virtual sal_Bool importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; virtual sal_Bool exportXML( - ::rtl::OUString& rStrExpValue, + OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; private: @@ -825,8 +823,8 @@ class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler public: virtual ~XMLSdHeaderFooterVisibilityTypeHdl(); - virtual sal_Bool importXML( const ::rtl::OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual sal_Bool exportXML( ::rtl::OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() @@ -834,7 +832,7 @@ XMLSdHeaderFooterVisibilityTypeHdl::~XMLSdHeaderFooterVisibilityTypeHdl() } sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( - const ::rtl::OUString& rStrImpValue, + const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& ) const { diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index c49200f3ff79..77bfe0053df7 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -254,9 +254,9 @@ private: SvxXMLNumRuleExport maNumRuleExp; sal_Bool mbIsInAutoStyles; - const rtl::OUString msCDATA; - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msCDATA; + const OUString msTrue; + const OUString msFalse; protected: virtual void ContextFilter( @@ -291,9 +291,9 @@ class XMLPageExportPropertyMapper : public SvXMLExportPropertyMapper private: SvXMLExport& mrExport; - const rtl::OUString msCDATA; - const rtl::OUString msTrue; - const rtl::OUString msFalse; + const OUString msCDATA; + const OUString msTrue; + const OUString msFalse; protected: virtual void ContextFilter( diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 78563fb77cd7..6e86da36ed2f 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -76,8 +76,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1877,7 +1875,7 @@ void SdXMLExport::_ExportContent() OUString aBookmarkName( aBookmarkURL.copy( nIndex+1 ) ); aBookmarkURL = GetRelativeReference( aFileName ); - aBookmarkURL += rtl::OUString(static_cast<sal_Unicode>('#')); + aBookmarkURL += OUString(static_cast<sal_Unicode>('#')); aBookmarkURL += aBookmarkName; } diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index ccc34b204bea..506981d978f0 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -69,14 +69,14 @@ DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap ); struct HeaderFooterPageSettingsImpl { - rtl::OUString maStrHeaderDeclName; - rtl::OUString maStrFooterDeclName; - rtl::OUString maStrDateTimeDeclName; + OUString maStrHeaderDeclName; + OUString maStrFooterDeclName; + OUString maStrDateTimeDeclName; }; struct DateTimeDeclImpl { - rtl::OUString maStrText; + OUString maStrText; sal_Bool mbFixed; sal_Int32 mnFormat; }; @@ -101,17 +101,17 @@ class SdXMLExport : public SvXMLExport ImpXMLEXPPageMasterInfo* mpHandoutPageMaster; ImpXMLAutoLayoutInfoList* mpAutoLayoutInfoList; - com::sun::star::uno::Sequence< ::rtl::OUString > maDrawPagesAutoLayoutNames; + com::sun::star::uno::Sequence< OUString > maDrawPagesAutoLayoutNames; - ::std::vector< ::rtl::OUString > maDrawPagesStyleNames; - ::std::vector< ::rtl::OUString > maDrawNotesPagesStyleNames; - ::std::vector< ::rtl::OUString > maMasterPagesStyleNames; - ::rtl::OUString maHandoutMasterStyleName; + ::std::vector< OUString > maDrawPagesStyleNames; + ::std::vector< OUString > maDrawNotesPagesStyleNames; + ::std::vector< OUString > maMasterPagesStyleNames; + OUString maHandoutMasterStyleName; ::std::vector< HeaderFooterPageSettingsImpl > maDrawPagesHeaderFooterSettings; ::std::vector< HeaderFooterPageSettingsImpl > maDrawNotesPagesHeaderFooterSettings; - ::std::vector< ::rtl::OUString > maHeaderDeclsVector; - ::std::vector< ::rtl::OUString > maFooterDeclsVector; + ::std::vector< OUString > maHeaderDeclsVector; + ::std::vector< OUString > maFooterDeclsVector; ::std::vector< DateTimeDeclImpl > maDateTimeDeclsVector; HeaderFooterPageSettingsImpl maHandoutPageHeaderFooterSettings; @@ -127,12 +127,12 @@ class SdXMLExport : public SvXMLExport sal_Bool mbFamilyGraphicUsed; sal_Bool mbFamilyPresentationUsed; - const rtl::OUString msZIndex; - const rtl::OUString msEmptyPres; - const rtl::OUString msModel; - const rtl::OUString msStartShape; - const rtl::OUString msEndShape; - const rtl::OUString msPageLayoutNames; + const OUString msZIndex; + const OUString msEmptyPres; + const OUString msModel; + const OUString msStartShape; + const OUString msEndShape; + const OUString msPageLayoutNames; virtual void _ExportStyles(sal_Bool bUsed); virtual void _ExportAutoStyles(); @@ -148,14 +148,14 @@ class SdXMLExport : public SvXMLExport void ImpWritePageMasterInfos(); void ImpPrepAutoLayoutInfos(); HeaderFooterPageSettingsImpl ImpPrepDrawPageHeaderFooterDecls( const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xDrawPage ); - ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const rtl::OUString& rName); + ImpXMLEXPPageMasterInfo* ImpGetPageMasterInfoByName(const OUString& rName); void ImpPrepDrawPageInfos(); void ImpPrepMasterPageInfos(); void ImpWritePresentationStyles(); - ::rtl::OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); + OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); - sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, rtl::OUString& rName); + sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); @@ -167,7 +167,7 @@ class SdXMLExport : public SvXMLExport // #82003# helper function for recursive object count sal_uInt32 ImpRecursiveObjectCount( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes); - rtl::OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage ); + OUString getNavigationOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::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 ); @@ -204,10 +204,10 @@ public: virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ); virtual void exportDataStyles(); virtual void exportAutoDataStyles(); - virtual rtl::OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; + virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const; // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); }; #endif // _SDXMLEXP_HXX diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 741a6852e961..afa0ea68d27d 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -48,8 +48,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -434,7 +432,7 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen if( xInfoSetInfo->hasPropertyByName( msPreview ) ) xInfoSet->getPropertyValue( msPreview ) >>= mbPreview; - ::rtl::OUString const sOrganizerMode( + OUString const sOrganizerMode( "OrganizerMode"); if (xInfoSetInfo->hasPropertyByName(sOrganizerMode)) { @@ -1011,19 +1009,19 @@ OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeExcept } } -void SdXMLImport::AddHeaderDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ) +void SdXMLImport::AddHeaderDecl( const OUString& rName, const OUString& rText ) { if( !rName.isEmpty() && !rText.isEmpty() ) maHeaderDeclsMap[rName] = rText; } -void SdXMLImport::AddFooterDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ) +void SdXMLImport::AddFooterDecl( const OUString& rName, const OUString& rText ) { if( !rName.isEmpty() && !rText.isEmpty() ) maFooterDeclsMap[rName] = rText; } -void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText, sal_Bool bFixed, const ::rtl::OUString& rDateTimeFormat ) +void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ) { if( !rName.isEmpty() && (!rText.isEmpty() || !bFixed) ) { @@ -1035,9 +1033,9 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU } } -::rtl::OUString SdXMLImport::GetHeaderDecl( const ::rtl::OUString& rName ) const +OUString SdXMLImport::GetHeaderDecl( const OUString& rName ) const { - ::rtl::OUString aRet; + OUString aRet; HeaderFooterDeclMap::const_iterator aIter( maHeaderDeclsMap.find( rName ) ); if( aIter != maHeaderDeclsMap.end() ) aRet = (*aIter).second; @@ -1045,9 +1043,9 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU return aRet; } -::rtl::OUString SdXMLImport::GetFooterDecl( const ::rtl::OUString& rName ) const +OUString SdXMLImport::GetFooterDecl( const OUString& rName ) const { - ::rtl::OUString aRet; + OUString aRet; HeaderFooterDeclMap::const_iterator aIter( maFooterDeclsMap.find( rName ) ); if( aIter != maFooterDeclsMap.end() ) aRet = (*aIter).second; @@ -1055,7 +1053,7 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU return aRet; } -::rtl::OUString SdXMLImport::GetDateTimeDecl( const ::rtl::OUString& rName, sal_Bool& rbFixed, ::rtl::OUString& rDateTimeFormat ) +OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ) { DateTimeDeclContextImpl aDecl; diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 43ba353e17b3..1a50eb9fc799 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -166,14 +166,14 @@ class SdXMLMasterStylesContext; struct DateTimeDeclContextImpl { - rtl::OUString maStrText; + OUString maStrText; sal_Bool mbFixed; - rtl::OUString maStrDateTimeFormat; + OUString maStrDateTimeFormat; DateTimeDeclContextImpl() : mbFixed(sal_True) {} }; -DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, HeaderFooterDeclMap ); +DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap ); DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap ); ////////////////////////////////////////////////////////////////////////////// @@ -211,8 +211,8 @@ class SdXMLImport: public SvXMLImport DrawPageIdMap maDrawPageIds; - ::rtl::OUString msPageLayouts; - ::rtl::OUString msPreview; + OUString msPageLayouts; + OUString msPreview; HeaderFooterDeclMap maHeaderDeclsMap; HeaderFooterDeclMap maFooterDeclsMap; @@ -222,7 +222,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); @@ -244,18 +244,18 @@ public: // namespace office // NB: in contrast to other CreateFooContexts, this particular one handles // the root element (i.e. office:document-meta) - SvXMLImportContext* CreateMetaContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateMetaContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName ); - SvXMLImportContext* CreateBodyContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateScriptContext( const OUString& rLocalName ); + SvXMLImportContext* CreateBodyContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLStylesContext* CreateStylesContext(const rtl::OUString& rLocalName, + SvXMLStylesContext* CreateStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLStylesContext* CreateAutoStylesContext(const rtl::OUString& rLocalName, + SvXMLStylesContext* CreateAutoStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext* CreateMasterStylesContext(const rtl::OUString& rLocalName, + SvXMLImportContext* CreateMasterStylesContext(const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); - SvXMLImportContext *CreateFontDeclsContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext *CreateFontDeclsContext(const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); // Styles and AutoStyles contexts @@ -300,15 +300,15 @@ public: sal_Bool IsPreview() const { return mbPreview; } // XServiceInfo ( : SvXMLExport ) - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - void AddHeaderDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ); - void AddFooterDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText ); - void AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OUString& rText, sal_Bool bFixed, const ::rtl::OUString& rDateTimeFormat ); + void AddHeaderDecl( const OUString& rName, const OUString& rText ); + void AddFooterDecl( const OUString& rName, const OUString& rText ); + void AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ); - ::rtl::OUString GetHeaderDecl( const ::rtl::OUString& rName ) const; - ::rtl::OUString GetFooterDecl( const ::rtl::OUString& rName ) const; - ::rtl::OUString GetDateTimeDecl( const ::rtl::OUString& rName, sal_Bool& rbFixed, ::rtl::OUString& rDateTimeFormat ); + OUString GetHeaderDecl( const OUString& rName ) const; + OUString GetFooterDecl( const OUString& rName ) const; + OUString GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ); virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; }; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index db38c9d649c3..51f0427ea1bb 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -155,10 +155,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement { uno::Sequence< uno::Any > aArgument( 1 ); uno::Sequence< beans::PropertyValue > aPropValues( 2 ); - aPropValues[ 0 ].Name = rtl::OUString( "CustomShape" ); + aPropValues[ 0 ].Name = OUString( "CustomShape" ); aPropValues[ 0 ].Value <<= xShape; sal_Bool bForceGroupWithText = sal_True; - aPropValues[ 1 ].Name = rtl::OUString( "ForceGroupWithText" ); + aPropValues[ 1 ].Name = OUString( "ForceGroupWithText" ); aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) ); @@ -321,7 +321,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap uno::Reference< beans::XPropertySet > xControlModel(xControl->getControl(), uno::UNO_QUERY); DBG_ASSERT(xControlModel.is(), "XMLShapeExport::collectShapeAutoStyles: no control model on the control shape!"); - ::rtl::OUString sNumberStyle = mrExport.GetFormExport()->getControlNumberStyle(xControlModel); + OUString sNumberStyle = mrExport.GetFormExport()->getControlNumberStyle(xControlModel); if (!sNumberStyle.isEmpty()) { sal_Int32 nIndex = GetPropertySetMapper()->getPropertySetMapper()->FindEntryIndex(CTF_SD_CONTROL_SHAPE_DATA_STYLE); @@ -383,7 +383,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // * defaults for style properties are not written, but we need to write the "left", // because we need to distiguish this "left" from the case where not align attribute // is present which means "void" - static const ::rtl::OUString s_sParaAdjustPropertyName( "ParaAdjust" ); + static const OUString s_sParaAdjustPropertyName( "ParaAdjust" ); if ( xPropSetInfo->hasPropertyByName( s_sParaAdjustPropertyName ) && ( beans::PropertyState_DEFAULT_VALUE == xPropState->getPropertyState( s_sParaAdjustPropertyName ) ) ) @@ -1077,14 +1077,14 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) { - rtl::OUString sCLSID; + OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID())) { eShapeType = XmlShapeTypeDrawChartShape; } - else if (sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) + else if (sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))) { eShapeType = XmlShapeTypeDrawSheetShape; } @@ -1127,7 +1127,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) try { - rtl::OUString sCLSID; + OUString sCLSID; if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) ) diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 4f00fe33305a..58cb26e03d1a 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -53,8 +53,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tuple/b2dtuple.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -226,7 +224,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR ////////////////////////////////////////////////////////////////////////////// -sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const rtl::OUString& rClass ) +sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass ) { sal_Bool bIsEmpty = sal_False; @@ -1143,12 +1141,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape( xPropSet->getPropertyValue( OUString("GraphicURL")) >>= sImageURL; OUString aResolveURL( sImageURL ); - const rtl::OUString sPackageURL( "vnd.sun.star.Package:" ); + const OUString sPackageURL( "vnd.sun.star.Package:" ); // sj: trying to preserve the filename if ( aStreamURL.match( sPackageURL, 0 ) ) { - rtl::OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); + OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) ); sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1; if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) ) sRequestedName = sRequestedName.copy( nLastIndex, sRequestedName.getLength() - nLastIndex ); @@ -1717,9 +1715,9 @@ void XMLShapeExport::ImpExportOLE2Shape( // this is an alien object ( currently MSOLE is the only supported type of such objects ) // in case it is not an OASIS format the object should be asked to store replacement image if possible - ::rtl::OUString sURLRequest( sURL ); + OUString sURLRequest( sURL ); if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURLRequest += ::rtl::OUString( "?oasis=false" ); + sURLRequest += OUString( "?oasis=false" ); mrExport.AddEmbeddedObjectAsBase64( sURLRequest ); } } @@ -1987,7 +1985,7 @@ void XMLShapeExport::ImpExportPluginShape( static void lcl_CopyStream( uno::Reference<io::XInputStream> const& xInStream, uno::Reference<embed::XStorage> const& xTarget, - ::rtl::OUString const& rPath) + OUString const& rPath) { ::comphelper::LifecycleProxy proxy; uno::Reference<io::XStream> const xStream( @@ -1999,19 +1997,19 @@ static void lcl_CopyStream( { SAL_WARN("xmloff", "no output stream"); throw uno::Exception( - ::rtl::OUString("no output stream"),0); + OUString("no output stream"),0); } uno::Reference< beans::XPropertySet > const xStreamProps(xStream, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( - ::rtl::OUString("MediaType"), - uno::makeAny(::rtl::OUString( + OUString("MediaType"), + uno::makeAny(OUString( //FIXME how to detect real media type? //but currently xmloff has this one hardcoded anyway... "application/vnd.sun.star.media"))); xStreamProps->setPropertyValue( // turn off compression - ::rtl::OUString("Compressed"), + OUString("Compressed"), uno::makeAny(sal_False)); } ::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream); @@ -2021,10 +2019,10 @@ static void lcl_CopyStream( static char const s_PkgScheme[] = "vnd.sun.star.Package:"; -static ::rtl::OUString +static OUString lcl_StoreMediaAndGetURL(SvXMLExport & rExport, uno::Reference<beans::XPropertySet> const& xPropSet, - ::rtl::OUString const& rURL) + OUString const& rURL) { if (0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( rURL.getStr(), rURL.getLength(), @@ -2036,16 +2034,16 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, rExport.GetTargetStorage(), uno::UNO_QUERY_THROW); uno::Reference<io::XInputStream> xInStream; xPropSet->getPropertyValue( - ::rtl::OUString("PrivateStream")) + OUString("PrivateStream")) >>= xInStream; if (!xInStream.is()) { SAL_WARN("xmloff", "no input stream"); - return ::rtl::OUString(); + return OUString(); } - ::rtl::OUString const urlPath( + OUString const urlPath( rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); lcl_CopyStream(xInStream, xTarget, rURL); @@ -2057,7 +2055,7 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, SAL_INFO("xmloff", "exception while storing embedded media: '" << e.Message << "'"); } - return ::rtl::OUString(); + return OUString(); } else { diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 9b5df3529e06..2cd8574b8754 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -41,8 +41,6 @@ #include "xmloff/xmlnmspe.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 7e21572c7d83..fb411104985a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -43,8 +43,6 @@ #include <map> #include <vector> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::com::sun::star; @@ -993,7 +991,7 @@ void XMLShapeImportHelper::shapeWithZIndexAdded( com::sun::star::uno::Reference< void XMLShapeImportHelper::addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, sal_Bool bStart, - const rtl::OUString& rDestShapeId, + const OUString& rDestShapeId, sal_Int32 nDestGlueId ) { ConnectionHint aHint; diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 9d30a46b82ba..2bed18d85f32 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -33,8 +33,6 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/unotools.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; @@ -150,7 +148,7 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue) const sal_Int32 aLen(rStr.getLength()); if(aLen) if(Imp_IsOnNumberChar(rStr, aLen - 1, false) && nValue >= 0) - rStr += rtl::OUString(static_cast<sal_Unicode>(' ')); + rStr += OUString(static_cast<sal_Unicode>(' ')); Imp_PutNumberChar(rStr, nValue); } @@ -1348,12 +1346,12 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints, // X and comma Imp_PutNumberChar(aNewString, nX); - aNewString += rtl::OUString(static_cast<sal_Unicode>(',')); + aNewString += OUString(static_cast<sal_Unicode>(',')); // Y and space (not for last) Imp_PutNumberChar(aNewString, nY); if(a + 1 != nCnt) - aNewString += rtl::OUString(static_cast<sal_Unicode>(' ')); + aNewString += OUString(static_cast<sal_Unicode>(' ')); // next point pArray++; @@ -1817,7 +1815,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('t')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('t')); + aNewString += OUString(static_cast<sal_Unicode>('t')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -1827,7 +1825,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('T')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('T')); + aNewString += OUString(static_cast<sal_Unicode>('T')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -1847,7 +1845,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('q')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('q')); + aNewString += OUString(static_cast<sal_Unicode>('q')); Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY); @@ -1859,7 +1857,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('Q')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('Q')); + aNewString += OUString(static_cast<sal_Unicode>('Q')); Imp_PutNumberCharWithSpace(aNewString, nX1); Imp_PutNumberCharWithSpace(aNewString, nY1); @@ -1906,7 +1904,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('s')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('s')); + aNewString += OUString(static_cast<sal_Unicode>('s')); Imp_PutNumberCharWithSpace(aNewString, nX2 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY2 - mnLastY); @@ -1918,7 +1916,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('S')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('S')); + aNewString += OUString(static_cast<sal_Unicode>('S')); Imp_PutNumberCharWithSpace(aNewString, nX2); Imp_PutNumberCharWithSpace(aNewString, nY2); @@ -1940,7 +1938,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('c')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('c')); + aNewString += OUString(static_cast<sal_Unicode>('c')); Imp_PutNumberCharWithSpace(aNewString, nX1 - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY1 - mnLastY); @@ -1954,7 +1952,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('C')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('C')); + aNewString += OUString(static_cast<sal_Unicode>('C')); Imp_PutNumberCharWithSpace(aNewString, nX1); Imp_PutNumberCharWithSpace(aNewString, nY1); @@ -1996,7 +1994,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('v')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('v')); + aNewString += OUString(static_cast<sal_Unicode>('v')); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2005,7 +2003,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('V')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('V')); + aNewString += OUString(static_cast<sal_Unicode>('V')); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2017,7 +2015,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('h')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('h')); + aNewString += OUString(static_cast<sal_Unicode>('h')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); @@ -2026,7 +2024,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('H')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('H')); + aNewString += OUString(static_cast<sal_Unicode>('H')); Imp_PutNumberCharWithSpace(aNewString, nX); @@ -2038,7 +2036,7 @@ void SdXMLImExSvgDElement::AddPolygon( if(mbRelative) { if(aLastCommand != sal_Unicode('l')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('l')); + aNewString += OUString(static_cast<sal_Unicode>('l')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2048,7 +2046,7 @@ void SdXMLImExSvgDElement::AddPolygon( else { if(aLastCommand != sal_Unicode('L')) - aNewString += rtl::OUString(static_cast<sal_Unicode>('L')); + aNewString += OUString(static_cast<sal_Unicode>('L')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2062,7 +2060,7 @@ void SdXMLImExSvgDElement::AddPolygon( // write as start point if(mbRelative) { - aNewString += rtl::OUString(static_cast<sal_Unicode>('m')); + aNewString += OUString(static_cast<sal_Unicode>('m')); Imp_PutNumberCharWithSpace(aNewString, nX - mnLastX); Imp_PutNumberCharWithSpace(aNewString, nY - mnLastY); @@ -2071,7 +2069,7 @@ void SdXMLImExSvgDElement::AddPolygon( } else { - aNewString += rtl::OUString(static_cast<sal_Unicode>('M')); + aNewString += OUString(static_cast<sal_Unicode>('M')); Imp_PutNumberCharWithSpace(aNewString, nX); Imp_PutNumberCharWithSpace(aNewString, nY); @@ -2099,9 +2097,9 @@ void SdXMLImExSvgDElement::AddPolygon( if(bClosed) { if(mbRelative) - aNewString += rtl::OUString(static_cast<sal_Unicode>('z')); + aNewString += OUString(static_cast<sal_Unicode>('z')); else - aNewString += rtl::OUString(static_cast<sal_Unicode>('Z')); + aNewString += OUString(static_cast<sal_Unicode>('Z')); // update current point - we're back at the start if( bDidWriteStart ) diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 2da5687532b0..da119f19dd6c 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -32,8 +32,6 @@ #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index e35b14c7cebd..42dcde876762 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -46,7 +46,7 @@ public: SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -70,7 +70,7 @@ public: TYPEINFO(); SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -94,7 +94,7 @@ public: TYPEINFO(); SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -109,14 +109,14 @@ public: class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext { - rtl::OUString maPoints; - rtl::OUString maViewBox; + OUString maPoints; + OUString maViewBox; public: TYPEINFO(); SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -135,7 +135,7 @@ public: TYPEINFO(); SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -154,7 +154,7 @@ public: TYPEINFO(); SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 4bfaa552f691..6eac43a8cc4e 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -30,8 +30,6 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -42,7 +40,7 @@ using namespace ::xmloff::token; SdXML3DLightContext::SdXML3DLightContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName), maDiffuseColor(0x00000000), @@ -243,7 +241,7 @@ SdXML3DSceneAttributesHelper::~SdXML3DSceneAttributesHelper() } /** creates a 3d ligth context and adds it to the internal list for later processing */ -SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uInt16 nPrfx, const rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = new SdXML3DLightContext(mrImport, nPrfx, rLName, xAttrList); @@ -258,7 +256,7 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn } /** this should be called for each scene attribute */ -void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DR3D == nPrefix ) { diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index d1a32bfd21b0..8eea3ac00d27 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -49,7 +49,7 @@ public: SdXML3DSceneShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -59,7 +59,7 @@ public: virtual void EndElement(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, 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::XShapes >& GetLocalShapesContext() const diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index dc4f534836ef..4f0ac3300fe9 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -37,8 +37,6 @@ #include "PropertySetMerger.hxx" #include "animationimport.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index a4a8fd542087..2e6b3b8d6337 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -30,21 +30,21 @@ class SdXMLDrawPageContext : public SdXMLGenericPageContext { - rtl::OUString maName; - rtl::OUString maMasterPageName; - rtl::OUString maStyleName; - rtl::OUString maHREF; + OUString maName; + OUString maMasterPageName; + OUString maStyleName; + OUString maHREF; bool mbHadSMILNodes; public: SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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); virtual ~SdXMLDrawPageContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -59,11 +59,11 @@ class SdXMLBodyContext : public SvXMLImportContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName ); + SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ); virtual ~SdXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 1a280ef14347..5dd0f00ef5e9 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -55,7 +55,7 @@ TYPEINIT1( XMLEnhancedCustomShapeContext, SvXMLImportContext ); XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrUnitConverter( rImport.GetMM100UnitConverter() ), @@ -73,7 +73,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] = { XML_TOKEN_INVALID, 0 } }; void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { bool bAttrBool; if (::sax::Converter::convertBool( bAttrBool, rValue )) @@ -86,7 +86,7 @@ void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nAttrNumber; if (::sax::Converter::convertNumber( nAttrNumber, rValue )) @@ -99,7 +99,7 @@ void GetInt32( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; if (::sax::Converter::convertDouble( fAttrDouble, rValue )) @@ -112,7 +112,7 @@ void GetDouble( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { double fAttrDouble; sal_Int16 const eSrcUnit( ::sax::Converter::GetUnitFromString( @@ -128,7 +128,7 @@ void GetDistance( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { beans::PropertyValue aProp; aProp.Name = EASGet( eDestProp ); @@ -137,7 +137,7 @@ void GetString( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, const SvXMLEnumMapEntry& rMap ) { sal_uInt16 eKind; @@ -152,7 +152,7 @@ void GetEnum( std::vector< com::sun::star::beans::PropertyValue >& rDest, } void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString( rValue, util::MeasureUnit::MM_100TH); @@ -172,7 +172,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r } void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { ::basegfx::B3DVector aB3DVector; if ( SvXMLUnitConverter::convertB3DVector( aB3DVector, rValue ) ) @@ -185,7 +185,7 @@ void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart, rtl::OUString& rEquationName ) +sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) { sal_Int32 nIndex = nStart; while( nIndex < rEquation.getLength() ) @@ -208,7 +208,7 @@ sal_Bool GetEquationName( const rtl::OUString& rEquation, const sal_Int32 nStart return bValid; } -sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const rtl::OUString& rParaString ) +sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) return sal_False; @@ -228,7 +228,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter { nIndex++; bNumberRequired = sal_False; - rtl::OUString aEquationName; + OUString aEquationName; bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) { @@ -397,7 +397,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter bValid = sal_False; if ( bValid ) { - rtl::OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); + OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); if ( bE || bDot ) { double fAttrDouble; @@ -426,7 +426,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter } void GetPosition3D( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:extrusion-viewpoint - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp, SvXMLUnitConverter& rUnitConverter ) { drawing::Position3D aPosition3D; @@ -440,14 +440,14 @@ 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 - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< double > vDirection; sal_Int32 nIndex = 0; do { double fAttrDouble; - rtl::OUString aToken( rValue.getToken( 0, ',', nIndex ) ); + OUString aToken( rValue.getToken( 0, ',', nIndex ) ); if (!::sax::Converter::convertDouble( fAttrDouble, aToken )) break; else @@ -473,14 +473,14 @@ void GetDoubleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDe } void GetSizeSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< sal_Int32 > vNum; sal_Int32 nIndex = 0; do { sal_Int32 n; - rtl::OUString aToken( rValue.getToken( 0, ' ', nIndex ) ); + OUString aToken( rValue.getToken( 0, ' ', nIndex ) ); if (!::sax::Converter::convertNumber( n, aToken )) break; else @@ -510,7 +510,7 @@ 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 - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; @@ -524,7 +524,7 @@ void GetEnhancedParameter( std::vector< com::sun::star::beans::PropertyValue >& } void GetEnhancedParameterPair( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:handle-position - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { sal_Int32 nIndex = 0; com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair; @@ -539,7 +539,7 @@ 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 - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vParameter; com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameter; @@ -569,7 +569,7 @@ sal_Int32 GetEnhancedParameterPairSequence( std::vector< com::sun::star::beans:: } void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:text-areas - const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) + const OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeTextFrame > vTextFrame; com::sun::star::drawing::EnhancedCustomShapeTextFrame aParameter; @@ -601,7 +601,7 @@ void GetEnhancedRectangleSequence( std::vector< com::sun::star::beans::PropertyV } void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest, // e.g. draw:enhanced-path - const rtl::OUString& rValue ) + const OUString& rValue ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeParameterPair > vCoordinates; std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > vSegments; @@ -855,7 +855,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest } void GetAdjustmentValues( std::vector< com::sun::star::beans::PropertyValue >& rDest, // draw:adjustments - const rtl::OUString& rValue ) + const OUString& rValue ) { std::vector< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > vAdjustmentValue; com::sun::star::drawing::EnhancedCustomShapeParameter aParameter; @@ -900,8 +900,8 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax sal_Int32 nAttrNumber; for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* sven fixme, this must be checked! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) @@ -959,7 +959,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax ::sax::Converter::GetUnitFromString( rValue, util::MeasureUnit::MM_100TH)); - rtl::OUStringBuffer aUnitStr; + OUStringBuffer aUnitStr; double fFactor = ::sax::Converter::GetConversionFactor( aUnitStr, util::MeasureUnit::MM_100TH, eSrcUnit); if ( ( fFactor != 1.0 ) && ( fFactor != 0.0 ) ) @@ -1153,7 +1153,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, const std::vector< beans::PropertyValues >& rElement, - const rtl::OUString& rElementName ) + const OUString& rElementName ) { if ( !rElement.empty() ) { @@ -1173,15 +1173,15 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::PropertyValue >& rPropVec, - const std::vector< rtl::OUString >& rElement, - const rtl::OUString& rElementName ) + const std::vector< OUString >& rElement, + const OUString& rElementName ) { if ( !rElement.empty() ) { - uno::Sequence< rtl::OUString > aPropSeq( rElement.size() ); - std::vector< rtl::OUString >::const_iterator aIter = rElement.begin(); - std::vector< rtl::OUString >::const_iterator aEnd = rElement.end(); - rtl::OUString* pValues = aPropSeq.getArray(); + uno::Sequence< OUString > aPropSeq( rElement.size() ); + std::vector< OUString >::const_iterator aIter = rElement.begin(); + std::vector< OUString >::const_iterator aEnd = rElement.end(); + OUString* pValues = aPropSeq.getArray(); while ( aIter != aEnd ) *pValues++ = *aIter++; @@ -1195,7 +1195,7 @@ 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, - const rtl::OUString& rElementName ) + const OUString& rElementName ) { if ( !rElement.empty() ) { @@ -1214,15 +1214,15 @@ void SdXMLCustomShapePropertyMerge( std::vector< com::sun::star::beans::Property } } -typedef boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash, OUStringEqFunc> EquationHashMap; +typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, OUStringEqFunc> EquationHashMap; /* if rPara.Type is from type EnhancedCustomShapeParameterType::EQUATION, the name of the equation - will be converted from rtl::OUString to index */ + will be converted from OUString to index */ void CheckAndResolveEquationParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rPara, EquationHashMap* pH ) { if ( rPara.Type == com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) { - rtl::OUString aEquationName; + OUString aEquationName; if ( rPara.Value >>= aEquationName ) { sal_Int32 nIndex = 0; @@ -1241,8 +1241,8 @@ void XMLEnhancedCustomShapeContext::EndElement() { // creating hash map containing the name and index of each equation EquationHashMap* pH = new EquationHashMap; - std::vector< rtl::OUString >::iterator aEquationNameIter = maEquationNames.begin(); - std::vector< rtl::OUString >::iterator aEquationNameEnd = maEquationNames.end(); + std::vector< OUString >::iterator aEquationNameIter = maEquationNames.begin(); + std::vector< OUString >::iterator aEquationNameEnd = maEquationNames.end(); while( aEquationNameIter != aEquationNameEnd ) { (*pH)[ *aEquationNameIter ] = (sal_Int32)( aEquationNameIter - maEquationNames.begin() ); @@ -1250,8 +1250,8 @@ void XMLEnhancedCustomShapeContext::EndElement() } // resolve equation - std::vector< rtl::OUString >::iterator aEquationIter = maEquations.begin(); - std::vector< rtl::OUString >::iterator aEquationEnd = maEquations.end(); + std::vector< OUString >::iterator aEquationIter = maEquations.begin(); + std::vector< OUString >::iterator aEquationEnd = maEquations.end(); while( aEquationIter != aEquationEnd ) { sal_Int32 nIndexOf = 0; @@ -1260,16 +1260,16 @@ void XMLEnhancedCustomShapeContext::EndElement() nIndexOf = aEquationIter->indexOf( '?', nIndexOf ); if ( nIndexOf != -1 ) { - rtl::OUString aEquationName; + OUString aEquationName; if ( GetEquationName( *aEquationIter, nIndexOf + 1, aEquationName ) ) { // copying first characters inclusive '?' - rtl::OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) ); + OUString aNew( aEquationIter->copy( 0, nIndexOf + 1 ) ); sal_Int32 nIndex = 0; EquationHashMap::iterator aHashIter( pH->find( aEquationName ) ); if ( aHashIter != pH->end() ) nIndex = (*aHashIter).second; - aNew += rtl::OUString::valueOf( nIndex ); + aNew += OUString::valueOf( nIndex ); aNew += aEquationIter->copy( nIndexOf + aEquationName.getLength() + 1 ); *aEquationIter = aNew; } @@ -1368,7 +1368,7 @@ void XMLEnhancedCustomShapeContext::EndElement() SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) ); } -SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const rtl::OUString& rLocalName, +SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList> & xAttrList ) { EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName ); @@ -1377,12 +1377,12 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 sal_Int16 nLength = xAttrList->getLength(); if ( nLength ) { - rtl::OUString aFormula; - rtl::OUString aFormulaName; + OUString aFormula; + OUString aFormulaName; for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) @@ -1410,8 +1410,8 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt1 const sal_Int16 nLength = xAttrList->getLength(); for( sal_Int16 nAttr = 0; nAttr < nLength; nAttr++ ) { - rtl::OUString aLocalName; - const rtl::OUString& rValue = xAttrList->getValueByIndex( nAttr ); + OUString aLocalName; + const OUString& rValue = xAttrList->getValueByIndex( nAttr ); /* fixme sven, this needs to be chekced! sal_uInt16 nPrefix = */ GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( nAttr ), &aLocalName ); switch( EASGet( aLocalName ) ) { diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index 1c0e4f28cfdd..008ba4a08da7 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -46,20 +46,20 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext 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< rtl::OUString > maEquations; - std::vector< rtl::OUString > maEquationNames; + std::vector< OUString > maEquations; + std::vector< OUString > maEquationNames; public: TYPEINFO(); XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); + const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & xAttrList ); }; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 513b39d27728..8747bdadb58c 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -24,8 +24,6 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index bfae703b22e5..b24414e91cb6 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -42,14 +42,14 @@ protected: public: TYPEINFO(); - SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index c277a907d353..92f99c004c28 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -21,8 +21,6 @@ #include "ximplink.hxx" #include <xmloff/xmltoken.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index 3b60b21b2c04..d2d33779787e 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -37,18 +37,18 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext { // the parent shape group this link is placed in com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxParent; - rtl::OUString msHyperlink; + OUString msHyperlink; public: TYPEINFO(); - SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + 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); virtual ~SdXMLShapeLinkContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index b92a14fcf37d..52f90ad8f02e 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -20,8 +20,6 @@ #include "ximpnote.hxx" #include <com/sun/star/presentation/XPresentationPage.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index 1f013726357e..89ec7e3163b5 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -31,17 +31,17 @@ class SdXMLNotesContext : public SdXMLGenericPageContext { private: - rtl::OUString msPageMasterName; + OUString msPageMasterName; public: SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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); virtual ~SdXMLNotesContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); }; diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 576b543d6fdf..3a9c5ab0db0d 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -38,8 +38,6 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/xmluconv.hxx> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -63,7 +61,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 ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); private: @@ -360,7 +358,7 @@ void SdXMLGenericPageContext::EndElement() SetNavigationOrder(); } -void SdXMLGenericPageContext::SetStyle( rtl::OUString& rStyleName ) +void SdXMLGenericPageContext::SetStyle( OUString& rStyleName ) { // set PageProperties? if(!rStyleName.isEmpty()) diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index 486846f55855..cb5b01a63035 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -38,17 +38,17 @@ class SdXMLGenericPageContext : public SvXMLImportContext ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxAnnotationAccess; protected: - rtl::OUString maPageLayoutName; - rtl::OUString maUseHeaderDeclName; - rtl::OUString maUseFooterDeclName; - rtl::OUString maUseDateTimeDeclName; - rtl::OUString msNavOrder; + OUString maPageLayoutName; + OUString maUseHeaderDeclName; + OUString maUseFooterDeclName; + OUString maUseDateTimeDeclName; + OUString msNavOrder; void SetLocalShapesContext(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rNew) { mxShapes = rNew; } /** sets the page style on this page */ - void SetStyle( rtl::OUString& rStyleName ); + void SetStyle( OUString& rStyleName ); /** sets the presentation layout at this page. It is used for drawing pages and for the handout master */ void SetLayout(); @@ -60,21 +60,21 @@ protected: SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } /** sets the properties from a page master style with the given name on this contexts page */ - void SetPageMaster( rtl::OUString& rsPageMasterName ); + void SetPageMaster( OUString& rsPageMasterName ); void SetNavigationOrder(); public: TYPEINFO(); - SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + 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); virtual ~SdXMLGenericPageContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index c38f45faf326..f853c3ddc895 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -77,8 +77,6 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/text/XTextDocument.hpp> -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -117,7 +115,7 @@ SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] = //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -static bool ImpIsEmptyURL( const ::rtl::OUString& rURL ) +static bool ImpIsEmptyURL( const OUString& rURL ) { if( rURL.isEmpty() ) return true; @@ -364,7 +362,7 @@ void SdXMLShapeContext::EndElement() { uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY ); - rtl::OUString sLink( "Hyperlink" ); + OUString sLink( "Hyperlink" ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) ) xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) ); Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW ); @@ -443,10 +441,10 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) { uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW ); if( !mbVisible ) - xSet->setPropertyValue( rtl::OUString( "Visible" ), uno::Any( sal_False ) ); + xSet->setPropertyValue( OUString( "Visible" ), uno::Any( sal_False ) ); if( !mbPrintable ) - xSet->setPropertyValue( rtl::OUString( "Printable" ), uno::Any( sal_False ) ); + xSet->setPropertyValue( OUString( "Printable" ), uno::Any( sal_False ) ); } catch(const Exception&) { @@ -511,7 +509,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName ) } catch(const uno::Exception& e) { - uno::Sequence<rtl::OUString> aSeq( 1 ); + uno::Sequence<OUString> aSeq( 1 ); aSeq[0] = OUString::createFromAscii(pServiceName); GetImport().SetError( XMLERROR_FLAG_ERROR | XMLERROR_API, aSeq, e.Message, NULL ); @@ -782,7 +780,7 @@ void SdXMLShapeContext::SetThumbnail() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { bool bHaveXmlId( false ); if( (XML_NAMESPACE_DRAW == nPrefix) || (XML_NAMESPACE_DRAW_EXT == nPrefix) ) @@ -945,7 +943,7 @@ SdXMLRectShapeContext::~SdXMLRectShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1023,7 +1021,7 @@ SdXMLLineShapeContext::~SdXMLLineShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1152,7 +1150,7 @@ SdXMLEllipseShapeContext::~SdXMLEllipseShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1274,7 +1272,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1373,7 +1371,7 @@ SdXMLPathShapeContext::~SdXMLPathShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_SVG == nPrefix ) { @@ -1507,7 +1505,7 @@ SdXMLTextBoxShapeContext::~SdXMLTextBoxShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1681,7 +1679,7 @@ SdXMLControlShapeContext::~SdXMLControlShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -1761,7 +1759,7 @@ SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -1994,7 +1992,7 @@ SdXMLMeasureShapeContext::~SdXMLMeasureShapeContext() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2114,7 +2112,7 @@ SdXMLPageShapeContext::~SdXMLPageShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -2267,7 +2265,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -2313,7 +2311,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_XLINK == nPrefix ) { @@ -2438,7 +2436,7 @@ void SdXMLGraphicObjectShapeContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -2567,13 +2565,13 @@ void SdXMLChartShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLChartShapeContext::Characters( const OUString& rChars ) { if( mpChartContext ) mpChartContext->Characters( rChars ); } -SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( mpChartContext ) @@ -2587,7 +2585,7 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext ); SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape) @@ -2731,7 +2729,7 @@ void SdXMLObjectShapeContext::EndElement() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2755,7 +2753,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl: } SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { // #100592# @@ -2804,7 +2802,7 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext ); SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape) @@ -2833,7 +2831,7 @@ void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Referen } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLAppletShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -2912,7 +2910,7 @@ void SdXMLAppletShapeContext::EndElement() xProps->setPropertyValue( OUString( "AppletCode" ), aAny ); } - aAny <<= ::rtl::OUString( GetImport().GetDocumentBase() ); + aAny <<= OUString( GetImport().GetDocumentBase() ); xProps->setPropertyValue( OUString( "AppletDocBase" ), aAny ); SetThumbnail(); @@ -2921,7 +2919,7 @@ void SdXMLAppletShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -2969,7 +2967,7 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext ); SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape) : @@ -3049,12 +3047,12 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen } } -static ::rtl::OUString -lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) +static OUString +lcl_GetMediaReference(SvXMLImport const& rImport, OUString const& rURL) { if (rImport.IsPackageURL(rURL)) { - return ::rtl::OUString( "vnd.sun.star.Package:") + rURL; + return OUString( "vnd.sun.star.Package:") + rURL; } else { @@ -3063,7 +3061,7 @@ lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLPluginShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -3096,7 +3094,7 @@ void SdXMLPluginShapeContext::EndElement() if ( maSize.Width && maSize.Height ) { - const rtl::OUString sVisibleArea( "VisibleArea" ); + const OUString sVisibleArea( "VisibleArea" ); uno::Reference< beans::XPropertySetInfo > aXPropSetInfo( xProps->getPropertySetInfo() ); if ( !aXPropSetInfo.is() || aXPropSetInfo->hasPropertyByName( sVisibleArea ) ) { @@ -3197,7 +3195,7 @@ void SdXMLPluginShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3245,7 +3243,7 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext ); SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape) @@ -3294,7 +3292,7 @@ void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno:: } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLFloatingFrameShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { switch( nPrefix ) { @@ -3342,7 +3340,7 @@ void SdXMLFloatingFrameShapeContext::EndElement() TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext ); SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape) @@ -3400,9 +3398,9 @@ void SdXMLFrameShapeContext::removeGraphicFromImportContext(const SvXMLImportCon } } -rtl::OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const +OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const { - rtl::OUString aRetval; + OUString aRetval; const SdXMLGraphicObjectShapeContext* pSdXMLGraphicObjectShapeContext = dynamic_cast< const SdXMLGraphicObjectShapeContext* >(&rContext); if(pSdXMLGraphicObjectShapeContext) @@ -3591,7 +3589,7 @@ void SdXMLFrameShapeContext::EndElement() } void SdXMLFrameShapeContext::processAttribute( sal_uInt16, - const ::rtl::OUString&, const ::rtl::OUString& ) + const OUString&, const OUString& ) { // ignore } @@ -3618,7 +3616,7 @@ SdXMLCustomShapeContext::~SdXMLCustomShapeContext() ////////////////////////////////////////////////////////////////////////////// // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -3682,7 +3680,7 @@ void SdXMLCustomShapeContext::EndElement() { if ( !maCustomShapeGeometry.empty() ) { - const rtl::OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); + const OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); // converting the vector to a sequence uno::Sequence< beans::PropertyValue > aSeq( maCustomShapeGeometry.size() ); @@ -3715,7 +3713,7 @@ void SdXMLCustomShapeContext::EndElement() Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( mxShape, UNO_QUERY ); if( xDefaulter.is() ) { - rtl::OUString aEmptyType; + OUString aEmptyType; xDefaulter->createCustomShapeDefaults( aEmptyType ); } } @@ -3727,7 +3725,7 @@ void SdXMLCustomShapeContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( - sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -3753,7 +3751,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); -SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::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 com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, sal_False ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); @@ -3865,7 +3863,7 @@ void SdXMLTableShapeContext::EndElement() } // this is called from the parent group for each unparsed attribute in the attribute list -void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ) +void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { if( nPrefix == XML_NAMESPACE_TABLE ) { @@ -3893,7 +3891,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:: SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) ) return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 56c428c55188..951fe905c426 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -50,11 +50,11 @@ protected: com::sun::star::uno::Reference< com::sun::star::container::XIdentifierContainer > mxGluePoints; com::sun::star::uno::Reference< com::sun::star::document::XActionLockable > mxLockable; - rtl::OUString maDrawStyleName; - rtl::OUString maTextStyleName; - rtl::OUString maPresentationClass; - rtl::OUString maShapeName; - rtl::OUString maThumbnailURL; + OUString maDrawStyleName; + OUString maTextStyleName; + OUString maPresentationClass; + OUString maShapeName; + OUString maThumbnailURL; /// whether to restore list context (#91964#) bool mbListContextPushed; @@ -65,12 +65,12 @@ protected: bool mbClearDefaultAttributes; sal_Bool mbIsUserTransformed; sal_Int32 mnZOrder; - rtl::OUString maShapeId; - rtl::OUString maLayerName; + OUString maShapeId; + OUString maLayerName; // #i68101# - rtl::OUString maShapeTitle; - rtl::OUString maShapeDescription; + OUString maShapeTitle; + OUString maShapeDescription; SdXMLImExTransform2D mnTransform; com::sun::star::awt::Size maSize; @@ -100,7 +100,7 @@ public: SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -109,11 +109,11 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -127,7 +127,7 @@ public: TYPEINFO(); SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -135,7 +135,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -152,7 +152,7 @@ public: TYPEINFO(); SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -160,7 +160,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -180,7 +180,7 @@ public: TYPEINFO(); SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -188,7 +188,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -196,22 +196,22 @@ public: class SdXMLPolygonShapeContext : public SdXMLShapeContext { - rtl::OUString maPoints; - rtl::OUString maViewBox; + OUString maPoints; + OUString maViewBox; sal_Bool mbClosed; public: TYPEINFO(); SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bClosed, sal_Bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -219,14 +219,14 @@ public: class SdXMLPathShapeContext : public SdXMLShapeContext { - rtl::OUString maD; - rtl::OUString maViewBox; + OUString maD; + OUString maViewBox; public: TYPEINFO(); SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -234,7 +234,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -248,7 +248,7 @@ public: TYPEINFO(); SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -256,7 +256,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -265,13 +265,13 @@ public: class SdXMLControlShapeContext : public SdXMLShapeContext { private: - rtl::OUString maFormId; + OUString maFormId; public: TYPEINFO(); SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -279,7 +279,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -293,9 +293,9 @@ private: sal_uInt16 mnType; - rtl::OUString maStartShapeId; + OUString maStartShapeId; sal_Int32 mnStartGlueId; - rtl::OUString maEndShapeId; + OUString maEndShapeId; sal_Int32 mnEndGlueId; sal_Int32 mnDelta1; @@ -308,7 +308,7 @@ public: TYPEINFO(); SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -316,7 +316,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -332,7 +332,7 @@ public: TYPEINFO(); SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -341,7 +341,7 @@ public: virtual void EndElement(); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -355,7 +355,7 @@ public: TYPEINFO(); SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -363,7 +363,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -379,7 +379,7 @@ public: TYPEINFO(); SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -387,7 +387,7 @@ public: virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -396,14 +396,14 @@ public: class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext { private: - ::rtl::OUString maURL; + OUString maURL; ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: TYPEINFO(); SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -411,11 +411,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -429,7 +429,7 @@ public: TYPEINFO(); SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -437,8 +437,8 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual void Characters( const OUString& rChars ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; @@ -448,8 +448,8 @@ public: class SdXMLObjectShapeContext : public SdXMLShapeContext { private: - rtl::OUString maCLSID; - rtl::OUString maHref; + OUString maCLSID; + OUString maHref; // #100592# ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; @@ -458,7 +458,7 @@ public: TYPEINFO(); SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -468,11 +468,11 @@ public: virtual void EndElement(); // #100592# - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -481,9 +481,9 @@ public: class SdXMLAppletShapeContext : public SdXMLShapeContext { private: - rtl::OUString maAppletName; - rtl::OUString maAppletCode; - rtl::OUString maHref; + OUString maAppletName; + OUString maAppletCode; + OUString maHref; sal_Bool mbIsScript; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -492,7 +492,7 @@ public: TYPEINFO(); SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -501,11 +501,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -514,8 +514,8 @@ public: class SdXMLPluginShapeContext : public SdXMLShapeContext { private: - rtl::OUString maMimeType; - rtl::OUString maHref; + OUString maMimeType; + OUString maHref; bool mbMedia; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -524,7 +524,7 @@ public: TYPEINFO(); SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -533,11 +533,11 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -546,14 +546,14 @@ public: class SdXMLFloatingFrameShapeContext : public SdXMLShapeContext { private: - rtl::OUString maFrameName; - rtl::OUString maHref; + OUString maFrameName; + OUString maHref; public: TYPEINFO(); SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -563,7 +563,7 @@ public: virtual void EndElement(); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -578,26 +578,26 @@ private: protected: /// helper to get the created xShape instance, needs to be overloaded - virtual rtl::OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; + virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: TYPEINFO(); SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; class SdXMLCustomShapeContext : public SdXMLShapeContext @@ -605,8 +605,8 @@ class SdXMLCustomShapeContext : public SdXMLShapeContext protected : - rtl::OUString maCustomShapeEngine; - rtl::OUString maCustomShapeData; + OUString maCustomShapeEngine; + OUString maCustomShapeData; std::vector< com::sun::star::beans::PropertyValue > maCustomShapeGeometry; @@ -614,7 +614,7 @@ public: TYPEINFO(); - SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName, + 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, sal_Bool bTemporaryShape); @@ -623,11 +623,11 @@ public: virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; ////////////////////////////////////////////////////////////////////////////// @@ -639,7 +639,7 @@ public: TYPEINFO(); SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLocalName, + 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 ); virtual ~SdXMLTableShapeContext(); @@ -647,14 +647,14 @@ public: virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); // this is called from the parent group for each unparsed attribute in the attribute list - virtual void processAttribute( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::rtl::OUString& rValue ); + virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); private: SvXMLImportContextRef mxTableImportContext; - rtl::OUString msTemplateStyleName; + OUString msTemplateStyleName; sal_Bool maTemplateStylesUsed[6]; }; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index fe6ebd919781..d80c71d43ecb 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -34,8 +34,6 @@ #include <xmloff/xmluconv.hxx> #include "ximpshow.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::std; using namespace ::cppu; diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index 116bb8eebb2b..a6190f0c6de8 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 rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLShowsContext(); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 61c1a48cd461..db902df9a80a 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -45,8 +45,6 @@ #include "XMLNumberStylesImport.hxx" #include "xmloff/xmlerror.hxx" -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -62,7 +60,7 @@ public: TYPEINFO(); SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProps, @@ -72,7 +70,7 @@ public: using SvXMLPropertySetContext::CreateChildContext; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp); @@ -143,7 +141,7 @@ public: SdXMLDrawingPageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID); @@ -151,7 +149,7 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); virtual void Finish( sal_Bool bOverwrite ); @@ -1270,8 +1268,8 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co try { uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW ); - rtl::OUString sPrefix(rMaster.GetDisplayName()); - sPrefix += rtl::OUString(static_cast<sal_Unicode>('-')); + OUString sPrefix(rMaster.GetDisplayName()); + sPrefix += OUString(static_cast<sal_Unicode>('-')); ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); } catch (const uno::Exception&) @@ -1291,7 +1289,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const const OUString sGraphicStyleName(OUString("graphics")); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW ); - ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, rtl::OUString()); + ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString()); } catch( uno::Exception& ) { @@ -1306,7 +1304,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const const OUString sCellStyleName(OUString("cell")); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW ); - ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString()); + ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, OUString()); } catch( uno::Exception& ) { @@ -1317,7 +1315,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const ////////////////////////////////////////////////////////////////////////////// // help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles() // -void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const rtl::OUString& rPrefix) const +void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const { sal_Int32 nPrefLen(rPrefix.getLength()); @@ -1449,7 +1447,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc if(xStyle.is()) { // set parent style name - ::rtl::OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); + OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); if( nPrefLen ) { sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( sal_Unicode('-') ) + 1; @@ -1498,7 +1496,7 @@ TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext ); SdXMLMasterStylesContext::SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName) + const OUString& rLName) : SvXMLImportContext( rImport, nPrfx, rLName) { } @@ -1512,7 +1510,7 @@ SdXMLMasterStylesContext::~SdXMLMasterStylesContext() SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList) { SvXMLImportContext* pContext = 0; @@ -1586,7 +1584,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( /////////////////////////////////////////////////////////////////////// SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList ) { @@ -1640,7 +1638,7 @@ void SdXMLHeaderFooterDeclContext::EndElement() } } -void SdXMLHeaderFooterDeclContext::Characters( const ::rtl::OUString& rChars ) +void SdXMLHeaderFooterDeclContext::Characters( const OUString& rChars ) { maStrText += rChars; } diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 05e13038ded7..3b572bfc5223 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -52,7 +52,7 @@ public: SdXMLPageMasterStyleContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterStyleContext(); @@ -70,7 +70,7 @@ public: class SdXMLPageMasterContext: public SvXMLStyleContext { - rtl::OUString msName; + OUString msName; SdXMLPageMasterStyleContext*mpPageMasterStyle; const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); } @@ -82,15 +82,15 @@ public: SdXMLPageMasterContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPageMasterContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); - const rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; @@ -99,10 +99,10 @@ public: class SdXMLMasterPageContext: public SdXMLGenericPageContext { - rtl::OUString msPageMasterName; - rtl::OUString msName; - rtl::OUString msDisplayName; - rtl::OUString msStyleName; + OUString msPageMasterName; + OUString msName; + OUString msDisplayName; + OUString msStyleName; public: TYPEINFO(); @@ -110,20 +110,20 @@ public: SdXMLMasterPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + 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); virtual ~SdXMLMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); - const rtl::OUString& GetPageMasterName() const { return msPageMasterName; } - const rtl::OUString& GetEncodedName() const { return msName; } - const rtl::OUString& GetDisplayName() const { return msDisplayName; } + const OUString& GetPageMasterName() const { return msPageMasterName; } + const OUString& GetEncodedName() const { return msName; } + const OUString& GetDisplayName() const { return msDisplayName; } }; typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; @@ -133,7 +133,7 @@ typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; class SdXMLPresentationPlaceholderContext: public SvXMLImportContext { - rtl::OUString msName; + OUString msName; sal_Int32 mnX; sal_Int32 mnY; sal_Int32 mnWidth; @@ -146,11 +146,11 @@ public: SdXMLPresentationPlaceholderContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPlaceholderContext(); - const rtl::OUString& GetName() const { return msName; } + const OUString& GetName() const { return msName; } sal_Int32 GetX() const { return mnX; } sal_Int32 GetY() const { return mnY; } sal_Int32 GetWidth() const { return mnWidth; } @@ -163,7 +163,7 @@ typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext { - rtl::OUString msName; + OUString msName; ImpPlaceholderList maList; sal_uInt16 mnTypeId; @@ -176,12 +176,12 @@ public: SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual ~SdXMLPresentationPageLayoutContext(); virtual SvXMLImportContext *CreateChildContext( - sal_uInt16 nPrefix, const rtl::OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual void EndElement(); @@ -204,23 +204,23 @@ class SdXMLStylesContext : public SvXMLStylesContext void ImpSetGraphicStyles() const; void ImpSetCellStyles() const; void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles, - sal_uInt16 nFamily, const rtl::OUString& rPrefix) const; + sal_uInt16 nFamily, const OUString& rPrefix) const; protected: virtual SvXMLStyleContext* CreateStyleChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, - const ::rtl::OUString& rLocalName, + const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: @@ -229,12 +229,12 @@ public: SdXMLStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName, + const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_Bool bIsAutoStyle); virtual ~SdXMLStylesContext(); - virtual sal_uInt16 GetFamily( const rtl::OUString& rFamily ) const; + virtual sal_uInt16 GetFamily( const OUString& rFamily ) const; virtual void EndElement(); virtual UniReference< SvXMLImportPropertyMapper > GetImportPropertyMapper(sal_uInt16 nFamily) const; @@ -259,12 +259,12 @@ public: SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, - const rtl::OUString& rLName); + const OUString& rLName); virtual ~SdXMLMasterStylesContext(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, - const rtl::OUString& rLocalName, + const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; } @@ -277,17 +277,17 @@ class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext { public: SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const ::rtl::OUString& rLName, + const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); virtual sal_Bool IsTransient() const; virtual void EndElement(); - virtual void Characters( const ::rtl::OUString& rChars ); + virtual void Characters( const OUString& rChars ); private: - ::rtl::OUString maStrName; - ::rtl::OUString maStrText; - ::rtl::OUString maStrDateTimeFormat; + OUString maStrName; + OUString maStrText; + OUString maStrDateTimeFormat; sal_Bool mbFixed; }; |