[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - sax/source

[Stephan Bergmann]

 sax/source/tools/fastserializer.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1bd2767d792a1f8cfa578170701b102dfff1bdee
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 10 14:11:03 2014 +0200

    Revert "This was OString already; use it that way"
    
    This reverts commit 9a25d12534f91c13400a63e265fb5aa14c6aca66,
    there's another use of DebugAttributes.find(rAttrName) in that
    function where rAttrName is of type OUString.

diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 4466623..fbce18a 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -225,7 +225,7 @@ namespace sax_fastparser {
     void FastSaxSerializer::writeFastAttributeList( const Reference< XFastAttributeList >& Attribs )
     {
 #ifdef DBG_UTIL
-        ::std::set<OString> DebugAttributes;
+        ::std::set<OUString> DebugAttributes;
 #endif
         Sequence< Attribute > aAttrSeq = Attribs->getUnknownAttributes();
         const Attribute *pAttr = aAttrSeq.getConstArray();
@@ -258,9 +258,10 @@ namespace sax_fastparser {
 
 #ifdef DBG_UTIL
             // Well-formedness constraint: Unique Att Spec
-            OString const nameId(getId(nToken));
-            assert(DebugAttributes.find(nameId) == DebugAttributes.end());
-            DebugAttributes.insert(nameId);
+            OUString const name(OStringToOUString(getId(nToken),
+                                                  RTL_TEXTENCODING_UTF8));
+            assert(DebugAttributes.find(name) == DebugAttributes.end());
+            DebugAttributes.insert(name);
 #endif
 
             writeBytes(toUnoSequence(maEqualSignAndQuote));