diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-21 19:21:44 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-21 19:22:18 +0200 |
commit | 75c0acd024e225699f47a4225453b92cdad54531 (patch) | |
tree | e35b15dda0bf5e2289d29c164c103f48fe5e16ca /writerfilter/inc | |
parent | 2747303afeef33f3b71b33642b6bde259194e867 (diff) |
writerfilter: rtl::OUString -> OUString
Change-Id: I1577c1bb8a3dc498b647b930d405c90f80eafaf9
Diffstat (limited to 'writerfilter/inc')
-rw-r--r-- | writerfilter/inc/dmapper/DomainMapper.hxx | 4 | ||||
-rw-r--r-- | writerfilter/inc/doctok/WW8Document.hxx | 4 | ||||
-rw-r--r-- | writerfilter/inc/ooxml/OOXMLDocument.hxx | 18 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/LoggedResources.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/TagLogger.hxx | 4 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index 391268b58c5c..b781418ad463 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -104,7 +104,7 @@ public: void AddListIDToLFOTable( sal_Int32 nAbstractNumId ); ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetCurrentTextRange(); - ::rtl::OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ); + OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ); boost::shared_ptr< StyleSheetTable > GetStyleSheetTable( ); GraphicZOrderHelper* graphicZOrderHelper(); @@ -139,7 +139,7 @@ private: void handleParaJustification(const sal_Int32 nIntValue, const ::boost::shared_ptr<PropertyMap> pContext, const bool bExchangeLeftRight); bool getColorFromIndex(const sal_Int32 nIndex, sal_Int32 &nColor); sal_Int16 getEmphasisValue(const sal_Int32 nIntValue); - rtl::OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true); + OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true); com::sun::star::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue); sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue); sal_Int32 mnBackgroundColor; diff --git a/writerfilter/inc/doctok/WW8Document.hxx b/writerfilter/inc/doctok/WW8Document.hxx index 117569197994..e9e8ac60c90a 100644 --- a/writerfilter/inc/doctok/WW8Document.hxx +++ b/writerfilter/inc/doctok/WW8Document.hxx @@ -66,7 +66,7 @@ public: @return the substream */ - virtual Pointer_t getSubStream(const ::rtl::OUString & rSid) = 0; + virtual Pointer_t getSubStream(const OUString & rSid) = 0; /** Return a continious part of the stream. @@ -82,7 +82,7 @@ public: // Returns the names of substreams contained in the stream virtual string getSubStreamNames() const = 0; - virtual uno::Sequence<rtl::OUString> getSubStreamUNames() const = 0; + virtual uno::Sequence<OUString> getSubStreamUNames() const = 0; /** Dumps content of stream to output. diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx index e5b3d29ad75f..f3365dbc4cf5 100644 --- a/writerfilter/inc/ooxml/OOXMLDocument.hxx +++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx @@ -106,9 +106,9 @@ public: @return the URL found or an empty string */ - virtual ::rtl::OUString getTargetForId(const ::rtl::OUString & rId) = 0; + virtual OUString getTargetForId(const OUString & rId) = 0; - virtual const ::rtl::OUString & getTarget() const = 0; + virtual const OUString & getTarget() const = 0; virtual uno::Reference<xml::sax::XFastTokenHandler> getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext) = 0; @@ -182,7 +182,7 @@ public: @param rPictureId id of the picture to resolve */ virtual void resolvePicture(Stream & rStream, - const rtl::OUString & rPictureId) = 0; + const OUString & rPictureId) = 0; /** Resolves a header to a stream handler. @@ -197,7 +197,7 @@ public: */ virtual void resolveHeader(Stream & rStream, const sal_Int32 type, - const rtl::OUString & rId) = 0; + const OUString & rId) = 0; /** Resolves a footer to a stream handler. @@ -212,7 +212,7 @@ public: */ virtual void resolveFooter(Stream & rStream, const sal_Int32 type, - const rtl::OUString & rId) = 0; + const OUString & rId) = 0; /** @@ -222,7 +222,7 @@ public: @return the URL found or an empty string */ - virtual ::rtl::OUString getTargetForId(const ::rtl::OUString & rId) = 0; + virtual OUString getTargetForId(const OUString & rId) = 0; virtual void setModel(uno::Reference<frame::XModel> xModel) = 0; virtual uno::Reference<frame::XModel> getModel() = 0; @@ -231,12 +231,12 @@ public: virtual uno::Reference<io::XInputStream> getInputStream() = 0; virtual uno::Reference<io::XInputStream> getStorageStream() = 0; virtual uno::Reference<io::XInputStream> getInputStreamForId - (const ::rtl::OUString & rId) = 0; + (const OUString & rId) = 0; virtual void setXNoteId(const sal_Int32 nId) = 0; virtual sal_Int32 getXNoteId() const = 0; virtual void setXNoteType(const Id & nId) = 0; virtual const Id & getXNoteType() const = 0; - virtual const ::rtl::OUString & getTarget() const = 0; + virtual const OUString & getTarget() const = 0; virtual uno::Reference<xml::sax::XFastShapeContextHandler> getShapeContext( ) = 0; virtual void setShapeContext( uno::Reference<xml::sax::XFastShapeContextHandler> xContext ) = 0; }; @@ -255,7 +255,7 @@ public: OOXMLStream::StreamType_t nStreamType = OOXMLStream::DOCUMENT); static OOXMLStream::Pointer_t - createStream(OOXMLStream::Pointer_t pStream, const rtl::OUString & rId); + createStream(OOXMLStream::Pointer_t pStream, const OUString & rId); static OOXMLDocument * createDocument(OOXMLStream::Pointer_t pStream); diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx index 2d75a9135a5f..419bde775fa8 100644 --- a/writerfilter/inc/resourcemodel/LoggedResources.hxx +++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx @@ -37,7 +37,7 @@ public: void startElement(const string & sElement); void endElement(const string & sElement); - void chars(const ::rtl::OUString & rChars); + void chars(const OUString & rChars); void chars(const string & rChars); void attribute(const string & rName, const string & rValue); void attribute(const string & rName, sal_uInt32 nValue); diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index c1eb29cd89d1..b17b3ffacbe6 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -1001,7 +1001,7 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable() (void) e; #if OSL_DEBUG_LEVEL > 0 rtl::OStringBuffer aBuf("resolving of current table failed with: "); - aBuf.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)); + aBuf.append(OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8)); OSL_FAIL(aBuf.getStr()); #endif } diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx index 0e301e69cf5f..2b8a5f11ec1d 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -72,11 +72,11 @@ namespace writerfilter #endif void attribute(const std::string & name, const std::string & value); #if OSL_DEBUG_LEVEL > 1 - void attribute(const std::string & name, const ::rtl::OUString & value); + void attribute(const std::string & name, const OUString & value); void attribute(const std::string & name, sal_uInt32 value); void attribute(const std::string & name, const uno::Any aAny); void chars(const std::string & chars); - void chars(const ::rtl::OUString & chars); + void chars(const OUString & chars); void endElement(); #endif diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx index 586b2896bc44..ab076a23370a 100644 --- a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx +++ b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx @@ -310,7 +310,7 @@ public: /** Returns string representation of the value. */ - virtual ::rtl::OUString getString() const = 0; + virtual OUString getString() const = 0; /** Returns representation of the value as uno::Any. @@ -408,7 +408,7 @@ Stream::Pointer_t WRITERFILTER_RESOURCEMODEL_DLLPUBLIC createStreamHandler(); void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<Properties>::Pointer_t props); void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n); void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - const rtl::OUString & /*str*/); + const OUString & /*str*/); void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC dump(OutputWithDepth<string> & o, const char * name, writerfilter::Reference<BinaryObj>::Pointer_t binary); } |