From db088d32388f57f5915b57d36fb391678e03e285 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 25 Feb 2012 20:11:55 +0000
Subject: clarify ambiguities

---
 .../source/dmapper/DomainMapperTableHandler.cxx        |  2 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  | 18 +++++++++---------
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx     |  2 +-
 writerfilter/source/resourcemodel/TagLogger.cxx        |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 87bb754b8928..9ce50c9a1248 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -719,7 +719,7 @@ void DomainMapperTableHandler::endTable()
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
             fprintf( stderr, "Conversion to table error: %s\n",
                     rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-            dmapper_logger->chars("failed to import table!");
+            dmapper_logger->chars(std::string("failed to import table!"));
 #endif
         }
         catch ( const uno::Exception &e )
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index f892357f4ee5..7d2f539dfda8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -417,7 +417,7 @@ void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) cons
     static char sBuffer[128];
     snprintf(sBuffer, sizeof(sBuffer), "%p", this);
 
-    pLogger->attribute("parent", sBuffer);
+    pLogger->attribute("parent", std::string(sBuffer));
     pLogger->attribute("type", getType());
     pLogger->attribute("resource", resourceToString(getResource()));
     pLogger->attribute("token", fastTokenToId(getToken()));
@@ -428,7 +428,7 @@ void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) cons
     if (pVal.get() != NULL)
         pLogger->attribute("value", pVal->toString());
     else
-        pLogger->attribute("value", "(null)");
+        pLogger->attribute("value", std::string("(null)"));
 
     pLogger->propertySet(getPropertySet(),
             IdToString::Pointer_t(new OOXMLIdToString()));
@@ -448,7 +448,7 @@ void OOXMLFastContextHandler::setId(Id rId)
     static char sBuffer[256];
     snprintf(sBuffer, sizeof(sBuffer), "%" SAL_PRIuUINT32, rId);
 
-    debug_logger->attribute("id", sBuffer);
+    debug_logger->attribute("id", std::string(sBuffer));
     debug_logger->attribute("name", (*QNameToString::Instance())(rId));
     debug_logger->endElement();
 #endif
@@ -1052,9 +1052,9 @@ void OOXMLFastContextHandler::setForwardEvents(bool bForwardEvents)
     debug_logger->startElement("contexthandler.setForwardEvents");
 
     if (bForwardEvents)
-        debug_logger->chars("true");
+        debug_logger->chars(std::string("true"));
     else
-        debug_logger->chars("false");
+        debug_logger->chars(std::string("false"));
 
     debug_logger->endElement();
 #endif
@@ -1315,7 +1315,7 @@ void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLog
     static char sBuffer[128];
     snprintf(sBuffer, sizeof(sBuffer), "%p", this);
 
-    pLogger->attribute("parent", sBuffer);
+    pLogger->attribute("parent", std::string(sBuffer));
     pLogger->attribute("type", getType());
     pLogger->attribute("resource", resourceToString(getResource()));
     pLogger->attribute("token", fastTokenToId(getToken()));
@@ -1326,7 +1326,7 @@ void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLog
     if (pVal.get() != NULL)
         pLogger->attribute("value", pVal->toString());
     else
-        pLogger->attribute("value", "(null)");
+        pLogger->attribute("value", std::string("(null)"));
 
     pLogger->attribute("resolve", mbResolve ? "resolve" : "noResolve");
 
@@ -1438,7 +1438,7 @@ void OOXMLFastContextHandlerProperties::setParent
 {
 #ifdef DEBUG_ELEMENT
     debug_logger->startElement("setParent");
-    debug_logger->chars("OOXMLFastContextHandlerProperties");
+    debug_logger->chars(std::string("OOXMLFastContextHandlerProperties"));
     debug_logger->endElement();
 #endif
 
@@ -1926,7 +1926,7 @@ OOXMLFastContextHandlerShape::OOXMLFastContextHandlerShape
         else
         {
             debug_logger->startElement("error");
-            debug_logger->chars("failed to get shape handler");
+            debug_logger->chars(std::string("failed to get shape handler"));
             debug_logger->endElement();
         }
 #endif
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 52dd4b7f1abf..505f5c326816 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -435,7 +435,7 @@ void OOXMLPropertySetImpl::resolve(Properties & rHandler)
         else
         {
             debug_logger->startElement("error");
-            debug_logger->chars("zero-property");
+            debug_logger->chars(std::string("zero-property"));
             debug_logger->endElement();
         }
 #endif
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index f71971ecfcc4..63ce7d9311b0 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -143,9 +143,9 @@ namespace writerfilter
             {
                 startElement( "exception" );
 
-                chars("getPropertyValue(\"");
+                chars(std::string("getPropertyValue(\""));
                 chars(sName);
-                chars("\")");
+                chars(std::string("\")"));
 
                 endElement( );
             }
-- 
cgit