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 /oox | |
| 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 'oox')
131 files changed, 882 insertions, 903 deletions
diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx index c6b3f06b763d..f11dc1d6260a 100644 --- a/oox/inc/oox/core/contexthandler.hxx +++ b/oox/inc/oox/core/contexthandler.hxx @@ -63,26 +63,26 @@ public: /** Returns the relations of the current fragment. */ const Relations& getRelations() const; /** Returns the full path of the current fragment. */ - const ::rtl::OUString& getFragmentPath() const; + const OUString& getFragmentPath() const; /** Returns the full fragment path for the target of the passed relation. */ - ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const; + OUString getFragmentPathFromRelation( const Relation& rRelation ) const; /** Returns the full fragment path for the passed relation identifier. */ - ::rtl::OUString getFragmentPathFromRelId( const ::rtl::OUString& rRelId ) const; + OUString getFragmentPathFromRelId( const OUString& rRelId ) const; /** Returns the full fragment path for the first relation of the passed type. */ - ::rtl::OUString getFragmentPathFromFirstType( const ::rtl::OUString& rType ) const; + OUString getFragmentPathFromFirstType( const OUString& rType ) const; // com.sun.star.xml.sax.XFastContextHandler interface --------------------- virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); // record context interface ----------------------------------------------- diff --git a/oox/inc/oox/core/contexthandler2.hxx b/oox/inc/oox/core/contexthandler2.hxx index 0bd192eeceb2..f1a0c7db38b2 100644 --- a/oox/inc/oox/core/contexthandler2.hxx +++ b/oox/inc/oox/core/contexthandler2.hxx @@ -103,7 +103,7 @@ public: The current element identifier can be accessed with getCurrentElement() or isCurrentElement(). Used by OOXML import only. */ - virtual void onCharacters( const ::rtl::OUString& rChars ) = 0; + virtual void onCharacters( const OUString& rChars ) = 0; /** Will be called when the current element is about to be left. @@ -179,7 +179,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ); /** Must be called from characters() in derived classes. */ - void implCharacters( const ::rtl::OUString& rChars ); + void implCharacters( const OUString& rChars ); /** Must be called from endFastElement() in derived classes. */ void implEndElement( sal_Int32 nElement ); @@ -236,7 +236,7 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters( const ::rtl::OUString& rChars ) + virtual void SAL_CALL characters( const OUString& rChars ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -254,7 +254,7 @@ public: virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/oox/inc/oox/core/fastparser.hxx b/oox/inc/oox/core/fastparser.hxx index a138756bb0a2..40b5e763998f 100644 --- a/oox/inc/oox/core/fastparser.hxx +++ b/oox/inc/oox/core/fastparser.hxx @@ -63,18 +63,18 @@ public: @param bCloseStream True = closes the passed stream after parsing. */ void parseStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream, - const ::rtl::OUString& rStreamName, bool bCloseStream = false ) + const OUString& rStreamName, bool bCloseStream = false ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); /** Parses a stream from the passed storage with the specified name. @param bCloseStream True = closes the stream after parsing. */ - void parseStream( StorageBase& rStorage, const ::rtl::OUString& rStreamName, bool bCloseStream = false ) + void parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); - ::rtl::OUString getNamespaceURL( const ::rtl::OUString& rPrefix ) + OUString getNamespaceURL( const OUString& rPrefix ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - sal_Int32 getNamespaceId( const ::rtl::OUString& aUrl ); + sal_Int32 getNamespaceId( const OUString& aUrl ); ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > getTokenHandler() const { return mxTokenHandler; } diff --git a/oox/inc/oox/core/fasttokenhandler.hxx b/oox/inc/oox/core/fasttokenhandler.hxx index 42479244e67d..05c7063d3925 100644 --- a/oox/inc/oox/core/fasttokenhandler.hxx +++ b/oox/inc/oox/core/fasttokenhandler.hxx @@ -43,13 +43,13 @@ public: virtual ~FastTokenHandler(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XFastTokenHandler - virtual sal_Int32 SAL_CALL getToken( const ::rtl::OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getToken( const OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException); diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx index 5f47ea9fcef2..6f4fc40499c7 100644 --- a/oox/inc/oox/core/filterbase.hxx +++ b/oox/inc/oox/core/filterbase.hxx @@ -148,10 +148,10 @@ public: ::comphelper::MediaDescriptor& getMediaDescriptor() const; /** Returns the URL of the imported or exported file. */ - const ::rtl::OUString& getFileUrl() const; + const OUString& getFileUrl() const; /** Returns an absolute URL for the passed relative or absolute URL. */ - ::rtl::OUString getAbsoluteUrl( const ::rtl::OUString& rUrl ) const; + OUString getAbsoluteUrl( const OUString& rUrl ) const; /** Returns the base storage of the imported/exported file. */ StorageRef getStorage() const; @@ -165,7 +165,7 @@ public: accessed by passing an empty string as stream name. */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - openInputStream( const ::rtl::OUString& rStreamName ) const; + openInputStream( const OUString& rStreamName ) const; /** Opens and returns the specified output stream from the base storage. @@ -176,7 +176,7 @@ public: accessed by passing an empty string as stream name. */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - openOutputStream( const ::rtl::OUString& rStreamName ) const; + openOutputStream( const OUString& rStreamName ) const; /** Commits changes to base storage (and substorages) */ void commitStorage() const; @@ -198,19 +198,19 @@ public: /** Imports the raw binary data from the specified stream. @return True, if the data could be imported from the stream. */ - bool importBinaryData( StreamDataSequence& orDataSeq, const ::rtl::OUString& rStreamName ); + bool importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName ); // com.sun.star.lang.XServiceInfo interface ------------------------------- - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& rServiceName ) + supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); @@ -272,7 +272,7 @@ private: /** Derived classes create a VBA project manager object. */ virtual ::oox::ole::VbaProject* implCreateVbaProject() const = 0; - virtual ::rtl::OUString implGetImplementationName() const = 0; + virtual OUString implGetImplementationName() const = 0; virtual StorageRef implCreateStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const = 0; diff --git a/oox/inc/oox/core/filterdetect.hxx b/oox/inc/oox/core/filterdetect.hxx index cf442771b82c..cd9573b0f0bd 100644 --- a/oox/inc/oox/core/filterdetect.hxx +++ b/oox/inc/oox/core/filterdetect.hxx @@ -50,7 +50,7 @@ namespace core { class FilterDetectDocHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler > { public: - explicit FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, ::rtl::OUString& rFilter ); + explicit FilterDetectDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, OUString& rFilter ); virtual ~FilterDetectDocHandler(); // XFastDocumentHandler @@ -60,28 +60,28 @@ public: // XFastContextHandler virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); private: void parseRelationship( const AttributeList& rAttribs ); - ::rtl::OUString getFilterNameFromContentType( const ::rtl::OUString& rContentType ) const; + OUString getFilterNameFromContentType( const OUString& rContentType ) const; void parseContentTypesDefault( const AttributeList& rAttribs ); void parseContentTypesOverride( const AttributeList& rAttribs ); private: typedef ::std::vector< sal_Int32 > ContextVector; - ::rtl::OUString& mrFilterName; + OUString& mrFilterName; ContextVector maContextStack; - ::rtl::OUString maTargetPath; + OUString maTargetPath; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; }; @@ -122,9 +122,9 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- - virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // com.sun.star.document.XExtendedFilterDetection interface --------------- @@ -144,7 +144,7 @@ public: interface of the temporary file will be stored in the 'ComponentData' property of the passed media descriptor. */ - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/oox/inc/oox/core/fragmenthandler.hxx b/oox/inc/oox/core/fragmenthandler.hxx index b7615b806c7d..236e212e6e32 100644 --- a/oox/inc/oox/core/fragmenthandler.hxx +++ b/oox/inc/oox/core/fragmenthandler.hxx @@ -43,14 +43,14 @@ namespace core { struct FragmentBaseData { XmlFilterBase& mrFilter; - const ::rtl::OUString maFragmentPath; + const OUString maFragmentPath; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > mxLocator; RelationsRef mxRelations; explicit FragmentBaseData( XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, RelationsRef xRelations ); }; @@ -79,7 +79,7 @@ typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::s class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE { public: - explicit FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath ); + explicit FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath ); virtual ~FragmentHandler(); /** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */ @@ -95,14 +95,14 @@ public: // com.sun.star.xml.sax.XFastContextHandler interface --------------------- virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); // XML stream handling ---------------------------------------------------- @@ -116,7 +116,7 @@ public: virtual const RecordInfo* getRecordInfos() const; protected: - explicit FragmentHandler( XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, RelationsRef xRelations ); + explicit FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, RelationsRef xRelations ); }; typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; diff --git a/oox/inc/oox/core/fragmenthandler2.hxx b/oox/inc/oox/core/fragmenthandler2.hxx index 5be5b62efebd..21ad03619fd1 100644 --- a/oox/inc/oox/core/fragmenthandler2.hxx +++ b/oox/inc/oox/core/fragmenthandler2.hxx @@ -47,7 +47,7 @@ protected: public: explicit FragmentHandler2( XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, bool bEnableTrimSpace = true ); virtual ~FragmentHandler2(); @@ -70,7 +70,7 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL characters( const ::rtl::OUString& rChars ) + virtual void SAL_CALL characters( const OUString& rChars ) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); @@ -98,7 +98,7 @@ public: virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); diff --git a/oox/inc/oox/core/recordparser.hxx b/oox/inc/oox/core/recordparser.hxx index 78da7cf0a6c1..9e417c03d01a 100644 --- a/oox/inc/oox/core/recordparser.hxx +++ b/oox/inc/oox/core/recordparser.hxx @@ -40,8 +40,8 @@ namespace prv { class ContextStack; } struct RecordInputSource { BinaryInputStreamRef mxInStream; - ::rtl::OUString maPublicId; - ::rtl::OUString maSystemId; + OUString maPublicId; + OUString maSystemId; }; // ============================================================================ diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx index a28387197568..b78d0d3056eb 100644 --- a/oox/inc/oox/core/relations.hxx +++ b/oox/inc/oox/core/relations.hxx @@ -49,9 +49,9 @@ namespace core { struct Relation { - ::rtl::OUString maId; - ::rtl::OUString maType; - ::rtl::OUString maTarget; + OUString maId; + OUString maType; + OUString maTarget; bool mbExternal; inline explicit Relation() : mbExternal( false ) {} @@ -62,35 +62,35 @@ struct Relation class Relations; typedef ::boost::shared_ptr< Relations > RelationsRef; -class OOX_DLLPUBLIC Relations : public ::std::map< ::rtl::OUString, Relation > +class OOX_DLLPUBLIC Relations : public ::std::map< OUString, Relation > { public: - explicit Relations( const ::rtl::OUString& rFragmentPath ); + explicit Relations( const OUString& rFragmentPath ); /** Returns the path of the fragment this relations collection is related to. */ - inline const ::rtl::OUString& getFragmentPath() const { return maFragmentPath; } + inline const OUString& getFragmentPath() const { return maFragmentPath; } /** Returns the relation with the passed relation identifier. */ - const Relation* getRelationFromRelId( const ::rtl::OUString& rId ) const; + const Relation* getRelationFromRelId( const OUString& rId ) const; /** Returns the first relation with the passed type. */ - const Relation* getRelationFromFirstType( const ::rtl::OUString& rType ) const; + const Relation* getRelationFromFirstType( const OUString& rType ) const; /** Finds all relations associated with the passed type. */ - RelationsRef getRelationsFromType( const ::rtl::OUString& rType ) const; + RelationsRef getRelationsFromType( const OUString& rType ) const; /** Returns the external target of the relation with the passed relation identifier. */ - ::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString& rRelId ) const; + OUString getExternalTargetFromRelId( const OUString& rRelId ) const; /** Returns the internal target of the relation with the passed relation identifier. */ - ::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString& rRelId ) const; + OUString getInternalTargetFromRelId( const OUString& rRelId ) const; /** Returns the full fragment path for the target of the passed relation. */ - ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const; + OUString getFragmentPathFromRelation( const Relation& rRelation ) const; /** Returns the full fragment path for the passed relation identifier. */ - ::rtl::OUString getFragmentPathFromRelId( const ::rtl::OUString& rRelId ) const; + OUString getFragmentPathFromRelId( const OUString& rRelId ) const; /** Returns the full fragment path for the first relation of the passed type. */ - ::rtl::OUString getFragmentPathFromFirstType( const ::rtl::OUString& rType ) const; + OUString getFragmentPathFromFirstType( const OUString& rType ) const; private: - ::rtl::OUString maFragmentPath; + OUString maFragmentPath; }; // ============================================================================ diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx index bf066fdfddb3..4b5c1e093657 100644 --- a/oox/inc/oox/core/xmlfilterbase.hxx +++ b/oox/inc/oox/core/xmlfilterbase.hxx @@ -97,7 +97,7 @@ public: /** Returns the fragment path from the first relation of the passed type, used for fragments referred by the root relations. */ - ::rtl::OUString getFragmentPathFromFirstType( const ::rtl::OUString& rType ); + OUString getFragmentPathFromFirstType( const OUString& rType ); /** Imports a fragment using the passed fragment handler, which contains the full path to the fragment stream. @@ -114,7 +114,7 @@ public: fragment could be imported. */ ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XDocument> importFragment( const ::rtl::OUString& rFragmentPath ); + ::com::sun::star::xml::dom::XDocument> importFragment( const OUString& rFragmentPath ); /** Imports a fragment from an xml::dom::XDocument using the passed fragment handler @@ -135,7 +135,7 @@ public: @return The relations collection of the specified fragment. */ - RelationsRef importRelations( const ::rtl::OUString& rFragmentPath ); + RelationsRef importRelations( const OUString& rFragmentPath ); /** Adds new relation. @@ -147,7 +147,7 @@ public: @return Added relation Id. */ - ::rtl::OUString addRelation( const ::rtl::OUString& rType, const ::rtl::OUString& rTarget, bool bExternal = false ); + OUString addRelation( const OUString& rType, const OUString& rTarget, bool bExternal = false ); /** Adds new relation to part's relations. @@ -162,7 +162,7 @@ public: @return Added relation Id. */ - ::rtl::OUString addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutputStream, const ::rtl::OUString& rType, const ::rtl::OUString& rTarget, bool bExternal = false ); + OUString addRelation( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOutputStream, const OUString& rType, const OUString& rTarget, bool bExternal = false ); /** Returns a stack of used textfields, used by the pptx importer to replace links to slidepages with rhe real page name */ TextFieldStack& getTextFieldStack() const; @@ -183,8 +183,8 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > openFragmentStream( - const ::rtl::OUString& rStreamName, - const ::rtl::OUString& rMediaType ); + const OUString& rStreamName, + const OUString& rMediaType ); /** Opens specified output stream from the base storage with specified media type and returns new fast serializer for that stream. @@ -203,16 +203,16 @@ public: */ ::sax_fastparser::FSHelperPtr openFragmentStreamWithSerializer( - const ::rtl::OUString& rStreamName, - const ::rtl::OUString& rMediaType ); + const OUString& rStreamName, + const OUString& rMediaType ); /** Returns new unique ID for exported document. @return newly created ID. */ inline sal_Int32 GetUniqueId() { return mnMaxDocId++; } - inline ::rtl::OString GetUniqueIdOString() { return ::rtl::OString::valueOf( mnMaxDocId++ ); } - inline ::rtl::OUString GetUniqueIdOUString() { return ::rtl::OUString::valueOf( mnMaxDocId++ ); } + inline OString GetUniqueIdOString() { return OString::valueOf( mnMaxDocId++ ); } + inline OUString GetUniqueIdOUString() { return OUString::valueOf( mnMaxDocId++ ); } /** Write the document properties into into the current OPC package. @@ -222,9 +222,9 @@ public: */ XmlFilterBase& exportDocumentProperties( ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xProperties ); - ::rtl::OUString getNamespaceURL( const ::rtl::OUString& rPrefix ); + OUString getNamespaceURL( const OUString& rPrefix ); - sal_Int32 getNamespaceId( const ::rtl::OUString& rUrl ); + sal_Int32 getNamespaceId( const OUString& rUrl ); void importDocumentProperties(); diff --git a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx b/oox/inc/oox/drawingml/chart/chartcontextbase.hxx index 3ec86d902e77..218e7bf4406e 100644 --- a/oox/inc/oox/drawingml/chart/chartcontextbase.hxx +++ b/oox/inc/oox/drawingml/chart/chartcontextbase.hxx @@ -48,7 +48,7 @@ template< typename ModelType > class FragmentBase : public ::oox::core::FragmentHandler2 { public: - explicit FragmentBase( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, ModelType& rModel ) : + explicit FragmentBase( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, ModelType& rModel ) : ::oox::core::FragmentHandler2( rFilter, rFragmentPath, false ), mrModel( rModel ) {} virtual ~FragmentBase() {} diff --git a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx index 292b7161a0be..43d27f586514 100644 --- a/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx +++ b/oox/inc/oox/drawingml/chart/chartdrawingfragment.hxx @@ -61,7 +61,7 @@ public: /** Imports the absolute anchor size from the cdr:ext element. */ void importExt( const AttributeList& rAttribs ); /** Sets an the relative anchor position from the cdr:from or cdr:to element. */ - void setPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue ); + void setPos( sal_Int32 nElement, sal_Int32 nParentContext, const OUString& rValue ); /** Calculates the resulting shape anchor in EMUs. */ EmuRectangle calcAnchorRectEmu( const EmuRectangle& rChartRect ) const; @@ -84,7 +84,7 @@ class ChartDrawingFragment : public ::oox::core::FragmentHandler2 public: explicit ChartDrawingFragment( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxDrawPage, const ::com::sun::star::awt::Size& rChartSize, const ::com::sun::star::awt::Point& rShapesOffset, @@ -92,7 +92,7 @@ public: virtual ~ChartDrawingFragment(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); private: diff --git a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx b/oox/inc/oox/drawingml/chart/chartspacefragment.hxx index 3c89a33f7f06..c9b1e0c6b776 100644 --- a/oox/inc/oox/drawingml/chart/chartspacefragment.hxx +++ b/oox/inc/oox/drawingml/chart/chartspacefragment.hxx @@ -37,7 +37,7 @@ class ChartSpaceFragment : public FragmentBase< ChartSpaceModel > public: explicit ChartSpaceFragment( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, ChartSpaceModel& rModel ); virtual ~ChartSpaceFragment(); diff --git a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx b/oox/inc/oox/drawingml/chart/chartspacemodel.hxx index 29ae93f8c058..b3d3405c4670 100644 --- a/oox/inc/oox/drawingml/chart/chartspacemodel.hxx +++ b/oox/inc/oox/drawingml/chart/chartspacemodel.hxx @@ -49,7 +49,7 @@ struct ChartSpaceModel View3DRef mxView3D; /// 3D settings. TitleRef mxTitle; /// Chart main title. LegendRef mxLegend; /// Chart legend. - ::rtl::OUString maDrawingPath; /// Path to drawing fragment with embedded shapes. + OUString maDrawingPath; /// Path to drawing fragment with embedded shapes. sal_Int32 mnDispBlanksAs; /// Mode how to display blank values. sal_Int32 mnStyle; /// Index to default formatting. bool mbAutoTitleDel; /// True = automatic title deleted manually. diff --git a/oox/inc/oox/drawingml/chart/converterbase.hxx b/oox/inc/oox/drawingml/chart/converterbase.hxx index 8ee81d40a678..21a03441e803 100644 --- a/oox/inc/oox/drawingml/chart/converterbase.hxx +++ b/oox/inc/oox/drawingml/chart/converterbase.hxx @@ -67,7 +67,7 @@ public: /** Creates an instance for the passed service name, using the process service factory. */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - createInstance( const ::rtl::OUString& rServiceName ) const; + createInstance( const OUString& rServiceName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() const; diff --git a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx b/oox/inc/oox/drawingml/chart/datasourcecontext.hxx index 948096f5f6a7..163b99c868e4 100644 --- a/oox/inc/oox/drawingml/chart/datasourcecontext.hxx +++ b/oox/inc/oox/drawingml/chart/datasourcecontext.hxx @@ -43,7 +43,7 @@ public: virtual ~DoubleSequenceContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: sal_Int32 mnPtIndex; /// Current data point index. @@ -61,7 +61,7 @@ public: virtual ~StringSequenceContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); private: sal_Int32 mnPtIndex; /// Current data point index. diff --git a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx b/oox/inc/oox/drawingml/chart/datasourceconverter.hxx index 27c63ef7e1f5..e8b5649e1bef 100644 --- a/oox/inc/oox/drawingml/chart/datasourceconverter.hxx +++ b/oox/inc/oox/drawingml/chart/datasourceconverter.hxx @@ -42,7 +42,7 @@ public: /** Creates a data sequence object from the contained formula link. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - createDataSequence( const ::rtl::OUString& rRole ); + createDataSequence( const OUString& rRole ); }; // ============================================================================ @@ -57,7 +57,7 @@ public: /** Creates a data sequence object from the contained series data. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - createDataSequence( const ::rtl::OUString& rRole ); + createDataSequence( const OUString& rRole ); }; // ============================================================================ diff --git a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx b/oox/inc/oox/drawingml/chart/datasourcemodel.hxx index 807d96b75de1..d43048ef071c 100644 --- a/oox/inc/oox/drawingml/chart/datasourcemodel.hxx +++ b/oox/inc/oox/drawingml/chart/datasourcemodel.hxx @@ -34,8 +34,8 @@ struct DataSequenceModel typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > AnyMap; AnyMap maData; /// Map of values, indexed by point identifier. - ::rtl::OUString maFormula; /// Formula reference, e.g. into a spreadsheet. - ::rtl::OUString maFormatCode; /// Number format for double values. + OUString maFormula; /// Formula reference, e.g. into a spreadsheet. + OUString maFormatCode; /// Number format for double values. sal_Int32 mnPointCount; /// Number of points in this series source. explicit DataSequenceModel(); diff --git a/oox/inc/oox/drawingml/chart/modelbase.hxx b/oox/inc/oox/drawingml/chart/modelbase.hxx index 52762621968c..985221ec394b 100644 --- a/oox/inc/oox/drawingml/chart/modelbase.hxx +++ b/oox/inc/oox/drawingml/chart/modelbase.hxx @@ -96,7 +96,7 @@ private: struct NumberFormat { - ::rtl::OUString maFormatCode; /// Number format code. + OUString maFormatCode; /// Number format code. bool mbSourceLinked; /// True = number format linked to source data. explicit NumberFormat(); diff --git a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx b/oox/inc/oox/drawingml/chart/plotareaconverter.hxx index bdc10808f54a..6796ffbd6a1c 100644 --- a/oox/inc/oox/drawingml/chart/plotareaconverter.hxx +++ b/oox/inc/oox/drawingml/chart/plotareaconverter.hxx @@ -79,14 +79,14 @@ public: void convertPositionFromModel(); /** Returns the automatic chart title if the chart contains only one series. */ - inline const ::rtl::OUString& getAutomaticTitle() const { return maAutoTitle; } + inline const OUString& getAutomaticTitle() const { return maAutoTitle; } /** Returns true, if the chart is three-dimensional. */ inline bool is3dChart() const { return mb3dChart; } /** Returns true, if chart type supports wall and floor format in 3D mode. */ inline bool isWall3dChart() const { return mbWall3dChart; } private: - ::rtl::OUString maAutoTitle; + OUString maAutoTitle; bool mb3dChart; bool mbWall3dChart; bool mbPieChart; diff --git a/oox/inc/oox/drawingml/chart/seriescontext.hxx b/oox/inc/oox/drawingml/chart/seriescontext.hxx index 79395b0fe420..e31156dd2796 100644 --- a/oox/inc/oox/drawingml/chart/seriescontext.hxx +++ b/oox/inc/oox/drawingml/chart/seriescontext.hxx @@ -39,7 +39,7 @@ public: virtual ~DataLabelContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); }; // ============================================================================ @@ -55,7 +55,7 @@ public: virtual ~DataLabelsContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); }; // ============================================================================ @@ -116,7 +116,7 @@ public: virtual ~TrendlineContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); }; // ============================================================================ diff --git a/oox/inc/oox/drawingml/chart/seriesconverter.hxx b/oox/inc/oox/drawingml/chart/seriesconverter.hxx index 7b74400b950d..073073c5bbe7 100644 --- a/oox/inc/oox/drawingml/chart/seriesconverter.hxx +++ b/oox/inc/oox/drawingml/chart/seriesconverter.hxx @@ -140,10 +140,10 @@ public: /** Creates a labeled data sequence object from category data link. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > - createCategorySequence( const ::rtl::OUString& rRole ); + createCategorySequence( const OUString& rRole ); /** Creates a labeled data sequence object from value data link. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > - createValueSequence( const ::rtl::OUString& rRole ); + createValueSequence( const OUString& rRole ); /** Creates a data series object with initialized source links. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > createDataSeries( const TypeGroupConverter& rTypeGroup, bool bVaryColorsByPoint ); @@ -152,7 +152,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > createLabeledDataSequence( SeriesModel::SourceType eSourceType, - const ::rtl::OUString& rRole, + const OUString& rRole, bool bUseTextLabel ); }; diff --git a/oox/inc/oox/drawingml/chart/seriesmodel.hxx b/oox/inc/oox/drawingml/chart/seriesmodel.hxx index 2a87f0b75361..998065f7f8ad 100644 --- a/oox/inc/oox/drawingml/chart/seriesmodel.hxx +++ b/oox/inc/oox/drawingml/chart/seriesmodel.hxx @@ -37,7 +37,7 @@ struct DataLabelModelBase ShapeRef mxShapeProp; /// Data label frame formatting. TextBodyRef mxTextProp; /// Data label text formatting. NumberFormat maNumberFormat; /// Number format for numeric data labels. - OptValue< ::rtl::OUString > moaSeparator;/// Separator between label components. + OptValue< OUString > moaSeparator;/// Separator between label components. OptValue< sal_Int32 > monLabelPos; /// Data label position. OptValue< bool > mobShowBubbleSize; /// True = show size of bubbles in bubble charts. OptValue< bool > mobShowCatName; /// True = show category name of data points. @@ -148,7 +148,7 @@ struct TrendlineModel ShapeRef mxShapeProp; /// Trendline formatting. TrendlineLabelRef mxLabel; /// Trendline label text object. - ::rtl::OUString maName; /// User-defined name of the trendline. + OUString maName; /// User-defined name of the trendline. OptValue< double > mfBackward; /// Size of trendline before first data point. OptValue< double > mfForward; /// Size of trendline behind last data point. OptValue< double > mfIntercept; /// Crossing point with Y axis. diff --git a/oox/inc/oox/drawingml/chart/titlecontext.hxx b/oox/inc/oox/drawingml/chart/titlecontext.hxx index 78e3b77c4307..b00a9ed45b6d 100644 --- a/oox/inc/oox/drawingml/chart/titlecontext.hxx +++ b/oox/inc/oox/drawingml/chart/titlecontext.hxx @@ -39,7 +39,7 @@ public: virtual ~TextContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); }; // ============================================================================ diff --git a/oox/inc/oox/drawingml/chart/titleconverter.hxx b/oox/inc/oox/drawingml/chart/titleconverter.hxx index 7fb72c455087..ad3694568efe 100644 --- a/oox/inc/oox/drawingml/chart/titleconverter.hxx +++ b/oox/inc/oox/drawingml/chart/titleconverter.hxx @@ -47,11 +47,11 @@ public: /** Creates a data sequence object from the contained text data. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - createDataSequence( const ::rtl::OUString& rRole ); + createDataSequence( const OUString& rRole ); /** Creates a sequence of formatted string objects. */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > createStringSequence( - const ::rtl::OUString& rDefaultText, + const OUString& rDefaultText, const ModelRef< TextBody >& rxTextProp, ObjectType eObjType ); @@ -59,7 +59,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > appendFormattedString( ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& orStringVec, - const ::rtl::OUString& rString, + const OUString& rString, bool bAddNewLine ) const; }; @@ -76,7 +76,7 @@ public: /** Creates a title text object and attaches it at the passed interface. */ void convertFromModel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitled >& rxTitled, - const ::rtl::OUString& rAutoTitle, ObjectType eObjType, + const OUString& rAutoTitle, ObjectType eObjType, sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ); }; diff --git a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx b/oox/inc/oox/drawingml/chart/typegroupconverter.hxx index e870c20ce790..dfce05065c18 100644 --- a/oox/inc/oox/drawingml/chart/typegroupconverter.hxx +++ b/oox/inc/oox/drawingml/chart/typegroupconverter.hxx @@ -149,7 +149,7 @@ public: /** Returns true, if this chart type has to reverse its series order. */ bool isReverseSeries() const; /** Returns series title, if the chart type group contains only one single series. */ - ::rtl::OUString getSingleSeriesTitle() const; + OUString getSingleSeriesTitle() const; /** Creates a coordinate system according to the contained chart type. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx index ec41bb1b4c01..e44f20db95e2 100644 --- a/oox/inc/oox/drawingml/customshapeproperties.hxx +++ b/oox/inc/oox/drawingml/customshapeproperties.hxx @@ -50,8 +50,8 @@ typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr; struct CustomShapeGuide { - rtl::OUString maName; - rtl::OUString maFormula; + OUString maName; + OUString maFormula; }; struct AdjustHandle @@ -61,12 +61,12 @@ struct AdjustHandle pos; // depending to the type (polar or not): - OptValue< rtl::OUString > gdRef1; // gdRefX or gdRefR + OptValue< OUString > gdRef1; // gdRefX or gdRefR OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > min1; // minX or minR OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > max1; // maxX or maxR - OptValue< rtl::OUString > gdRef2; // gdRefY or gdRefAng + OptValue< OUString > gdRef2; // gdRefY or gdRefAng OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > min2; // minX or minAng OptValue< com::sun::star::drawing::EnhancedCustomShapeParameter > @@ -133,7 +133,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape); sal_Int32 getShapePresetType() const { return mnShapePresetType; } - ::rtl::OUString getShapePresetTypeName() const; + OUString getShapePresetTypeName() const; void setShapePresetType( sal_Int32 nShapePresetType ){ mnShapePresetType = nShapePresetType; }; std::vector< CustomShapeGuide >& getAdjustmentGuideList(){ return maAdjustmentGuideList; }; @@ -148,7 +148,7 @@ public: void setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; }; static sal_Int32 SetCustomShapeGuideValue( std::vector< CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide ); - static sal_Int32 GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const rtl::OUString& rFormulaName ); + static sal_Int32 GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const OUString& rFormulaName ); sal_Int32 getArcNum() { return mnArcNum++; } diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx b/oox/inc/oox/drawingml/diagram/diagram.hxx index f8a4b39bf4b6..e37c1a44e42f 100644 --- a/oox/inc/oox/drawingml/diagram/diagram.hxx +++ b/oox/inc/oox/drawingml/diagram/diagram.hxx @@ -36,10 +36,10 @@ namespace oox { namespace drawingml { */ void loadDiagram( ShapePtr& pShape, core::XmlFilterBase& rFilter, - const ::rtl::OUString& rDataModelPath, - const ::rtl::OUString& rLayoutPath, - const ::rtl::OUString& rQStylePath, - const ::rtl::OUString& rColorStylePath ); + const OUString& rDataModelPath, + const OUString& rLayoutPath, + const OUString& rQStylePath, + const OUString& rColorStylePath ); void loadDiagram( const ShapePtr& pShape, core::XmlFilterBase& rFilter, diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/oox/inc/oox/drawingml/drawingmltypes.hxx index d7e0ac610c22..5df664ee66a4 100644 --- a/oox/inc/oox/drawingml/drawingmltypes.hxx +++ b/oox/inc/oox/drawingml/drawingmltypes.hxx @@ -97,19 +97,19 @@ com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun:: sal_Int32 GetCoordinate( sal_Int32 nValue ); /** converts an emu string into 1/100th mmm */ -sal_Int32 GetCoordinate( const ::rtl::OUString& sValue ); +sal_Int32 GetCoordinate( const OUString& sValue ); /** converts a ST_Percentage % string into 1/1000th of % */ -sal_Int32 GetPercent( const ::rtl::OUString& sValue ); +sal_Int32 GetPercent( const OUString& sValue ); /** Converts a ST_PositiveFixedPercentage to a float. 1.0 == 100% */ -double GetPositiveFixedPercentage( const ::rtl::OUString& sValue ); +double GetPositiveFixedPercentage( const OUString& sValue ); /** converts the ST_TextFontSize to point */ -float GetTextSize( const ::rtl::OUString& rValue ); +float GetTextSize( const OUString& rValue ); /** converts the ST_TextSpacingPoint to 1/100mm */ -sal_Int32 GetTextSpacingPoint( const ::rtl::OUString& sValue ); +sal_Int32 GetTextSpacingPoint( const OUString& sValue ); sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue ); /** */ diff --git a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx b/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx index 5b0f285cd11e..97cebd54947b 100644 --- a/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx +++ b/oox/inc/oox/drawingml/embeddedwavaudiofile.hxx @@ -34,8 +34,8 @@ namespace oox { namespace drawingml { { } bool mbBuiltIn; - ::rtl::OUString msName; - ::rtl::OUString msEmbed; + OUString msName; + OUString msEmbed; }; void getEmbeddedWAVAudioFile( diff --git a/oox/inc/oox/drawingml/graphicshapecontext.hxx b/oox/inc/oox/drawingml/graphicshapecontext.hxx index 95e79a107d46..c5984d503363 100644 --- a/oox/inc/oox/drawingml/graphicshapecontext.hxx +++ b/oox/inc/oox/drawingml/graphicshapecontext.hxx @@ -76,10 +76,10 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); private: - ::rtl::OUString msDm; - ::rtl::OUString msLo; - ::rtl::OUString msQs; - ::rtl::OUString msCs; + OUString msDm; + OUString msLo; + OUString msQs; + OUString msCs; }; // ==================================================================== diff --git a/oox/inc/oox/drawingml/guidcontext.hxx b/oox/inc/oox/drawingml/guidcontext.hxx index 0ad3bd135e80..8a60bf20ab5c 100644 --- a/oox/inc/oox/drawingml/guidcontext.hxx +++ b/oox/inc/oox/drawingml/guidcontext.hxx @@ -28,12 +28,12 @@ namespace oox { namespace drawingml { { public: - GuidContext( ::oox::core::ContextHandler& rParent, rtl::OUString& rGuidId ); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + GuidContext( ::oox::core::ContextHandler& rParent, OUString& rGuidId ); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); private: - rtl::OUString& mrGuidId; + OUString& mrGuidId; }; } } diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx index 88d37b3df25a..f8a58ec5340b 100644 --- a/oox/inc/oox/drawingml/shape.hxx +++ b/oox/inc/oox/drawingml/shape.hxx @@ -44,7 +44,7 @@ namespace oox { namespace drawingml { class CustomShapeProperties; typedef boost::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr; -typedef ::std::map< ::rtl::OUString, ShapePtr > ShapeIdMap; +typedef ::std::map< OUString, ShapePtr > ShapeIdMap; struct ShapeStyleRef { @@ -59,7 +59,7 @@ typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap; /** Additional information for a chart embedded in a drawing shape. */ struct ChartShapeInfo { - ::rtl::OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts. + OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts. bool mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage. inline explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} @@ -76,7 +76,7 @@ public: explicit Shape( const ShapePtr& pSourceShape ); virtual ~Shape(); - rtl::OUString& getServiceName(){ return msServiceName; } + OUString& getServiceName(){ return msServiceName; } void setServiceName( const sal_Char* pServiceName ); PropertyMap& getShapeProperties(){ return maShapeProperties; } @@ -114,10 +114,10 @@ public: void addChild( const ShapePtr pChildPtr ) { maChildren.push_back( pChildPtr ); } std::vector< ShapePtr >& getChildren() { return maChildren; } - void setName( const rtl::OUString& rName ) { msName = rName; } - ::rtl::OUString getName( ) { return msName; } - void setId( const rtl::OUString& rId ) { msId = rId; } - ::rtl::OUString getId() { return msId; } + void setName( const OUString& rName ) { msName = rName; } + OUString getName( ) { return msName; } + void setId( const OUString& rId ) { msId = rId; } + OUString getId() { return msId; } void setHidden( sal_Bool bHidden ) { mbHidden = bHidden; } sal_Bool getHidden() const { return mbHidden; }; void setHiddenMasterShape( sal_Bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; } @@ -169,16 +169,16 @@ public: getXShape() const { return mxShape; } virtual void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true ); - const ::std::vector<rtl::OUString>& + const ::std::vector<OUString>& getExtDrawings() { return maExtDrawings; } - void addExtDrawingRelId( const ::rtl::OUString &rRelId ) { maExtDrawings.push_back( rRelId ); } + void addExtDrawingRelId( const OUString &rRelId ) { maExtDrawings.push_back( rRelId ); } protected: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createAndInsert( ::oox::core::XmlFilterBase& rFilterBase, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const Theme* pTheme, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, const ::com::sun::star::awt::Rectangle* pShapeRect, @@ -197,9 +197,9 @@ protected: ShapeIdMap* pShapeMap, basegfx::B2DHomMatrix& aTransformation ); - virtual ::rtl::OUString finalizeServiceName( + virtual OUString finalizeServiceName( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const ::com::sun::star::awt::Rectangle& rShapeRect ); virtual void finalizeXShape( @@ -226,9 +226,9 @@ protected: TextListStylePtr mpMasterTextListStyle; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; - rtl::OUString msServiceName; - rtl::OUString msName; - rtl::OUString msId; + OUString msServiceName; + OUString msName; + OUString msId; sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder OptValue< sal_Int32 > moSubTypeIndex; @@ -236,7 +236,7 @@ protected: com::sun::star::awt::Size maSize; com::sun::star::awt::Point maPosition; - ::std::vector<rtl::OUString> maExtDrawings; + ::std::vector<OUString> maExtDrawings; private: enum FrameType diff --git a/oox/inc/oox/drawingml/shape3dproperties.hxx b/oox/inc/oox/drawingml/shape3dproperties.hxx index e01f6659b727..d1891402757c 100644 --- a/oox/inc/oox/drawingml/shape3dproperties.hxx +++ b/oox/inc/oox/drawingml/shape3dproperties.hxx @@ -38,20 +38,20 @@ namespace drawingml { struct Shape3DPropertyNames { - ::rtl::OUString maFillStyle; - ::rtl::OUString maFillColor; - ::rtl::OUString maFillTransparence; - ::rtl::OUString maFillGradient; - ::rtl::OUString maFillBitmap; - ::rtl::OUString maFillBitmapMode; - ::rtl::OUString maFillBitmapTile; - ::rtl::OUString maFillBitmapStretch; - ::rtl::OUString maFillBitmapLogicalSize; - ::rtl::OUString maFillBitmapSizeX; - ::rtl::OUString maFillBitmapSizeY; - ::rtl::OUString maFillBitmapOffsetX; - ::rtl::OUString maFillBitmapOffsetY; - ::rtl::OUString maFillBitmapRectanglePoint; + OUString maFillStyle; + OUString maFillColor; + OUString maFillTransparence; + OUString maFillGradient; + OUString maFillBitmap; + OUString maFillBitmapMode; + OUString maFillBitmapTile; + OUString maFillBitmapStretch; + OUString maFillBitmapLogicalSize; + OUString maFillBitmapSizeX; + OUString maFillBitmapSizeY; + OUString maFillBitmapOffsetX; + OUString maFillBitmapOffsetY; + OUString maFillBitmapRectanglePoint; bool mbNamedFillGradient; bool mbNamedFillBitmap; bool mbTransformGraphic; diff --git a/oox/inc/oox/drawingml/shapepropertymap.hxx b/oox/inc/oox/drawingml/shapepropertymap.hxx index 994c0326139c..a5cc12f5484c 100644 --- a/oox/inc/oox/drawingml/shapepropertymap.hxx +++ b/oox/inc/oox/drawingml/shapepropertymap.hxx @@ -102,7 +102,7 @@ public: /** Returns true, if named line markers are supported, and the specified line marker has already been inserted into the marker table. */ - bool hasNamedLineMarkerInTable( const ::rtl::OUString& rMarkerName ) const; + bool hasNamedLineMarkerInTable( const OUString& rMarkerName ) const; /** Sets the specified shape property to the passed value. */ bool setAnyProperty( ShapePropertyId ePropId, const ::com::sun::star::uno::Any& rValue ); diff --git a/oox/inc/oox/drawingml/table/tableproperties.hxx b/oox/inc/oox/drawingml/table/tableproperties.hxx index e1479c07fc7f..8c584b1f8959 100644 --- a/oox/inc/oox/drawingml/table/tableproperties.hxx +++ b/oox/inc/oox/drawingml/table/tableproperties.hxx @@ -42,7 +42,7 @@ public: std::vector< sal_Int32 >& getTableGrid() { return mvTableGrid; }; std::vector< TableRow >& getTableRows() { return mvTableRows; }; - rtl::OUString& getStyleId(){ return maStyleId; }; + OUString& getStyleId(){ return maStyleId; }; boost::shared_ptr< TableStyle >& getTableStyle(){ return mpTableStyle; }; sal_Bool& isRtl(){ return mbRtl; }; sal_Bool& isFirstRow(){ return mbFirstRow; }; @@ -59,7 +59,7 @@ private: const TableStyle& getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase ); - rtl::OUString maStyleId; // either StyleId is available + OUString maStyleId; // either StyleId is available boost::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle std::vector< sal_Int32 > mvTableGrid; std::vector< TableRow > mvTableRows; diff --git a/oox/inc/oox/drawingml/table/tablestyle.hxx b/oox/inc/oox/drawingml/table/tablestyle.hxx index 66bbf0c7a1f3..b31b5891a32b 100644 --- a/oox/inc/oox/drawingml/table/tablestyle.hxx +++ b/oox/inc/oox/drawingml/table/tablestyle.hxx @@ -33,8 +33,8 @@ public: TableStyle(); ~TableStyle(); - rtl::OUString& getStyleId(){ return maStyleId; } - rtl::OUString& getStyleName() { return maStyleName; } + OUString& getStyleId(){ return maStyleId; } + OUString& getStyleName() { return maStyleName; } ::oox::drawingml::ShapeStyleRef& getBackgroundFillStyleRef(){ return maFillStyleRef; } @@ -56,8 +56,8 @@ public: private: - rtl::OUString maStyleId; - rtl::OUString maStyleName; + OUString maStyleId; + OUString maStyleName; ::oox::drawingml::ShapeStyleRef maFillStyleRef; diff --git a/oox/inc/oox/drawingml/table/tablestylelist.hxx b/oox/inc/oox/drawingml/table/tablestylelist.hxx index 16d95a3e61eb..320609d064d9 100644 --- a/oox/inc/oox/drawingml/table/tablestylelist.hxx +++ b/oox/inc/oox/drawingml/table/tablestylelist.hxx @@ -35,12 +35,12 @@ public: TableStyleList(); ~TableStyleList(); - rtl::OUString& getDefaultStyleId() { return maDefaultStyleId; }; + OUString& getDefaultStyleId() { return maDefaultStyleId; }; std::vector< TableStyle >& getTableStyles(){ return maTableStyles; }; private: - rtl::OUString maDefaultStyleId; + OUString maDefaultStyleId; std::vector< TableStyle > maTableStyles; }; diff --git a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx index b26439d5e334..d6ef77f8614c 100644 --- a/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx +++ b/oox/inc/oox/drawingml/table/tablestylelistfragmenthandler.hxx @@ -34,7 +34,7 @@ class TableStyleListFragmentHandler : public ::oox::core::FragmentHandler2 public: explicit TableStyleListFragmentHandler( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, TableStyleList& rTableStyleList ); virtual ~TableStyleListFragmentHandler(); diff --git a/oox/inc/oox/drawingml/textbodycontext.hxx b/oox/inc/oox/drawingml/textbodycontext.hxx index 7b21718d72a4..d46272e853a6 100644 --- a/oox/inc/oox/drawingml/textbodycontext.hxx +++ b/oox/inc/oox/drawingml/textbodycontext.hxx @@ -49,7 +49,7 @@ public: virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); protected: TextRunPtr mpRunPtr; diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx b/oox/inc/oox/drawingml/textcharacterproperties.hxx index 3dc40621695a..99792fe7725d 100644 --- a/oox/inc/oox/drawingml/textcharacterproperties.hxx +++ b/oox/inc/oox/drawingml/textcharacterproperties.hxx @@ -42,7 +42,7 @@ struct TextCharacterProperties Color maCharColor; Color maUnderlineColor; Color maHighlightColor; - OptValue< ::rtl::OUString > moLang; + OptValue< OUString > moLang; OptValue< sal_Int32 > moHeight; OptValue< sal_Int32 > moSpacing; OptValue< sal_Int32 > moUnderline; diff --git a/oox/inc/oox/drawingml/textfield.hxx b/oox/inc/oox/drawingml/textfield.hxx index dc1c4f938966..df98b0302560 100644 --- a/oox/inc/oox/drawingml/textfield.hxx +++ b/oox/inc/oox/drawingml/textfield.hxx @@ -38,8 +38,8 @@ public: inline TextParagraphProperties& getTextParagraphProperties() { return maTextParagraphProperties; } inline const TextParagraphProperties& getTextParagraphProperties() const { return maTextParagraphProperties; } - inline void setType( const ::rtl::OUString& sType ) { msType = sType; } - inline void setUuid( const ::rtl::OUString & sUuid ) { msUuid = sUuid; } + inline void setType( const OUString& sType ) { msType = sType; } + inline void setUuid( const OUString & sUuid ) { msUuid = sUuid; } virtual sal_Int32 insertAt( const ::oox::core::XmlFilterBase& rFilterBase, @@ -49,8 +49,8 @@ public: private: TextParagraphProperties maTextParagraphProperties; - ::rtl::OUString msType; - ::rtl::OUString msUuid; + OUString msType; + OUString msUuid; }; typedef boost::shared_ptr< TextField > TextFieldPtr; diff --git a/oox/inc/oox/drawingml/textfieldcontext.hxx b/oox/inc/oox/drawingml/textfieldcontext.hxx index 8b64b420be66..3a50ea93620f 100644 --- a/oox/inc/oox/drawingml/textfieldcontext.hxx +++ b/oox/inc/oox/drawingml/textfieldcontext.hxx @@ -34,7 +34,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rXAttributes, TextField& rTextField); virtual void SAL_CALL endFastElement( sal_Int32 aElementToken ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 aElementToken, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rXAttributes ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); diff --git a/oox/inc/oox/drawingml/textfont.hxx b/oox/inc/oox/drawingml/textfont.hxx index 74adff2015d3..95a7a1716a0d 100644 --- a/oox/inc/oox/drawingml/textfont.hxx +++ b/oox/inc/oox/drawingml/textfont.hxx @@ -45,20 +45,20 @@ public: /** Returns the font name, pitch, and family; tries to resolve theme placeholder names, e.g. '+mj-lt' for the major latin theme font. */ bool getFontData( - ::rtl::OUString& rFontName, + OUString& rFontName, sal_Int16& rnFontPitch, sal_Int16& rnFontFamily, const ::oox::core::XmlFilterBase& rFilter ) const; private: bool implGetFontData( - ::rtl::OUString& rFontName, + OUString& rFontName, sal_Int16& rnFontPitch, sal_Int16& rnFontFamily ) const; private: - ::rtl::OUString maTypeface; - ::rtl::OUString maPanose; + OUString maTypeface; + OUString maPanose; sal_Int32 mnPitch; sal_Int32 mnCharset; }; diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx index 3dacd86831ad..1cb8215a3fc1 100644 --- a/oox/inc/oox/drawingml/textparagraphproperties.hxx +++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx @@ -45,7 +45,7 @@ public: bool is() const; void apply( const BulletList& ); void pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, PropertyMap& xPropMap ) const; - void setBulletChar( const ::rtl::OUString & sChar ); + void setBulletChar( const OUString & sChar ); void setStartAt( sal_Int32 nStartAt ){ mnStartAt <<= static_cast< sal_Int16 >( nStartAt ); } void setType( sal_Int32 nType ); void setNone( ); @@ -56,7 +56,7 @@ public: void setSuffixMinusRight(); void setBulletSize(sal_Int16 nSize); void setFontSize(sal_Int16 nSize); - void setStyleName( const rtl::OUString& rStyleName ) { maStyleName <<= rStyleName; } + void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; } void setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic ); ::oox::drawingml::ColorPtr maBulletColorPtr; diff --git a/oox/inc/oox/drawingml/textrun.hxx b/oox/inc/oox/drawingml/textrun.hxx index 4d14a17d485e..0e215bf68973 100644 --- a/oox/inc/oox/drawingml/textrun.hxx +++ b/oox/inc/oox/drawingml/textrun.hxx @@ -33,8 +33,8 @@ public: TextRun(); virtual ~TextRun(); - inline ::rtl::OUString& getText() { return msText; } - inline const ::rtl::OUString& getText() const { return msText; } + inline OUString& getText() { return msText; } + inline const OUString& getText() const { return msText; } inline TextCharacterProperties& getTextCharacterProperties() { return maTextCharacterProperties; } inline const TextCharacterProperties& getTextCharacterProperties() const { return maTextCharacterProperties; } @@ -48,7 +48,7 @@ public: const TextCharacterProperties& rTextCharacterStyle ) const; private: - ::rtl::OUString msText; + OUString msText; TextCharacterProperties maTextCharacterProperties; bool mbIsLineBreak; }; diff --git a/oox/inc/oox/drawingml/theme.hxx b/oox/inc/oox/drawingml/theme.hxx index 12bb62be476c..f167c43a4fd4 100644 --- a/oox/inc/oox/drawingml/theme.hxx +++ b/oox/inc/oox/drawingml/theme.hxx @@ -48,8 +48,8 @@ public: explicit Theme(); ~Theme(); - inline void setStyleName( const ::rtl::OUString& rStyleName ) { maStyleName = rStyleName; } - inline const ::rtl::OUString& getStyleName() const { return maStyleName; } + inline void setStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; } + inline const OUString& getStyleName() const { return maStyleName; } inline ClrScheme& getClrScheme() { return maClrScheme; } inline const ClrScheme& getClrScheme() const { return maClrScheme; } @@ -75,7 +75,7 @@ public: /** Returns theme font properties by scheme type (major/minor). */ const TextCharacterProperties* getFontStyle( sal_Int32 nSchemeType ) const; /** Returns theme font by placeholder name, e.g. the major latin theme font for the font name '+mj-lt'. */ - const TextFont* resolveFont( const ::rtl::OUString& rName ) const; + const TextFont* resolveFont( const OUString& rName ) const; inline Shape& getSpDef() { return maSpDef; } inline const Shape& getSpDef() const { return maSpDef; } @@ -92,7 +92,7 @@ public: ::com::sun::star::xml::dom::XDocument>& getFragment() const { return mxFragment; } private: - ::rtl::OUString maStyleName; + OUString maStyleName; ClrScheme maClrScheme; FillStyleList maFillStyleList; FillStyleList maBgFillStyleList; diff --git a/oox/inc/oox/drawingml/themefragmenthandler.hxx b/oox/inc/oox/drawingml/themefragmenthandler.hxx index a8de3b4ba07e..61062775fa37 100644 --- a/oox/inc/oox/drawingml/themefragmenthandler.hxx +++ b/oox/inc/oox/drawingml/themefragmenthandler.hxx @@ -35,7 +35,7 @@ class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2 public: explicit ThemeFragmentHandler( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, Theme& rTheme ); virtual ~ThemeFragmentHandler(); diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 6ba5ab7d4e5c..043bb73ecfa8 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -91,10 +91,10 @@ const sal_Unicode OOX_DUMP_EMPTYVALUE = '~'; const sal_Unicode OOX_DUMP_CMDPROMPT = '?'; const sal_Unicode OOX_DUMP_PLACEHOLDER = '\x01'; -typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > OUStringPair; +typedef ::std::pair< OUString, OUString > OUStringPair; typedef ::std::pair< sal_Int64, sal_Int64 > Int64Pair; -typedef ::std::vector< ::rtl::OUString > OUStringVector; +typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< sal_Int64 > Int64Vector; // ============================================================================ @@ -106,23 +106,23 @@ class InputOutputHelper public: // file names ------------------------------------------------------------- - static ::rtl::OUString convertFileNameToUrl( const ::rtl::OUString& rFileName ); - static sal_Int32 getFileNamePos( const ::rtl::OUString& rFileUrl ); - static ::rtl::OUString getFileNameExtension( const ::rtl::OUString& rFileUrl ); + static OUString convertFileNameToUrl( const OUString& rFileName ); + static sal_Int32 getFileNamePos( const OUString& rFileUrl ); + static OUString getFileNameExtension( const OUString& rFileUrl ); // input streams ---------------------------------------------------------- static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > openInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& rFileName ); + const OUString& rFileName ); // output streams --------------------------------------------------------- static ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > openOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& rFileName ); + const OUString& rFileName ); static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > openTextOutputStream( @@ -133,7 +133,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > openTextOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& rFileName, + const OUString& rFileName, rtl_TextEncoding eTextEnc ); }; @@ -214,12 +214,12 @@ struct ItemFormat { DataType meDataType; ///< Data type of the item. FormatType meFmtType; ///< Output format for the value. - ::rtl::OUString maItemName; ///< Name of the item. - ::rtl::OUString maListName; ///< Name of a name list to be used for this item. + OUString maItemName; ///< Name of the item. + OUString maListName; ///< Name of a name list to be used for this item. explicit ItemFormat(); - void set( DataType eDataType, FormatType eFmtType, const ::rtl::OUString& rItemName ); + void set( DataType eDataType, FormatType eFmtType, const OUString& rItemName ); /** Initializes the struct from a vector of strings containing the item format. @@ -246,7 +246,7 @@ struct ItemFormat @return List containing remaining unhandled format strings. */ - OUStringVector parse( const ::rtl::OUString& rFormatStr ); + OUStringVector parse( const OUString& rFormatStr ); }; // ============================================================================ @@ -300,120 +300,120 @@ class StringHelper public: // append string to string ------------------------------------------------ - static void appendChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1 ); - static void appendString( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1 ); + static void appendString( OUStringBuffer& rStr, const OUString& rData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); // append decimal --------------------------------------------------------- - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); - static void appendDec( ::rtl::OUStringBuffer& rStr, double fData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_uInt8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_Int8 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_uInt16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_Int16 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, sal_Int64 nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); + static void appendDec( OUStringBuffer& rStr, double fData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' ); // append hexadecimal ----------------------------------------------------- - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true ); - static void appendHex( ::rtl::OUStringBuffer& rStr, double fData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true ); + static void appendHex( OUStringBuffer& rStr, double fData, bool bPrefix = true ); // append shortened hexadecimal ------------------------------------------- - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true ); - static void appendShortHex( ::rtl::OUStringBuffer& rStr, double fData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_uInt8 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_Int8 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_uInt16 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_Int16 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_uInt32 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_Int32 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_uInt64 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, sal_Int64 nData, bool bPrefix = true ); + static void appendShortHex( OUStringBuffer& rStr, double fData, bool bPrefix = true ); // append binary ---------------------------------------------------------- - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt8 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int8 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt16 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int16 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt32 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int32 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_uInt64 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, sal_Int64 nData, bool bDots = true ); - static void appendBin( ::rtl::OUStringBuffer& rStr, double fData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_uInt8 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_Int8 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_uInt16 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_Int16 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_uInt32 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_Int32 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_uInt64 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, sal_Int64 nData, bool bDots = true ); + static void appendBin( OUStringBuffer& rStr, double fData, bool bDots = true ); // append fixed-point decimal --------------------------------------------- template< typename Type > - static void appendFix( ::rtl::OUStringBuffer& rStr, Type nData, sal_Int32 nWidth = 0 ); + static void appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth = 0 ); // append formatted value ------------------------------------------------- - static void appendBool( ::rtl::OUStringBuffer& rStr, bool bData ); + static void appendBool( OUStringBuffer& rStr, bool bData ); template< typename Type > - static void appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatType eFmtType ); + static void appendValue( OUStringBuffer& rStr, Type nData, FormatType eFmtType ); // encoded text output ---------------------------------------------------- - static void appendCChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix = true ); - static void appendEncChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1, bool bPrefix = true ); - static void appendEncString( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rData, bool bPrefix = true ); + static void appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix = true ); + static void appendEncChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount = 1, bool bPrefix = true ); + static void appendEncString( OUStringBuffer& rStr, const OUString& rData, bool bPrefix = true ); // token list ------------------------------------------------------------- - static void appendToken( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); + static void appendToken( OUStringBuffer& rStr, const OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); - static void appendIndex( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rIdx ); - static void appendIndex( ::rtl::OUStringBuffer& rStr, sal_Int64 nIdx ); + static void appendIndex( OUStringBuffer& rStr, const OUString& rIdx ); + static void appendIndex( OUStringBuffer& rStr, sal_Int64 nIdx ); - static ::rtl::OUString getToken( const ::rtl::OUString& rData, sal_Int32& rnPos, sal_Unicode cSep = OOX_DUMP_LISTSEP ); + static OUString getToken( const OUString& rData, sal_Int32& rnPos, sal_Unicode cSep = OOX_DUMP_LISTSEP ); /** Encloses the passed string with the passed characters. Uses cOpen, if cClose is NUL. */ - static void enclose( ::rtl::OUStringBuffer& rStr, sal_Unicode cOpen, sal_Unicode cClose = '\0' ); + static void enclose( OUStringBuffer& rStr, sal_Unicode cOpen, sal_Unicode cClose = '\0' ); // string conversion ------------------------------------------------------ - static ::rtl::OUString trimSpaces( const ::rtl::OUString& rStr ); - static ::rtl::OUString trimTrailingNul( const ::rtl::OUString& rStr ); + static OUString trimSpaces( const OUString& rStr ); + static OUString trimTrailingNul( const OUString& rStr ); - static ::rtl::OString convertToUtf8( const ::rtl::OUString& rStr ); - static DataType convertToDataType( const ::rtl::OUString& rStr ); - static FormatType convertToFormatType( const ::rtl::OUString& rStr ); + static OString convertToUtf8( const OUString& rStr ); + static DataType convertToDataType( const OUString& rStr ); + static FormatType convertToFormatType( const OUString& rStr ); - static bool convertFromDec( sal_Int64& ornData, const ::rtl::OUString& rData ); - static bool convertFromHex( sal_Int64& ornData, const ::rtl::OUString& rData ); + static bool convertFromDec( sal_Int64& ornData, const OUString& rData ); + static bool convertFromHex( sal_Int64& ornData, const OUString& rData ); - static bool convertStringToInt( sal_Int64& ornData, const ::rtl::OUString& rData ); - static bool convertStringToDouble( double& orfData, const ::rtl::OUString& rData ); - static bool convertStringToBool( const ::rtl::OUString& rData ); + static bool convertStringToInt( sal_Int64& ornData, const OUString& rData ); + static bool convertStringToDouble( double& orfData, const OUString& rData ); + static bool convertStringToBool( const OUString& rData ); - static OUStringPair convertStringToPair( const ::rtl::OUString& rString, sal_Unicode cSep = '=' ); + static OUStringPair convertStringToPair( const OUString& rString, sal_Unicode cSep = '=' ); // string to list conversion ---------------------------------------------- - static void convertStringToStringList( OUStringVector& orVec, const ::rtl::OUString& rData, bool bIgnoreEmpty ); - static void convertStringToIntList( Int64Vector& orVec, const ::rtl::OUString& rData, bool bIgnoreEmpty ); + static void convertStringToStringList( OUStringVector& orVec, const OUString& rData, bool bIgnoreEmpty ); + static void convertStringToIntList( Int64Vector& orVec, const OUString& rData, bool bIgnoreEmpty ); }; // ---------------------------------------------------------------------------- template< typename Type > -void StringHelper::appendFix( ::rtl::OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) +void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) { appendDec( rStr, static_cast< double >( nData ) / pow( 2.0, 4.0 * sizeof( Type ) ), nWidth ); } template< typename Type > -void StringHelper::appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatType eFmtType ) +void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFmtType ) { switch( eFmtType ) { @@ -429,16 +429,16 @@ void StringHelper::appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatT // ============================================================================ -class String : public ::rtl::OUString +class String : public OUString { public: inline String() {} - inline /*implicit*/ String( const ::rtl::OUString& rStr ) : ::rtl::OUString( rStr ) {} - inline /*implicit*/ String( const sal_Char* pcStr ) : ::rtl::OUString( ::rtl::OUString::createFromAscii( pcStr ? pcStr : "" ) ) {} - inline /*implicit*/ String( sal_Unicode cChar ) : ::rtl::OUString( cChar ) {} + inline /*implicit*/ String( const OUString& rStr ) : OUString( rStr ) {} + inline /*implicit*/ String( const sal_Char* pcStr ) : OUString( OUString::createFromAscii( pcStr ? pcStr : "" ) ) {} + inline /*implicit*/ String( sal_Unicode cChar ) : OUString( cChar ) {} inline bool has() const { return getLength() > 0; } - inline ::rtl::OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); } + inline OUString operator()( const sal_Char* pcDefault ) const { if( has() ) return *this; return String( pcDefault ); } }; static const String EMPTY_STRING; @@ -526,13 +526,13 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); virtual void implProcessConfigItemInt( TextInputStream& rStrm, sal_Int64 nKey, - const ::rtl::OUString& rData ); + const OUString& rData ); void readConfigBlockContents( TextInputStream& rStrm ); @@ -542,13 +542,13 @@ private: LineType readConfigLine( TextInputStream& rStrm, - ::rtl::OUString& orKey, - ::rtl::OUString& orData ) const; + OUString& orKey, + OUString& orData ) const; void processConfigItem( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); }; // ============================================================================ @@ -570,7 +570,7 @@ typedef ::boost::shared_ptr< NameListBase > NameListRef; class NameListBase : public Base, public ConfigItemBase { public: - typedef ::std::map< sal_Int64, ::rtl::OUString > OUStringMap; + typedef ::std::map< sal_Int64, OUString > OUStringMap; typedef OUStringMap::const_iterator const_iterator; public: @@ -589,11 +589,11 @@ public: /** Returns the name for the passed key. */ template< typename Type > - inline ::rtl::OUString getName( const Config& rCfg, Type nKey ) const + inline OUString getName( const Config& rCfg, Type nKey ) const { return implGetName( rCfg, static_cast< sal_Int64 >( nKey ) ); } /** Returns a display name for the passed double value. */ - inline ::rtl::OUString getName( const Config& rCfg, double fValue ) const + inline OUString getName( const Config& rCfg, double fValue ) const { return implGetNameDbl( rCfg, fValue ); } /** Returns a map iterator pointing to the first contained name. */ @@ -608,33 +608,33 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); virtual void implProcessConfigItemInt( TextInputStream& rStrm, sal_Int64 nKey, - const ::rtl::OUString& rData ); + const OUString& rData ); /** Derived classes set the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ) = 0; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) = 0; /** Derived classes generate and return the name for the passed key. */ - virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const = 0; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const = 0; /** Derived classes generate and return the name for the passed double value. */ - virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const = 0; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const = 0; /** Derived classes insert all names and other settings from the passed list. */ virtual void implIncludeList( const NameListBase& rList ) = 0; /** Inserts the passed name into the internal map. */ - void insertRawName( sal_Int64 nKey, const ::rtl::OUString& rName ); + void insertRawName( sal_Int64 nKey, const OUString& rName ); /** Returns the name for the passed key, or 0, if nothing found. */ - const ::rtl::OUString* findRawName( sal_Int64 nKey ) const; + const OUString* findRawName( sal_Int64 nKey ) const; private: /** Includes name lists, given in a comma separated list of names of the lists. */ - void include( const ::rtl::OUString& rListKeys ); + void include( const OUString& rListKeys ); /** Excludes names from the list, given in a comma separated list of their keys. */ - void exclude( const ::rtl::OUString& rKeys ); + void exclude( const OUString& rKeys ); private: OUStringMap maMap; @@ -656,20 +656,20 @@ public: protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ); /** Returns the name for the passed key, or the default name, if key is not contained. */ - virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; /** Returns the name for the passed double value. */ - virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const; /** Inserts all names from the passed list. */ virtual void implIncludeList( const NameListBase& rList ); private: - ::rtl::OUString maDefName; + OUString maDefName; bool mbQuoteNames; }; @@ -685,13 +685,13 @@ public: protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); - virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ); private: - void insertNames( sal_Int64 nStartKey, const ::rtl::OUString& rData ); + void insertNames( sal_Int64 nStartKey, const OUString& rData ); private: bool mbIgnoreEmpty; @@ -712,15 +712,15 @@ public: protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ); /** Returns the name for the passed key. */ - virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; /** Returns the name for the passed double value. */ - virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const; /** Inserts all flags from the passed list. */ virtual void implIncludeList( const NameListBase& rList ); @@ -737,9 +737,9 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ); /** Returns the name for the passed key. */ - virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; /** Inserts all flags from the passed list. */ virtual void implIncludeList( const NameListBase& rList ); @@ -773,16 +773,16 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const ::rtl::OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ); /** Returns the converted value with appended unit name. */ - virtual ::rtl::OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; /** Returns the converted value with appended unit name. */ - virtual ::rtl::OUString implGetNameDbl( const Config& rCfg, double fValue ) const; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const; /** Empty implementation. */ virtual void implIncludeList( const NameListBase& rList ); private: - ::rtl::OUString maUnitName; + OUString maUnitName; double mfFactor; }; @@ -792,7 +792,7 @@ class NameListWrapper { public: inline NameListWrapper() {} - inline /*implicit*/ NameListWrapper( const ::rtl::OUString& rListName ) : maName( rListName ) {} + inline /*implicit*/ NameListWrapper( const OUString& rListName ) : maName( rListName ) {} inline /*implicit*/ NameListWrapper( const sal_Char* pcListName ) : maName( pcListName ) {} inline /*implicit*/ NameListWrapper( const NameListRef& rxList ) : mxList( rxList ) {} @@ -824,25 +824,25 @@ class SharedConfigData : public Base, public ConfigItemBase { public: explicit SharedConfigData( - const ::rtl::OUString& rFileName, + const OUString& rFileName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const StorageRef& rxRootStrg, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); virtual ~SharedConfigData(); inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxContext; } inline const StorageRef& getRootStorage() const { return mxRootStrg; } - inline const ::rtl::OUString& getSysFileName() const { return maSysFileName; } + inline const OUString& getSysFileName() const { return maSysFileName; } - void setOption( const ::rtl::OUString& rKey, const ::rtl::OUString& rData ); - const ::rtl::OUString* getOption( const ::rtl::OUString& rKey ) const; + void setOption( const OUString& rKey, const OUString& rData ); + const OUString* getOption( const OUString& rKey ) const; template< typename ListType > - ::boost::shared_ptr< ListType > createNameList( const ::rtl::OUString& rListName ); - void setNameList( const ::rtl::OUString& rListName, const NameListRef& rxList ); - void eraseNameList( const ::rtl::OUString& rListName ); - NameListRef getNameList( const ::rtl::OUString& rListName ) const; + ::boost::shared_ptr< ListType > createNameList( const OUString& rListName ); + void setNameList( const OUString& rListName, const NameListRef& rxList ); + void eraseNameList( const OUString& rListName ); + NameListRef getNameList( const OUString& rListName ) const; inline bool isPasswordCancelled() const { return mbPwCancelled; } @@ -850,28 +850,28 @@ protected: virtual bool implIsValid() const; virtual void implProcessConfigItemStr( TextInputStream& rStrm, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rData ); + const OUString& rKey, + const OUString& rData ); private: - bool readConfigFile( const ::rtl::OUString& rFileUrl ); + bool readConfigFile( const OUString& rFileUrl ); template< typename ListType > - void readNameList( TextInputStream& rStrm, const ::rtl::OUString& rListName ); - void createShortList( const ::rtl::OUString& rData ); - void createUnitConverter( const ::rtl::OUString& rData ); + void readNameList( TextInputStream& rStrm, const OUString& rListName ); + void createShortList( const OUString& rData ); + void createUnitConverter( const OUString& rData ); private: - typedef ::std::set< ::rtl::OUString > ConfigFileSet; - typedef ::std::map< ::rtl::OUString, ::rtl::OUString > ConfigDataMap; - typedef ::std::map< ::rtl::OUString, NameListRef > NameListMap; + typedef ::std::set< OUString > ConfigFileSet; + typedef ::std::map< OUString, OUString > ConfigDataMap; + typedef ::std::map< OUString, NameListRef > NameListMap; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; StorageRef mxRootStrg; - ::rtl::OUString maSysFileName; + OUString maSysFileName; ConfigFileSet maConfigFiles; ConfigDataMap maConfigData; NameListMap maNameLists; - ::rtl::OUString maConfigPath; + OUString maConfigPath; bool mbLoaded; bool mbPwCancelled; }; @@ -879,7 +879,7 @@ private: // ---------------------------------------------------------------------------- template< typename ListType > -::boost::shared_ptr< ListType > SharedConfigData::createNameList( const ::rtl::OUString& rListName ) +::boost::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) { ::boost::shared_ptr< ListType > xList; if( !rListName.isEmpty() ) @@ -891,7 +891,7 @@ template< typename ListType > } template< typename ListType > -void SharedConfigData::readNameList( TextInputStream& rStrm, const ::rtl::OUString& rListName ) +void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rListName ) { NameListRef xList = createNameList< ListType >( rListName ); if( xList.get() ) @@ -911,15 +911,15 @@ public: const sal_Char* pcEnvVar, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const StorageRef& rxRootStrg, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); virtual ~Config(); inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const { return mxCfgData->getContext(); } inline const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); } - inline const ::rtl::OUString& getSysFileName() const { return mxCfgData->getSysFileName(); } + inline const OUString& getSysFileName() const { return mxCfgData->getSysFileName(); } - const ::rtl::OUString& getStringOption( const String& rKey, const ::rtl::OUString& rDefault ) const; + const OUString& getStringOption( const String& rKey, const OUString& rDefault ) const; bool getBoolOption( const String& rKey, bool bDefault ) const; template< typename Type > Type getIntOption( const String& rKey, Type nDefault ) const; @@ -934,7 +934,7 @@ public: /** Returns the name for the passed key from the passed name list. */ template< typename Type > - ::rtl::OUString getName( const NameListWrapper& rListWrp, Type nKey ) const; + OUString getName( const NameListWrapper& rListWrp, Type nKey ) const; /** Returns true, if the passed name list contains an entry for the passed key. */ template< typename Type > bool hasName( const NameListWrapper& rListWrp, Type nKey ) const; @@ -951,11 +951,11 @@ protected: const sal_Char* pcEnvVar, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const StorageRef& rxRootStrg, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); virtual bool implIsValid() const; - virtual const ::rtl::OUString* implGetOption( const ::rtl::OUString& rKey ) const; - virtual NameListRef implGetNameList( const ::rtl::OUString& rListName ) const; + virtual const OUString* implGetOption( const OUString& rKey ) const; + virtual NameListRef implGetNameList( const OUString& rListName ) const; private: typedef ::boost::shared_ptr< SharedConfigData > SharedConfigDataRef; @@ -970,7 +970,7 @@ template< typename Type > Type Config::getIntOption( const String& rKey, Type nDefault ) const { sal_Int64 nRawData; - const ::rtl::OUString* pData = implGetOption( rKey ); + const OUString* pData = implGetOption( rKey ); return (pData && StringHelper::convertStringToInt( nRawData, *pData )) ? static_cast< Type >( nRawData ) : nDefault; } @@ -982,7 +982,7 @@ template< typename ListType > } template< typename Type > -::rtl::OUString Config::getName( const NameListWrapper& rListWrp, Type nKey ) const +OUString Config::getName( const NameListWrapper& rListWrp, Type nKey ) const { NameListRef xList = rListWrp.getNameList( *this ); return xList.get() ? xList->getName( *this, nKey ) : OOX_DUMP_ERR_NOMAP; @@ -1003,13 +1003,13 @@ class Output : public Base public: explicit Output( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& rFileName ); + const OUString& rFileName ); // ------------------------------------------------------------------------ void newLine(); void emptyLine( size_t nCount = 1 ); - inline ::rtl::OUStringBuffer& getLine() { return maLine; } + inline OUStringBuffer& getLine() { return maLine; } void incIndent(); void decIndent(); @@ -1026,7 +1026,7 @@ public: void startItem( const String& rItemName ); void contItem(); void endItem(); - inline const ::rtl::OUString& getLastItemValue() const { return maLastItem; } + inline const OUString& getLastItemValue() const { return maLastItem; } void startMultiItems(); void endMultiItems(); @@ -1035,7 +1035,7 @@ public: void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 ); void writeAscii( const sal_Char* pcStr ); - void writeString( const ::rtl::OUString& rStr ); + void writeString( const OUString& rStr ); void writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); void writeBool( bool bData ); void writeDateTime( const ::com::sun::star::util::DateTime& rDateTime ); @@ -1073,9 +1073,9 @@ private: typedef ::std::vector< sal_Int32 > StringLenVec; ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextOutputStream2 > mxStrm; - ::rtl::OUString maIndent; - ::rtl::OUStringBuffer maLine; - ::rtl::OUString maLastItem; + OUString maIndent; + OUStringBuffer maLine; + OUString maLastItem; StringLenVec maColPos; size_t mnCol; size_t mnItemLevel; @@ -1164,7 +1164,7 @@ public: StorageIterator& operator++(); - ::rtl::OUString getName() const; + OUString getName() const; bool isStream() const; bool isStorage() const; @@ -1220,7 +1220,7 @@ protected: protected: using ObjectBase::construct; - void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath ); + void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); void construct( const ObjectBase& rParent ); virtual bool implIsValid() const; @@ -1228,57 +1228,57 @@ protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); virtual void implDumpStorage( const StorageRef& rxStrg, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rSysPath ); + const OUString& rStrgPath, + const OUString& rSysPath ); virtual void implDumpBaseStream( const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); void addPreferredStream( const String& rStrmName ); void addPreferredStorage( const String& rStrgPath ); private: - ::rtl::OUString getSysFileName( - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysOutPath ); + OUString getSysFileName( + const OUString& rStrmName, + const OUString& rSysOutPath ); void extractStream( StorageBase& rStrg, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); void extractStorage( const StorageRef& rxStrg, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rSysPath ); + const OUString& rStrgPath, + const OUString& rSysPath ); void extractItem( const StorageRef& rxStrg, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rItemName, - const ::rtl::OUString& rSysPath, + const OUString& rStrgPath, + const OUString& rItemName, + const OUString& rSysPath, bool bIsStrg, bool bIsStrm ); private: struct PreferredItem { - ::rtl::OUString maName; + OUString maName; bool mbStorage; - inline explicit PreferredItem( const ::rtl::OUString rName, bool bStorage ) : + inline explicit PreferredItem( const OUString rName, bool bStorage ) : maName( rName ), mbStorage( bStorage ) {} }; typedef ::std::vector< PreferredItem > PreferredItemVector; StorageRef mxStrg; - ::rtl::OUString maSysPath; + OUString maSysPath; PreferredItemVector maPreferred; }; @@ -1297,7 +1297,7 @@ protected: inline explicit OutputObjectBase() {} using ObjectBase::construct; - void construct( const ObjectBase& rParent, const ::rtl::OUString& rSysFileName ); + void construct( const ObjectBase& rParent, const OUString& rSysFileName ); void construct( const OutputObjectBase& rParent ); virtual bool implIsValid() const; @@ -1307,10 +1307,10 @@ protected: void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); void writeCharItem( const String& rName, sal_Unicode cData ); - void writeStringItem( const String& rName, const ::rtl::OUString& rData ); + void writeStringItem( const String& rName, const OUString& rData ); void writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); void writeDateTimeItem( const String& rName, const ::com::sun::star::util::DateTime& rDateTime ); - void writeGuidItem( const String& rName, const ::rtl::OUString& rGuid ); + void writeGuidItem( const String& rName, const OUString& rGuid ); template< typename Type > void addNameToItem( Type nData, const NameListWrapper& rListWrp ); @@ -1342,7 +1342,7 @@ protected: protected: OutputRef mxOut; - ::rtl::OUString maSysFileName; + OUString maSysFileName; }; typedef ::boost::shared_ptr< OutputObjectBase > OutputObjectRef; @@ -1432,7 +1432,7 @@ void OutputObjectBase::writeValueItem( const String& rName, Type nData, FormatTy template< typename Type > void OutputObjectBase::writeValueItem( const ItemFormat& rItemFmt, Type nData ) { - ::rtl::OString aNameUtf8 = StringHelper::convertToUtf8( rItemFmt.maItemName ); + OString aNameUtf8 = StringHelper::convertToUtf8( rItemFmt.maItemName ); writeValueItem( aNameUtf8.getStr(), nData, rItemFmt.meFmtType, rItemFmt.maListName ); } @@ -1467,7 +1467,7 @@ protected: inline explicit InputObjectBase() {} using OutputObjectBase::construct; - void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName ); + void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ); void construct( const InputObjectBase& rParent ); @@ -1494,11 +1494,11 @@ protected: sal_Unicode dumpUnicode( const String& rName ); - ::rtl::OUString dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false ); - ::rtl::OUString dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false ); + OUString dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false ); + OUString dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false ); ::com::sun::star::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING ); - ::rtl::OUString dumpGuid( const String& rName = EMPTY_STRING ); + OUString dumpGuid( const String& rName = EMPTY_STRING ); void dumpItem( const ItemFormat& rItemFmt ); @@ -1675,7 +1675,7 @@ public: explicit BinaryStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); protected: void dumpBinaryStream( bool bShowOffset = true ); @@ -1696,7 +1696,7 @@ protected: const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm, @@ -1723,7 +1723,7 @@ public: const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); explicit TextLineStreamObject( const OutputObjectBase& rParent, @@ -1732,7 +1732,7 @@ public: protected: virtual void implDumpText( TextInputStream& rTextStrm ); - virtual void implDumpLine( const ::rtl::OUString& rLine, sal_uInt32 nLine ); + virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; // ============================================================================ @@ -1743,7 +1743,7 @@ public: explicit XmlStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); protected: virtual void implDumpText( TextInputStream& rTextStrm ); @@ -1761,7 +1761,7 @@ protected: void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxBaseStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, const BinaryInputStreamRef& rxRecStrm, const String& rRecNames, const String& rSimpleRecs = EMPTY_STRING ); @@ -1813,7 +1813,7 @@ protected: void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxBaseStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, const String& rRecNames, const String& rSimpleRecs = EMPTY_STRING ); diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx index 8020cf058242..b58500ef8f3c 100644 --- a/oox/inc/oox/dump/oledumper.hxx +++ b/oox/inc/oox/dump/oledumper.hxx @@ -40,12 +40,12 @@ class OleInputObjectBase : public InputObjectBase protected: inline explicit OleInputObjectBase() {} - ::rtl::OUString dumpAnsiString32( const String& rName ); - ::rtl::OUString dumpUniString32( const String& rName ); + OUString dumpAnsiString32( const String& rName ); + OUString dumpUniString32( const String& rName ); sal_Int32 dumpStdClipboardFormat( const String& rName = EMPTY_STRING ); - ::rtl::OUString dumpAnsiString32OrStdClip( const String& rName ); - ::rtl::OUString dumpUniString32OrStdClip( const String& rName ); + OUString dumpAnsiString32OrStdClip( const String& rName ); + OUString dumpUniString32OrStdClip( const String& rName ); void writeOleColorItem( const String& rName, sal_uInt32 nColor ); sal_uInt32 dumpOleColor( const String& rName ); @@ -80,7 +80,7 @@ protected: class OleStreamObject : public OleInputObjectBase { public: - explicit OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName ); + explicit OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); }; // ============================================================================ @@ -88,7 +88,7 @@ public: class OleCompObjObject : public OleStreamObject { public: - explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName ); + explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: virtual void implDump(); @@ -100,13 +100,13 @@ protected: class OlePropertyStreamObject : public InputObjectBase { public: - explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName ); + explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: virtual void implDump(); private: - void dumpSection( const ::rtl::OUString& rGuid, sal_uInt32 nStartPos ); + void dumpSection( const OUString& rGuid, sal_uInt32 nStartPos ); void dumpProperty( sal_Int32 nPropId, sal_uInt32 nStartPos ); void dumpCodePageProperty( sal_uInt32 nStartPos ); @@ -119,15 +119,15 @@ private: sal_uInt16 dumpPropertyType(); void dumpBlob( sal_Int32 nPropId, const String& rName ); - ::rtl::OUString dumpString8( const String& rName ); - ::rtl::OUString dumpCharArray8( const String& rName, sal_Int32 nLen ); - ::rtl::OUString dumpString16( const String& rName ); - ::rtl::OUString dumpCharArray16( const String& rName, sal_Int32 nLen ); + OUString dumpString8( const String& rName ); + OUString dumpCharArray8( const String& rName, sal_Int32 nLen ); + OUString dumpString16( const String& rName ); + OUString dumpCharArray16( const String& rName, sal_Int32 nLen ); bool dumpTypedProperty( const String& rName, sal_uInt16 nExpectedType ); void dumpHlinks( sal_Int32 nSize ); bool startElement( sal_uInt32 nStartPos ); - void writeSectionHeader( const ::rtl::OUString& rGuid, sal_uInt32 nStartPos ); + void writeSectionHeader( const OUString& rGuid, sal_uInt32 nStartPos ); void writePropertyHeader( sal_Int32 nPropId, sal_uInt32 nStartPos ); private: @@ -141,19 +141,19 @@ private: class OleStorageObject : public StorageObjectBase { public: - explicit OleStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath ); + explicit OleStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); protected: inline explicit OleStorageObject() {} using StorageObjectBase::construct; - void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath ); + void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); }; // ============================================================================ @@ -296,7 +296,7 @@ protected: void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, const String& rPropNameList, bool b64BitPropFlags = false ); void construct( @@ -317,7 +317,7 @@ protected: void setAlignAnchor(); bool startNextProperty(); - ::rtl::OUString getPropertyName() const; + OUString getPropertyName() const; template< typename Type > Type dumpDecProperty( Type nDefault, const NameListWrapper& rListWrp = NO_LIST ); @@ -345,8 +345,8 @@ protected: void dumpPosProperty(); void dumpSizeProperty(); - void dumpGuidProperty( ::rtl::OUString* pValue = 0 ); - void dumpStringProperty( ::rtl::OUString* pValue = 0 ); + void dumpGuidProperty( OUString* pValue = 0 ); + void dumpStringProperty( OUString* pValue = 0 ); void dumpStringArrayProperty(); void dumpStreamProperty(); @@ -357,7 +357,7 @@ private: void constructAxPropObj( const String& rPropNameList, bool b64BitPropFlags ); void dumpVersion(); - ::rtl::OUString dumpString( const String& rName, sal_uInt32 nSize, bool bArray ); + OUString dumpString( const String& rName, sal_uInt32 nSize, bool bArray ); void dumpShortProperties(); void dumpLargeProperties(); @@ -367,17 +367,17 @@ private: enum LargePropertyType { PROPTYPE_POS, PROPTYPE_SIZE, PROPTYPE_GUID, PROPTYPE_STRING, PROPTYPE_STRINGARRAY }; LargePropertyType mePropType; - ::rtl::OUString maItemName; + OUString maItemName; sal_uInt32 mnDataSize; - ::rtl::OUString* mpItemValue; - inline explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, ::rtl::OUString* pItemValue = 0 ) : + OUString* mpItemValue; + inline explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = 0 ) : mePropType( ePropType ), maItemName( rItemName ), mnDataSize( nDataSize ), mpItemValue( pItemValue ) {} }; typedef ::std::vector< LargeProperty > LargePropertyVector; struct StreamProperty { - ::rtl::OUString maItemName; + OUString maItemName; sal_uInt16 mnData; inline explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) : maItemName( rItemName ), mnData( nData ) {} @@ -547,21 +547,21 @@ public: explicit FormControlStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, - const ::rtl::OUString* pProgId = 0 ); + const OUString& rSysFileName, + const OUString* pProgId = 0 ); explicit FormControlStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString* pProgId = 0 ); + const OUString* pProgId = 0 ); protected: virtual void implDump(); private: - void constructFormCtrlStrmObj( const ::rtl::OUString* pProgId ); + void constructFormCtrlStrmObj( const OUString* pProgId ); private: - ::rtl::OUString maProgId; + OUString maProgId; bool mbReadGuid; }; @@ -570,7 +570,7 @@ private: struct VbaFormSiteInfo { - ::rtl::OUString maProgId; + OUString maProgId; sal_Int32 mnId; sal_uInt32 mnLength; bool mbInStream; @@ -635,7 +635,7 @@ public: explicit VbaFStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, VbaFormSharedData& rFormData ); protected: @@ -661,7 +661,7 @@ public: explicit VbaOStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, VbaFormSharedData& rFormData ); protected: @@ -705,7 +705,7 @@ public: explicit VbaXStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, VbaFormSharedData& rFormData ); protected: @@ -723,22 +723,22 @@ public: explicit VbaContainerStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, - const ::rtl::OUString& rSysPath ); + const OUString& rSysPath ); protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); virtual void implDumpStorage( const StorageRef& rxStrg, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rSysPath ); + const OUString& rStrgPath, + const OUString& rSysPath ); private: - bool isFormStorage( const ::rtl::OUString& rStrgPath ) const; + bool isFormStorage( const OUString& rStrgPath ) const; private: VbaFormSharedData maFormData; @@ -749,15 +749,15 @@ private: struct VbaSharedData { - typedef ::std::map< ::rtl::OUString, sal_Int32 > StreamOffsetMap; + typedef ::std::map< OUString, sal_Int32 > StreamOffsetMap; StreamOffsetMap maStrmOffsets; rtl_TextEncoding meTextEnc; explicit VbaSharedData(); - bool isModuleStream( const ::rtl::OUString& rStrmName ) const; - sal_Int32 getStreamOffset( const ::rtl::OUString& rStrmName ) const; + bool isModuleStream( const OUString& rStrmName ) const; + sal_Int32 getStreamOffset( const OUString& rStrmName ) const; }; // ============================================================================ @@ -768,7 +768,7 @@ public: explicit VbaDirStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, VbaSharedData& rVbaData ); protected: @@ -777,15 +777,15 @@ protected: virtual void implDumpRecordBody(); private: - ::rtl::OUString dumpByteString( const String& rName = EMPTY_STRING ); - ::rtl::OUString dumpUniString( const String& rName = EMPTY_STRING ); + OUString dumpByteString( const String& rName = EMPTY_STRING ); + OUString dumpUniString( const String& rName = EMPTY_STRING ); - ::rtl::OUString dumpByteStringWithLength( const String& rName = EMPTY_STRING ); + OUString dumpByteStringWithLength( const String& rName = EMPTY_STRING ); private: VbaSharedData& mrVbaData; BinaryInputStreamRef mxInStrm; - ::rtl::OUString maCurrStream; + OUString maCurrStream; sal_Int32 mnCurrOffset; }; @@ -797,7 +797,7 @@ public: explicit VbaModuleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName, + const OUString& rSysFileName, VbaSharedData& rVbaData, sal_Int32 nStrmOffset ); @@ -817,15 +817,15 @@ public: explicit VbaStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, - const ::rtl::OUString& rSysPath, + const OUString& rSysPath, VbaSharedData& rVbaData ); protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); private: VbaSharedData& mrVbaData; @@ -839,15 +839,15 @@ public: explicit VbaFormStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, - const ::rtl::OUString& rSysPath, + const OUString& rSysPath, VbaSharedData& rVbaData ); protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); private: VbaSharedData& mrVbaData; @@ -858,19 +858,19 @@ private: class VbaProjectStorageObject : public OleStorageObject { public: - explicit VbaProjectStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath ); + explicit VbaProjectStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); virtual void implDumpStorage( const StorageRef& rxStrg, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rSysPath ); + const OUString& rStrgPath, + const OUString& rSysPath ); private: VbaSharedData maVbaData; @@ -885,12 +885,12 @@ public: explicit ActiveXStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, - const ::rtl::OUString& rSysPath ); + const OUString& rSysPath ); protected: virtual void implDumpBaseStream( const BinaryInputStreamRef& rxStrm, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); }; // ============================================================================ diff --git a/oox/inc/oox/dump/pptxdumper.hxx b/oox/inc/oox/dump/pptxdumper.hxx index 0b032c38cc78..43f39002059b 100644 --- a/oox/inc/oox/dump/pptxdumper.hxx +++ b/oox/inc/oox/dump/pptxdumper.hxx @@ -38,9 +38,9 @@ public: protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); }; // ============================================================================ @@ -53,7 +53,7 @@ public: explicit Dumper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); protected: virtual void implDump(); diff --git a/oox/inc/oox/dump/xlsbdumper.hxx b/oox/inc/oox/dump/xlsbdumper.hxx index 71e14b8d2a9e..ffd24d4de808 100644 --- a/oox/inc/oox/dump/xlsbdumper.hxx +++ b/oox/inc/oox/dump/xlsbdumper.hxx @@ -44,12 +44,12 @@ protected: virtual ~RecordObjectBase(); using SequenceRecordObjectBase::construct; - void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName ); + void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); void construct( const RecordObjectBase& rParent ); virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ); - ::rtl::OUString getErrorName( sal_uInt8 nErrCode ) const; + OUString getErrorName( sal_uInt8 nErrCode ) const; // ------------------------------------------------------------------------ @@ -69,7 +69,7 @@ protected: sal_uInt8 dumpBoolean( const String& rName = EMPTY_STRING ); sal_uInt8 dumpErrorCode( const String& rName = EMPTY_STRING ); - ::rtl::OUString dumpString( const String& rName = EMPTY_STRING, bool bRich = false, bool b32BitLen = true ); + OUString dumpString( const String& rName = EMPTY_STRING, bool bRich = false, bool b32BitLen = true ); void dumpColor( const String& rName = EMPTY_STRING ); ::com::sun::star::util::DateTime dumpPivotDateTime( const String& rName = EMPTY_STRING ); @@ -103,9 +103,9 @@ public: protected: virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, - const ::rtl::OUString& rStrgPath, - const ::rtl::OUString& rStrmName, - const ::rtl::OUString& rSysFileName ); + const OUString& rStrgPath, + const OUString& rStrmName, + const OUString& rSysFileName ); }; // ============================================================================ @@ -118,7 +118,7 @@ public: explicit Dumper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm, - const ::rtl::OUString& rSysFileName ); + const OUString& rSysFileName ); protected: virtual void implDump(); diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx index 83b2ef196a2f..10fc8922dc4a 100644 --- a/oox/inc/oox/export/chartexport.hxx +++ b/oox/inc/oox/export/chartexport.hxx @@ -88,16 +88,16 @@ private: com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram; com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > mxNewDiagram; - rtl::OUString msTableName; - rtl::OUStringBuffer msStringBuffer; - rtl::OUString msString; + OUString msTableName; + OUStringBuffer msStringBuffer; + OUString msString; // members filled by InitRangeSegmentationProperties (retrieved from DataProvider) sal_Bool mbHasSeriesLabels; sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false sal_Bool mbRowSourceColumns; - rtl::OUString msChartAddress; - rtl::OUString msTableNumberList; + OUString msChartAddress; + OUString msTableNumberList; ::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping; //::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxAdditionalShapes; @@ -116,7 +116,7 @@ private: sal_Int32 getChartType( ); - rtl::OUString parseFormula( const rtl::OUString& rRange ); + OUString parseFormula( const OUString& rRange ); void InitPlotArea(); void _ExportContent(); diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx index 09da104d84e3..fa13a49ea090 100644 --- a/oox/inc/oox/export/drawingml.hxx +++ b/oox/inc/oox/export/drawingml.hxx @@ -82,7 +82,7 @@ protected: String aName, ::com::sun::star::beans::PropertyState& eState ); const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField ); - rtl::OUString WriteImage( const rtl::OUString& rURL ); + OUString WriteImage( const OUString& rURL ); const char* GetComponentDir(); const char* GetRelationCompPrefix(); @@ -94,7 +94,7 @@ public: ::oox::core::XmlFilterBase* GetFB() { return mpFB; } DocumentType GetDocumentType() { return meDocumentType; } - rtl::OUString WriteImage( const Graphic &rGraphic ); + OUString WriteImage( const Graphic &rGraphic ); void WriteColor( sal_uInt32 nColor ); void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor ); @@ -111,7 +111,7 @@ public: void WriteStretch(); void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing ); - ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL, const Graphic *pGraphic=NULL ); + OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString& rURL, const Graphic *pGraphic=NULL ); void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape, @@ -134,7 +134,7 @@ public: static void ResetCounters(); - void GetUUID( ::rtl::OStringBuffer& rBuffer ); + void GetUUID( OStringBuffer& rBuffer ); static sal_Unicode SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star::awt::FontDescriptor& rFontDesc ); @@ -143,12 +143,12 @@ public: static const char* GetAlignment( sal_Int32 nAlignment ); sax_fastparser::FSHelperPtr CreateOutputStream ( - const ::rtl::OUString& sFullStream, - const ::rtl::OUString& sRelativeStream, + const OUString& sFullStream, + const OUString& sRelativeStream, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xParentRelation, const char* sContentType, const char* sRelationshipType, - ::rtl::OUString* pRelationshipId = NULL ); + OUString* pRelationshipId = NULL ); }; diff --git a/oox/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx index b4915048cefe..04c3b3375742 100644 --- a/oox/inc/oox/export/utils.hxx +++ b/oox/inc/oox/export/utils.hxx @@ -20,10 +20,10 @@ #ifndef _OOX_EXPORT_UTILS_HXX_ #define _OOX_EXPORT_UTILS_HXX_ -#define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr() -#define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr() -#define IS(x) rtl::OString::valueOf( x ).getStr() -#define USS(x) rtl::OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() +#define I32S(x) OString::valueOf( (sal_Int32) x ).getStr() +#define I64S(x) OString::valueOf( (sal_Int64) x ).getStr() +#define IS(x) OString::valueOf( x ).getStr() +#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() #ifndef DBG # if OSL_DEBUG_LEVEL > 0 diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx index 29ccdab1dbcb..01fb85760d05 100644 --- a/oox/inc/oox/export/vmlexport.hxx +++ b/oox/inc/oox/export/vmlexport.hxx @@ -67,7 +67,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx sal_uInt32 m_nShapeFlags; /// Remember style, the most important shape attribute ;-) - rtl::OStringBuffer *m_pShapeStyle; + OStringBuffer *m_pShapeStyle; /// Remember which shape types we had already written. bool *m_pShapeTypeWritten; @@ -89,7 +89,7 @@ protected: /// /// This should be called from within StartShape() to ensure that the /// added attribute is preserved. - void AddShapeAttribute( sal_Int32 nAttribute, const rtl::OString& sValue ); + void AddShapeAttribute( sal_Int32 nAttribute, const OString& sValue ); using EscherEx::StartShape; using EscherEx::EndShape; @@ -118,13 +118,13 @@ private: private: /// Create an OString representing the id from a numerical id. - static rtl::OString ShapeIdString( sal_uInt32 nId ); + static OString ShapeIdString( sal_uInt32 nId ); /// Add starting and ending point of a line to the m_pShapeAttrList. void AddLineDimensions( const Rectangle& rRectangle ); /// Add position and size to the OStringBuffer. - void AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle ); + void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle ); }; } // namespace vml diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx index a709a9f74662..55f41cf0a3b3 100644 --- a/oox/inc/oox/helper/attributelist.hxx +++ b/oox/inc/oox/helper/attributelist.hxx @@ -38,26 +38,26 @@ class OOX_DLLPUBLIC AttributeConversion { public: /** Returns the XML token identifier from the passed string. */ - static sal_Int32 decodeToken( const ::rtl::OUString& rValue ); + static sal_Int32 decodeToken( const OUString& rValue ); /** Returns the decoded string value. All characters in the format '_xHHHH_' (H being a hexadecimal digit), will be decoded. */ - static ::rtl::OUString decodeXString( const ::rtl::OUString& rValue ); + static OUString decodeXString( const OUString& rValue ); /** Returns the double value from the passed string. */ - static double decodeDouble( const ::rtl::OUString& rValue ); + static double decodeDouble( const OUString& rValue ); /** Returns the 32-bit signed integer value from the passed string (decimal). */ - static sal_Int32 decodeInteger( const ::rtl::OUString& rValue ); + static sal_Int32 decodeInteger( const OUString& rValue ); /** Returns the 32-bit unsigned integer value from the passed string (decimal). */ - static sal_uInt32 decodeUnsigned( const ::rtl::OUString& rValue ); + static sal_uInt32 decodeUnsigned( const OUString& rValue ); /** Returns the 64-bit signed integer value from the passed string (decimal). */ - static sal_Int64 decodeHyper( const ::rtl::OUString& rValue ); + static sal_Int64 decodeHyper( const OUString& rValue ); /** Returns the 32-bit signed integer value from the passed string (hexadecimal). */ - static sal_Int32 decodeIntegerHex( const ::rtl::OUString& rValue ); + static sal_Int32 decodeIntegerHex( const OUString& rValue ); }; // ============================================================================ @@ -87,11 +87,11 @@ public: OptValue< sal_Int32 > getToken( sal_Int32 nAttrToken ) const; /** Returns the string value of the specified attribute. */ - OptValue< ::rtl::OUString > getString( sal_Int32 nAttrToken ) const; + OptValue< OUString > getString( sal_Int32 nAttrToken ) const; /** Returns the string value of the specified attribute. All characters in the format '_xHHHH_' (H being a hexadecimal digit), will be decoded. */ - OptValue< ::rtl::OUString > getXString( sal_Int32 nAttrToken ) const; + OptValue< OUString > getXString( sal_Int32 nAttrToken ) const; /** Returns the double value of the specified attribute. */ OptValue< double > getDouble( sal_Int32 nAttrToken ) const; @@ -122,11 +122,11 @@ public: /** Returns the string value of the specified attribute, or the passed default string if the attribute is missing. */ - ::rtl::OUString getString( sal_Int32 nAttrToken, const ::rtl::OUString& rDefault ) const; + OUString getString( sal_Int32 nAttrToken, const OUString& rDefault ) const; /** Returns the decoded string value of the specified attribute, or the passed default string if the attribute is missing. */ - ::rtl::OUString getXString( sal_Int32 nAttrToken, const ::rtl::OUString& rDefault ) const; + OUString getXString( sal_Int32 nAttrToken, const OUString& rDefault ) const; /** Returns the double value of the specified attribute, or the passed default value if the attribute is missing or not convertible to a double. */ diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx index aeadb4fac4bb..64d85357c2e8 100644 --- a/oox/inc/oox/helper/binaryinputstream.hxx +++ b/oox/inc/oox/helper/binaryinputstream.hxx @@ -157,7 +157,7 @@ public: /** Reads a NUL-terminated Unicode character array and returns the string. */ - ::rtl::OUString readNulUnicodeArray(); + OUString readNulUnicodeArray(); /** Reads a byte character array and returns the string. @@ -168,7 +168,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OString readCharArray( sal_Int32 nChars, bool bAllowNulChars = false ); + OString readCharArray( sal_Int32 nChars, bool bAllowNulChars = false ); /** Reads a byte character array and returns a Unicode string. @@ -182,7 +182,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); + OUString readCharArrayUC( sal_Int32 nChars, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); /** Reads a Unicode character array and returns the string. @@ -193,7 +193,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readUnicodeArray( sal_Int32 nChars, bool bAllowNulChars = false ); + OUString readUnicodeArray( sal_Int32 nChars, bool bAllowNulChars = false ); /** Reads a Unicode character array (may be compressed) and returns the string. @@ -209,7 +209,7 @@ public: True = NUL characters are inserted into the imported string. False = NUL characters are replaced by question marks (default). */ - ::rtl::OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false ); + OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false ); /** Copies nBytes bytes from the current position to the passed output stream. */ diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx b/oox/inc/oox/helper/binaryoutputstream.hxx index 687008a6ffd1..0882821e9834 100644 --- a/oox/inc/oox/helper/binaryoutputstream.hxx +++ b/oox/inc/oox/helper/binaryoutputstream.hxx @@ -68,11 +68,11 @@ public: template< typename Type > inline BinaryOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } - void writeCompressedUnicodeArray( const ::rtl::OUString& rString, bool bCompressed, bool bAllowNulChars = false ); + void writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars = false ); - void writeCharArrayUC( const ::rtl::OUString& rString, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); + void writeCharArrayUC( const OUString& rString, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false ); - void writeUnicodeArray( const ::rtl::OUString& rString, bool bAllowNulChars = false ); + void writeUnicodeArray( const OUString& rString, bool bAllowNulChars = false ); protected: /** This dummy default c'tor will never call the c'tor of the virtual base diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx index 48432268780f..667de0d21866 100644 --- a/oox/inc/oox/helper/containerhelper.hxx +++ b/oox/inc/oox/helper/containerhelper.hxx @@ -168,9 +168,9 @@ public: @return An unused name. Will be equal to the suggested name, if not contained, otherwise a numerical index will be appended. */ - static ::rtl::OUString getUnusedName( + static OUString getUnusedName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxNameAccess, - const ::rtl::OUString& rSuggestedName, + const OUString& rSuggestedName, sal_Unicode cSeparator, sal_Int32 nFirstIndexToAppend = 1 ); @@ -187,7 +187,7 @@ public: */ static bool insertByName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer, - const ::rtl::OUString& rName, + const OUString& rName, const ::com::sun::star::uno::Any& rObject, bool bReplaceOldExisting = true ); @@ -217,9 +217,9 @@ public: equal to the suggested name, if parameter bRenameOldExisting is true. */ - static ::rtl::OUString insertByUnusedName( + static OUString insertByUnusedName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxNameContainer, - const ::rtl::OUString& rSuggestedName, + const OUString& rSuggestedName, sal_Unicode cSeparator, const ::com::sun::star::uno::Any& rObject, bool bRenameOldExisting = false ); diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx index 2c75a3e5084e..0681716bc84f 100644 --- a/oox/inc/oox/helper/graphichelper.hxx +++ b/oox/inc/oox/helper/graphichelper.hxx @@ -115,26 +115,26 @@ public: /** Imports a graphic from the storage stream with the passed path and name. */ ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > - importEmbeddedGraphic( const ::rtl::OUString& rStreamName ) const; + importEmbeddedGraphic( const OUString& rStreamName ) const; /** Creates a persistent graphic object from the passed graphic. @return The URL of the created and internally cached graphic object. */ - ::rtl::OUString createGraphicObject( + OUString createGraphicObject( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const; /** Creates a persistent graphic object from the passed input stream. @return The URL of the created and internally cached graphic object. */ - ::rtl::OUString importGraphicObject( + OUString importGraphicObject( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm, const WMF_EXTERNALHEADER* pExtHeader = NULL ) const; /** Creates a persistent graphic object from the passed binary memory block. @return The URL of the created and internally cached graphic object. */ - ::rtl::OUString importGraphicObject( const StreamDataSequence& rGraphicData ) const; + OUString importGraphicObject( const StreamDataSequence& rGraphicData ) const; /** Imports a graphic object from the storage stream with the passed path and name. @return The URL of the created and internally cached graphic object. */ - ::rtl::OUString importEmbeddedGraphicObject( const ::rtl::OUString& rStreamName ) const; + OUString importEmbeddedGraphicObject( const OUString& rStreamName ) const; /** calculates the orignal size of a graphic which is necessary to be able to calculate cropping values @return The original Graphic size in 100thmm */ @@ -144,7 +144,7 @@ public: private: typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette; typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque; - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap; + typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > EmbeddedGraphicMap; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicProvider > mxGraphicProvider; @@ -154,7 +154,7 @@ private: StorageRef mxStorage; ///< Storage containing embedded graphics. mutable GraphicObjectDeque maGraphicObjects; ///< Caches all created graphic objects to keep them alive. mutable EmbeddedGraphicMap maEmbeddedGraphics; ///< Maps all embedded graphics by their storage path. - const ::rtl::OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects. + const OUString maGraphicObjScheme; ///< The URL scheme name for graphic objects. double mfPixelPerHmmX; ///< Number of screen pixels per 1/100 mm in X direction. double mfPixelPerHmmY; ///< Number of screen pixels per 1/100 mm in Y direction. }; diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx index e82cea772d2b..4f8e738354d4 100644 --- a/oox/inc/oox/helper/helper.hxx +++ b/oox/inc/oox/helper/helper.hxx @@ -47,14 +47,14 @@ namespace oox { #define STATIC_ARRAY_SELECT( array, index, def ) \ ((static_cast<size_t>(index) < STATIC_ARRAY_SIZE(array)) ? ((array)[static_cast<size_t>(index)]) : (def)) -/** Expands to a temporary ::rtl::OString, created from a literal(!) character +/** Expands to a temporary OString, created from a literal(!) character array. */ #define CREATE_OSTRING( ascii ) \ - ::rtl::OString( RTL_CONSTASCII_STRINGPARAM( ascii ) ) + OString( RTL_CONSTASCII_STRINGPARAM( ascii ) ) /** Convert an OUString to an ASCII C string. Use for debug purposes only. */ #define OUSTRING_TO_CSTR( str ) \ - ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() + OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() // Common constants =========================================================== diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/oox/inc/oox/helper/modelobjecthelper.hxx index aa6e980d27b1..98b34aa1f4d2 100644 --- a/oox/inc/oox/helper/modelobjecthelper.hxx +++ b/oox/inc/oox/helper/modelobjecthelper.hxx @@ -41,15 +41,15 @@ class ObjectContainer public: explicit ObjectContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory, - const ::rtl::OUString& rServiceName ); + const OUString& rServiceName ); ~ObjectContainer(); /** Returns true, if the object with the passed name exists in the container. */ - bool hasObject( const ::rtl::OUString& rObjName ) const; + bool hasObject( const OUString& rObjName ) const; /** Inserts the passed object into the container, returns its final name. */ - ::rtl::OUString insertObject( - const ::rtl::OUString& rObjName, + OUString insertObject( + const OUString& rObjName, const ::com::sun::star::uno::Any& rObj, bool bInsertByUnusedName ); @@ -61,7 +61,7 @@ private: mxModelFactory; ///< Factory to create the container. mutable ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxContainer; ///< Container for the objects. - ::rtl::OUString maServiceName; ///< Service name to create the container. + OUString maServiceName; ///< Service name to create the container. sal_Int32 mnIndex; ///< Index to create unique identifiers. }; @@ -81,27 +81,27 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory ); /** Returns true, if the model contains a line marker with the passed name. */ - bool hasLineMarker( const ::rtl::OUString& rMarkerName ) const; + bool hasLineMarker( const OUString& rMarkerName ) const; /** Inserts a new named line marker, overwrites an existing line marker with the same name. Returns true, if the marker could be inserted. */ bool insertLineMarker( - const ::rtl::OUString& rMarkerName, + const OUString& rMarkerName, const ::com::sun::star::drawing::PolyPolygonBezierCoords& rMarker ); /** Inserts a new named line dash, returns the line dash name, based on an internal constant name with a new unused index appended. */ - ::rtl::OUString insertLineDash( const ::com::sun::star::drawing::LineDash& rDash ); + OUString insertLineDash( const ::com::sun::star::drawing::LineDash& rDash ); /** Inserts a new named fill gradient, returns the gradient name, based on an internal constant name with a new unused index appended. */ - ::rtl::OUString insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient ); + OUString insertFillGradient( const ::com::sun::star::awt::Gradient& rGradient ); - ::rtl::OUString insertTransGrandient( const ::com::sun::star::awt::Gradient& rGradient ); + OUString insertTransGrandient( const ::com::sun::star::awt::Gradient& rGradient ); /** Inserts a new named fill bitmap URL, returns the bitmap name, based on an internal constant name with a new unused index appended. */ - ::rtl::OUString insertFillBitmapUrl( const ::rtl::OUString& rGraphicUrl ); + OUString insertFillBitmapUrl( const OUString& rGraphicUrl ); private: ObjectContainer maMarkerContainer; ///< Contains all named line markers (line end polygons). @@ -109,10 +109,10 @@ private: ObjectContainer maGradientContainer; ///< Contains all named fill gradients. ObjectContainer maTransGradContainer; ///< Contains all named transparency Gradients. ObjectContainer maBitmapUrlContainer; ///< Contains all named fill bitmap URLs. - const ::rtl::OUString maDashNameBase; ///< Base name for all named line dashes. - const ::rtl::OUString maGradientNameBase; ///< Base name for all named fill gradients. - const ::rtl::OUString maTransGradNameBase; ///< Base name for all named fill gradients. - const ::rtl::OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs. + const OUString maDashNameBase; ///< Base name for all named line dashes. + const OUString maGradientNameBase; ///< Base name for all named fill gradients. + const OUString maTransGradNameBase; ///< Base name for all named fill gradients. + const OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs. }; // ============================================================================ diff --git a/oox/inc/oox/helper/progressbar.hxx b/oox/inc/oox/helper/progressbar.hxx index 3c316b3d4d73..bb8540262750 100644 --- a/oox/inc/oox/helper/progressbar.hxx +++ b/oox/inc/oox/helper/progressbar.hxx @@ -89,7 +89,7 @@ class OOX_DLLPUBLIC ProgressBar : public IProgressBar public: explicit ProgressBar( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator, - const ::rtl::OUString& rText ); + const OUString& rText ); virtual ~ProgressBar(); @@ -113,7 +113,7 @@ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar public: explicit SegmentProgressBar( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& rxIndicator, - const ::rtl::OUString& rText ); + const OUString& rText ); /** Returns the current position of the progress bar segment. */ virtual double getPosition() const; diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx index a7c14b55b06e..d03d891d93b5 100644 --- a/oox/inc/oox/helper/propertymap.hxx +++ b/oox/inc/oox/helper/propertymap.hxx @@ -54,7 +54,7 @@ public: explicit PropertyMap(); /** Returns the name of the passed property identifier. */ - static const ::rtl::OUString& getPropertyName( sal_Int32 nPropId ); + static const OUString& getPropertyName( sal_Int32 nPropId ); /** Returns true, if the map contains a property with the passed identifier. */ inline bool hasProperty( sal_Int32 nPropId ) const @@ -84,7 +84,7 @@ public: /** Fills the passed sequences of names and anys with all contained properties. */ void fillSequences( - ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames, + ::com::sun::star::uno::Sequence< OUString >& rNames, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) const; /** Creates a property set supporting the XPropertySet interface and inserts all properties. */ diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx index 75035e6fb744..2c97b29677fa 100644 --- a/oox/inc/oox/helper/propertyset.hxx +++ b/oox/inc/oox/helper/propertyset.hxx @@ -108,7 +108,7 @@ public: @param rPropNames The property names. MUST be ordered alphabetically. @param rValues The related property values. */ void setProperties( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropNames, + const ::com::sun::star::uno::Sequence< OUString >& rPropNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ); /** Puts the passed property map into the property set. Tries to use the XMultiPropertySet interface. @@ -123,10 +123,10 @@ public: private: /** Gets the specified property from the property set. @return true, if the any could be filled with the property value. */ - bool implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const ::rtl::OUString& rPropName ) const; + bool implGetPropertyValue( ::com::sun::star::uno::Any& orValue, const OUString& rPropName ) const; /** Puts the passed any into the property set. */ - bool implSetPropertyValue( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue ); + bool implSetPropertyValue( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue ); private: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/oox/inc/oox/helper/storagebase.hxx b/oox/inc/oox/helper/storagebase.hxx index f22e0acda7e7..f318f01b4768 100644 --- a/oox/inc/oox/helper/storagebase.hxx +++ b/oox/inc/oox/helper/storagebase.hxx @@ -73,14 +73,14 @@ public: getXStorage() const; /** Returns the element name of this storage. */ - const ::rtl::OUString& getName() const; + const OUString& getName() const; /** Returns the full path of this storage. */ - ::rtl::OUString getPath() const; + OUString getPath() const; /** Fills the passed vector with the names of all direct elements of this storage. */ - void getElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const; + void getElementNames( ::std::vector< OUString >& orElementNames ) const; /** Opens and returns the specified sub storage from the storage. @@ -91,7 +91,7 @@ public: True = create missing sub storages (for export filters). Must be false for storages based on input streams. */ - StorageRef openSubStorage( const ::rtl::OUString& rStorageName, bool bCreateMissing ); + StorageRef openSubStorage( const OUString& rStorageName, bool bCreateMissing ); /** Opens and returns the specified input stream from the storage. @@ -102,7 +102,7 @@ public: accessed by passing an empty string as stream name. */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - openInputStream( const ::rtl::OUString& rStreamName ); + openInputStream( const OUString& rStreamName ); /** Opens and returns the specified output stream from the storage. @@ -113,7 +113,7 @@ public: can be accessed by passing an empty string as stream name. */ ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - openOutputStream( const ::rtl::OUString& rStreamName ); + openOutputStream( const OUString& rStreamName ); /** Copies the specified element from this storage to the passed destination storage. @@ -124,7 +124,7 @@ public: case, the element will be copied to the same substorage in the destination storage. */ - void copyToStorage( StorageBase& rDestStrg, const ::rtl::OUString& rElementName ); + void copyToStorage( StorageBase& rDestStrg, const OUString& rElementName ); /** Copies all streams of this storage and of all substorages to the passed destination. */ @@ -135,7 +135,7 @@ public: protected: /** Special constructor for sub storage objects. */ - explicit StorageBase( const StorageBase& rParentStorage, const ::rtl::OUString& rStorageName, bool bReadOnly ); + explicit StorageBase( const StorageBase& rParentStorage, const OUString& rStorageName, bool bReadOnly ); private: StorageBase( const StorageBase& ); @@ -149,35 +149,35 @@ private: implGetXStorage() const = 0; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const = 0; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const = 0; /** Implementation of opening a storage element. */ - virtual StorageRef implOpenSubStorage( const ::rtl::OUString& rElementName, bool bCreate ) = 0; + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreate ) = 0; /** Implementation of opening an input stream element. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const ::rtl::OUString& rElementName ) = 0; + implOpenInputStream( const OUString& rElementName ) = 0; /** Implementation of opening an output stream element. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const ::rtl::OUString& rElementName ) = 0; + implOpenOutputStream( const OUString& rElementName ) = 0; /** Commits the current storage. */ virtual void implCommit() const = 0; /** Helper that opens and caches the specified direct substorage. */ - StorageRef getSubStorage( const ::rtl::OUString& rElementName, bool bCreateMissing ); + StorageRef getSubStorage( const OUString& rElementName, bool bCreateMissing ); private: - typedef RefMap< ::rtl::OUString, StorageBase > SubStorageMap; + typedef RefMap< OUString, StorageBase > SubStorageMap; SubStorageMap maSubStorages; ///< Map of direct sub storages. ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxInStream; ///< Cached base input stream (to keep it alive). ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > mxOutStream; ///< Cached base output stream (to keep it alive). - ::rtl::OUString maParentPath; ///< Full path of parent storage. - ::rtl::OUString maStorageName; ///< Name of this storage, if it is a substorage. + OUString maParentPath; ///< Full path of parent storage. + OUString maStorageName; ///< Name of this storage, if it is a substorage. bool mbBaseStreamAccess; ///< True = access base streams with empty stream name. bool mbReadOnly; ///< True = storage opened read-only (based on input stream). }; diff --git a/oox/inc/oox/helper/textinputstream.hxx b/oox/inc/oox/helper/textinputstream.hxx index 944f32950f4b..16a2d5145e9d 100644 --- a/oox/inc/oox/helper/textinputstream.hxx +++ b/oox/inc/oox/helper/textinputstream.hxx @@ -62,7 +62,7 @@ public: line-end character, the next call to this function will turn the stream into EOF state and return an empty string. */ - ::rtl::OUString readLine(); + OUString readLine(); /** Reads a text portion from the stream until the specified character is found. @@ -85,7 +85,7 @@ public: returned as first character in the next call of this function or readLine(). */ - ::rtl::OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); + OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); // ------------------------------------------------------------------------ @@ -105,7 +105,7 @@ private: rtl_TextEncoding eTextEnc ); /** Adds the pending character in front of the passed string, if existing. */ - ::rtl::OUString createFinalString( const ::rtl::OUString& rString ); + OUString createFinalString( const OUString& rString ); private: ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 > diff --git a/oox/inc/oox/helper/zipstorage.hxx b/oox/inc/oox/helper/zipstorage.hxx index 94049eb144e5..e46df41387d7 100644 --- a/oox/inc/oox/helper/zipstorage.hxx +++ b/oox/inc/oox/helper/zipstorage.hxx @@ -48,7 +48,7 @@ private: explicit ZipStorage( const ZipStorage& rParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, - const ::rtl::OUString& rElementName ); + const OUString& rElementName ); /** Returns true, if the object represents a valid storage. */ virtual bool implIsStorage() const; @@ -58,18 +58,18 @@ private: implGetXStorage() const; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const; /** Opens and returns the specified sub storage from the storage. */ - virtual StorageRef implOpenSubStorage( const ::rtl::OUString& rElementName, bool bCreateMissing ); + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ); /** Opens and returns the specified input stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const ::rtl::OUString& rElementName ); + implOpenInputStream( const OUString& rElementName ); /** Opens and returns the specified output stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const ::rtl::OUString& rElementName ); + implOpenOutputStream( const OUString& rElementName ); /** Commits the current storage. */ virtual void implCommit() const; diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx index 771851562996..7b3cca66473f 100644 --- a/oox/inc/oox/mathml/importutils.hxx +++ b/oox/inc/oox/mathml/importutils.hxx @@ -134,12 +134,12 @@ public: { bool hasAttribute( int token ) const; OUString& operator[] (int token); - rtl::OUString attribute( int token, const rtl::OUString& def = rtl::OUString()) const; + OUString attribute( int token, const OUString& def = OUString()) const; bool attribute( int token, bool def ) const; sal_Unicode attribute( int token, sal_Unicode def ) const; // when adding more attribute() overloads, add also to XmlStream itself protected: - std::map< int, rtl::OUString > attrs; + std::map< int, OUString > attrs; }; /** Structure representing a tag, including its attributes and content text immediatelly following it. @@ -148,17 +148,17 @@ public: { Tag( int token = XML_TOKEN_INVALID, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >& attributes = com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >(), - const rtl::OUString& text = rtl::OUString()); + const OUString& text = OUString()); Tag( int token, const AttributeList& attribs); int token; ///< tag type, or XML_TOKEN_INVALID AttributeList attributes; - rtl::OUString text; + OUString text; /** This function returns value of the given attribute, or the passed default value if not found. The type of the default value selects the return type (OUString here). */ - rtl::OUString attribute( int token, const rtl::OUString& def = rtl::OUString()) const; + OUString attribute( int token, const OUString& def = OUString()) const; /** @overload */ @@ -244,11 +244,11 @@ public: const AttributeList& attribs ); void appendClosingTag( int token ); // appends the characters after the last appended token - void appendCharacters( const rtl::OUString& characters ); + void appendCharacters( const OUString& characters ); }; inline -rtl::OUString XmlStream::Tag::attribute( int t, const rtl::OUString& def ) const +OUString XmlStream::Tag::attribute( int t, const OUString& def ) const { return attributes.attribute( t, def ); } diff --git a/oox/inc/oox/ole/axbinaryreader.hxx b/oox/inc/oox/ole/axbinaryreader.hxx index 44003f56fcaf..f734a307d895 100644 --- a/oox/inc/oox/ole/axbinaryreader.hxx +++ b/oox/inc/oox/ole/axbinaryreader.hxx @@ -87,7 +87,7 @@ private: typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; /** An array of string values as a property. */ -typedef ::std::vector< ::rtl::OUString > AxStringArray; +typedef ::std::vector< OUString > AxStringArray; // ============================================================================ @@ -111,10 +111,10 @@ public: void readPairProperty( AxPairData& orPairData ); /** Reads the next string property from the stream, if the respective flag in the property mask is set. */ - void readStringProperty( ::rtl::OUString& orValue ); + void readStringProperty( OUString& orValue ); /** Reads the next GUID property from the stream, if the respective flag in the property mask is set. The GUID will be enclosed in braces. */ - void readGuidProperty( ::rtl::OUString& orGuid ); + void readGuidProperty( OUString& orGuid ); /** Reads the next font property from the stream, if the respective flag in the property mask is set. */ void readFontProperty( AxFontData& orFontData ); @@ -176,10 +176,10 @@ private: /** Complex property for a string value. */ struct StringProperty : public ComplexProperty { - ::rtl::OUString& mrValue; + OUString& mrValue; sal_uInt32 mnSize; - inline explicit StringProperty( ::rtl::OUString& rValue, sal_uInt32 nSize ) : + inline explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -197,9 +197,9 @@ private: /** Complex property for a GUID value. */ struct GuidProperty : public ComplexProperty { - ::rtl::OUString& mrGuid; + OUString& mrGuid; - inline explicit GuidProperty( ::rtl::OUString& rGuid ) : + inline explicit GuidProperty( OUString& rGuid ) : mrGuid( rGuid ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ); }; @@ -233,7 +233,7 @@ private: AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. AxFontData maDummyFontData; ///< Dummy font for unsupported properties. StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties. - ::rtl::OUString maDummyString; ///< Dummy string for unsupported properties. + OUString maDummyString; ///< Dummy string for unsupported properties. AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties. sal_Int64 mnPropFlags; ///< Flags specifying existing properties. sal_Int64 mnNextProp; ///< Next property to read. diff --git a/oox/inc/oox/ole/axbinarywriter.hxx b/oox/inc/oox/ole/axbinarywriter.hxx index d9a940381f73..eb4aec532d1f 100644 --- a/oox/inc/oox/ole/axbinarywriter.hxx +++ b/oox/inc/oox/ole/axbinarywriter.hxx @@ -91,7 +91,7 @@ private: typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; /** An array of string values as a property. */ -typedef ::std::vector< ::rtl::OUString > AxStringArray; +typedef ::std::vector< OUString > AxStringArray; // ============================================================================ @@ -115,7 +115,7 @@ public: void writePairProperty( AxPairData& orPairData ); /** Write a string property to the stream, the respective flag in the property mask is set. */ - void writeStringProperty( ::rtl::OUString& orValue, bool bCompressed = true ); + void writeStringProperty( OUString& orValue, bool bCompressed = true ); /** Skips the next property clears the respective flag in the property mask. */ @@ -149,10 +149,10 @@ private: /** Complex property for a string value. */ struct StringProperty : public ComplexProperty { - ::rtl::OUString& mrValue; + OUString& mrValue; sal_uInt32 mnSize; - inline explicit StringProperty( ::rtl::OUString& rValue, sal_uInt32 nSize ) : + inline explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); }; @@ -175,7 +175,7 @@ private: ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties. - ::rtl::OUString maDummyString; ///< Dummy string for unsupported properties. + OUString maDummyString; ///< Dummy string for unsupported properties. AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties. sal_Int16 mnBlockSize; sal_Int64 mnPropFlagsStart; ///< pos of Prop flags diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx index 337bac344fcc..6612ef3c497d 100644 --- a/oox/inc/oox/ole/axcontrol.hxx +++ b/oox/inc/oox/ole/axcontrol.hxx @@ -258,8 +258,8 @@ public: implementation will check which source types are supported. */ void bindToSources( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel, - const ::rtl::OUString& rCtrlSource, - const ::rtl::OUString& rRowSource, + const OUString& rCtrlSource, + const OUString& rRowSource, sal_Int32 nRefSheet = 0 ) const; // ActiveX (Forms 2.0) specific conversion -------------------------------- @@ -313,14 +313,14 @@ public: properties. */ void convertAxState( PropertyMap& rPropMap, - const ::rtl::OUString& rValue, + const OUString& rValue, sal_Int32 nMultiSelect, ApiDefaultStateMode eDefStateMode, bool bAwtModel ) const; void convertToAxState( PropertySet& rPropSet, - ::rtl::OUString& rValue, + OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode, bool bAwtModel ) const; @@ -360,10 +360,10 @@ public: /** Returns the UNO service name used to construct the AWT control model, or the control form component. */ - ::rtl::OUString getServiceName() const; + OUString getServiceName() const; /** Derived classes set specific OOXML properties at the model structure. */ - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); /** Derived classes set binary data (picture, mouse icon) at the model structure. */ virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); /** Derived classes import a form control model from the passed input stream. */ @@ -487,7 +487,7 @@ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase public: explicit AxControlModelBase(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); }; // ============================================================================ @@ -498,7 +498,7 @@ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase public: explicit AxFontDataModel( bool bSupportsAlign = true ); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; @@ -522,7 +522,7 @@ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel public: explicit AxCommandButtonModel(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); @@ -534,7 +534,7 @@ public: public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. - ::rtl::OUString maCaption; ///< Visible caption of the button. + OUString maCaption; ///< Visible caption of the button. sal_uInt32 mnTextColor; ///< Text color. sal_uInt32 mnBackColor; ///< Fill color. sal_uInt32 mnFlags; ///< Various flags. @@ -551,7 +551,7 @@ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel public: explicit AxLabelModel(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); virtual void exportCompObj( BinaryOutputStream& rOutStrm ); @@ -561,7 +561,7 @@ public: virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); public: // direct access needed for legacy VML drawing controls - ::rtl::OUString maCaption; ///< Visible caption of the button. + OUString maCaption; ///< Visible caption of the button. sal_uInt32 mnTextColor; ///< Text color. sal_uInt32 mnBackColor; ///< Fill color. sal_uInt32 mnFlags; ///< Various flags. @@ -579,7 +579,7 @@ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase public: explicit AxImageModel(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); @@ -608,7 +608,7 @@ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel public: explicit AxMorphDataModelBase(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); @@ -616,9 +616,9 @@ public: public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. - ::rtl::OUString maCaption; ///< Visible caption of the button. - ::rtl::OUString maValue; ///< Current value of the control. - ::rtl::OUString maGroupName; ///< Group name for option buttons. + OUString maCaption; ///< Visible caption of the button. + OUString maValue; ///< Current value of the control. + OUString maGroupName; ///< Group name for option buttons. sal_uInt32 mnTextColor; ///< Text color. sal_uInt32 mnBackColor; ///< Fill color. sal_uInt32 mnFlags; ///< Various flags. @@ -674,7 +674,7 @@ public: explicit AxOptionButtonModel(); /** Returns the group name used to goup several option buttons gogether. */ - inline const ::rtl::OUString& getGroupName() const { return maGroupName; } + inline const OUString& getGroupName() const { return maGroupName; } virtual ApiControlType getControlType() const; virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; @@ -746,7 +746,7 @@ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase public: explicit AxSpinButtonModel(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); @@ -775,7 +775,7 @@ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase public: explicit AxScrollBarModel(); - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); virtual void exportCompObj( BinaryOutputStream& rOutStrm ); @@ -800,7 +800,7 @@ public: // direct access needed for legacy VML drawing controls // ============================================================================ -typedef ::std::vector< ::rtl::OUString > AxClassTable; +typedef ::std::vector< OUString > AxClassTable; /** Base class for ActiveX container controls. */ class OOX_DLLPUBLIC AxContainerModelBase : public AxFontDataModel @@ -809,7 +809,7 @@ public: explicit AxContainerModelBase( bool bFontSupport = false ); /** Allows to set single properties specified by XML token identifier. */ - virtual void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); /** Reads the leading structure in the 'f' stream containing the model for this control. */ virtual bool importBinaryModel( BinaryInputStream& rInStrm ); @@ -822,7 +822,7 @@ public: public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. - ::rtl::OUString maCaption; ///< Visible caption of the form. + OUString maCaption; ///< Visible caption of the form. AxPairData maLogicalSize; ///< Logical form size (scroll area). AxPairData maScrollPos; ///< Scroll position. sal_uInt32 mnBackColor; ///< Fill color. @@ -868,7 +868,7 @@ public: class HtmlSelectModel : public AxListBoxModel { - com::sun::star::uno::Sequence< rtl::OUString > msListData; + com::sun::star::uno::Sequence< OUString > msListData; com::sun::star::uno::Sequence< sal_Int16 > msIndices; public: HtmlSelectModel(); @@ -889,7 +889,7 @@ public: class OOX_DLLPUBLIC EmbeddedControl { public: - explicit EmbeddedControl( const ::rtl::OUString& rName ); + explicit EmbeddedControl( const OUString& rName ); virtual ~EmbeddedControl(); /** Creates and returns the internal control model of the specified type. */ @@ -902,7 +902,7 @@ public: /** Creates and returns the internal control model according to the passed MS class identifier. */ - ControlModelBase* createModelFromGuid( const ::rtl::OUString& rClassId ); + ControlModelBase* createModelFromGuid( const OUString& rClassId ); /** Returns true, if the internal control model exists. */ inline bool hasModel() const { return mxModel.get() != 0; } @@ -912,7 +912,7 @@ public: inline ControlModelBase* getModel() { return mxModel.get(); } /** Returns the UNO service name needed to construct the control model. */ - ::rtl::OUString getServiceName() const; + OUString getServiceName() const; /** Converts all control properties and inserts them into the passed model. */ bool convertProperties( @@ -925,7 +925,7 @@ public: private: ControlModelRef mxModel; ///< Control model containing the properties. - ::rtl::OUString maName; ///< Name of the control. + OUString maName; ///< Name of the control. }; // ---------------------------------------------------------------------------- diff --git a/oox/inc/oox/ole/axcontrolfragment.hxx b/oox/inc/oox/ole/axcontrolfragment.hxx index 28ae526d8e08..653f23c30479 100644 --- a/oox/inc/oox/ole/axcontrolfragment.hxx +++ b/oox/inc/oox/ole/axcontrolfragment.hxx @@ -54,7 +54,7 @@ class AxControlFragment : public ::oox::core::FragmentHandler2 public: explicit AxControlFragment( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, EmbeddedControl& rControl ); virtual ::oox::core::ContextHandlerRef diff --git a/oox/inc/oox/ole/axfontdata.hxx b/oox/inc/oox/ole/axfontdata.hxx index 2660f38e12a4..9dbec1786261 100644 --- a/oox/inc/oox/ole/axfontdata.hxx +++ b/oox/inc/oox/ole/axfontdata.hxx @@ -46,7 +46,7 @@ const sal_Int32 AX_FONTDATA_CENTER = 3; /** All entries of a font property. */ struct OOX_DLLPUBLIC AxFontData { - ::rtl::OUString maFontName; ///< Name of the used font. + OUString maFontName; ///< Name of the used font. sal_uInt32 mnFontEffects; ///< Font effect flags. sal_Int32 mnFontHeight; ///< Height of the font (not really twips, see code). sal_Int32 mnFontCharSet; ///< Windows character set of the font. diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx index 68d3133b7db6..e75a0cd07588 100644 --- a/oox/inc/oox/ole/olehelper.hxx +++ b/oox/inc/oox/ole/olehelper.hxx @@ -71,7 +71,7 @@ const sal_uInt8 OLE_STDFONT_STRIKE = 0x08; /** Stores data about a StdFont font structure. */ struct StdFontInfo { - ::rtl::OUString maName; ///< Font name. + OUString maName; ///< Font name. sal_uInt32 mnHeight; ///< Font height (1/10,000 points). sal_uInt16 mnWeight; ///< Font weight (normal/bold). sal_uInt16 mnCharSet; ///< Font charset. @@ -79,7 +79,7 @@ struct StdFontInfo explicit StdFontInfo(); explicit StdFontInfo( - const ::rtl::OUString& rName, + const OUString& rName, sal_uInt32 nHeight, sal_uInt16 nWeight = OLE_STDFONT_NORMAL, sal_uInt16 nCharSet = WINDOWS_CHARSET_ANSI, @@ -91,10 +91,10 @@ struct StdFontInfo /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo { - ::rtl::OUString maTarget; - ::rtl::OUString maLocation; - ::rtl::OUString maDisplay; - ::rtl::OUString maFrame; + OUString maTarget; + OUString maLocation; + OUString maDisplay; + OUString maFrame; }; // ============================================================================ @@ -121,7 +121,7 @@ public: /** Imports a GUID from the passed binary stream and returns its string representation (in uppercase characters). */ - static ::rtl::OUString importGuid( BinaryInputStream& rInStrm ); + static OUString importGuid( BinaryInputStream& rInStrm ); /** Imports an OLE StdFont font structure from the current position of the passed binary stream. @@ -163,10 +163,10 @@ protected: bool importControlFromStream( ::oox::BinaryInputStream& rInStrm, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp, - const ::rtl::OUString& rGuidString ); + const OUString& rGuidString ); bool importControlFromStream( ::oox::BinaryInputStream& rInStrm, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp, - const ::rtl::OUString& rGuidString, + const OUString& rGuidString, sal_Int32 nSize ); public: MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel ); @@ -174,7 +174,7 @@ public: sal_Bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp ); sal_Bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp, sal_Int32 nPos, sal_Int32 nSize ); - static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,rtl::OUString &rName); + static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName); #ifdef SvxMSConvertOCXControlsRemoved const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > & GetShapes(); diff --git a/oox/inc/oox/ole/oleobjecthelper.hxx b/oox/inc/oox/ole/oleobjecthelper.hxx index a07f0c3da683..9d97a8d95f71 100644 --- a/oox/inc/oox/ole/oleobjecthelper.hxx +++ b/oox/inc/oox/ole/oleobjecthelper.hxx @@ -39,8 +39,8 @@ namespace ole { struct OleObjectInfo { StreamDataSequence maEmbeddedData; ///< Data of an embedded OLE object. - ::rtl::OUString maTargetLink; ///< Path to external data for linked OLE object. - ::rtl::OUString maProgId; + OUString maTargetLink; ///< Path to external data for linked OLE object. + OUString maProgId; bool mbLinked; ///< True = linked OLE object, false = embedded OLE object. bool mbShowAsIcon; ///< True = show as icon, false = show contents. bool mbAutoUpdate; @@ -65,7 +65,7 @@ public: private: ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxResolver; - const ::rtl::OUString maEmbeddedObjScheme; + const OUString maEmbeddedObjScheme; sal_Int32 mnObjectId; }; diff --git a/oox/inc/oox/ole/olestorage.hxx b/oox/inc/oox/ole/olestorage.hxx index ff5ab59b2c27..1b48eab8213d 100644 --- a/oox/inc/oox/ole/olestorage.hxx +++ b/oox/inc/oox/ole/olestorage.hxx @@ -52,12 +52,12 @@ private: explicit OleStorage( const OleStorage& rParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxStorage, - const ::rtl::OUString& rElementName, + const OUString& rElementName, bool bReadOnly ); explicit OleStorage( const OleStorage& rParentStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream, - const ::rtl::OUString& rElementName ); + const OUString& rElementName ); /** Initializes the API storage object for input. */ void initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ); @@ -76,18 +76,18 @@ private: implGetXStorage() const; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< ::rtl::OUString >& orElementNames ) const; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const; /** Opens and returns the specified sub storage from the storage. */ - virtual StorageRef implOpenSubStorage( const ::rtl::OUString& rElementName, bool bCreateMissing ); + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ); /** Opens and returns the specified input stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const ::rtl::OUString& rElementName ); + implOpenInputStream( const OUString& rElementName ); /** Opens and returns the specified output stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const ::rtl::OUString& rElementName ); + implOpenOutputStream( const OUString& rElementName ); /** Commits the current storage. */ virtual void implCommit() const; diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx index b9f3975d5e37..0de80153baed 100644 --- a/oox/inc/oox/ole/vbacontrol.hxx +++ b/oox/inc/oox/ole/vbacontrol.hxx @@ -44,14 +44,14 @@ public: virtual ~VbaSiteModel(); /** Allows to set single properties specified by XML token identifier. */ - void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue ); + void importProperty( sal_Int32 nPropId, const OUString& rValue ); /** Imports the site model data from the passed input stream. */ bool importBinaryModel( BinaryInputStream& rInStrm ); /** Moves the control relative to its current position by the passed distance. */ void moveRelative( const AxPairData& rDistance ); /** Returns the programmatical name of the control. */ - inline const ::rtl::OUString& getName() const { return maName; } + inline const OUString& getName() const { return maName; } /** Returns the position of the control in its parent. */ inline const AxPairData& getPosition() const { return maPos; } /** Returns the unique identifier of this control. */ @@ -61,7 +61,7 @@ public: /** Returns the length of the stream data for stream based controls. */ sal_uInt32 getStreamLength() const; /** Returns the name of the substorage for the container control data. */ - ::rtl::OUString getSubStorageName() const; + OUString getSubStorageName() const; /** Returns the tab index of the control. */ inline sal_Int16 getTabIndex() const { return mnTabIndex; } @@ -75,11 +75,11 @@ public: sal_Int32 nCtrlIndex ) const; protected: - ::rtl::OUString maName; ///< Name of the control. - ::rtl::OUString maTag; ///< User defined tag. - ::rtl::OUString maToolTip; ///< Tool tip for the control. - ::rtl::OUString maControlSource; ///< Linked cell for the control value in a spreadsheet. - ::rtl::OUString maRowSource; ///< Source data for the control in a spreadsheet. + OUString maName; ///< Name of the control. + OUString maTag; ///< User defined tag. + OUString maToolTip; ///< Tool tip for the control. + OUString maControlSource; ///< Linked cell for the control value in a spreadsheet. + OUString maRowSource; ///< Source data for the control in a spreadsheet. AxPairData maPos; ///< Position in parent container. sal_Int32 mnId; ///< Control identifier. @@ -116,7 +116,7 @@ public: const AxClassTable& rClassTable ); /** Returns the programmatical name of the control. */ - ::rtl::OUString getControlName() const; + OUString getControlName() const; /** Creates the UNO control model, inserts it into the passed container, and converts all control properties. */ @@ -186,7 +186,7 @@ public: void importForm( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxDialogLib, StorageBase& rVbaFormStrg, - const ::rtl::OUString& rModuleName, + const OUString& rModuleName, rtl_TextEncoding eTextEnc ); private: diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx index dadfd8de66af..a8faee21ff6e 100644 --- a/oox/inc/oox/ole/vbahelper.hxx +++ b/oox/inc/oox/ole/vbahelper.hxx @@ -79,9 +79,9 @@ public: value are not empty. False otherwise. */ static bool extractKeyValue( - ::rtl::OUString& rKey, - ::rtl::OUString& rValue, - const ::rtl::OUString& rKeyValue ); + OUString& rKey, + OUString& rValue, + const OUString& rKeyValue ); private: VbaHelper(); diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx index 91f5b62a54c7..70dcd3913b9a 100644 --- a/oox/inc/oox/ole/vbamodule.hxx +++ b/oox/inc/oox/ole/vbamodule.hxx @@ -46,7 +46,7 @@ public: explicit VbaModule( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel, - const ::rtl::OUString& rName, + const OUString& rName, rtl_TextEncoding eTextEnc, bool bExecutable ); @@ -56,9 +56,9 @@ public: inline void setType( sal_Int32 nType ) { mnType = nType; } /** Returns the name of the module. */ - inline const ::rtl::OUString& getName() const { return maName; } + inline const OUString& getName() const { return maName; } /** Returns the stream name of the module. */ - inline const ::rtl::OUString& getStreamName() const { return maStreamName; } + inline const OUString& getStreamName() const { return maStreamName; } /** Imports all records for this module until the MODULEEND record. */ void importDirRecords( BinaryInputStream& rDirStrm ); @@ -75,11 +75,11 @@ public: private: /** Reads and returns the VBA source code from the passed storage. */ - ::rtl::OUString readSourceCode( StorageBase& rVbaStrg ) const; + OUString readSourceCode( StorageBase& rVbaStrg ) const; /** Creates a new Basic module and inserts it into the passed Basic library. */ void createModule( - const ::rtl::OUString& rVBASourceCode, + const OUString& rVBASourceCode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const; @@ -88,9 +88,9 @@ private: mxContext; ///< Component context with service manager. ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel; ///< Document model used to import/export the VBA project. - ::rtl::OUString maName; - ::rtl::OUString maStreamName; - ::rtl::OUString maDocString; + OUString maName; + OUString maStreamName; + OUString maDocString; rtl_TextEncoding meTextEnc; sal_Int32 mnType; sal_uInt32 mnOffset; diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx index 723d2ca0a562..f742138756b5 100644 --- a/oox/inc/oox/ole/vbaproject.hxx +++ b/oox/inc/oox/ole/vbaproject.hxx @@ -47,7 +47,7 @@ class OOX_DLLPUBLIC VbaFilterConfig public: explicit VbaFilterConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& rConfigCompName ); + const OUString& rConfigCompName ); ~VbaFilterConfig(); /** Returns true, if the VBA source code and forms should be imported. */ @@ -84,7 +84,7 @@ private: class OOX_DLLPUBLIC VbaMacroAttacherBase { public: - explicit VbaMacroAttacherBase( const ::rtl::OUString& rMacroName ); + explicit VbaMacroAttacherBase( const OUString& rMacroName ); virtual ~VbaMacroAttacherBase(); /** Resolves the internal macro name to the related macro URL, and attaches @@ -95,10 +95,10 @@ public: private: /** Called after the VBA project has been imported. Derived classes will attach the passed script to the object represented by this instance. */ - virtual void attachMacro( const ::rtl::OUString& rScriptUrl ) = 0; + virtual void attachMacro( const OUString& rScriptUrl ) = 0; private: - ::rtl::OUString maMacroName; + OUString maMacroName; }; typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; @@ -111,7 +111,7 @@ public: explicit VbaProject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel, - const ::rtl::OUString& rConfigCompName ); + const OUString& rConfigCompName ); virtual ~VbaProject(); /** Imports the entire VBA project from the passed storage. @@ -141,7 +141,7 @@ public: protected: /** Registers a dummy module that will be created when the VBA project is imported. */ - void addDummyModule( const ::rtl::OUString& rName, sal_Int32 nType ); + void addDummyModule( const OUString& rName, sal_Int32 nType ); /** Called when the import process of the VBA project has been started. */ virtual void prepareImport(); @@ -179,7 +179,7 @@ private: private: typedef RefVector< VbaMacroAttacherBase > MacroAttacherVector; - typedef ::std::map< ::rtl::OUString, sal_Int32 > DummyModuleMap; + typedef ::std::map< OUString, sal_Int32 > DummyModuleMap; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; ///< Component context with service manager. @@ -191,7 +191,7 @@ private: mxDialogLib; ///< The dialog library of the document used for import. MacroAttacherVector maMacroAttachers; ///< Objects that want to attach a VBA macro to an action. DummyModuleMap maDummyModules; ///< Additional empty modules created on import. - ::rtl::OUString maPrjName; ///< Name of the VBA project. + OUString maPrjName; ///< Name of the VBA project. ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxOleOverridesSink; }; diff --git a/oox/inc/oox/ppt/animationspersist.hxx b/oox/inc/oox/ppt/animationspersist.hxx index 50908a7ffd7a..ba63991def2a 100644 --- a/oox/inc/oox/ppt/animationspersist.hxx +++ b/oox/inc/oox/ppt/animationspersist.hxx @@ -62,7 +62,7 @@ namespace oox { namespace ppt { sal_Int32 mnType; sal_Int32 mnRangeType; drawingml::IndexRange maRange; - ::rtl::OUString msSubShapeId; + OUString msSubShapeId; }; @@ -76,7 +76,7 @@ namespace oox { namespace ppt { ::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const; sal_Int32 mnType; - ::rtl::OUString msValue; + OUString msValue; ShapeTargetElement maShapeTarget; }; @@ -108,8 +108,8 @@ namespace oox { namespace ppt { struct TimeAnimationValue { - ::rtl::OUString msFormula; - ::rtl::OUString msTime; + OUString msFormula; + OUString msTime; ::com::sun::star::uno::Any maValue; }; diff --git a/oox/inc/oox/ppt/comments.hxx b/oox/inc/oox/ppt/comments.hxx index fe718db36efa..1095cd0223db 100644 --- a/oox/inc/oox/ppt/comments.hxx +++ b/oox/inc/oox/ppt/comments.hxx @@ -18,11 +18,11 @@ namespace oox { namespace ppt { struct CommentAuthor { - ::rtl::OUString clrIdx; - ::rtl::OUString id; - ::rtl::OUString initials; - ::rtl::OUString lastIdx; - ::rtl::OUString name; + OUString clrIdx; + OUString id; + OUString initials; + OUString lastIdx; + OUString name; }; class CommentAuthorList @@ -49,60 +49,60 @@ class CommentAuthorList class Comment { private: - ::rtl::OUString authorId; - ::rtl::OUString dt; - ::rtl::OUString idx; - ::rtl::OUString x; - ::rtl::OUString y; - ::rtl::OUString text; + OUString authorId; + OUString dt; + OUString idx; + OUString x; + OUString y; + OUString text; ::com::sun::star::util::DateTime aDateTime; - void setDateTime (::rtl::OUString datetime); + void setDateTime (OUString datetime); public: - void setAuthorId(const ::rtl::OUString& _aId) + void setAuthorId(const OUString& _aId) { authorId = _aId; } - void setdt(const ::rtl::OUString& _dt) + void setdt(const OUString& _dt) { dt=_dt; setDateTime(_dt); } - void setidx(const ::rtl::OUString& _idx) + void setidx(const OUString& _idx) { idx=_idx; } - void setPoint(const ::rtl::OUString& _x, const ::rtl::OUString& _y) + void setPoint(const OUString& _x, const OUString& _y) { x=_x; y=_y; } - void setText(const rtl::OUString& _text) + void setText(const OUString& _text) { text = _text; } - ::rtl::OUString getAuthorId() + OUString getAuthorId() { return authorId; } - ::rtl::OUString getdt() + OUString getdt() { return dt; } - ::rtl::OUString getidx() + OUString getidx() { return idx; } - ::rtl::OUString get_X() + OUString get_X() { return x; } - ::rtl::OUString get_Y() + OUString get_Y() { return y; } - ::rtl::OUString get_text() + OUString get_text() { return text; } @@ -118,7 +118,7 @@ class Comment { return y.toInt32(); } - ::rtl::OUString getAuthor ( const CommentAuthorList& list ); + OUString getAuthor ( const CommentAuthorList& list ); }; class CommentList diff --git a/oox/inc/oox/ppt/customshowlistcontext.hxx b/oox/inc/oox/ppt/customshowlistcontext.hxx index 5266c1ba8a45..ed913c8bbe2c 100644 --- a/oox/inc/oox/ppt/customshowlistcontext.hxx +++ b/oox/inc/oox/ppt/customshowlistcontext.hxx @@ -28,9 +28,9 @@ namespace oox { namespace ppt { struct CustomShow { - ::rtl::OUString maName; - ::rtl::OUString mnId; - std::vector< rtl::OUString >maSldLst; + OUString maName; + OUString mnId; + std::vector< OUString >maSldLst; }; /** CT_ */ diff --git a/oox/inc/oox/ppt/dgmimport.hxx b/oox/inc/oox/ppt/dgmimport.hxx index 4881ca14db2f..f369c5e526b8 100644 --- a/oox/inc/oox/ppt/dgmimport.hxx +++ b/oox/inc/oox/ppt/dgmimport.hxx @@ -51,7 +51,7 @@ public: virtual oox::drawingml::chart::ChartConverter* getChartConverter(); private: - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const; }; diff --git a/oox/inc/oox/ppt/dgmlayout.hxx b/oox/inc/oox/ppt/dgmlayout.hxx index 0657871925fd..bf964fe5d310 100644 --- a/oox/inc/oox/ppt/dgmlayout.hxx +++ b/oox/inc/oox/ppt/dgmlayout.hxx @@ -51,7 +51,7 @@ public: virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); private: - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const; drawingml::ThemePtr mpThemePtr; }; diff --git a/oox/inc/oox/ppt/layoutfragmenthandler.hxx b/oox/inc/oox/ppt/layoutfragmenthandler.hxx index 8f1ca06677f8..80983182b73d 100644 --- a/oox/inc/oox/ppt/layoutfragmenthandler.hxx +++ b/oox/inc/oox/ppt/layoutfragmenthandler.hxx @@ -29,7 +29,7 @@ namespace oox { namespace ppt { class LayoutFragmentHandler : public SlideFragmentHandler { public: - LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw(); + LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw(); virtual ~LayoutFragmentHandler() throw(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); diff --git a/oox/inc/oox/ppt/pptimport.hxx b/oox/inc/oox/ppt/pptimport.hxx index 1a99b6eab046..035ea8cdc5c1 100644 --- a/oox/inc/oox/ppt/pptimport.hxx +++ b/oox/inc/oox/ppt/pptimport.hxx @@ -51,7 +51,7 @@ public: virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; }; - std::map< rtl::OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; }; + std::map< OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; }; std::vector< SlidePersistPtr >& getDrawPages(){ return maDrawPages; }; std::vector< SlidePersistPtr >& getMasterPages(){ return maMasterPages; }; std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; }; @@ -68,14 +68,14 @@ public: private: virtual GraphicHelper* implCreateGraphicHelper() const; virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual ::rtl::OUString implGetImplementationName() const; + virtual OUString implGetImplementationName() const; private: - rtl::OUString maTableStyleListPath; + OUString maTableStyleListPath; oox::drawingml::table::TableStyleListPtr mpTableStyleList; SlidePersistPtr mpActualSlidePersist; - std::map< rtl::OUString, oox::drawingml::ThemePtr > maThemes; + std::map< OUString, oox::drawingml::ThemePtr > maThemes; std::vector< SlidePersistPtr > maDrawPages; std::vector< SlidePersistPtr > maMasterPages; diff --git a/oox/inc/oox/ppt/presentationfragmenthandler.hxx b/oox/inc/oox/ppt/presentationfragmenthandler.hxx index f6d0feb0897e..ae26cb233e8c 100644 --- a/oox/inc/oox/ppt/presentationfragmenthandler.hxx +++ b/oox/inc/oox/ppt/presentationfragmenthandler.hxx @@ -38,7 +38,7 @@ namespace oox { namespace ppt { class PresentationFragmentHandler : public ::oox::core::FragmentHandler2 { public: - PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath ) throw(); + PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw(); virtual ~PresentationFragmentHandler() throw(); virtual void finalizeImport(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); @@ -51,9 +51,9 @@ private: void importSlide(sal_uInt32 nSlide, sal_Bool bFirstSlide, sal_Bool bImportNotes); - std::vector< rtl::OUString > maSlideMasterVector; - std::vector< rtl::OUString > maSlidesVector; - std::vector< rtl::OUString > maNotesMasterVector; + std::vector< OUString > maSlideMasterVector; + std::vector< OUString > maSlidesVector; + std::vector< OUString > maNotesMasterVector; ::oox::drawingml::TextListStylePtr mpTextListStyle; ::com::sun::star::awt::Size maSlideSize; diff --git a/oox/inc/oox/ppt/slidefragmenthandler.hxx b/oox/inc/oox/ppt/slidefragmenthandler.hxx index b3a9c6745e87..045f6ff1ccda 100644 --- a/oox/inc/oox/ppt/slidefragmenthandler.hxx +++ b/oox/inc/oox/ppt/slidefragmenthandler.hxx @@ -34,23 +34,23 @@ namespace oox { namespace ppt { class SlideFragmentHandler : public ::oox::core::FragmentHandler2 { public: - SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw(); + SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw(); virtual ~SlideFragmentHandler() throw(); virtual void finalizeImport(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); - const ::std::vector< rtl::OUString>& getCharVector() { return maCharVector; } + const ::std::vector< OUString>& getCharVector() { return maCharVector; } protected: SlidePersistPtr mpSlidePersistPtr; ShapeLocation meShapeLocation; private: - ::rtl::OUString maSlideName; + OUString maSlideName; PropertyMap maSlideProperties; - ::std::vector< rtl::OUString> maCharVector; // handle char in OnCharacters + ::std::vector< OUString> maCharVector; // handle char in OnCharacters }; } } diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx index 10274117b678..6f58d81813c3 100644 --- a/oox/inc/oox/ppt/slidepersist.hxx +++ b/oox/inc/oox/ppt/slidepersist.hxx @@ -70,11 +70,11 @@ public: void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; } SlidePersistPtr getMasterPersist() const { return mpMasterPagePtr; } - void setPath( const rtl::OUString& rPath ) { maPath = rPath; } - const rtl::OUString getPath() const { return maPath; } + void setPath( const OUString& rPath ) { maPath = rPath; } + const OUString getPath() const { return maPath; } - void setLayoutPath( const rtl::OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; } - const rtl::OUString getLayoutPath() const { return maLayoutPath; } + void setLayoutPath( const OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; } + const OUString getLayoutPath() const { return maLayoutPath; } void setTheme( const oox::drawingml::ThemePtr pThemePtr ){ mpThemePtr = pThemePtr; } oox::drawingml::ThemePtr getTheme() const { return mpThemePtr; } @@ -113,16 +113,16 @@ public: void createBackground( const oox::core::XmlFilterBase& rFilterBase ); void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase ); - std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; }; - ::oox::drawingml::ShapePtr getShape( const ::rtl::OUString & id ) { return maShapeMap[ id ]; } + std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; }; + ::oox::drawingml::ShapePtr getShape( const OUString & id ) { return maShapeMap[ id ]; } ::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; } CommentList& getCommentsList() { return maCommentsList; } CommentAuthorList& getCommentAuthors() { return maCommentAuthors; } private: - rtl::OUString maPath; - rtl::OUString maLayoutPath; + OUString maPath; + OUString maLayoutPath; ::boost::shared_ptr< oox::vml::Drawing > mpDrawingPtr; com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage; oox::drawingml::ThemePtr mpThemePtr; // the theme that is used @@ -146,8 +146,8 @@ private: oox::drawingml::TextListStylePtr maNotesTextStylePtr; oox::drawingml::TextListStylePtr maOtherTextStylePtr; - std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap; - std::map< ::rtl::OUString, ::oox::drawingml::ShapePtr > maShapeMap; + std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap; + std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap; // slide comments CommentList maCommentsList; diff --git a/oox/inc/oox/ppt/slidetransition.hxx b/oox/inc/oox/ppt/slidetransition.hxx index f940b39a68fa..01f701d63dfe 100644 --- a/oox/inc/oox/ppt/slidetransition.hxx +++ b/oox/inc/oox/ppt/slidetransition.hxx @@ -33,7 +33,7 @@ namespace oox { namespace ppt { { public: SlideTransition(); - explicit SlideTransition(const ::rtl::OUString & ); + explicit SlideTransition(const OUString & ); void setSlideProperties( PropertyMap& props ); void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter ); diff --git a/oox/inc/oox/ppt/soundactioncontext.hxx b/oox/inc/oox/ppt/soundactioncontext.hxx index a393e5857e04..d1f1040c75ba 100644 --- a/oox/inc/oox/ppt/soundactioncontext.hxx +++ b/oox/inc/oox/ppt/soundactioncontext.hxx @@ -41,9 +41,9 @@ private: bool mbHasStartSound; bool mbLoopSound; bool mbStopSound; - ::rtl::OUString msEmbedded; - ::rtl::OUString msLink; - ::rtl::OUString msSndName; + OUString msEmbedded; + OUString msLink; + OUString msSndName; }; } } diff --git a/oox/inc/oox/ppt/timenode.hxx b/oox/inc/oox/ppt/timenode.hxx index cd66c234392f..769cc0e03943 100644 --- a/oox/inc/oox/ppt/timenode.hxx +++ b/oox/inc/oox/ppt/timenode.hxx @@ -45,7 +45,7 @@ namespace oox { namespace ppt { class TimeNode { public: - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > UserDataMap; + typedef ::std::map< OUString, ::com::sun::star::uno::Any > UserDataMap; TimeNode( sal_Int16 nNodeType ); virtual ~TimeNode(); @@ -59,7 +59,7 @@ namespace oox { namespace ppt { { return maChildren; } void setId( sal_Int32 nId ); - const ::rtl::OUString & getId() const { return msId; } + const OUString & getId() const { return msId; } void addNode( const ::oox::core::XmlFilterBase& rFilter, @@ -96,12 +96,12 @@ namespace oox { namespace ppt { { mbHasEndSyncValue = true; return maEndSyncValue; } protected: - static rtl::OUString getServiceName( sal_Int16 nNodeType ); + static OUString getServiceName( sal_Int16 nNodeType ); ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > createAndInsert( const ::oox::core::XmlFilterBase& rFilter, - const rtl::OUString& rServiceName, + const OUString& rServiceName, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode ); private: @@ -109,7 +109,7 @@ namespace oox { namespace ppt { TimeNodePtrList maChildren; - rtl::OUString msId; + OUString msId; NodePropertyMap maNodeProperties; UserDataMap maUserData; // a sequence to be stored as "UserData" property SlideTransition maTransitionFilter; diff --git a/oox/inc/oox/token/namespacemap.hxx b/oox/inc/oox/token/namespacemap.hxx index 7120675e3cf1..78eeaa93cc40 100644 --- a/oox/inc/oox/token/namespacemap.hxx +++ b/oox/inc/oox/token/namespacemap.hxx @@ -29,7 +29,7 @@ namespace oox { // ============================================================================ /** A map that contains all XML namespace URLs used in the filters. */ -struct NamespaceMap : public ::std::map< sal_Int32, ::rtl::OUString > { NamespaceMap(); }; +struct NamespaceMap : public ::std::map< sal_Int32, OUString > { NamespaceMap(); }; /** Thread-save singleton of a map of all supported XML namespace URLs. */ struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; diff --git a/oox/inc/oox/token/propertynames.hxx b/oox/inc/oox/token/propertynames.hxx index eb42611aae1f..931eaed0172b 100644 --- a/oox/inc/oox/token/propertynames.hxx +++ b/oox/inc/oox/token/propertynames.hxx @@ -29,7 +29,7 @@ namespace oox { // ============================================================================ /** A vector that contains all predefined property names used in the filters. */ -struct PropertyNameVector : public ::std::vector< ::rtl::OUString > { PropertyNameVector(); }; +struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; /** Thread-save singleton of a vector of all supported property names. */ struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; diff --git a/oox/inc/oox/token/tokenmap.hxx b/oox/inc/oox/token/tokenmap.hxx index cdeebecceac5..84dc70d03fac 100644 --- a/oox/inc/oox/token/tokenmap.hxx +++ b/oox/inc/oox/token/tokenmap.hxx @@ -36,10 +36,10 @@ public: ~TokenMap(); /** Returns the Unicode name of the passed token identifier. */ - ::rtl::OUString getUnicodeTokenName( sal_Int32 nToken ) const; + OUString getUnicodeTokenName( sal_Int32 nToken ) const; /** Returns the token identifier for the passed Unicode token name. */ - sal_Int32 getTokenFromUnicode( const ::rtl::OUString& rUnicodeName ) const; + sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName ) const; /** Returns the UTF8 name of the passed token identifier as byte sequence. */ ::com::sun::star::uno::Sequence< sal_Int8 > @@ -52,7 +52,7 @@ public: private: struct TokenName { - ::rtl::OUString maUniName; + OUString maUniName; ::com::sun::star::uno::Sequence< sal_Int8 > maUtf8Name; }; typedef ::std::vector< TokenName > TokenNameVector; diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx index 64015b04c62c..ad7790962366 100644 --- a/oox/inc/oox/vml/vmldrawing.hxx +++ b/oox/inc/oox/vml/vmldrawing.hxx @@ -62,8 +62,8 @@ enum DrawingType /** Contains information about an OLE object embedded in a draw page. */ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo { - ::rtl::OUString maShapeId; ///< Shape identifier for shape lookup. - ::rtl::OUString maName; ///< Programmatical name of the OLE object. + OUString maShapeId; ///< Shape identifier for shape lookup. + OUString maName; ///< Programmatical name of the OLE object. bool mbAutoLoad; const bool mbDmlShape; ///< True = DrawingML shape (PowerPoint), false = VML shape (Excel/Word). @@ -78,9 +78,9 @@ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo /** Contains information about a form control embedded in a draw page. */ struct OOX_DLLPUBLIC ControlInfo { - ::rtl::OUString maShapeId; ///< Shape identifier for shape lookup. - ::rtl::OUString maFragmentPath; ///< Path to the fragment describing the form control properties. - ::rtl::OUString maName; ///< Programmatical name of the form control. + OUString maShapeId; ///< Shape identifier for shape lookup. + OUString maFragmentPath; ///< Path to the fragment describing the form control properties. + OUString maName; ///< Programmatical name of the form control. explicit ControlInfo(); @@ -130,17 +130,17 @@ public: void convertAndInsert() const; /** Returns the local shape index from the passed global shape identifier. */ - sal_Int32 getLocalShapeIndex( const ::rtl::OUString& rShapeId ) const; + sal_Int32 getLocalShapeIndex( const OUString& rShapeId ) const; /** Returns the registered info structure for an OLE object, if extant. */ - const OleObjectInfo* getOleObjectInfo( const ::rtl::OUString& rShapeId ) const; + const OleObjectInfo* getOleObjectInfo( const OUString& rShapeId ) const; /** Returns the registered info structure for a form control, if extant. */ - const ControlInfo* getControlInfo( const ::rtl::OUString& rShapeId ) const; + const ControlInfo* getControlInfo( const OUString& rShapeId ) const; /** Creates a new UNO shape object, inserts it into the passed UNO shape container, and sets the shape position and size. */ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createAndInsertXShape( - const ::rtl::OUString& rService, + const OUString& rService, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, const ::com::sun::star::awt::Rectangle& rShapeRect ) const; @@ -158,13 +158,13 @@ public: /** Derived classes may return additional base names for automatic shape name creation. */ - virtual ::rtl::OUString getShapeBaseName( const ShapeBase& rShape ) const; + virtual OUString getShapeBaseName( const ShapeBase& rShape ) const; /** Derived classes may calculate the shape rectangle from a non-standard anchor information string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const ::rtl::OUString& rShapeAnchor ) const; + const OUString& rShapeAnchor ) const; /** Derived classes create a UNO shape according to the passed shape model. Called for shape models that specify being under host control. */ @@ -189,8 +189,8 @@ private: typedef ::std::auto_ptr< ::oox::ole::EmbeddedForm > EmbeddedFormPtr; typedef ::std::auto_ptr< ShapeContainer > ShapeContainerPtr; SAL_WNODEPRECATED_DECLARATIONS_POP - typedef ::std::map< ::rtl::OUString, OleObjectInfo > OleObjectInfoMap; - typedef ::std::map< ::rtl::OUString, ControlInfo > ControlInfoMap; + typedef ::std::map< OUString, OleObjectInfo > OleObjectInfoMap; + typedef ::std::map< OUString, ControlInfo > ControlInfoMap; ::oox::core::XmlFilterBase& mrFilter; ///< Filter object that imports/exports the VML drawing. ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > diff --git a/oox/inc/oox/vml/vmldrawingfragment.hxx b/oox/inc/oox/vml/vmldrawingfragment.hxx index 855a5683565b..f0947998a092 100644 --- a/oox/inc/oox/vml/vmldrawingfragment.hxx +++ b/oox/inc/oox/vml/vmldrawingfragment.hxx @@ -35,7 +35,7 @@ class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2 public: explicit DrawingFragment( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, Drawing& rDrawing ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx index d6752551e80b..91356e36bce2 100644 --- a/oox/inc/oox/vml/vmlformatting.hxx +++ b/oox/inc/oox/vml/vmlformatting.hxx @@ -49,13 +49,13 @@ public: /** Returns two values contained in rValue separated by cSep. */ static bool separatePair( - ::rtl::OUString& orValue1, ::rtl::OUString& orValue2, - const ::rtl::OUString& rValue, sal_Unicode cSep ); + OUString& orValue1, OUString& orValue2, + const OUString& rValue, sal_Unicode cSep ); /** Returns the boolean value from the passed string of a VML attribute. Supported values: 'f', 't', 'false', 'true'. False for anything else. */ - static bool decodeBool( const ::rtl::OUString& rValue ); + static bool decodeBool( const OUString& rValue ); /** Converts the passed VML percentage measure string to a normalized floating-point value. @@ -67,7 +67,7 @@ public: the value will be divided by 65536. */ static double decodePercent( - const ::rtl::OUString& rValue, + const OUString& rValue, double fDefValue ); /** Converts the passed VML measure string to EMU (English Metric Units). @@ -90,7 +90,7 @@ public: */ static sal_Int64 decodeMeasureToEmu( const GraphicHelper& rGraphicHelper, - const ::rtl::OUString& rValue, + const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel ); @@ -105,7 +105,7 @@ public: */ static sal_Int32 decodeMeasureToHmm( const GraphicHelper& rGraphicHelper, - const ::rtl::OUString& rValue, + const OUString& rValue, sal_Int32 nRefValue, bool bPixelX, bool bDefaultAsPixel ); @@ -134,7 +134,7 @@ public: */ static ::oox::drawingml::Color decodeColor( const GraphicHelper& rGraphicHelper, - const OptValue< ::rtl::OUString >& roVmlColor, + const OptValue< OUString >& roVmlColor, const OptValue< double >& roVmlOpacity, sal_Int32 nDefaultRgb, sal_Int32 nPrimaryRgb = API_RGB_TRANSPARENT ); @@ -181,10 +181,10 @@ struct StrokeModel OptValue< bool > moStroked; ///< Shape border line on/off. StrokeArrowModel maStartArrow; ///< Start line arrow style. StrokeArrowModel maEndArrow; ///< End line arrow style. - OptValue< ::rtl::OUString > moColor; ///< Solid line color. + OptValue< OUString > moColor; ///< Solid line color. OptValue< double > moOpacity; ///< Solid line color opacity. - OptValue< ::rtl::OUString > moWeight; ///< Line width. - OptValue< ::rtl::OUString > moDashStyle; ///< Line dash (predefined or manually). + OptValue< OUString > moWeight; ///< Line width. + OptValue< OUString > moDashStyle; ///< Line dash (predefined or manually). OptValue< sal_Int32 > moLineStyle; ///< Line style (single, double, ...). OptValue< sal_Int32 > moEndCap; ///< Type of line end cap. OptValue< sal_Int32 > moJoinStyle; ///< Type of line join. @@ -203,16 +203,16 @@ struct StrokeModel struct FillModel { OptValue< bool > moFilled; ///< Shape fill on/off. - OptValue< ::rtl::OUString > moColor; ///< Solid fill color. + OptValue< OUString > moColor; ///< Solid fill color. OptValue< double > moOpacity; ///< Solid fill color opacity. - OptValue< ::rtl::OUString > moColor2; ///< End color of gradient. + OptValue< OUString > moColor2; ///< End color of gradient. OptValue< double > moOpacity2; ///< End color opacity of gradient. OptValue< sal_Int32 > moType; ///< Fill type. OptValue< sal_Int32 > moAngle; ///< Gradient rotation angle. OptValue< double > moFocus; ///< Linear gradient focus of second color. OptValue< DoublePair > moFocusPos; ///< Rectangular gradient focus position of second color. OptValue< DoublePair > moFocusSize; ///< Rectangular gradient focus size of second color. - OptValue< ::rtl::OUString > moBitmapPath; ///< Path to fill bitmap fragment. + OptValue< OUString > moBitmapPath; ///< Path to fill bitmap fragment. OptValue< bool > moRotate; ///< True = rotate gradient/bitmap with shape. void assignUsed( const FillModel& rSource ); diff --git a/oox/inc/oox/vml/vmlinputstream.hxx b/oox/inc/oox/vml/vmlinputstream.hxx index 5c23af76971f..7c8e13160722 100644 --- a/oox/inc/oox/vml/vmlinputstream.hxx +++ b/oox/inc/oox/vml/vmlinputstream.hxx @@ -74,17 +74,17 @@ public: private: void updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - ::rtl::OString readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - ::rtl::OString readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + OString readToElementBegin() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + OString readToElementEnd() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); private: ::com::sun::star::uno::Reference< ::com::sun::star::io::XTextInputStream2 > mxTextStrm; ::com::sun::star::uno::Sequence< sal_Unicode > maOpeningBracket; ::com::sun::star::uno::Sequence< sal_Unicode > maClosingBracket; - const ::rtl::OString maOpeningCData; - const ::rtl::OString maClosingCData; - ::rtl::OString maBuffer; + const OString maOpeningCData; + const OString maClosingCData; + OString maBuffer; sal_Int32 mnBufferPos; }; diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index f1a96523e9ce..7b6a4a9376c7 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -57,42 +57,42 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4; /** The shape model structure contains all properties shared by all types of shapes. */ struct OOX_DLLPUBLIC ShapeTypeModel { - ::rtl::OUString maShapeId; ///< Unique identifier of the shape. - ::rtl::OUString maShapeName; ///< Name of the shape, if present. + OUString maShapeId; ///< Unique identifier of the shape. + OUString maShapeName; ///< Name of the shape, if present. OptValue< sal_Int32 > moShapeType; ///< Builtin shape type identifier. OptValue< Int32Pair > moCoordPos; ///< Top-left position of coordinate system for children scaling. OptValue< Int32Pair > moCoordSize; ///< Size of coordinate system for children scaling. - ::rtl::OUString maPosition; ///< Position type of the shape. - ::rtl::OUString maLeft; ///< X position of the shape bounding box (number with unit). - ::rtl::OUString maTop; ///< Y position of the shape bounding box (number with unit). - ::rtl::OUString maWidth; ///< Width of the shape bounding box (number with unit). - ::rtl::OUString maHeight; ///< Height of the shape bounding box (number with unit). - ::rtl::OUString maMarginLeft; ///< X position of the shape bounding box to shape anchor (number with unit). - ::rtl::OUString maMarginTop; ///< Y position of the shape bounding box to shape anchor (number with unit). - ::rtl::OUString maPositionHorizontalRelative; ///< The X position is relative to this. - ::rtl::OUString maPositionVerticalRelative; ///< The Y position is relative to this. - ::rtl::OUString maPositionHorizontal; ///< The X position orientation (default: absolute). - ::rtl::OUString maPositionVertical; ///< The Y position orientation. - ::rtl::OUString maWidthPercent; ///< The width in percents of the WidthRelative - ::rtl::OUString maHeightPercent; ///< The height in percents of the HeightRelative - ::rtl::OUString maWidthRelative; ///< To what the width is relative - ::rtl::OUString maHeightRelative; ///< To what the height is relative - ::rtl::OUString maRotation; ///< Rotation of the shape, in degrees. - ::rtl::OUString maFlip; ///< Flip type of the shape (can be "x" or "y"). + OUString maPosition; ///< Position type of the shape. + OUString maLeft; ///< X position of the shape bounding box (number with unit). + OUString maTop; ///< Y position of the shape bounding box (number with unit). + OUString maWidth; ///< Width of the shape bounding box (number with unit). + OUString maHeight; ///< Height of the shape bounding box (number with unit). + OUString maMarginLeft; ///< X position of the shape bounding box to shape anchor (number with unit). + OUString maMarginTop; ///< Y position of the shape bounding box to shape anchor (number with unit). + OUString maPositionHorizontalRelative; ///< The X position is relative to this. + OUString maPositionVerticalRelative; ///< The Y position is relative to this. + OUString maPositionHorizontal; ///< The X position orientation (default: absolute). + OUString maPositionVertical; ///< The Y position orientation. + OUString maWidthPercent; ///< The width in percents of the WidthRelative + OUString maHeightPercent; ///< The height in percents of the HeightRelative + OUString maWidthRelative; ///< To what the width is relative + OUString maHeightRelative; ///< To what the height is relative + OUString maRotation; ///< Rotation of the shape, in degrees. + OUString maFlip; ///< Flip type of the shape (can be "x" or "y"). sal_Bool mbAutoHeight; ///< If true, the height value is a minimum value (mostly used for textboxes) sal_Bool mbVisible; ///< Visible or Hidden - ::rtl::OUString maWrapStyle; ///< Wrapping mode for text. - ::rtl::OUString maArcsize; ///< round rectangles arc size + OUString maWrapStyle; ///< Wrapping mode for text. + OUString maArcsize; ///< round rectangles arc size StrokeModel maStrokeModel; ///< Border line formatting. FillModel maFillModel; ///< Shape fill formatting. ShadowModel maShadowModel; ///< Shape shadow formatting. - OptValue< ::rtl::OUString > moGraphicPath; ///< Path to a graphic for this shape. - OptValue< ::rtl::OUString > moGraphicTitle; ///< Title of the graphic. - OptValue< ::rtl::OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated. - OptValue< ::rtl::OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated. + OptValue< OUString > moGraphicPath; ///< Path to a graphic for this shape. + OptValue< OUString > moGraphicTitle; ///< Title of the graphic. + OptValue< OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated. + OptValue< OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated. explicit ShapeTypeModel(); @@ -115,11 +115,11 @@ public: inline const ShapeTypeModel& getTypeModel() const { return maTypeModel; } /** Returns the shape identifier (which is unique through the containing drawing). */ - inline const ::rtl::OUString& getShapeId() const { return maTypeModel.maShapeId; } + inline const OUString& getShapeId() const { return maTypeModel.maShapeId; } /** Returns the application defined shape type. */ sal_Int32 getShapeType() const; /** Returns the fragment path to the embedded graphic used by this shape. */ - ::rtl::OUString getGraphicPath() const; + OUString getGraphicPath() const; const Drawing& getDrawing() const { return mrDrawing; } @@ -143,12 +143,12 @@ protected: /** Excel specific shape client data (such as cell anchor). */ struct ClientData { - ::rtl::OUString maAnchor; ///< Cell anchor as comma-separated string. - ::rtl::OUString maFmlaMacro; ///< Link to macro associated to the control. - ::rtl::OUString maFmlaPict; ///< Target cell range of picture links. - ::rtl::OUString maFmlaLink; ///< Link to value cell associated to the control. - ::rtl::OUString maFmlaRange; ///< Link to cell range used as data source for the control. - ::rtl::OUString maFmlaGroup; ///< Link to value cell associated to a group of option buttons. + OUString maAnchor; ///< Cell anchor as comma-separated string. + OUString maFmlaMacro; ///< Link to macro associated to the control. + OUString maFmlaPict; ///< Target cell range of picture links. + OUString maFmlaLink; ///< Link to value cell associated to the control. + OUString maFmlaRange; ///< Link to cell range used as data source for the control. + OUString maFmlaGroup; ///< Link to value cell associated to a group of option buttons. sal_Int32 mnObjType; ///< Type of the shape. sal_Int32 mnTextHAlign; ///< Horizontal text alignment. sal_Int32 mnTextVAlign; ///< Vertical text alignment. @@ -186,16 +186,16 @@ struct ShapeModel typedef ::std::auto_ptr< ClientData > ClientDataPtr; SAL_WNODEPRECATED_DECLARATIONS_POP - ::rtl::OUString maType; ///< Shape template with default properties. + OUString maType; ///< Shape template with default properties. PointVector maPoints; ///< Points for the polyline shape. TextBoxPtr mxTextBox; ///< Text contents and properties. ClientDataPtr mxClientData; ///< Excel specific client data. - ::rtl::OUString maLegacyDiagramPath;///< Legacy Diagram Fragment Path - ::rtl::OUString maFrom; ///< Start point for line shape. - ::rtl::OUString maTo; ///< End point for line shape. - ::rtl::OUString maControl1; ///< Bezier control point 1 - ::rtl::OUString maControl2; ///< Bezier control point 2 - ::rtl::OUString maVmlPath; ///< VML path for this shape + OUString maLegacyDiagramPath;///< Legacy Diagram Fragment Path + OUString maFrom; ///< Start point for line shape. + OUString maTo; ///< End point for line shape. + OUString maControl1; ///< Bezier control point 1 + OUString maControl2; ///< Bezier control point 2 + OUString maVmlPath; ///< VML path for this shape explicit ShapeModel(); ~ShapeModel(); @@ -227,12 +227,12 @@ public: virtual void finalizeFragmentImport(); /** Returns the real shape name if existing, or a generated shape name. */ - ::rtl::OUString getShapeName() const; + OUString getShapeName() const; /** Returns the shape template with the passed identifier from the child shapes. */ - virtual const ShapeType* getChildTypeById( const ::rtl::OUString& rShapeId ) const; + virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const; /** Returns the shape with the passed identifier from the child shapes. */ - virtual const ShapeBase* getChildById( const ::rtl::OUString& rShapeId ) const; + virtual const ShapeBase* getChildById( const OUString& rShapeId ) const; /** Creates the corresponding XShape and inserts it into the passed container. */ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > @@ -273,9 +273,9 @@ protected: class SimpleShape : public ShapeBase { public: - explicit SimpleShape( Drawing& rDrawing, const ::rtl::OUString& rService ); + explicit SimpleShape( Drawing& rDrawing, const OUString& rService ); - void setService( rtl::OUString aService ) { maService = aService; } + void setService( OUString aService ) { maService = aService; } protected: /** Creates the corresponding XShape and inserts it into the passed container. */ @@ -289,7 +289,7 @@ protected: const com::sun::star::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const; private: - ::rtl::OUString maService; ///< Name of the UNO shape service. + OUString maService; ///< Name of the UNO shape service. }; // ============================================================================ @@ -411,9 +411,9 @@ public: virtual void finalizeFragmentImport(); /** Returns the shape template with the passed identifier from the child shapes. */ - virtual const ShapeType* getChildTypeById( const ::rtl::OUString& rShapeId ) const; + virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const; /** Returns the shape with the passed identifier from the child shapes. */ - virtual const ShapeBase* getChildById( const ::rtl::OUString& rShapeId ) const; + virtual const ShapeBase* getChildById( const OUString& rShapeId ) const; protected: /** Creates the corresponding XShape and inserts it into the passed container. */ diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/oox/inc/oox/vml/vmlshapecontainer.hxx index f1b707bcbe2e..5e6a2c2a9d75 100644 --- a/oox/inc/oox/vml/vmlshapecontainer.hxx +++ b/oox/inc/oox/vml/vmlshapecontainer.hxx @@ -70,10 +70,10 @@ public: /** Returns the shape template with the passed identifier. @param bDeep True = searches in all group shapes too. */ - const ShapeType* getShapeTypeById( const ::rtl::OUString& rShapeId, bool bDeep ) const; + const ShapeType* getShapeTypeById( const OUString& rShapeId, bool bDeep ) const; /** Returns the shape with the passed identifier. @param bDeep True = searches in all group shapes too. */ - const ShapeBase* getShapeById( const ::rtl::OUString& rShapeId, bool bDeep ) const; + const ShapeBase* getShapeById( const OUString& rShapeId, bool bDeep ) const; /** Searches for a shape type by using the passed functor that takes a constant reference of a ShapeType object. */ @@ -110,8 +110,8 @@ public: private: typedef RefVector< ShapeType > ShapeTypeVector; typedef RefVector< ShapeBase > ShapeVector; - typedef RefMap< ::rtl::OUString, ShapeType > ShapeTypeMap; - typedef RefMap< ::rtl::OUString, ShapeBase > ShapeMap; + typedef RefMap< OUString, ShapeType > ShapeTypeMap; + typedef RefMap< OUString, ShapeBase > ShapeMap; Drawing& mrDrawing; ///< The VML drawing page that contains this shape. ShapeTypeVector maTypes; ///< All shape templates. diff --git a/oox/inc/oox/vml/vmlshapecontext.hxx b/oox/inc/oox/vml/vmlshapecontext.hxx index e3d5d8963eb2..803674088e37 100644 --- a/oox/inc/oox/vml/vmlshapecontext.hxx +++ b/oox/inc/oox/vml/vmlshapecontext.hxx @@ -66,12 +66,12 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onEndElement(); private: ClientData& mrClientData; - ::rtl::OUString maElementText; + OUString maElementText; }; // ============================================================================ @@ -105,10 +105,10 @@ public: private: /** Processes the 'style' attribute. */ - void setStyle( const ::rtl::OUString& rStyle ); + void setStyle( const OUString& rStyle ); /** Resolve a relation identifier to a fragment path. */ - OptValue< ::rtl::OUString > decodeFragmentPath( const AttributeList& rAttribs, sal_Int32 nToken ) const; + OptValue< OUString > decodeFragmentPath( const AttributeList& rAttribs, sal_Int32 nToken ) const; private: ShapeTypeModel& mrTypeModel; @@ -129,17 +129,17 @@ public: private: /** Processes the 'points' attribute. */ - void setPoints( const ::rtl::OUString& rPoints ); + void setPoints( const OUString& rPoints ); /** Processes the 'from' attribute. */ - void setFrom( const ::rtl::OUString& rPoints ); + void setFrom( const OUString& rPoints ); /** Processes the 'to' attribute. */ - void setTo( const ::rtl::OUString& rPoints ); + void setTo( const OUString& rPoints ); /** Processes the 'control1' attribute. */ - void setControl1( const ::rtl::OUString& rPoints ); + void setControl1( const OUString& rPoints ); /** Processes the 'control2' attribute. */ - void setControl2( const ::rtl::OUString& rPoints ); + void setControl2( const OUString& rPoints ); /** Processes the 'path' attribute. */ - void setVmlPath( const ::rtl::OUString& rPath ); + void setVmlPath( const OUString& rPath ); protected: ShapeBase& mrShape; diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx index f234b00b9665..4975e6bb26b6 100644 --- a/oox/inc/oox/vml/vmltextbox.hxx +++ b/oox/inc/oox/vml/vmltextbox.hxx @@ -40,8 +40,8 @@ struct ShapeTypeModel; /** Font settings for a text portion in a textbox. */ struct OOX_DLLPUBLIC TextFontModel { - OptValue< ::rtl::OUString > moName; ///< Font name. - OptValue< ::rtl::OUString > moColor; ///< Font color, HTML encoded, sort of. + OptValue< OUString > moName; ///< Font name. + OptValue< OUString > moColor; ///< Font color, HTML encoded, sort of. OptValue< sal_Int32 > monSize; ///< Font size in twips. OptValue< sal_Int32 > monUnderline; ///< Single or double underline. OptValue< sal_Int32 > monEscapement; ///< Subscript or superscript. @@ -58,9 +58,9 @@ struct OOX_DLLPUBLIC TextFontModel struct TextPortionModel { TextFontModel maFont; - ::rtl::OUString maText; + OUString maText; - explicit TextPortionModel( const TextFontModel& rFont, const ::rtl::OUString& rText ); + explicit TextPortionModel( const TextFontModel& rFont, const OUString& rText ); }; // ============================================================================ @@ -72,14 +72,14 @@ public: explicit TextBox(ShapeTypeModel& rTypeModel); /** Appends a new text portion to the textbox. */ - void appendPortion( const TextFontModel& rFont, const ::rtl::OUString& rText ); + void appendPortion( const TextFontModel& rFont, const OUString& rText ); /** Returns the current number of text portions. */ inline size_t getPortionCount() const { return maPortions.size(); } /** Returns the font settings of the first text portion. */ const TextFontModel* getFirstFont() const; /** Returns the entire text of all text portions. */ - ::rtl::OUString getText() const; + OUString getText() const; void convert(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape) const; ShapeTypeModel& mrTypeModel; diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx b/oox/inc/oox/vml/vmltextboxcontext.hxx index a644026f7b4d..47d71ac41b41 100644 --- a/oox/inc/oox/vml/vmltextboxcontext.hxx +++ b/oox/inc/oox/vml/vmltextboxcontext.hxx @@ -40,7 +40,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const ::rtl::OUString& rChars ); + virtual void onCharacters( const OUString& rChars ); virtual void onStartElement(const AttributeList& rAttribs); virtual void onEndElement(); diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx index 1a90ce48ccd2..2d41797631f6 100644 --- a/oox/source/core/contexthandler.cxx +++ b/oox/source/core/contexthandler.cxx @@ -29,7 +29,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index 2a7442bdbcfe..560965a1543b 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -28,8 +28,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index ffeb255df0a6..03fd60a7481e 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 3791b950dc26..c71f966b587c 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -30,7 +30,6 @@ namespace core { using namespace ::com::sun::star::uno; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 8643d2c75d74..4d31f0547787 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -56,7 +56,6 @@ using ::comphelper::MediaDescriptor; using ::comphelper::SequenceAsHashMap; using ::oox::ole::OleObjectHelper; using ::oox::ole::VbaProject; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index a581d10c1d66..1bc095fd1395 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::xml::sax; using ::comphelper::MediaDescriptor; using ::comphelper::SequenceAsHashMap; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx index 3c970bbff1a0..f390698be446 100644 --- a/oox/source/core/fragmenthandler.cxx +++ b/oox/source/core/fragmenthandler.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index bfc68343a1b9..b94ff56a9641 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -28,7 +28,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; @@ -86,9 +85,9 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis if( !str.isEmpty() ) { Sequence< ::com::sun::star::xml::FastAttribute > attrs = rAttribs.getFastAttributeList()->getFastAttributes(); - // printf("MCE: %s\n", ::rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); + // printf("MCE: %s\n", OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); // TODO: Check & Get the namespaces in "Ignorable" - // printf("NS: %d : %s\n", attrs.getLength(), ::rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); + // printf("NS: %d : %s\n", attrs.getLength(), OUStringToOString( str, RTL_TEXTENCODING_UTF8 ).getStr() ); } } return false; diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 43018cd35233..0f302b840bec 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index c49fe6320bf4..ef4d0b139cfe 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -27,8 +27,6 @@ namespace core { // ============================================================================ -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index 899a8d25efd5..73005eb216f8 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -30,8 +30,6 @@ namespace core { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx index aec65592db88..6873e4d194ce 100644 --- a/oox/source/core/services.cxx +++ b/oox/source/core/services.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/implementationentry.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; // Declare static functions providing service information ===================== diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 2289e4d4be61..73d223eec1bc 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -72,9 +72,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using ::comphelper::MediaDescriptor; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using ::sax_fastparser::FSHelperPtr; using ::sax_fastparser::FastSerializerHelper; @@ -496,7 +493,7 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const util::DateTime& rTi } static void -writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, Sequence< rtl::OUString > aItems ) +writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, Sequence< OUString > aItems ) { if( aItems.getLength() == 0 ) return; diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index 51eccab59548..b3e79048eb67 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -50,7 +50,7 @@ class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xm sal_Int32 m_nInBlock; - ::rtl::OUString m_aCustomPropertyName; + OUString m_aCustomPropertyName; public: explicit OOXMLDocPropHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > xDocProp ); @@ -60,10 +60,10 @@ public: void InitNew(); void AddCustomProperty( const ::com::sun::star::uno::Any& aAny ); - ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const ::rtl::OUString& aChars ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetKeywordsSet( const ::rtl::OUString& aChars ); - ::com::sun::star::lang::Locale GetLanguage( const ::rtl::OUString& aChars ); - void UpdateDocStatistic( const ::rtl::OUString& aChars ); + ::com::sun::star::util::DateTime GetDateTimeFromW3CDTF( const OUString& aChars ); + ::com::sun::star::uno::Sequence< OUString > GetKeywordsSet( const OUString& aChars ); + ::com::sun::star::lang::Locale GetLanguage( const OUString& aChars ); + void UpdateDocStatistic( const OUString& aChars ); // com.sun.star.xml.sax.XFastDocumentHandler @@ -74,14 +74,14 @@ public: // com.sun.star.xml.sax.XFastContextHandler virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index ea91a6a2daa4..f4d3092e83ee 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index 25122942c20b..acbf15de00c2 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -41,9 +41,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XOOXMLDocumentPropertiesImporter virtual void SAL_CALL importProperties( diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index e42ddcf82967..5497be835933 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -62,7 +62,7 @@ class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2 public: DiagramQStylesFragmentHandler( oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, DiagramQStyleMap& rStylesMap ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); @@ -75,7 +75,7 @@ private: const AttributeList& rAttribs, ShapeStyleRef& o_rStyle); - ::rtl::OUString maStyleName; + OUString maStyleName; DiagramStyle maStyleEntry; DiagramQStyleMap& mrStylesMap; }; @@ -85,7 +85,7 @@ class ColorFragmentHandler : public ::oox::core::FragmentHandler2 public: ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter, - const ::rtl::OUString& rFragmentPath, + const OUString& rFragmentPath, DiagramColorMap& rColorMap ); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); @@ -94,7 +94,7 @@ public: virtual void onEndElement(); private: - ::rtl::OUString maColorName; + OUString maColorName; DiagramColor maColorEntry; DiagramColorMap& mrColorsMap; }; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 000859d9ef70..07b5371fbf17 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2302,7 +2302,7 @@ void ChartExport::exportDataLabels( { (void)rEx; // avoid warning for pro build OSL_TRACE( "Exception caught during Export of data label: %s", - rtl::OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr() ); } if( xPropSet.is() ) diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx index e72a90acd738..23f89aeaa299 100644 --- a/oox/source/helper/binaryoutputstream.cxx +++ b/oox/source/helper/binaryoutputstream.cxx @@ -111,7 +111,7 @@ BinaryOutputStream::writeCharArrayUC( const OUString& rString, rtl_TextEncoding } void -BinaryOutputStream::writeUnicodeArray( const ::rtl::OUString& rString, bool bAllowNulChars ) +BinaryOutputStream::writeUnicodeArray( const OUString& rString, bool bAllowNulChars ) { OUString sBuf( rString ); if( !bAllowNulChars ) @@ -127,7 +127,7 @@ BinaryOutputStream::writeUnicodeArray( const ::rtl::OUString& rString, bool bAll } void -BinaryOutputStream::writeCompressedUnicodeArray( const rtl::OUString& rString, bool bCompressed, bool bAllowNulChars ) +BinaryOutputStream::writeCompressedUnicodeArray( const OUString& rString, bool bCompressed, bool bAllowNulChars ) { if ( bCompressed ) // ISO-8859-1 maps all byte values 0xHH to the same Unicode code point U+00HH diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 1cdf563dc956..af3e0b41a228 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -91,8 +91,6 @@ using namespace ::com::sun::star::uno; using ::com::sun::star::drawing::TextHorizontalAdjust; using ::com::sun::star::drawing::TextVerticalAdjust; -using ::rtl::OString; -using ::rtl::OUString; // ============================================================================ diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 6d44cf07f000..2b51604fb467 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -114,7 +114,7 @@ OUString& XmlStream::AttributeList::operator[] (int token) return attrs[token]; } -rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString& def ) const +OUString XmlStream::AttributeList::attribute( int token, const OUString& def ) const { std::map< int, OUString >::const_iterator find = attrs.find( token ); if( find != attrs.end()) @@ -158,7 +158,7 @@ sal_Unicode XmlStream::AttributeList::attribute( int token, sal_Unicode def ) co return def; } -XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const rtl::OUString& txt ) +XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const OUString& txt ) : token( t ) , attributes( AttributeListBuilder( a )) , text( txt ) @@ -353,7 +353,7 @@ void XmlStreamBuilder::appendClosingTag( int token ) tags.push_back( Tag( CLOSING( token ))); } -void XmlStreamBuilder::appendCharacters( const rtl::OUString& chars ) +void XmlStreamBuilder::appendCharacters( const OUString& chars ) { assert( !tags.empty()); tags.back().text += chars; diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx index 8ca11b9caca1..26725ffdf0f6 100644 --- a/oox/source/ppt/comments.cxx +++ b/oox/source/ppt/comments.cxx @@ -29,7 +29,7 @@ void CommentAuthorList::setValues(const CommentAuthorList& list) } //DateTime is saved as : 2013-01-10T15:53:26.000 -void Comment::setDateTime (::rtl::OUString datetime) +void Comment::setDateTime (OUString datetime) { aDateTime.Year = datetime.getToken(0,'-').toInt32(); aDateTime.Month = datetime.getToken(1,'-').toInt32(); diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index d38d815a8514..247b81b981a1 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -281,7 +281,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, sal_Bool bFirst { // Comments are present and commentAuthors.xml has still not been read mbCommentAuthorsRead = true; - rtl::OUString aCommentAuthorsFragmentPath = "ppt/commentAuthors.xml"; + OUString aCommentAuthorsFragmentPath = "ppt/commentAuthors.xml"; Reference< XPresentationPage > xPresentationPage( xSlide, UNO_QUERY ); Reference< XDrawPage > xCommentAuthorsPage( xPresentationPage->getNotesPage() ); SlidePersistPtr pCommentAuthorsPersistPtr( |