diff options
72 files changed, 443 insertions, 447 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); } diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx index 2fc9e1d720a2..32017595bc92 100644 --- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx +++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx @@ -73,9 +73,9 @@ public: uno::Sequence<uno::Any> aUcbInitSequence(2); aUcbInitSequence[0] <<= - rtl::OUString("Local"); + OUString("Local"); aUcbInitSequence[1] <<= - rtl::OUString("Office"); + OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xFactory, uno::UNO_QUERY); @@ -118,7 +118,7 @@ public: rtl_uString *absfile=NULL; rtl_uString_newConcat(&absfile, dir, fname); - rtl::OUString sInputFileURL( absfile ); + OUString sInputFileURL( absfile ); for (sal_Int32 n = 0; n < sInputFileURL.getLength(); ++n) { diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx index 88673bcf1427..6ea35c62e9ce 100644 --- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx +++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx @@ -32,10 +32,6 @@ using namespace std; using namespace util; using namespace osl; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::rtl::OString; - /** Helper function, get a temporary file name */ OString getTempFileName(const OUString& fileName) diff --git a/writerfilter/source/dmapper/genclass.xsl b/writerfilter/source/dmapper/genclass.xsl index 53c7bb382e8e..994b35d35a2e 100644 --- a/writerfilter/source/dmapper/genclass.xsl +++ b/writerfilter/source/dmapper/genclass.xsl @@ -343,7 +343,7 @@ <xsl:value-of select="$try1"/> </xsl:when> <xsl:when test="@type='OUString'"> - <xsl:text>rtl::OUString</xsl:text> + <xsl:text>OUString</xsl:text> </xsl:when> <xsl:otherwise> <xsl:if test="$impl='true'"> diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx index 57272363a6b8..5457fefe352d 100644 --- a/writerfilter/source/doctok/DffImpl.cxx +++ b/writerfilter/source/doctok/DffImpl.cxx @@ -319,9 +319,9 @@ DffDGG::get_fidcl(sal_uInt32 pos) // DffBSE -rtl::OUString DffBSE::get_blipname() +OUString DffBSE::get_blipname() { - rtl::OUString sResult; + OUString sResult; WW8FBSE aFBSE(this, 0x8); if (aFBSE.get_cbName() > 0) @@ -395,11 +395,11 @@ void WW8FOPTE::resolveNoAuto(Properties & rHandler) // DffFSP -rtl::OUString DffFSP::get_shptypename() +OUString DffFSP::get_shptypename() { string aName = (*ShapeTypeToString::Instance())(get_shptype()); - return rtl::OUString::createFromAscii(aName.c_str()); + return OUString::createFromAscii(aName.c_str()); } // DffSpContainer diff --git a/writerfilter/source/doctok/WW8Annotation.cxx b/writerfilter/source/doctok/WW8Annotation.cxx index d6afbca1ca83..e616e282112e 100644 --- a/writerfilter/source/doctok/WW8Annotation.cxx +++ b/writerfilter/source/doctok/WW8Annotation.cxx @@ -22,7 +22,7 @@ namespace writerfilter { namespace doctok { -rtl::OUString WW8ATRD::get_xstUsrInitl() +OUString WW8ATRD::get_xstUsrInitl() { return getString(0x0); } diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx index f7f67a88abeb..cfdae5ff777c 100644 --- a/writerfilter/source/doctok/WW8DocumentImpl.cxx +++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx @@ -634,7 +634,7 @@ void WW8DocumentImpl::parseBinTableCpAndFcs(WW8BinTable & rTable, } WW8Stream::Pointer_t WW8DocumentImpl::getSubStream -(const ::rtl::OUString & sId) const +(const OUString & sId) const { return mpStream->getSubStream(sId); } @@ -1352,7 +1352,7 @@ void WW8DocumentImpl::resolveSpecialChar(sal_uInt32 nChar, Stream & rStream) void WW8DocumentImpl::text(Stream & rStream, const sal_uInt8 * data, size_t len) { #ifdef DEBUG_ELEMENT - ::rtl::OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 ); + OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 ); debug_logger->startElement("text"); debug_logger->chars(OUStringToOString(sText, RTL_TEXTENCODING_ASCII_US).getStr()); debug_logger->endElement(); @@ -1365,8 +1365,8 @@ void WW8DocumentImpl::utext(Stream & rStream, const sal_uInt8 * data, size_t len #ifdef DEBUG_ELEMENT debug_logger->startElement("utext"); - ::rtl::OUString sText; - ::rtl::OUStringBuffer aBuffer = ::rtl:: OUStringBuffer(len); + OUString sText; + OUStringBuffer aBuffer = ::rtl:: OUStringBuffer(len); aBuffer.append( (const sal_Unicode *) data, len); sText = aBuffer.makeStringAndClear(); @@ -1892,7 +1892,7 @@ string CpAndFc::toString() const // Bookmark Bookmark::Bookmark(writerfilter::Reference<Properties>::Pointer_t pBKF, - rtl::OUString & rName) + OUString & rName) : mpBKF(pBKF), mName(rName) { } @@ -1930,7 +1930,7 @@ CpAndFc BookmarkHelper::getEndCpAndFc(sal_uInt32 nPos) return aCpAndFc; } -rtl::OUString BookmarkHelper::getName(sal_uInt32 nPos) +OUString BookmarkHelper::getName(sal_uInt32 nPos) { return mpNames->getEntry(nPos); } @@ -2045,7 +2045,7 @@ BookmarkHelper::getBookmark(const CpAndFc & rCpAndFc) try { - rtl::OUString aName = getName(rCpAndFc); + OUString aName = getName(rCpAndFc); pResult = writerfilter::Reference<Properties>::Pointer_t (new Bookmark(getBKF(rCpAndFc), aName)); @@ -2058,9 +2058,9 @@ BookmarkHelper::getBookmark(const CpAndFc & rCpAndFc) return pResult; } -rtl::OUString BookmarkHelper::getName(const CpAndFc & rCpAndFc) +OUString BookmarkHelper::getName(const CpAndFc & rCpAndFc) { - rtl::OUString sResult; + OUString sResult; sal_uInt32 nIndex = getIndex(rCpAndFc); diff --git a/writerfilter/source/doctok/WW8DocumentImpl.hxx b/writerfilter/source/doctok/WW8DocumentImpl.hxx index f686c95039ab..a21f2cccead3 100644 --- a/writerfilter/source/doctok/WW8DocumentImpl.hxx +++ b/writerfilter/source/doctok/WW8DocumentImpl.hxx @@ -44,11 +44,11 @@ class Bookmark : public writerfilter::Reference<Properties> writerfilter::Reference<Properties>::Pointer_t mpBKF; /// name of bookmark - rtl::OUString mName; + OUString mName; public: Bookmark(writerfilter::Reference<Properties>::Pointer_t pBKF, - rtl::OUString & rName); + OUString & rName); virtual ~Bookmark() {} @@ -101,7 +101,7 @@ class BookmarkHelper @param nPos index of the bookmark */ - rtl::OUString getName(sal_uInt32 nPos); + OUString getName(sal_uInt32 nPos); /** Return index of a bookmark. @@ -144,7 +144,7 @@ public: @param rCpAndFc CpAndFc of the bookmark */ - rtl::OUString getName(const CpAndFc & rCp); + OUString getName(const CpAndFc & rCp); /** Return bookmark. @@ -355,7 +355,7 @@ class WW8DocumentImpl : public WW8Document bool isSpecial(sal_uInt32 nChar); - WW8Stream::Pointer_t getSubStream(const ::rtl::OUString & sId) const; + WW8Stream::Pointer_t getSubStream(const OUString & sId) const; /** Parse bin table and create CpAndFcs for all points in the diff --git a/writerfilter/source/doctok/WW8FontTable.cxx b/writerfilter/source/doctok/WW8FontTable.cxx index c0d8d80da562..2ecfe15a30f1 100644 --- a/writerfilter/source/doctok/WW8FontTable.cxx +++ b/writerfilter/source/doctok/WW8FontTable.cxx @@ -74,7 +74,7 @@ sal_uInt32 WW8Font::get_f() return mnIndex; } -rtl::OUString WW8Font::get_xszFfn() +OUString WW8Font::get_xszFfn() { sal_uInt32 nOffset = 0x28; sal_uInt32 nCount = get_cbFfnM1() - nOffset; @@ -85,10 +85,10 @@ rtl::OUString WW8Font::get_xszFfn() rtl_uString_newFromStr (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0])); - return rtl::OUString(pNew); + return OUString(pNew); } -rtl::OUString WW8Font::get_altName() +OUString WW8Font::get_altName() { sal_uInt32 nOffset = 0x28 + get_ixchSzAlt(); sal_uInt32 nCount = get_cbFfnM1() - nOffset; @@ -99,7 +99,7 @@ rtl::OUString WW8Font::get_altName() rtl_uString_newFromStr (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0])); - return rtl::OUString(pNew); + return OUString(pNew); } }} diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx index 00017da24897..3d6eb21d3ec2 100644 --- a/writerfilter/source/doctok/WW8ListTable.cxx +++ b/writerfilter/source/doctok/WW8ListTable.cxx @@ -96,7 +96,7 @@ WW8List::get_listlevel(sal_uInt32 nIndex) (new WW8ListLevel(mpParent, nPayloadOffset, nPayloadSize)); } -::rtl::OUString WW8ListLevel::get_xst() +OUString WW8ListLevel::get_xst() { sal_uInt32 nOffset = WW8ListLevel::getSize(); diff --git a/writerfilter/source/doctok/WW8Picture.cxx b/writerfilter/source/doctok/WW8Picture.cxx index 53085f728856..f6d7ddc41f38 100644 --- a/writerfilter/source/doctok/WW8Picture.cxx +++ b/writerfilter/source/doctok/WW8Picture.cxx @@ -145,9 +145,9 @@ static sal_uInt32 lcl_FFDATA_tooltip_offset(WW8FFDATA & rRef) return nResult; } -rtl::OUString WW8FFDATA::get_default() +OUString WW8FFDATA::get_default() { - rtl::OUString sResult; + OUString sResult; sal_uInt32 nOffset = lcl_FFDATA_default_offset(*this); switch (get_FLT()) @@ -163,19 +163,19 @@ rtl::OUString WW8FFDATA::get_default() return sResult; } -rtl::OUString WW8FFDATA::get_formatting() +OUString WW8FFDATA::get_formatting() { return getString(lcl_FFDATA_formatting_offset(*this)); } -rtl::OUString WW8FFDATA::get_help() +OUString WW8FFDATA::get_help() { return getString(lcl_FFDATA_help_offset(*this)); } -rtl::OUString WW8FFDATA::get_tooltip() +OUString WW8FFDATA::get_tooltip() { - rtl::OUString sResult; + OUString sResult; sResult = getString(lcl_FFDATA_tooltip_offset(*this)); diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx index 6455ba72d353..2b585ba7e74e 100644 --- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx +++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx @@ -268,9 +268,9 @@ uno::Any WW8Value::getAny() const return uno::Any(); } -::rtl::OUString WW8Value::getString() const +OUString WW8Value::getString() const { - return ::rtl::OUString(); + return OUString(); } string WW8Value::toString() const @@ -298,9 +298,9 @@ int WW8IntValue::getInt() const return mValue; } -::rtl::OUString WW8IntValue::getString() const +OUString WW8IntValue::getString() const { - return ::rtl::OUString::valueOf(static_cast<sal_Int32>(mValue)); + return OUString::valueOf(static_cast<sal_Int32>(mValue)); } uno::Any WW8IntValue::getAny() const @@ -338,7 +338,7 @@ int WW8StringValue::getInt() const return 0; } -::rtl::OUString WW8StringValue::getString() const +OUString WW8StringValue::getString() const { return mString; } @@ -380,7 +380,7 @@ string WW8StringValue::toString() const return result; } -WW8Value::Pointer_t createValue(const rtl::OUString & rStr) +WW8Value::Pointer_t createValue(const OUString & rStr) { return WW8Value::Pointer_t(new WW8StringValue(rStr)); } diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.hxx b/writerfilter/source/doctok/WW8ResourceModelImpl.hxx index 547b645f13ac..a1b0fad10f3c 100644 --- a/writerfilter/source/doctok/WW8ResourceModelImpl.hxx +++ b/writerfilter/source/doctok/WW8ResourceModelImpl.hxx @@ -151,7 +151,7 @@ public: virtual string toString() const; virtual int getInt() const; - virtual ::rtl::OUString getString() const; + virtual OUString getString() const; virtual uno::Any getAny() const; virtual writerfilter::Reference<Properties>::Pointer_t getProperties(); virtual writerfilter::Reference<Stream>::Pointer_t getStream(); @@ -167,7 +167,7 @@ public: virtual ~WW8IntValue() {} virtual int getInt() const; - virtual ::rtl::OUString getString() const; + virtual OUString getString() const; virtual uno::Any getAny() const; virtual string toString() const; @@ -186,14 +186,14 @@ ostream & operator << (ostream & o, const WW8Value & rValue); class WW8StringValue : public WW8Value { - ::rtl::OUString mString; + OUString mString; public: - WW8StringValue(::rtl::OUString string_) : mString(string_) {} + WW8StringValue(OUString string_) : mString(string_) {} virtual ~WW8StringValue() {} virtual int getInt() const; - virtual ::rtl::OUString getString() const; + virtual OUString getString() const; virtual uno::Any getAny() const; virtual string toString() const; @@ -206,7 +206,7 @@ public: @param rStr string to create value from. */ -WW8Value::Pointer_t createValue(const rtl::OUString & rStr); +WW8Value::Pointer_t createValue(const OUString & rStr); class WW8PropertiesValue : public WW8Value { diff --git a/writerfilter/source/doctok/WW8StreamImpl.cxx b/writerfilter/source/doctok/WW8StreamImpl.cxx index 2a9c7a70bb93..85cb49c1c173 100644 --- a/writerfilter/source/doctok/WW8StreamImpl.cxx +++ b/writerfilter/source/doctok/WW8StreamImpl.cxx @@ -84,7 +84,7 @@ WW8Stream::Sequence WW8StreamImpl::get(sal_uInt32 nOffset, return WW8Stream::Sequence(); } -WW8Stream::Pointer_t WW8StreamImpl::getSubStream(const ::rtl::OUString & sId) +WW8Stream::Pointer_t WW8StreamImpl::getSubStream(const OUString & sId) { WW8Stream::Pointer_t pResult; @@ -127,12 +127,12 @@ string WW8StreamImpl::getSubStreamNames() const if (xOLESimpleStorage.is()) { - uno::Sequence<rtl::OUString> aSeq = xOLESimpleStorage->getElementNames(); + uno::Sequence<OUString> aSeq = xOLESimpleStorage->getElementNames(); for (sal_uInt32 n = 0; n < sal::static_int_cast<sal_uInt32>(aSeq.getLength()); ++n) { - rtl::OUString aOUStr = aSeq[n]; + OUString aOUStr = aSeq[n]; if (n > 0) sResult += ", "; @@ -162,7 +162,7 @@ string WW8StreamImpl::getSubStreamNames() const return sResult; } -uno::Sequence<rtl::OUString> WW8StreamImpl::getSubStreamUNames() const +uno::Sequence<OUString> WW8StreamImpl::getSubStreamUNames() const { return xOLESimpleStorage->getElementNames(); } diff --git a/writerfilter/source/doctok/WW8StreamImpl.hxx b/writerfilter/source/doctok/WW8StreamImpl.hxx index c92db9116d2c..6f6a32456954 100644 --- a/writerfilter/source/doctok/WW8StreamImpl.hxx +++ b/writerfilter/source/doctok/WW8StreamImpl.hxx @@ -40,13 +40,13 @@ public: uno::Reference<io::XInputStream> rStream); virtual ~WW8StreamImpl(); - virtual WW8Stream::Pointer_t getSubStream(const ::rtl::OUString & rId); + virtual WW8Stream::Pointer_t getSubStream(const OUString & rId); virtual Sequence get(sal_uInt32 nOffset, sal_uInt32 nCount) const; virtual string getSubStreamNames() const; - virtual uno::Sequence<rtl::OUString> getSubStreamUNames() const; + virtual uno::Sequence<OUString> getSubStreamUNames() const; virtual void dump(OutputWithDepth<string> & o) const; }; diff --git a/writerfilter/source/doctok/WW8StructBase.cxx b/writerfilter/source/doctok/WW8StructBase.cxx index 0b9386fb478e..4d971b5b7963 100644 --- a/writerfilter/source/doctok/WW8StructBase.cxx +++ b/writerfilter/source/doctok/WW8StructBase.cxx @@ -90,10 +90,10 @@ sal_uInt32 getU32(const WW8StructBase::Sequence & rSeq, return nResult; } -rtl::OUString WW8StructBase::getString(sal_uInt32 nOffset, sal_uInt32 nCount) +OUString WW8StructBase::getString(sal_uInt32 nOffset, sal_uInt32 nCount) const { - rtl::OUString aResult; + OUString aResult; if (nOffset < getCount()) { @@ -112,7 +112,7 @@ rtl::OUString WW8StructBase::getString(sal_uInt32 nOffset, sal_uInt32 nCount) (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0]), nCount1); - aResult = rtl::OUString(pNew); + aResult = OUString(pNew); } } @@ -134,7 +134,7 @@ WW8StructBase::getRemainder(sal_uInt32 nOffset) const } -rtl::OUString WW8StructBase::getString(sal_uInt32 nOffset) const +OUString WW8StructBase::getString(sal_uInt32 nOffset) const { sal_uInt32 nCount = getU16(nOffset); diff --git a/writerfilter/source/doctok/WW8StructBase.hxx b/writerfilter/source/doctok/WW8StructBase.hxx index d33b5b759655..7039299f6b43 100644 --- a/writerfilter/source/doctok/WW8StructBase.hxx +++ b/writerfilter/source/doctok/WW8StructBase.hxx @@ -222,7 +222,7 @@ public: @return the string */ - rtl::OUString getString(sal_uInt32 nOffset) const; + OUString getString(sal_uInt32 nOffset) const; /** Returns binary object for remainder of this WW8StructBase @@ -238,7 +238,7 @@ public: @param nOffset offset the string starts at @param nLength number of characters in the string */ - rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32) const; + OUString getString(sal_uInt32 nOffset, sal_uInt32) const; /** Dump the part. diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx index 38347f1486ee..c090b52b99f2 100644 --- a/writerfilter/source/doctok/WW8Sttbf.cxx +++ b/writerfilter/source/doctok/WW8Sttbf.cxx @@ -63,7 +63,7 @@ sal_uInt32 WW8Sttbf::getEntryCount() const return mnCount; } -rtl::OUString WW8Sttbf::getEntry(sal_uInt32 nPos) const +OUString WW8Sttbf::getEntry(sal_uInt32 nPos) const { return getString(getEntryOffset(nPos)); } diff --git a/writerfilter/source/doctok/WW8Sttbf.hxx b/writerfilter/source/doctok/WW8Sttbf.hxx index 7e0f4ccfe582..8f588424bde7 100644 --- a/writerfilter/source/doctok/WW8Sttbf.hxx +++ b/writerfilter/source/doctok/WW8Sttbf.hxx @@ -76,7 +76,7 @@ public: @param nPos the index of the entry */ - rtl::OUString getEntry(sal_uInt32 nPos) const; + OUString getEntry(sal_uInt32 nPos) const; }; class WW8SttbTableResource : public ::writerfilter::Reference<Table> diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx b/writerfilter/source/doctok/WW8StyleSheet.cxx index 3c4ca5eccdea..3b7c298e7847 100644 --- a/writerfilter/source/doctok/WW8StyleSheet.cxx +++ b/writerfilter/source/doctok/WW8StyleSheet.cxx @@ -62,7 +62,7 @@ WW8StyleSheet::getEntry(sal_uInt32 nIndex) return pResult; } -rtl::OUString WW8Style::get_xstzName() +OUString WW8Style::get_xstzName() { sal_uInt32 nCount = getU8(0xc); @@ -74,14 +74,14 @@ rtl::OUString WW8Style::get_xstzName() rtl_uString_newFromStr (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0])); - return rtl::OUString(pNew); + return OUString(pNew); } return get_xstzName1(); } -rtl::OUString WW8Style::get_xstzName1() +OUString WW8Style::get_xstzName1() { WW8StyleSheet * pParentStyleSheet = dynamic_cast<WW8StyleSheet *>(mpParent); @@ -101,13 +101,13 @@ rtl::OUString WW8Style::get_xstzName1() rtl_uString_newFromStr (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0])); - return rtl::OUString(pNew); + return OUString(pNew); } } } - return rtl::OUString(); + return OUString(); } sal_uInt32 WW8Style::get_upxstart() diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl index a50c8bde5a87..966182566866 100644 --- a/writerfilter/source/doctok/resources.xsl +++ b/writerfilter/source/doctok/resources.xsl @@ -81,7 +81,7 @@ typedef const WW8DocumentImpl * WW8DocumentImplPointer; using namespace ::std;
</xsl:text> <xsl:apply-templates select="//UML:Class" mode="class"/> <xsl:text> -rtl::OUString getDffOptName(sal_uInt32 nPid); +OUString getDffOptName(sal_uInt32 nPid); bool isBooleanDffOpt(sal_uInt32 nId); }} #endif // INCLUDED_RESOURCES_HXX
</xsl:text></out> @@ -619,7 +619,7 @@ class </xsl:text> <xsl:text>; }
</xsl:text> </xsl:when> <xsl:when test='$stereotype = "string"'> - rtl::OUString get_<xsl:value-of select='@name'/>() const { return getString(<xsl:value-of select='$offset'/>); } + OUString get_<xsl:value-of select='@name'/>() const { return getString(<xsl:value-of select='$offset'/>); } </xsl:when> </xsl:choose> </xsl:template> @@ -730,7 +730,7 @@ class </xsl:text> <xsl:when test="$type='S16'">sal_Int16</xsl:when> <xsl:when test="$type='U32'">sal_uInt32</xsl:when> <xsl:when test="$type='S32'">sal_Int32</xsl:when> - <xsl:when test="$type='String'">rtl::OUString</xsl:when> + <xsl:when test="$type='String'">OUString</xsl:when> <xsl:when test="$type='Value'">WW8Value::Pointer_t</xsl:when> <xsl:when test="$type='Binary'">WW8BinaryObjReference::Pointer_t</xsl:when> <xsl:when test="$parenttype=''"> diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl index 431e72c22853..d0b714dc36fc 100644 --- a/writerfilter/source/doctok/resourcesimpl.xsl +++ b/writerfilter/source/doctok/resourcesimpl.xsl @@ -562,9 +562,9 @@ writerfilter::Reference < BinaryObj > ::Pointer_t createSprmBinary <xsl:template name="getdffoptname"> <xsl:text> -rtl::OUString getDffOptName(sal_uInt32 nPid) +OUString getDffOptName(sal_uInt32 nPid) { - rtl::OUString result; + OUString result; switch (nPid) {
</xsl:text> @@ -656,7 +656,7 @@ WW8Value::Pointer_t WW8FOPTE::get_value() <xsl:template match='UML:Model/UML:Namespace.ownedElement' mode='ww8foptename'> <xsl:text> -rtl::OUString WW8FOPTE::get_name() +OUString WW8FOPTE::get_name() { return getDffOptName(get_pid()); }</xsl:text> diff --git a/writerfilter/source/doctok/resourcetools.xsl b/writerfilter/source/doctok/resourcetools.xsl index f8ae1c9febb2..f3df28d1a1db 100644 --- a/writerfilter/source/doctok/resourcetools.xsl +++ b/writerfilter/source/doctok/resourcetools.xsl @@ -44,7 +44,7 @@ <xsl:when test="$type='S16'">sal_Int16</xsl:when> <xsl:when test="$type='U32'">sal_uInt32</xsl:when> <xsl:when test="$type='S32'">sal_Int32</xsl:when> - <xsl:when test="$type='String'">rtl::OUString</xsl:when> + <xsl:when test="$type='String'">OUString</xsl:when> <xsl:otherwise> <xsl:text>writerfilter::Reference < </xsl:text> <xsl:value-of select='$parenttype'/> diff --git a/writerfilter/source/filter/RtfFilter.hxx b/writerfilter/source/filter/RtfFilter.hxx index b614d0bd89ba..3940f664f8ac 100644 --- a/writerfilter/source/filter/RtfFilter.hxx +++ b/writerfilter/source/filter/RtfFilter.hxx @@ -43,7 +43,7 @@ class WRITERFILTER_WRITERFILTER_DLLPUBLIC RtfFilter : public cppu::WeakImplHelpe protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc, m_xDstDoc; - ::rtl::OUString m_sFilterName; + OUString m_sFilterName; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; @@ -70,20 +70,20 @@ public: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString RtfFilter_getImplementationName() +OUString RtfFilter_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL RtfFilter_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL RtfFilter_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL RtfFilter_createInstance( diff --git a/writerfilter/source/filter/WriterFilter.hxx b/writerfilter/source/filter/WriterFilter.hxx index 5fd370eb91fe..d34de2ca2d85 100644 --- a/writerfilter/source/filter/WriterFilter.hxx +++ b/writerfilter/source/filter/WriterFilter.hxx @@ -43,7 +43,7 @@ class WRITERFILTER_WRITERFILTER_DLLPUBLIC WriterFilter : public cppu::WeakImplHe protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xSrcDoc, m_xDstDoc; - ::rtl::OUString m_sFilterName; + OUString m_sFilterName; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; @@ -70,23 +70,23 @@ public: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString WriterFilter_getImplementationName() +OUString WriterFilter_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL WriterFilter_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL WriterFilter_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WriterFilter_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL WriterFilter_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL WriterFilter_createInstance( diff --git a/writerfilter/source/filter/WriterFilterDetection.hxx b/writerfilter/source/filter/WriterFilterDetection.hxx index 48971c40e027..393c58852cf6 100644 --- a/writerfilter/source/filter/WriterFilterDetection.hxx +++ b/writerfilter/source/filter/WriterFilterDetection.hxx @@ -39,25 +39,25 @@ public: virtual ~WriterFilterDetection(); //XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) throw( com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString WriterFilterDetection_getImplementationName() +OUString WriterFilterDetection_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL WriterFilterDetection_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL WriterFilterDetection_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WriterFilterDetection_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL WriterFilterDetection_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL WriterFilterDetection_createInstance( diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx index 2c42224dc4d0..2762350f37c4 100644 --- a/writerfilter/source/ooxml/Handler.cxx +++ b/writerfilter/source/ooxml/Handler.cxx @@ -294,7 +294,7 @@ OOXMLHyperlinkHandler::OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext) OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler() { - ::rtl::OUString sReturn(" HYPERLINK \""); + OUString sReturn(" HYPERLINK \""); sReturn += mURL; sReturn += "\""; diff --git a/writerfilter/source/ooxml/Handler.hxx b/writerfilter/source/ooxml/Handler.hxx index 99667d30940f..c185d0f621d7 100644 --- a/writerfilter/source/ooxml/Handler.hxx +++ b/writerfilter/source/ooxml/Handler.hxx @@ -51,7 +51,7 @@ public: class OOXMLFooterHandler : public Properties { OOXMLFastContextHandler * mpFastContext; - ::rtl::OUString msStreamId; + OUString msStreamId; sal_Int32 mnType; public: OOXMLFooterHandler(OOXMLFastContextHandler * pContext); @@ -63,7 +63,7 @@ public: class OOXMLHeaderHandler : public Properties { OOXMLFastContextHandler * mpFastContext; - ::rtl::OUString msStreamId; + OUString msStreamId; sal_Int32 mnType; public: OOXMLHeaderHandler(OOXMLFastContextHandler * pContext); @@ -75,7 +75,7 @@ public: class OOXMLCommentHandler : public Properties { OOXMLFastContextHandler * mpFastContext; - ::rtl::OUString msStreamId; + OUString msStreamId; public: OOXMLCommentHandler(OOXMLFastContextHandler * pContext); virtual ~OOXMLCommentHandler(); @@ -121,8 +121,8 @@ public: class OOXMLHyperlinkHandler : public Properties { OOXMLFastContextHandler * mpFastContext; - ::rtl::OUString mFieldCode; - ::rtl::OUString mURL; + OUString mFieldCode; + OUString mURL; public: OOXMLHyperlinkHandler(OOXMLFastContextHandler * pContext); diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index e893023dcf92..fa77978e19de 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -118,13 +118,13 @@ const Id & OOXMLDocumentImpl::getXNoteType() const return mXNoteType; } -const ::rtl::OUString & OOXMLDocumentImpl::getTarget() const +const OUString & OOXMLDocumentImpl::getTarget() const { return mpStream->getTarget(); } writerfilter::Reference<Stream>::Pointer_t -OOXMLDocumentImpl::getSubStream(const rtl::OUString & rId) +OOXMLDocumentImpl::getSubStream(const OUString & rId) { OOXMLStream::Pointer_t pStream (OOXMLDocumentFactory::createStream(mpStream, rId)); @@ -210,7 +210,7 @@ void OOXMLDocumentImpl::resolveComment(Stream & rStream, } OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet -(const ::rtl::OUString & rId) +(const OUString & rId) { OOXMLStream::Pointer_t pStream (OOXMLDocumentFactory::createStream(mpStream, rId)); @@ -242,21 +242,21 @@ OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet } void OOXMLDocumentImpl::resolvePicture(Stream & rStream, - const rtl::OUString & rId) + const OUString & rId) { OOXMLPropertySet * pProps = getPicturePropSet(rId); rStream.props(writerfilter::Reference<Properties>::Pointer_t(pProps)); } -::rtl::OUString OOXMLDocumentImpl::getTargetForId(const ::rtl::OUString & rId) +OUString OOXMLDocumentImpl::getTargetForId(const OUString & rId) { return mpStream->getTargetForId(rId); } void OOXMLDocumentImpl::resolveHeader(Stream & rStream, const sal_Int32 type, - const rtl::OUString & rId) + const OUString & rId) { writerfilter::Reference<Stream>::Pointer_t pStream = getSubStream(rId); @@ -278,7 +278,7 @@ void OOXMLDocumentImpl::resolveHeader(Stream & rStream, void OOXMLDocumentImpl::resolveFooter(Stream & rStream, const sal_Int32 type, - const rtl::OUString & rId) + const OUString & rId) { writerfilter::Reference<Stream>::Pointer_t pStream = getSubStream(rId); @@ -350,7 +350,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream) #endif } -uno::Reference<io::XInputStream> OOXMLDocumentImpl::getInputStreamForId(const ::rtl::OUString & rId) +uno::Reference<io::XInputStream> OOXMLDocumentImpl::getInputStreamForId(const OUString & rId) { OOXMLStream::Pointer_t pStream(OOXMLDocumentFactory::createStream(mpStream, rId)); diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index 3c1629a4e27a..f23725d64399 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -52,7 +52,7 @@ protected: sal_uInt32 nId); writerfilter::Reference<Stream>::Pointer_t - getSubStream(const rtl::OUString & rId); + getSubStream(const OUString & rId); writerfilter::Reference<Stream>::Pointer_t getXNoteStream(OOXMLStream::StreamType_t nType, @@ -77,18 +77,18 @@ public: const sal_Int32 nNoteId); virtual void resolveHeader(Stream & rStream, const sal_Int32 type, - const rtl::OUString & rId); + const OUString & rId); virtual void resolveFooter(Stream & rStream, const sal_Int32 type, - const rtl::OUString & rId); + const OUString & rId); virtual void resolveComment(Stream & rStream, const sal_Int32 nId); virtual OOXMLPropertySet * getPicturePropSet - (const ::rtl::OUString & rId); - virtual void resolvePicture(Stream & rStream, const rtl::OUString & rId); + (const OUString & rId); + virtual void resolvePicture(Stream & rStream, const OUString & rId); - virtual ::rtl::OUString getTargetForId(const ::rtl::OUString & rId); + virtual OUString getTargetForId(const OUString & rId); virtual void setModel(uno::Reference<frame::XModel> xModel); virtual uno::Reference<frame::XModel> getModel(); @@ -96,12 +96,12 @@ public: virtual uno::Reference<drawing::XDrawPage> getDrawPage(); virtual uno::Reference<io::XInputStream> getInputStream(); virtual uno::Reference<io::XInputStream> getStorageStream(); - virtual uno::Reference<io::XInputStream> getInputStreamForId(const rtl::OUString & rId); + virtual uno::Reference<io::XInputStream> getInputStreamForId(const OUString & rId); virtual void setXNoteId(const sal_Int32 nId); virtual sal_Int32 getXNoteId() const; virtual void setXNoteType(const Id & rId); virtual const Id & getXNoteType() const; - virtual const ::rtl::OUString & getTarget() const; + virtual const OUString & getTarget() const; virtual uno::Reference<xml::sax::XFastShapeContextHandler> getShapeContext( ); virtual void setShapeContext( uno::Reference<xml::sax::XFastShapeContextHandler> xContext ); }; diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx index e00e91380914..20fc82c75b6f 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.cxx +++ b/writerfilter/source/ooxml/OOXMLFactory.cxx @@ -156,7 +156,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler, #ifdef DEBUG_FACTORY debug_logger->element("boolean"); #endif - ::rtl::OUString aValue(Attribs->getValue(aIt->first)); + OUString aValue(Attribs->getValue(aIt->first)); OOXMLFastHelper<OOXMLBooleanValue>::newProperty(pHandler, nId, aValue); OOXMLValue::Pointer_t pValue(new OOXMLBooleanValue(aValue)); @@ -168,7 +168,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler, #ifdef DEBUG_FACTORY debug_logger->element("string"); #endif - ::rtl::OUString aValue(Attribs->getValue(aIt->first)); + OUString aValue(Attribs->getValue(aIt->first)); OOXMLFastHelper<OOXMLStringValue>::newProperty (pHandler, nId, aValue); @@ -181,7 +181,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler, #ifdef DEBUG_FACTORY debug_logger->element("integer"); #endif - ::rtl::OUString aValue(Attribs->getValue(aIt->first)); + OUString aValue(Attribs->getValue(aIt->first)); OOXMLFastHelper<OOXMLIntegerValue>::newProperty (pHandler, nId, aValue); @@ -194,7 +194,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler, #ifdef DEBUG_FACTORY debug_logger->element("hex"); #endif - ::rtl::OUString aValue(Attribs->getValue(aIt->first)); + OUString aValue(Attribs->getValue(aIt->first)); OOXMLFastHelper<OOXMLHexValue>::newProperty (pHandler, nId, aValue); @@ -212,7 +212,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler, if (pListValueMap.get() != NULL) { - ::rtl::OUString aValue(Attribs->getValue(aIt->first)); + OUString aValue(Attribs->getValue(aIt->first)); sal_uInt32 nValue = (*pListValueMap)[aValue]; #ifdef DEBUG_FACTORY @@ -276,7 +276,7 @@ OOXMLFactory::createFastChildContext(OOXMLFastContextHandler * pHandler, } void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler, - const ::rtl::OUString & rString) + const OUString & rString) { #ifdef DEBUG_FACTORY debug_logger->startElement("factory.characters"); @@ -338,7 +338,7 @@ void OOXMLFactory_ns::endAction(OOXMLFastContextHandler *) { } -void OOXMLFactory_ns::charactersAction(OOXMLFastContextHandler *, const ::rtl::OUString &) +void OOXMLFactory_ns::charactersAction(OOXMLFastContextHandler *, const OUString &) { } diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx index 545dadf89823..94039d3bb59d 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.hxx +++ b/writerfilter/source/ooxml/OOXMLFactory.hxx @@ -70,7 +70,7 @@ typedef boost::unordered_map<Token_t, AttributeInfo> AttributeToResourceMap; typedef boost::shared_ptr<AttributeToResourceMap> AttributeToResourceMapPointer; typedef boost::unordered_map<Id, AttributeToResourceMapPointer> AttributesMap; -typedef boost::unordered_map<rtl::OUString, sal_Int32, ::rtl::OUStringHash> ListValueMap; +typedef boost::unordered_map<OUString, sal_Int32, OUStringHash> ListValueMap; typedef boost::shared_ptr<ListValueMap> ListValueMapPointer; typedef boost::unordered_map<Id, ListValueMapPointer> ListValuesMap; @@ -98,7 +98,7 @@ public: typedef boost::shared_ptr<OOXMLFactory_ns> Pointer_t; virtual void startAction(OOXMLFastContextHandler * pHandler); - virtual void charactersAction(OOXMLFastContextHandler * pHandler, const ::rtl::OUString & rString); + virtual void charactersAction(OOXMLFastContextHandler * pHandler, const OUString & rString); virtual void endAction(OOXMLFastContextHandler * pHandler); virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue); virtual string getDefineName(Id nId) const; @@ -142,7 +142,7 @@ public: const uno::Reference< xml::sax::XFastAttributeList > & Attribs); void characters(OOXMLFastContextHandler * pHandler, - const ::rtl::OUString & rString); + const OUString & rString); void startAction(OOXMLFastContextHandler * pHandler, Token_t nToken); void endAction(OOXMLFastContextHandler * pHandler, Token_t nToken); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 87bd54a542d8..680109b225c5 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -195,7 +195,7 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement } void SAL_CALL OOXMLFastContextHandler::startUnknownElement -(const ::rtl::OUString & Namespace, const ::rtl::OUString & Name, +(const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -250,7 +250,7 @@ void OOXMLFastContextHandler::lcl_endFastElement } void SAL_CALL OOXMLFastContextHandler::endUnknownElement -(const ::rtl::OUString & , const ::rtl::OUString & ) +(const OUString & , const OUString & ) throw (uno::RuntimeException, xml::sax::SAXException) { #ifdef DEBUG_CONTEXT_HANDLER @@ -292,8 +292,8 @@ uno::Reference< xml::sax::XFastContextHandler > uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLFastContextHandler::createUnknownChildContext -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, +(const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -312,14 +312,14 @@ OOXMLFastContextHandler::createUnknownChildContext } void SAL_CALL OOXMLFastContextHandler::characters -(const ::rtl::OUString & aChars) +(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) { lcl_characters(aChars); } void OOXMLFastContextHandler::lcl_characters -(const ::rtl::OUString & rString) +(const OUString & rString) throw (uno::RuntimeException, xml::sax::SAXException) { OOXMLFactory::getInstance()->characters(this, rString); @@ -496,7 +496,7 @@ void OOXMLFastContextHandler::setParent } OOXMLPropertySet * OOXMLFastContextHandler::getPicturePropSet -(const ::rtl::OUString & rId) +(const OUString & rId) { return dynamic_cast<OOXMLDocumentImpl *>(mpParserState->getDocument())-> getPicturePropSet(rId); @@ -831,7 +831,7 @@ void OOXMLFastContextHandler::endTxbxContent() mpParserState->endTxbxContent(); } -void OOXMLFastContextHandler::text(const ::rtl::OUString & sText) +void OOXMLFastContextHandler::text(const OUString & sText) { #ifdef DEBUG_CONTEXT_HANDLER debug_logger->startElement("contexthandler.text"); @@ -854,7 +854,7 @@ void OOXMLFastContextHandler::text(const ::rtl::OUString & sText) is done sooner than lcl_sprms() actually results in processing the tags it is enclosed in, so the values are stored in PositionHandler for later use. */ -void OOXMLFastContextHandler::positionOffset(const ::rtl::OUString & sText) +void OOXMLFastContextHandler::positionOffset(const OUString & sText) { #ifdef DEBUG_ELEMENT debug_logger->startElement("positionOffset"); @@ -865,7 +865,7 @@ void OOXMLFastContextHandler::positionOffset(const ::rtl::OUString & sText) ::writerfilter::dmapper::PositionHandler::setPositionOffset( sText, inPositionV ); } -void OOXMLFastContextHandler::alignH(const ::rtl::OUString & sText) +void OOXMLFastContextHandler::alignH(const OUString & sText) { #ifdef DEBUG_ELEMENT debug_logger->startElement("alignH"); @@ -876,7 +876,7 @@ void OOXMLFastContextHandler::alignH(const ::rtl::OUString & sText) ::writerfilter::dmapper::PositionHandler::setAlignH( sText ); } -void OOXMLFastContextHandler::alignV(const ::rtl::OUString & sText) +void OOXMLFastContextHandler::alignV(const OUString & sText) { #ifdef DEBUG_ELEMENT debug_logger->startElement("alignV"); @@ -1115,24 +1115,24 @@ void OOXMLFastContextHandler::resolveComment(const sal_Int32 nId) mpParserState->getDocument()->resolveComment(*mpStream, nId); } -void OOXMLFastContextHandler::resolvePicture(const rtl::OUString & rId) +void OOXMLFastContextHandler::resolvePicture(const OUString & rId) { mpParserState->getDocument()->resolvePicture(*mpStream, rId); } void OOXMLFastContextHandler::resolveHeader -(const sal_Int32 type, const rtl::OUString & rId) +(const sal_Int32 type, const OUString & rId) { mpParserState->getDocument()->resolveHeader(*mpStream, type, rId); } void OOXMLFastContextHandler::resolveFooter -(const sal_Int32 type, const rtl::OUString & rId) +(const sal_Int32 type, const OUString & rId) { mpParserState->getDocument()->resolveFooter(*mpStream, type, rId); } -void OOXMLFastContextHandler::resolveOLE(const rtl::OUString & rId) +void OOXMLFastContextHandler::resolveOLE(const OUString & rId) { uno::Reference<io::XInputStream> xInputStream (mpParserState->getDocument()->getInputStreamForId(rId)); @@ -1142,8 +1142,8 @@ void OOXMLFastContextHandler::resolveOLE(const rtl::OUString & rId) newProperty(NS_ooxml::LN_inputstream, aValue); } -::rtl::OUString OOXMLFastContextHandler::getTargetForId -(const ::rtl::OUString & rId) +OUString OOXMLFastContextHandler::getTargetForId +(const OUString & rId) { return mpParserState->getDocument()->getTargetForId(rId); } @@ -1248,7 +1248,7 @@ void OOXMLFastContextHandlerStream::sendProperty(Id nId) OOXMLPropertySetEntryToString aHandler(nId); getPropertySetAttrs()->resolve(aHandler); - const ::rtl::OUString & sText = aHandler.getString(); + const OUString & sText = aHandler.getString(); mpStream->utext(reinterpret_cast < const sal_uInt8 * > (sText.getStr()), sText.getLength()); @@ -1602,7 +1602,7 @@ void OOXMLFastContextHandlerValue::setDefaultStringValue() if (mpValue.get() == NULL) { - OOXMLValue::Pointer_t pValue(new OOXMLStringValue(::rtl::OUString())); + OOXMLValue::Pointer_t pValue(new OOXMLStringValue(OUString())); setValue(pValue); } } @@ -1964,8 +1964,8 @@ void OOXMLFastContextHandlerShape::lcl_startFastElement } void SAL_CALL OOXMLFastContextHandlerShape::startUnknownElement -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, +(const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -2024,8 +2024,8 @@ void OOXMLFastContextHandlerShape::lcl_endFastElement } void SAL_CALL OOXMLFastContextHandlerShape::endUnknownElement -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name) +(const OUString & Namespace, + const OUString & Name) throw (uno::RuntimeException, xml::sax::SAXException) { if (mrShapeContext.is()) @@ -2076,8 +2076,8 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLFastContextHandlerShape::createUnknownChildContext -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, +(const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -2091,7 +2091,7 @@ OOXMLFastContextHandlerShape::createUnknownChildContext } void OOXMLFastContextHandlerShape::lcl_characters -(const ::rtl::OUString & aChars) +(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) { if (mrShapeContext.is()) @@ -2120,8 +2120,8 @@ OOXMLFastContextHandlerWrapper::~OOXMLFastContextHandlerWrapper() } void SAL_CALL OOXMLFastContextHandlerWrapper::startUnknownElement -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, +(const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -2130,8 +2130,8 @@ void SAL_CALL OOXMLFastContextHandlerWrapper::startUnknownElement } void SAL_CALL OOXMLFastContextHandlerWrapper::endUnknownElement -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name) +(const OUString & Namespace, + const OUString & Name) throw (uno::RuntimeException, xml::sax::SAXException) { if (mxContext.is()) @@ -2140,8 +2140,8 @@ void SAL_CALL OOXMLFastContextHandlerWrapper::endUnknownElement uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLFastContextHandlerWrapper::createUnknownChildContext -(const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, +(const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException) { @@ -2259,7 +2259,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext } void OOXMLFastContextHandlerWrapper::lcl_characters -(const ::rtl::OUString & aChars) +(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) { if (mxContext.is()) @@ -2419,7 +2419,7 @@ OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t, return xContextHandler; } -void OOXMLFastContextHandlerLinear::lcl_characters(const ::rtl::OUString& aChars) +void OOXMLFastContextHandlerLinear::lcl_characters(const OUString& aChars) throw (uno::RuntimeException, xml::sax::SAXException) { buffer.appendCharacters( aChars ); @@ -2438,7 +2438,7 @@ void OOXMLFastContextHandlerMath::process() { SvGlobalName name( SO3_SM_CLASSID ); comphelper::EmbeddedObjectContainer container; - rtl::OUString aName; + OUString aName; uno::Reference< embed::XEmbeddedObject > ref = container.CreateEmbeddedObject( name.GetByteSequence(), aName ); uno::Reference< uno::XInterface > component( ref->getComponent(), uno::UNO_QUERY ); if( oox::FormulaImportBase* import = dynamic_cast< oox::FormulaImportBase* >( component.get())) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index aa693104cfba..6aae4759e804 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -74,8 +74,8 @@ public: throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL startUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); @@ -83,7 +83,7 @@ public: throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL endUnknownElement - (const ::rtl::OUString & Namespace, const ::rtl::OUString & Name) + (const OUString & Namespace, const OUString & Name) throw (uno::RuntimeException, xml::sax::SAXException); virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL @@ -94,12 +94,12 @@ public: virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); - virtual void SAL_CALL characters(const ::rtl::OUString & aChars) + virtual void SAL_CALL characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); static const uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -144,14 +144,14 @@ public: void resolveFootnote(const sal_Int32 nId); void resolveEndnote(const sal_Int32 nId); void resolveComment(const sal_Int32 nId); - void resolvePicture(const rtl::OUString & rId); + void resolvePicture(const OUString & rId); void resolveHeader(const sal_Int32 type, - const rtl::OUString & rId); + const OUString & rId); void resolveFooter(const sal_Int32 type, - const rtl::OUString & rId); - void resolveOLE(const rtl::OUString & rId); + const OUString & rId); + void resolveOLE(const OUString & rId); - ::rtl::OUString getTargetForId(const ::rtl::OUString & rId); + OUString getTargetForId(const OUString & rId); uno::Reference < xml::sax::XFastContextHandler > createFromStart @@ -198,10 +198,10 @@ public: void softHyphen(); void handleLastParagraphInSection(); void endOfParagraph(); - void text(const ::rtl::OUString & sText); - void positionOffset(const ::rtl::OUString & sText); - void alignH(const ::rtl::OUString & sText); - void alignV(const ::rtl::OUString & sText); + void text(const OUString & sText); + void positionOffset(const OUString & sText); + void alignH(const OUString & sText); + void alignV(const OUString & sText); void startTxbxContent(); void endTxbxContent(); virtual void propagateCharacterProperties(); @@ -263,7 +263,7 @@ protected: const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); - virtual void lcl_characters(const ::rtl::OUString & aChars) + virtual void lcl_characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); void startAction(Token_t Element); @@ -273,7 +273,7 @@ protected: virtual OOXMLPropertySet * getPicturePropSet - (const ::rtl::OUString & rId); + (const OUString & rId); virtual void resolvePropertySetAttrs(); uno::Reference< uno::XComponentContext > getComponentContext(); @@ -506,20 +506,20 @@ public: // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL endUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name) + (const OUString & Namespace, + const OUString & Name) throw (uno::RuntimeException, xml::sax::SAXException); virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); @@ -547,7 +547,7 @@ protected: const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); - virtual void lcl_characters(const ::rtl::OUString & aChars) + virtual void lcl_characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); }; @@ -569,20 +569,20 @@ public: // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL endUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name) + (const OUString & Namespace, + const OUString & Name) throw (uno::RuntimeException, xml::sax::SAXException); virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); @@ -616,7 +616,7 @@ protected: const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); - virtual void lcl_characters(const ::rtl::OUString & aChars) + virtual void lcl_characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); virtual void setId(Id nId); @@ -675,7 +675,7 @@ protected: const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); - virtual void lcl_characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); + virtual void lcl_characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); // should be private, but not much point in making deep copies of it oox::formulaimport::XmlStreamBuilder buffer; diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index 673b8429b24b..f6f6b60d27d0 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -57,11 +57,11 @@ Element } void SAL_CALL OOXMLFastDocumentHandler::startUnknownElement -(const ::rtl::OUString & +(const OUString & #ifdef DEBUG_CONTEXT_STACK Namespace #endif -, const ::rtl::OUString & +, const OUString & #ifdef DEBUG_CONTEXT_STACK Name #endif @@ -93,11 +93,11 @@ throw (uno::RuntimeException, xml::sax::SAXException) } void SAL_CALL OOXMLFastDocumentHandler::endUnknownElement -(const ::rtl::OUString & +(const OUString & #ifdef DEBUG_CONTEXT_STACK Namespace #endif -, const ::rtl::OUString & +, const OUString & #ifdef DEBUG_CONTEXT_STACK Name #endif @@ -146,12 +146,12 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLFastDocumentHandler::createUnknownChildContext -(const ::rtl::OUString & +(const OUString & #ifdef DEBUG_CONTEXT_STACK Namespace #endif , - const ::rtl::OUString & + const OUString & #ifdef DEBUG_CONTEXT_STACK Name #endif @@ -170,7 +170,7 @@ Name (new OOXMLFastDocumentHandler(m_xContext)); } -void SAL_CALL OOXMLFastDocumentHandler::characters(const ::rtl::OUString & /*aChars*/) +void SAL_CALL OOXMLFastDocumentHandler::characters(const OUString & /*aChars*/) throw (uno::RuntimeException, xml::sax::SAXException) { // TODO: Insert your implementation for "characters" here. diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index 84f5374d5ee0..50f06321f02a 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -59,15 +59,15 @@ public: const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL startUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL endFastElement(::sal_Int32 Element) throw (uno::RuntimeException, xml::sax::SAXException); virtual void SAL_CALL endUnknownElement - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name) + (const OUString & Namespace, + const OUString & Name) throw (uno::RuntimeException, xml::sax::SAXException); virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createFastChildContext @@ -76,11 +76,11 @@ public: throw (uno::RuntimeException, xml::sax::SAXException); virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext - (const ::rtl::OUString & Namespace, - const ::rtl::OUString & Name, + (const OUString & Namespace, + const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) throw (uno::RuntimeException, xml::sax::SAXException); - virtual void SAL_CALL characters(const ::rtl::OUString & aChars) + virtual void SAL_CALL characters(const OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException); void setStream(Stream * pStream); diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx index 1c28e36b09ca..cfc21dc80973 100644 --- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx +++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx @@ -47,14 +47,14 @@ public: static void newProperty(OOXMLFastContextHandler * pHandler, Id nId, - const ::rtl::OUString & rValue); + const OUString & rValue); static void newProperty(OOXMLFastContextHandler * pHandler, Id nId, sal_Int32 nValue); static void mark(OOXMLFastContextHandler * pHandler, Id nId, - const ::rtl::OUString & rValue); + const OUString & rValue); static void attributes (OOXMLFastContextHandler * pContext, @@ -168,7 +168,7 @@ OOXMLFastHelper<T>::createAndSetParentRef template <class T> void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler, Id nId, - const ::rtl::OUString & rValue) + const OUString & rValue) { OOXMLValue::Pointer_t pVal(new T(rValue)); @@ -179,7 +179,7 @@ void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler, debug_logger->attribute("name", aStr); debug_logger->attribute ("value", - ::rtl::OUStringToOString + OUStringToOString (rValue, RTL_TEXTENCODING_ASCII_US).getStr()); if (aStr.empty()) @@ -220,7 +220,7 @@ void OOXMLFastHelper<T>::newProperty(OOXMLFastContextHandler * pHandler, template <class T> void OOXMLFastHelper<T>::mark(OOXMLFastContextHandler * pHandler, Id nId, - const ::rtl::OUString & rValue) + const OUString & rValue) { OOXMLValue::Pointer_t pVal(new T(rValue)); @@ -231,7 +231,7 @@ void OOXMLFastHelper<T>::mark(OOXMLFastContextHandler * pHandler, debug_logger->attribute("name", aStr); debug_logger->attribute ("value", - ::rtl::OUStringToOString + OUStringToOString (rValue, RTL_TEXTENCODING_ASCII_US).getStr()); if (aStr.empty()) diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx index 147651aadb51..53338c8e6440 100644 --- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx @@ -35,7 +35,7 @@ OOXMLFastTokenHandler::OOXMLFastTokenHandler {} // ::com::sun::star::xml::sax::XFastTokenHandler: -::sal_Int32 SAL_CALL OOXMLFastTokenHandler::getToken(const ::rtl::OUString & Identifier) +::sal_Int32 SAL_CALL OOXMLFastTokenHandler::getToken(const OUString & Identifier) throw (css::uno::RuntimeException) { ::sal_Int32 nResult = OOXML_FAST_TOKENS_END; @@ -58,17 +58,17 @@ OOXMLFastTokenHandler::OOXMLFastTokenHandler return nResult; } -::rtl::OUString SAL_CALL OOXMLFastTokenHandler::getIdentifier(::sal_Int32 Token) +OUString SAL_CALL OOXMLFastTokenHandler::getIdentifier(::sal_Int32 Token) throw (css::uno::RuntimeException) { - ::rtl::OUString sResult; + OUString sResult; if ( Token >= 0 || Token < OOXML_FAST_TOKENS_END ) { - static ::rtl::OUString aTokens[OOXML_FAST_TOKENS_END]; + static OUString aTokens[OOXML_FAST_TOKENS_END]; if (aTokens[Token].getLength() == 0) - aTokens[Token] = ::rtl::OUString::createFromAscii + aTokens[Token] = OUString::createFromAscii (tokenmap::wordlist[Token].name); } diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx index b6a36138a1de..3af8b5d36867 100644 --- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx @@ -39,8 +39,8 @@ public: explicit OOXMLFastTokenHandler(css::uno::Reference< css::uno::XComponentContext > const & context); // ::com::sun::star::xml::sax::XFastTokenHandler: - virtual ::sal_Int32 SAL_CALL getToken(const ::rtl::OUString & Identifier) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifier(::sal_Int32 Token) throw (css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getToken(const OUString & Identifier) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getIdentifier(::sal_Int32 Token) throw (css::uno::RuntimeException); virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getUTF8Identifier(::sal_Int32 Token) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getTokenFromUTF8(const css::uno::Sequence< ::sal_Int8 > & Identifier) throw (css::uno::RuntimeException); diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index 348a07862a3b..fc812d3ec50a 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -134,7 +134,7 @@ sal_Int32 OOXMLParserState::getXNoteId() const return mpDocument->getXNoteId(); } -const ::rtl::OUString & OOXMLParserState::getTarget() const +const OUString & OOXMLParserState::getTarget() const { return mpDocument->getTarget(); } diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx index 02795791c707..cd20b9de9cba 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.hxx +++ b/writerfilter/source/ooxml/OOXMLParserState.hxx @@ -45,7 +45,7 @@ class OOXMLParserState unsigned int mnHandle; OOXMLDocument * mpDocument; sal_Int32 mnXNoteId; - rtl::OUString msTarget; + OUString msTarget; OOXMLPropertySet::Pointer_t mpCharacterProps; stack<OOXMLPropertySet::Pointer_t> mCellProps; stack<OOXMLPropertySet::Pointer_t> mRowProps; @@ -90,7 +90,7 @@ public: void setXNoteId(const sal_Int32 rId); sal_Int32 getXNoteId() const; - const rtl::OUString & getTarget() const; + const OUString & getTarget() const; void resolveCharacterProperties(Stream & rStream); void setCharacterProperties(OOXMLPropertySet::Pointer_t pProps); diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx index 7d3c769274d3..a97759e0771d 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx @@ -196,9 +196,9 @@ int OOXMLValue::getInt() const return 0; } -::rtl::OUString OOXMLValue::getString() const +OUString OOXMLValue::getString() const { - return ::rtl::OUString(); + return OUString(); } uno::Any OOXMLValue::getAny() const @@ -269,7 +269,7 @@ OOXMLBooleanValue::OOXMLBooleanValue(bool bValue) { } -OOXMLBooleanValue::OOXMLBooleanValue(const rtl::OUString & rValue) +OOXMLBooleanValue::OOXMLBooleanValue(const OUString & rValue) : mbValue(false) { mbValue = (rValue == "true" @@ -314,7 +314,7 @@ OOXMLValue * OOXMLBooleanValue::clone() const class OOXMLStringValue */ -OOXMLStringValue::OOXMLStringValue(const rtl::OUString & rStr) +OOXMLStringValue::OOXMLStringValue(const OUString & rStr) : mStr(rStr) { } @@ -330,7 +330,7 @@ uno::Any OOXMLStringValue::getAny() const return aAny; } -rtl::OUString OOXMLStringValue::getString() const +OUString OOXMLStringValue::getString() const { return mStr; } @@ -576,7 +576,7 @@ OOXMLIntegerValue::OOXMLIntegerValue(sal_Int32 nValue) { } -OOXMLIntegerValue::OOXMLIntegerValue(const rtl::OUString & rValue) +OOXMLIntegerValue::OOXMLIntegerValue(const OUString & rValue) : mnValue(0) { mnValue = rValue.toInt32(); @@ -620,7 +620,7 @@ OOXMLHexValue::OOXMLHexValue(sal_uInt32 nValue) { } -OOXMLHexValue::OOXMLHexValue(const rtl::OUString & rValue) +OOXMLHexValue::OOXMLHexValue(const OUString & rValue) { mnValue = static_cast<sal_uInt32>(rValue.toInt32(16)); } @@ -782,7 +782,7 @@ void OOXMLPropertySetEntryToString::attribute(Id nId, Value & rValue) mStr = rValue.getString(); } -const ::rtl::OUString & OOXMLPropertySetEntryToString::getString() const +const OUString & OOXMLPropertySetEntryToString::getString() const { return mStr; } diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx index 868411cb5b28..8ea8d85836de 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx @@ -46,7 +46,7 @@ public: virtual int getInt() const; virtual bool getBool() const; - virtual ::rtl::OUString getString() const; + virtual OUString getString() const; virtual uno::Any getAny() const; virtual writerfilter::Reference<Properties>::Pointer_t getProperties(); virtual writerfilter::Reference<Stream>::Pointer_t getStream(); @@ -102,7 +102,7 @@ protected: bool mbValue; public: explicit OOXMLBooleanValue(bool bValue); - explicit OOXMLBooleanValue(const rtl::OUString & rValue); + explicit OOXMLBooleanValue(const OUString & rValue); virtual ~OOXMLBooleanValue(); virtual int getInt() const; @@ -115,13 +115,13 @@ public: class OOXMLStringValue : public OOXMLValue { protected: - rtl::OUString mStr; + OUString mStr; public: - explicit OOXMLStringValue(const rtl::OUString & rStr); + explicit OOXMLStringValue(const OUString & rStr); virtual ~OOXMLStringValue(); virtual uno::Any getAny() const; - virtual rtl::OUString getString() const; + virtual OUString getString() const; virtual string toString() const; virtual OOXMLValue * clone() const; }; @@ -191,7 +191,7 @@ protected: sal_Int32 mnValue; public: explicit OOXMLIntegerValue(sal_Int32 nValue); - explicit OOXMLIntegerValue(const rtl::OUString & rValue); + explicit OOXMLIntegerValue(const OUString & rValue); virtual ~OOXMLIntegerValue(); virtual int getInt() const; @@ -206,7 +206,7 @@ protected: sal_uInt32 mnValue; public: explicit OOXMLHexValue(sal_uInt32 nValue); - explicit OOXMLHexValue(const rtl::OUString & rValue); + explicit OOXMLHexValue(const OUString & rValue); virtual ~OOXMLHexValue(); virtual int getInt() const; @@ -261,7 +261,7 @@ public: class OOXMLPropertySetEntryToString : public Properties { Id mnId; - ::rtl::OUString mStr; + OUString mStr; public: OOXMLPropertySetEntryToString(Id nId); @@ -270,7 +270,7 @@ public: virtual void sprm(Sprm & rSprm); virtual void attribute(Id nId, Value & rValue); - const ::rtl::OUString & getString() const; + const OUString & getString() const; }; class OOXMLPropertySetEntryToInteger : public Properties diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index 12dce7450df1..98747403278f 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -60,7 +60,7 @@ OOXMLStreamImpl::OOXMLStreamImpl } OOXMLStreamImpl::OOXMLStreamImpl -(OOXMLStreamImpl & rOOXMLStream, const rtl::OUString & rId) +(OOXMLStreamImpl & rOOXMLStream, const OUString & rId) : mxContext(rOOXMLStream.mxContext), mxStorageStream(rOOXMLStream.mxStorageStream), mxStorage(rOOXMLStream.mxStorage), @@ -80,7 +80,7 @@ OOXMLStreamImpl::~OOXMLStreamImpl() #endif } -const ::rtl::OUString & OOXMLStreamImpl::getTarget() const +const OUString & OOXMLStreamImpl::getTarget() const { return msTarget; } @@ -88,33 +88,33 @@ const ::rtl::OUString & OOXMLStreamImpl::getTarget() const bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> xRelationshipAccess, StreamType_t nStreamType, - const ::rtl::OUString & rId, - ::rtl::OUString & rDocumentTarget) + const OUString & rId, + OUString & rDocumentTarget) { bool bFound = false; static uno::Reference< com::sun::star::uri::XUriReferenceFactory > xFac = ::com::sun::star::uri::UriReferenceFactory::create( mxContext ); // use '/' to representent the root of the zip package ( and provide a 'file' scheme to // keep the XUriReference implementation happy ) // add mspath to represent the 'source' of this stream - uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( rtl::OUString( "file:///" ) + msPath ); - - static rtl::OUString sType("Type"); - static rtl::OUString sId("Id"); - static rtl::OUString sDocumentType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"); - static rtl::OUString sStylesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"); - static rtl::OUString sNumberingType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"); - static rtl::OUString sFonttableType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"); - static rtl::OUString sFootnotesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"); - static rtl::OUString sEndnotesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"); - static rtl::OUString sCommentsType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"); - static rtl::OUString sThemeType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"); - static rtl::OUString sSettingsType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"); - static rtl::OUString sTarget("Target"); - static rtl::OUString sTargetMode("TargetMode"); - static rtl::OUString sExternal("External"); - static rtl::OUString sVBAProjectType("http://schemas.microsoft.com/office/2006/relationships/vbaProject"); - - rtl::OUString sStreamType; + uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( OUString( "file:///" ) + msPath ); + + static OUString sType("Type"); + static OUString sId("Id"); + static OUString sDocumentType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"); + static OUString sStylesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"); + static OUString sNumberingType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"); + static OUString sFonttableType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"); + static OUString sFootnotesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"); + static OUString sEndnotesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"); + static OUString sCommentsType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"); + static OUString sThemeType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"); + static OUString sSettingsType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"); + static OUString sTarget("Target"); + static OUString sTargetMode("TargetMode"); + static OUString sExternal("External"); + static OUString sVBAProjectType("http://schemas.microsoft.com/office/2006/relationships/vbaProject"); + + OUString sStreamType; switch (nStreamType) { @@ -162,7 +162,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> uno::Sequence< beans::StringPair > aSeq = aSeqs[j]; bool bExternalTarget = false; - ::rtl::OUString sMyTarget; + OUString sMyTarget; for (sal_Int32 i = 0; i < aSeq.getLength(); i++) { beans::StringPair aPair = aSeq[i]; @@ -207,9 +207,9 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> return bFound; } -::rtl::OUString OOXMLStreamImpl::getTargetForId(const ::rtl::OUString & rId) +OUString OOXMLStreamImpl::getTargetForId(const OUString & rId) { - ::rtl::OUString sTarget; + OUString sTarget; uno::Reference<embed::XRelationshipAccess> xRelationshipAccess (mxDocumentStream, uno::UNO_QUERY_THROW); @@ -217,7 +217,7 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> if (lcl_getTarget(xRelationshipAccess, UNKNOWN, rId, sTarget)) return sTarget; - return ::rtl::OUString(); + return OUString(); } void OOXMLStreamImpl::init() @@ -271,7 +271,7 @@ uno::Reference<xml::sax::XParser> OOXMLStreamImpl::getParser() uno::Reference<xml::sax::XParser> xParser (xFactory->createInstanceWithContext - ( rtl::OUString("com.sun.star.xml.sax.Parser"), + ( OUString("com.sun.star.xml.sax.Parser"), mxContext ), uno::UNO_QUERY ); @@ -315,7 +315,7 @@ OOXMLDocumentFactory::createStream OOXMLStream::Pointer_t OOXMLDocumentFactory::createStream -(OOXMLStream::Pointer_t pStream, const rtl::OUString & rId) +(OOXMLStream::Pointer_t pStream, const OUString & rId) { return OOXMLStream::Pointer_t (new OOXMLStreamImpl(*dynamic_cast<OOXMLStreamImpl *>(pStream.get()), diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx index c8d0c27485b8..e5d3f33a596d 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx @@ -44,15 +44,15 @@ class OOXMLStreamImpl : public OOXMLStream StreamType_t mnStreamType; - rtl::OUString msId; - rtl::OUString msPath; - rtl::OUString msTarget; + OUString msId; + OUString msPath; + OUString msTarget; bool lcl_getTarget(uno::Reference<embed::XRelationshipAccess> xRelationshipAccess, StreamType_t nStreamType, - const ::rtl::OUString & rId, - ::rtl::OUString & rDocumentTarget); + const OUString & rId, + OUString & rDocumentTarget); public: typedef boost::shared_ptr<OOXMLStreamImpl> Pointer_t; @@ -62,7 +62,7 @@ public: (uno::Reference<uno::XComponentContext> xContext, uno::Reference<io::XInputStream> xStorageStream, StreamType_t nType); - OOXMLStreamImpl(OOXMLStreamImpl & rStream, const rtl::OUString & rId); + OOXMLStreamImpl(OOXMLStreamImpl & rStream, const OUString & rId); virtual ~OOXMLStreamImpl(); @@ -71,8 +71,8 @@ public: virtual uno::Reference<io::XInputStream> getDocumentStream(); virtual uno::Reference<io::XInputStream> getStorageStream(); virtual uno::Reference<uno::XComponentContext> getContext(); - virtual ::rtl::OUString getTargetForId(const ::rtl::OUString & rId); - virtual const ::rtl::OUString & getTarget() const; + virtual OUString getTargetForId(const OUString & rId); + virtual const OUString & getTarget() const; virtual uno::Reference<xml::sax::XFastTokenHandler> getFastTokenHandler(uno::Reference<uno::XComponentContext> rContext); diff --git a/writerfilter/source/ooxml/factory_ns.xsl b/writerfilter/source/ooxml/factory_ns.xsl index 07bf84cf4b1a..2815078d979a 100644 --- a/writerfilter/source/ooxml/factory_ns.xsl +++ b/writerfilter/source/ooxml/factory_ns.xsl @@ -64,7 +64,7 @@ </xsl:if> </xsl:for-each> <xsl:text> - virtual void charactersAction(OOXMLFastContextHandler * pHandler, const ::rtl::OUString & sText);</xsl:text> + virtual void charactersAction(OOXMLFastContextHandler * pHandler, const OUString & sText);</xsl:text> </xsl:template> <!-- factorydecl --> diff --git a/writerfilter/source/ooxml/factory_values.xsl b/writerfilter/source/ooxml/factory_values.xsl index 2e49eb730c0c..1d8b37832344 100644 --- a/writerfilter/source/ooxml/factory_values.xsl +++ b/writerfilter/source/ooxml/factory_values.xsl @@ -56,7 +56,7 @@ --> <xsl:template name="valueconstantdecls"> <xsl:text> -extern rtl::OUString +extern OUString </xsl:text> <xsl:call-template name="valuestringname"> <xsl:with-param name="string"></xsl:with-param> @@ -64,7 +64,7 @@ extern rtl::OUString <xsl:text>;</xsl:text> <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]"> <xsl:text> -extern rtl::OUString </xsl:text> +extern OUString </xsl:text> <xsl:call-template name="valuestringname"> <xsl:with-param name="string" select="."/> </xsl:call-template> diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index bf20ecc02c57..bc8e8c2822ed 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -609,7 +609,7 @@ CreateElementMapPointer </xsl:text> <xsl:text> pHandler</xsl:text> </xsl:if> <xsl:if test="$action='characters'"> - <xsl:text>, const ::rtl::OUString &</xsl:text> + <xsl:text>, const OUString &</xsl:text> <xsl:if test="contains($switchblock1, 'sText') or contains($switchblock2, 'sText')"> <xsl:text> sText</xsl:text> </xsl:if> diff --git a/writerfilter/source/ooxml/factoryimpl_values.xsl b/writerfilter/source/ooxml/factoryimpl_values.xsl index 35c967b51914..886553d1b4da 100644 --- a/writerfilter/source/ooxml/factoryimpl_values.xsl +++ b/writerfilter/source/ooxml/factoryimpl_values.xsl @@ -56,14 +56,14 @@ --> <xsl:template name="valueconstants"> <xsl:text> -rtl::OUString </xsl:text> +OUString </xsl:text> <xsl:call-template name="valuestringname"> <xsl:with-param name="string"></xsl:with-param> </xsl:call-template> <xsl:text>("");</xsl:text> <xsl:for-each select="//rng:value[generate-id(key('value-with-content', text())[1]) = generate-id(.)]"> <xsl:text> -rtl::OUString </xsl:text> +OUString </xsl:text> <xsl:call-template name="valuestringname"> <xsl:with-param name="string" select="."/> </xsl:call-template> diff --git a/writerfilter/source/resourcemodel/LoggedResources.cxx b/writerfilter/source/resourcemodel/LoggedResources.cxx index 53b7dfedcac4..f94bd921993b 100644 --- a/writerfilter/source/resourcemodel/LoggedResources.cxx +++ b/writerfilter/source/resourcemodel/LoggedResources.cxx @@ -46,7 +46,7 @@ void LoggedResourcesHelper::endElement(const string & /*sElement*/) mpLogger->endElement(); } -void LoggedResourcesHelper::chars(const ::rtl::OUString & rChars) +void LoggedResourcesHelper::chars(const OUString & rChars) { mpLogger->chars(rChars); } @@ -165,7 +165,7 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len) #ifdef DEBUG_LOGGING mHelper.startElement("text"); - ::rtl::OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 ); + OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 ); mHelper.startElement("data"); mHelper.chars(sText); @@ -185,8 +185,8 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len) mHelper.startElement("utext"); mHelper.startElement("data"); - ::rtl::OUString sText; - ::rtl::OUStringBuffer aBuffer = ::rtl::OUStringBuffer(len); + OUString sText; + OUStringBuffer aBuffer = OUStringBuffer(len); aBuffer.append( (const sal_Unicode *) data, len); sText = aBuffer.makeStringAndClear(); diff --git a/writerfilter/source/resourcemodel/Protocol.cxx b/writerfilter/source/resourcemodel/Protocol.cxx index a9c015c0e6a1..c85a75826e05 100644 --- a/writerfilter/source/resourcemodel/Protocol.cxx +++ b/writerfilter/source/resourcemodel/Protocol.cxx @@ -78,7 +78,7 @@ void StreamProtocol::endCharacterGroup() void StreamProtocol::text(const sal_uInt8 * data, size_t len) { - ::rtl::OUString sText((const sal_Char*) data, len, + OUString sText((const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252); m_pTagLogger->startElement("protocol-text"); m_pTagLogger->chars(sText); @@ -89,8 +89,8 @@ void StreamProtocol::text(const sal_uInt8 * data, size_t len) void StreamProtocol::utext(const sal_uInt8 * data, size_t len) { - ::rtl::OUString sText; - ::rtl::OUStringBuffer aBuffer = ::rtl::OUStringBuffer(len); + OUString sText; + OUStringBuffer aBuffer = OUStringBuffer(len); aBuffer.append( (const sal_Unicode *) data, len); sText = aBuffer.makeStringAndClear(); diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx index 426c3be91cba..247a41c04fe1 100644 --- a/writerfilter/source/resourcemodel/TagLogger.cxx +++ b/writerfilter/source/resourcemodel/TagLogger.cxx @@ -123,7 +123,7 @@ namespace writerfilter for (int i = 0; i < aProps.getLength(); ++i) { startElement( "property" ); - ::rtl::OUString sName(aProps[i].Name); + OUString sName(aProps[i].Name); attribute( "name", sName ); try @@ -167,7 +167,7 @@ namespace writerfilter } #if OSL_DEBUG_LEVEL > 1 - void TagLogger::attribute(const string & name, const ::rtl::OUString & value) + void TagLogger::attribute(const string & name, const OUString & value) { attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() ); } @@ -188,7 +188,7 @@ namespace writerfilter sal_Int32 nInt = 0; float nFloat = 0.0; - ::rtl::OUString aStr; + OUString aStr; xmlChar* xmlName = xmlCharStrdup( name.c_str() ); if ( aAny >>= nInt ) @@ -215,7 +215,7 @@ namespace writerfilter xmlFree( xmlChars ); } - void TagLogger::chars(const ::rtl::OUString & rChars) + void TagLogger::chars(const OUString & rChars) { chars(OUStringToOString(rChars, RTL_TEXTENCODING_ASCII_US).getStr()); } diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx index cc5eea46230b..bf70a98c1390 100644 --- a/writerfilter/source/resourcemodel/resourcemodel.cxx +++ b/writerfilter/source/resourcemodel/resourcemodel.cxx @@ -63,7 +63,7 @@ void dump(OutputWithDepth<string> & o, const char * name, sal_uInt32 n) } void dump(OutputWithDepth<string> & /*o*/, const char * /*name*/, - const rtl::OUString & /*str*/) + const OUString & /*str*/) { } @@ -408,7 +408,7 @@ void WW8StreamHandler::info(const string & info_) void WW8PropertiesHandler::attribute(Id name, Value & val) { boost::shared_ptr<rtl::OString> pStr(new ::rtl::OString()); - ::rtl::OUString aStr = val.getString(); + OUString aStr = val.getString(); aStr.convertToString(pStr.get(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS); string sXMLValue = xmlify(pStr->getStr()); diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx index a68f0f43cea7..70b99ac31c7a 100644 --- a/writerfilter/source/resourcemodel/util.cxx +++ b/writerfilter/source/resourcemodel/util.cxx @@ -94,7 +94,7 @@ string toString(uno::Reference< text::XTextRange > textRange) if (textRange.get()) { - rtl::OUString aOUStr = textRange->getString(); + OUString aOUStr = textRange->getString(); rtl::OString aOStr(aOUStr.getStr(), aOUStr.getLength(), RTL_TEXTENCODING_ASCII_US ); result = aOStr.getStr(); diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx index 97e0187f555e..0cab73f1d3b8 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx @@ -60,9 +60,9 @@ const sal_Char AnalyzeService::IMPLEMENTATION_NAME[40] = "debugservices.doctok.A class URLLister { uno::Reference<io::XInputStream> xInputStream; - rtl::OUString mString; - rtl::OUString mCRLF; - rtl::OUString mLF; + OUString mString; + OUString mCRLF; + OUString mLF; sal_uInt32 getEOLIndex() { @@ -78,18 +78,18 @@ class URLLister public: URLLister(uno::Reference<com::sun::star::uno::XComponentContext> xContext, - rtl::OUString absFileUrl) + OUString absFileUrl) { uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); xInputStream = xFileAccess->openFileRead(absFileUrl) ; - mLF = rtl::OUString("\n"); - mCRLF = rtl::OUString("\r\n"); + mLF = OUString("\n"); + mCRLF = OUString("\r\n"); } - rtl::OUString getURL() + OUString getURL() { - rtl::OUString aResult; + OUString aResult; sal_Int32 nIndex = getEOLIndex(); @@ -106,7 +106,7 @@ public: nCount); rtl::OString aTmp(pNew); - rtl::OUString aTail(rtl::OStringToOUString + OUString aTail(rtl::OStringToOUString (aTmp, RTL_TEXTENCODING_ASCII_US)); mString = mString.concat(aTail); } @@ -137,13 +137,13 @@ xContext( xContext_ ) } sal_Int32 SAL_CALL AnalyzeService::run -( const uno::Sequence< rtl::OUString >& aArguments ) +( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); + aUcbInitSequence[0] <<= OUString("Local"); aUcbInitSequence[1] <<= - rtl::OUString("Office"); + OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); uno::Reference<lang::XMultiComponentFactory> @@ -151,19 +151,19 @@ sal_Int32 SAL_CALL AnalyzeService::run if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) { - rtl::OUString arg=aArguments[0]; + OUString arg=aArguments[0]; rtl_uString *dir=NULL; osl_getProcessWorkingDir(&dir); - rtl::OUString absFileUrlUrls; + OUString absFileUrlUrls; osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData); URLLister aLister(xContext, absFileUrlUrls); fprintf(stdout, "<analyze>\n"); - rtl::OUString aURL = aLister.getURL(); + OUString aURL = aLister.getURL(); while (!aURL.isEmpty()) { @@ -248,20 +248,20 @@ sal_Int32 SAL_CALL AnalyzeService::run return 0; } -::rtl::OUString AnalyzeService_getImplementationName () +OUString AnalyzeService_getImplementationName () { - return rtl::OUString(AnalyzeService::IMPLEMENTATION_NAME ); + return OUString(AnalyzeService::IMPLEMENTATION_NAME ); } -sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName ) { return ServiceName == AnalyzeService::SERVICE_NAME; } -uno::Sequence< rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(AnalyzeService::SERVICE_NAME ); + uno::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(AnalyzeService::SERVICE_NAME ); return aRet; } diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx index 59ba4f0d8b03..03039913c570 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx @@ -34,7 +34,7 @@ private: public: AnalyzeService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext); - virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); public: const static sal_Char SERVICE_NAME[40]; @@ -42,9 +42,9 @@ public: }; -::rtl::OUString AnalyzeService_getImplementationName (); -sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +OUString AnalyzeService_getImplementationName (); +sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName ); +::com::sun::star::uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL AnalyzeService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception ); } } /* end namespace writerfilter::rtftok */ diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx index 0190050df41f..a2ae1b72b386 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx @@ -65,22 +65,22 @@ xContext( xContext_ ) { } -sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) { - rtl::OUString arg=aArguments[0]; + OUString arg=aArguments[0]; uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); rtl_uString *dir=NULL; osl_getProcessWorkingDir(&dir); - rtl::OUString absFileUrl; + OUString absFileUrl; osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); rtl_uString_release(dir); @@ -101,16 +101,16 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > return 0; } -::rtl::OUString ScannerTestService_getImplementationName () +OUString ScannerTestService_getImplementationName () { - return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME ); + return OUString(ScannerTestService::IMPLEMENTATION_NAME ); } -uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(ScannerTestService::SERVICE_NAME ); + uno::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(ScannerTestService::SERVICE_NAME ); return aRet; } diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx index 150ee3ecb048..1310c6bfbf44 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx @@ -34,7 +34,7 @@ private: public: ScannerTestService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext); - virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); public: const static sal_Char SERVICE_NAME[40]; @@ -42,8 +42,8 @@ public: }; -::rtl::OUString ScannerTestService_getImplementationName (); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +OUString ScannerTestService_getImplementationName (); +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScannerTestService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception ); } } /* end namespace writerfilter::rtftok */ diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx index 46161e9324b8..8c538014888e 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx @@ -61,9 +61,9 @@ const sal_Char AnalyzeService::IMPLEMENTATION_NAME[40] = "debugservices.ooxml.An class URLLister { uno::Reference<io::XInputStream> xInputStream; - rtl::OUString mString; - rtl::OUString mCRLF; - rtl::OUString mLF; + OUString mString; + OUString mCRLF; + OUString mLF; sal_uInt32 getEOLIndex() { @@ -79,18 +79,18 @@ class URLLister public: URLLister(uno::Reference<com::sun::star::uno::XComponentContext> xContext, - rtl::OUString absFileUrl) + OUString absFileUrl) { uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); xInputStream = xFileAccess->openFileRead(absFileUrl) ; - mLF = rtl::OUString("\n"); - mCRLF = rtl::OUString("\r\n"); + mLF = OUString("\n"); + mCRLF = OUString("\r\n"); } - rtl::OUString getURL() + OUString getURL() { - rtl::OUString aResult; + OUString aResult; sal_Int32 nIndex = getEOLIndex(); @@ -107,7 +107,7 @@ public: nCount); rtl::OString aTmp(pNew); - rtl::OUString aTail(rtl::OStringToOUString + OUString aTail(rtl::OStringToOUString (aTmp, RTL_TEXTENCODING_ASCII_US)); mString = mString.concat(aTail); } @@ -138,12 +138,12 @@ xContext( xContext_ ) } sal_Int32 SAL_CALL AnalyzeService::run -( const uno::Sequence< rtl::OUString >& aArguments ) +( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); uno::Reference<lang::XMultiComponentFactory> @@ -153,12 +153,12 @@ sal_Int32 SAL_CALL AnalyzeService::run { ::comphelper::setProcessServiceFactory(xServiceFactory); - rtl::OUString arg=aArguments[0]; + OUString arg=aArguments[0]; rtl_uString *dir=NULL; osl_getProcessWorkingDir(&dir); - rtl::OUString absFileUrlUrls; + OUString absFileUrlUrls; osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData); URLLister aLister(xContext, absFileUrlUrls); @@ -167,7 +167,7 @@ sal_Int32 SAL_CALL AnalyzeService::run writerfilter::analyzerIds(); - rtl::OUString aURL = aLister.getURL(); + OUString aURL = aLister.getURL(); while (!aURL.isEmpty()) { @@ -245,20 +245,20 @@ sal_Int32 SAL_CALL AnalyzeService::run return 0; } -::rtl::OUString AnalyzeService_getImplementationName () +OUString AnalyzeService_getImplementationName () { - return rtl::OUString(AnalyzeService::IMPLEMENTATION_NAME ); + return OUString(AnalyzeService::IMPLEMENTATION_NAME ); } -sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName ) { return ServiceName == AnalyzeService::SERVICE_NAME; } -uno::Sequence< rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(AnalyzeService::SERVICE_NAME ); + uno::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(AnalyzeService::SERVICE_NAME ); return aRet; } diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx index 2650be0000c9..36038dcbaf1a 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx @@ -34,7 +34,7 @@ private: public: AnalyzeService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext); - virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); public: const static sal_Char SERVICE_NAME[40]; @@ -42,9 +42,9 @@ public: }; -::rtl::OUString AnalyzeService_getImplementationName (); -sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +OUString AnalyzeService_getImplementationName (); +sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName ); +::com::sun::star::uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL AnalyzeService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception ); } } /* end namespace writerfilter::rtftok */ diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx index 1a9c434b9855..92d0144aa518 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx @@ -72,11 +72,11 @@ xContext( xContext_ ) { } -sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > debugLogger->startDocument(); #endif - rtl::OUString arg=aArguments[0]; + OUString arg=aArguments[0]; ::comphelper::setProcessServiceFactory(xServiceFactory); @@ -95,7 +95,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > rtl_uString *dir=NULL; osl_getProcessWorkingDir(&dir); - rtl::OUString absFileUrl; + OUString absFileUrl; osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); rtl_uString_release(dir); @@ -123,16 +123,16 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > return 0; } -::rtl::OUString ScannerTestService_getImplementationName () +OUString ScannerTestService_getImplementationName () { - return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME ); + return OUString(ScannerTestService::IMPLEMENTATION_NAME ); } -uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(ScannerTestService::SERVICE_NAME ); + uno::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(ScannerTestService::SERVICE_NAME ); return aRet; } diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx index 8283540790d2..a2de044e4730 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx @@ -34,7 +34,7 @@ private: public: ScannerTestService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext); - virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); public: const static sal_Char SERVICE_NAME[40]; @@ -42,8 +42,8 @@ public: }; -::rtl::OUString ScannerTestService_getImplementationName (); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +OUString ScannerTestService_getImplementationName (); +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScannerTestService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception ); } } /* end namespace writerfilter::ooxml */ diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx index aa2d24ce3eaf..e085f3ea26f8 100644 --- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx +++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx @@ -125,24 +125,24 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler aArgs0[0] <<= myStream; uno::Reference< container::XNameContainer > xNameContainer( xServiceFactory->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"), + OUString("com.sun.star.embed.OLESimpleStorage"), aArgs0 ), uno::UNO_QUERY_THROW ); try { printf("TRY\n"); - ::com::sun::star::uno::Sequence< ::rtl::OUString > names=xNameContainer->getElementNames(); + ::com::sun::star::uno::Sequence< OUString > names=xNameContainer->getElementNames(); printf("OK\n"); for(int i=0;i<names.getLength();i++) { - rtl::OUString &name=names[i]; + OUString &name=names[i]; wprintf(L"name=%s\n", name.getStr()); } { uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement( - rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); + OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW); - xContentStreamPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.sun.star.oleobject"))); + xContentStreamPropSet->setPropertyValue(OUString("MediaType"), uno::makeAny(OUString("application/vnd.sun.star.oleobject"))); uno::Reference<io::XOutputStream> myOutStream=xContentStream->getOutputStream(); uno::Sequence< ::sal_Int8 > seq1(binLen); unsigned char *data1=binBufferStr; @@ -165,23 +165,23 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler printf("SEQ OK\n"); uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement( - rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); + OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW); - xContentStreamPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.sun.star.oleobject"))); + xContentStreamPropSet->setPropertyValue(OUString("MediaType"), uno::makeAny(OUString("application/vnd.sun.star.oleobject"))); printf("CONTENT STREAM OK\n"); uno::Sequence< uno::Any > aArgs1( 1 ); aArgs1[0] <<= xContentStream; uno::Reference< container::XNameContainer > xNameContainer2( xServiceFactory->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"), + OUString("com.sun.star.embed.OLESimpleStorage"), aArgs1 ), uno::UNO_QUERY_THROW ); printf("OLE STORAGE OK\n"); uno::Any anyStream; anyStream <<= myInStream; - xNameContainer2->insertByName(rtl::OUString("\1Ole10Native"), anyStream); + xNameContainer2->insertByName(OUString("\1Ole10Native"), anyStream); printf("INSERT OK\n"); uno::Reference<embed::XTransactedObject> xTransact(xNameContainer2, uno::UNO_QUERY); @@ -273,7 +273,7 @@ public: bytesTotal=xSeekable->getLength(); if (xStatusIndicator.is() && xSeekable.is()) { - xStatusIndicator->start(::rtl::OUString("Converting"), 100); + xStatusIndicator->start(OUString("Converting"), 100); } } @@ -298,7 +298,7 @@ public: { char buf1[100]; sprintf(buf1, "Converted %" SAL_PRIdINT64 " KB", bytesRead/1024); - xStatusIndicator->start(::rtl::OUString::createFromAscii(buf1), 0); + xStatusIndicator->start(OUString::createFromAscii(buf1), 0); } } return len; @@ -319,14 +319,14 @@ xContext( xContext_ ) { } -sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { printf("TEST\n"); uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); printf("A\n"); uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); @@ -334,20 +334,20 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) { printf("C\n"); - rtl::OUString arg=aArguments[0]; + OUString arg=aArguments[0]; uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); rtl_uString *dir=NULL; osl_getProcessWorkingDir(&dir); - rtl::OUString absFileUrl; + OUString absFileUrl; osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); rtl_uString_release(dir); uno::Reference <lang::XSingleServiceFactory> xStorageFactory( - xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW); + xServiceFactory->createInstance (OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW); - rtl::OUString outFileUrl; + OUString outFileUrl; { rtl_uString *dir1=NULL; osl_getProcessWorkingDir(&dir1); @@ -360,7 +360,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > aArgs2[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE; uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs2), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW); - xPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.oasis.opendocument.text"))); + xPropSet->setPropertyValue(OUString("MediaType"), uno::makeAny(OUString("application/vnd.oasis.opendocument.text"))); uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl); uno::Reference< task::XStatusIndicator > xStatusIndicator; @@ -389,20 +389,20 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString > return 0; } -::rtl::OUString ScannerTestService_getImplementationName () +OUString ScannerTestService_getImplementationName () { - return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME ); + return OUString(ScannerTestService::IMPLEMENTATION_NAME ); } -sal_Bool SAL_CALL ScannerTestService_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL ScannerTestService_supportsService( const OUString& ServiceName ) { return ServiceName == ScannerTestService::SERVICE_NAME; } -uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(ScannerTestService::SERVICE_NAME ); + uno::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(ScannerTestService::SERVICE_NAME ); return aRet; } diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx index 9d7cd5af8aca..61d4ed1bba70 100644 --- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx +++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx @@ -34,7 +34,7 @@ private: public: ScannerTestService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext); - virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); public: const static sal_Char SERVICE_NAME[40]; @@ -42,9 +42,9 @@ public: }; -::rtl::OUString ScannerTestService_getImplementationName (); -sal_Bool SAL_CALL ScannerTestService_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +OUString ScannerTestService_getImplementationName (); +sal_Bool SAL_CALL ScannerTestService_supportsService( const OUString& ServiceName ); +::com::sun::star::uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScannerTestService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception ); } } /* end namespace writerfilter::rtftok */ diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx index 2e62863a34cd..819e92fa272e 100644 --- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx +++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx @@ -191,7 +191,7 @@ public: bytesTotal=xSeekable->getLength(); if (xStatusIndicator.is() && xSeekable.is()) { - xStatusIndicator->start(::rtl::OUString("Converting"), 100); + xStatusIndicator->start(OUString("Converting"), 100); } } @@ -216,7 +216,7 @@ public: { char buf1[100]; sprintf(buf1, "Converted %" SAL_PRIdINT64 " KB", bytesRead/1024); - xStatusIndicator->start(::rtl::OUString::createFromAscii(buf1), 0); + xStatusIndicator->start(OUString::createFromAscii(buf1), 0); } } return len; @@ -237,26 +237,26 @@ xContext( xContext_ ) { } -sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException) +sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= rtl::OUString("Local"); - aUcbInitSequence[1] <<= rtl::OUString("Office"); + aUcbInitSequence[0] <<= OUString("Local"); + aUcbInitSequence[1] <<= OUString("Office"); uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) { - rtl::OUString arg=aArguments[0]; + OUString arg=aArguments[0]; uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); rtl_uString *dir=NULL; osl_getProcessWorkingDir(&dir); - rtl::OUString absFileUrl; + OUString absFileUrl; osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); rtl_uString_release(dir); uno::Reference <lang::XSingleServiceFactory> xStorageFactory( - xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW); + xServiceFactory->createInstance (OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW); uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl); uno::Reference< task::XStatusIndicator > xStatusIndicator; @@ -279,20 +279,20 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum return 0; } -::rtl::OUString XMLScanner_getImplementationName () +OUString XMLScanner_getImplementationName () { - return rtl::OUString(XMLScanner::IMPLEMENTATION_NAME ); + return OUString(XMLScanner::IMPLEMENTATION_NAME ); } -sal_Bool SAL_CALL XMLScanner_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XMLScanner_supportsService( const OUString& ServiceName ) { return ServiceName == XMLScanner::SERVICE_NAME; } -uno::Sequence< rtl::OUString > SAL_CALL XMLScanner_getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL XMLScanner_getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence < rtl::OUString > aRet(1); - rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString(XMLScanner::SERVICE_NAME ); + uno::Sequence < OUString > aRet(1); + OUString* pArray = aRet.getArray(); + pArray[0] = OUString(XMLScanner::SERVICE_NAME ); return aRet; } diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx index 7908b2090802..10be77462aaf 100644 --- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx +++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx @@ -34,7 +34,7 @@ private: public: XMLScanner(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext); - virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException); public: const static sal_Char SERVICE_NAME[40]; @@ -42,9 +42,9 @@ public: }; -::rtl::OUString XMLScanner_getImplementationName (); -sal_Bool SAL_CALL XMLScanner_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL XMLScanner_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +OUString XMLScanner_getImplementationName (); +sal_Bool SAL_CALL XMLScanner_supportsService( const OUString& ServiceName ); +::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLScanner_getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL XMLScanner_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception ); } } /* end namespace writerfilter::rtftok */ |