[Libreoffice-commits] .: writerfilter/inc writerfilter/qa writerfilter/source writerfilter/unocomponent
Miklos Vajna
vmiklos at kemper.freedesktop.org
Sat Jul 21 10:22:35 PDT 2012
writerfilter/inc/dmapper/DomainMapper.hxx | 4
writerfilter/inc/doctok/WW8Document.hxx | 4
writerfilter/inc/ooxml/OOXMLDocument.hxx | 18 +-
writerfilter/inc/resourcemodel/LoggedResources.hxx | 2
writerfilter/inc/resourcemodel/TableManager.hxx | 2
writerfilter/inc/resourcemodel/TagLogger.hxx | 4
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx | 4
writerfilter/qa/cppunittests/doctok/testdoctok.cxx | 6
writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 4
writerfilter/source/dmapper/genclass.xsl | 2
writerfilter/source/doctok/DffImpl.cxx | 8 -
writerfilter/source/doctok/WW8Annotation.cxx | 2
writerfilter/source/doctok/WW8DocumentImpl.cxx | 18 +-
writerfilter/source/doctok/WW8DocumentImpl.hxx | 10 -
writerfilter/source/doctok/WW8FontTable.cxx | 8 -
writerfilter/source/doctok/WW8ListTable.cxx | 2
writerfilter/source/doctok/WW8Picture.cxx | 12 -
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 12 -
writerfilter/source/doctok/WW8ResourceModelImpl.hxx | 12 -
writerfilter/source/doctok/WW8StreamImpl.cxx | 8 -
writerfilter/source/doctok/WW8StreamImpl.hxx | 4
writerfilter/source/doctok/WW8StructBase.cxx | 8 -
writerfilter/source/doctok/WW8StructBase.hxx | 4
writerfilter/source/doctok/WW8Sttbf.cxx | 2
writerfilter/source/doctok/WW8Sttbf.hxx | 2
writerfilter/source/doctok/WW8StyleSheet.cxx | 10 -
writerfilter/source/doctok/resources.xsl | 6
writerfilter/source/doctok/resourcesimpl.xsl | 6
writerfilter/source/doctok/resourcetools.xsl | 2
writerfilter/source/filter/RtfFilter.hxx | 12 -
writerfilter/source/filter/WriterFilter.hxx | 14 +-
writerfilter/source/filter/WriterFilterDetection.hxx | 14 +-
writerfilter/source/ooxml/Handler.cxx | 2
writerfilter/source/ooxml/Handler.hxx | 10 -
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 16 +-
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 16 +-
writerfilter/source/ooxml/OOXMLFactory.cxx | 14 +-
writerfilter/source/ooxml/OOXMLFactory.hxx | 6
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 70 +++++-----
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 64 ++++-----
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 14 +-
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 14 +-
writerfilter/source/ooxml/OOXMLFastHelper.hxx | 12 -
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx | 10 -
writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx | 4
writerfilter/source/ooxml/OOXMLParserState.cxx | 2
writerfilter/source/ooxml/OOXMLParserState.hxx | 4
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 16 +-
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 18 +-
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 58 ++++----
writerfilter/source/ooxml/OOXMLStreamImpl.hxx | 16 +-
writerfilter/source/ooxml/factory_ns.xsl | 2
writerfilter/source/ooxml/factory_values.xsl | 4
writerfilter/source/ooxml/factoryimpl_ns.xsl | 2
writerfilter/source/ooxml/factoryimpl_values.xsl | 4
writerfilter/source/resourcemodel/LoggedResources.cxx | 8 -
writerfilter/source/resourcemodel/Protocol.cxx | 6
writerfilter/source/resourcemodel/TagLogger.cxx | 8 -
writerfilter/source/resourcemodel/resourcemodel.cxx | 4
writerfilter/source/resourcemodel/util.cxx | 2
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 44 +++---
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx | 8 -
writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx | 22 +--
writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx | 6
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx | 44 +++---
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx | 8 -
writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx | 22 +--
writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx | 6
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx | 52 +++----
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx | 8 -
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx | 30 ++--
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx | 8 -
72 files changed, 443 insertions(+), 447 deletions(-)
New commits:
commit 75c0acd024e225699f47a4225453b92cdad54531
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat Jul 21 19:21:44 2012 +0200
writerfilter: rtl::OUString -> OUString
Change-Id: I1577c1bb8a3dc498b647b930d405c90f80eafaf9
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx
index 391268b..b781418 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 1175691..e9e8ac6 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 e5b3d29..f3365db 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 2d75a91..419bde7 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 c1eb29c..b17b3ff 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 0e301e6..2b8a5f1 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 586b289..ab076a2 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 2fc9e1d..3201759 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 88673bc..6ea35c6 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 53c7bb3..994b35d 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 5727236..5457fef 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 d6afbca..e616e28 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 f7f67a8..cfdae5f 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 f686c95..a21f2cc 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 c0d8d80..2ecfe15 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 00017da..3d6eb21 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 53085f7..f6d7ddc 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 6455ba7..2b585ba 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 547b645..a1b0fad 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 2a9c7a7..85cb49c 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 c92db91..6f6a324 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 0b9386f..4d971b5 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 d33b5b7..7039299 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 38347f1..c090b52 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 7e0f4cc..8f58842 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 3c4ca5e..3b7c298 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 a50c8bd..9661825 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 431e72c..d0b714d 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 f8ae1c9..f3df28d 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 b614d0b..3940f66 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 5fd370e..d34de2c 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 48971c4..393c588 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 2c42224..2762350 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 99667d3..c185d0f 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 e893023..fa77978 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 3c1629a..f23725d 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 e00e913..20fc82c 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 545dadf..94039d3 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 87bd54a..680109b 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 aa69310..6aae475 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 673b842..f6f6b60 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 84f5374..50f0632 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 1c28e36..cfc21dc 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 147651a..53338c8 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 b6a3613..3af8b5d 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 348a078..fc812d3 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 0279579..cd20b9d 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 7d3c769..a97759e 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 868411c..8ea8d85 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 12dce74..9874740 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 c8d0c27..e5d3f33 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 07bf84c..2815078 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 2e49eb7..1d8b378 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 bf20ecc..bc8e8c2 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 35c967b..886553d 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 53b7dfe..f94bd92 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 a9c015c..c85a758 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 426c3be..247a41c 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 cc5eea4..bf70a98 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 a68f0f4..70b99ac 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 97e0187..0cab73f 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);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list