Kaydet (Commit) db088d32 authored tarafından Caolán McNamara's avatar Caolán McNamara

clarify ambiguities

üst 0ef8e5c1
...@@ -719,7 +719,7 @@ void DomainMapperTableHandler::endTable() ...@@ -719,7 +719,7 @@ void DomainMapperTableHandler::endTable()
#ifdef DEBUG_DMAPPER_TABLE_HANDLER #ifdef DEBUG_DMAPPER_TABLE_HANDLER
fprintf( stderr, "Conversion to table error: %s\n", fprintf( stderr, "Conversion to table error: %s\n",
rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); 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 #endif
} }
catch ( const uno::Exception &e ) catch ( const uno::Exception &e )
......
...@@ -417,7 +417,7 @@ void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) cons ...@@ -417,7 +417,7 @@ void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) cons
static char sBuffer[128]; static char sBuffer[128];
snprintf(sBuffer, sizeof(sBuffer), "%p", this); snprintf(sBuffer, sizeof(sBuffer), "%p", this);
pLogger->attribute("parent", sBuffer); pLogger->attribute("parent", std::string(sBuffer));
pLogger->attribute("type", getType()); pLogger->attribute("type", getType());
pLogger->attribute("resource", resourceToString(getResource())); pLogger->attribute("resource", resourceToString(getResource()));
pLogger->attribute("token", fastTokenToId(getToken())); pLogger->attribute("token", fastTokenToId(getToken()));
...@@ -428,7 +428,7 @@ void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) cons ...@@ -428,7 +428,7 @@ void OOXMLFastContextHandler::dumpXml( const TagLogger::Pointer_t pLogger ) cons
if (pVal.get() != NULL) if (pVal.get() != NULL)
pLogger->attribute("value", pVal->toString()); pLogger->attribute("value", pVal->toString());
else else
pLogger->attribute("value", "(null)"); pLogger->attribute("value", std::string("(null)"));
pLogger->propertySet(getPropertySet(), pLogger->propertySet(getPropertySet(),
IdToString::Pointer_t(new OOXMLIdToString())); IdToString::Pointer_t(new OOXMLIdToString()));
...@@ -448,7 +448,7 @@ void OOXMLFastContextHandler::setId(Id rId) ...@@ -448,7 +448,7 @@ void OOXMLFastContextHandler::setId(Id rId)
static char sBuffer[256]; static char sBuffer[256];
snprintf(sBuffer, sizeof(sBuffer), "%" SAL_PRIuUINT32, rId); 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->attribute("name", (*QNameToString::Instance())(rId));
debug_logger->endElement(); debug_logger->endElement();
#endif #endif
...@@ -1052,9 +1052,9 @@ void OOXMLFastContextHandler::setForwardEvents(bool bForwardEvents) ...@@ -1052,9 +1052,9 @@ void OOXMLFastContextHandler::setForwardEvents(bool bForwardEvents)
debug_logger->startElement("contexthandler.setForwardEvents"); debug_logger->startElement("contexthandler.setForwardEvents");
if (bForwardEvents) if (bForwardEvents)
debug_logger->chars("true"); debug_logger->chars(std::string("true"));
else else
debug_logger->chars("false"); debug_logger->chars(std::string("false"));
debug_logger->endElement(); debug_logger->endElement();
#endif #endif
...@@ -1315,7 +1315,7 @@ void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLog ...@@ -1315,7 +1315,7 @@ void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLog
static char sBuffer[128]; static char sBuffer[128];
snprintf(sBuffer, sizeof(sBuffer), "%p", this); snprintf(sBuffer, sizeof(sBuffer), "%p", this);
pLogger->attribute("parent", sBuffer); pLogger->attribute("parent", std::string(sBuffer));
pLogger->attribute("type", getType()); pLogger->attribute("type", getType());
pLogger->attribute("resource", resourceToString(getResource())); pLogger->attribute("resource", resourceToString(getResource()));
pLogger->attribute("token", fastTokenToId(getToken())); pLogger->attribute("token", fastTokenToId(getToken()));
...@@ -1326,7 +1326,7 @@ void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLog ...@@ -1326,7 +1326,7 @@ void OOXMLFastContextHandlerProperties::dumpXml( const TagLogger::Pointer_t pLog
if (pVal.get() != NULL) if (pVal.get() != NULL)
pLogger->attribute("value", pVal->toString()); pLogger->attribute("value", pVal->toString());
else else
pLogger->attribute("value", "(null)"); pLogger->attribute("value", std::string("(null)"));
pLogger->attribute("resolve", mbResolve ? "resolve" : "noResolve"); pLogger->attribute("resolve", mbResolve ? "resolve" : "noResolve");
...@@ -1438,7 +1438,7 @@ void OOXMLFastContextHandlerProperties::setParent ...@@ -1438,7 +1438,7 @@ void OOXMLFastContextHandlerProperties::setParent
{ {
#ifdef DEBUG_ELEMENT #ifdef DEBUG_ELEMENT
debug_logger->startElement("setParent"); debug_logger->startElement("setParent");
debug_logger->chars("OOXMLFastContextHandlerProperties"); debug_logger->chars(std::string("OOXMLFastContextHandlerProperties"));
debug_logger->endElement(); debug_logger->endElement();
#endif #endif
...@@ -1926,7 +1926,7 @@ OOXMLFastContextHandlerShape::OOXMLFastContextHandlerShape ...@@ -1926,7 +1926,7 @@ OOXMLFastContextHandlerShape::OOXMLFastContextHandlerShape
else else
{ {
debug_logger->startElement("error"); 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(); debug_logger->endElement();
} }
#endif #endif
......
...@@ -435,7 +435,7 @@ void OOXMLPropertySetImpl::resolve(Properties & rHandler) ...@@ -435,7 +435,7 @@ void OOXMLPropertySetImpl::resolve(Properties & rHandler)
else else
{ {
debug_logger->startElement("error"); debug_logger->startElement("error");
debug_logger->chars("zero-property"); debug_logger->chars(std::string("zero-property"));
debug_logger->endElement(); debug_logger->endElement();
} }
#endif #endif
......
...@@ -143,9 +143,9 @@ namespace writerfilter ...@@ -143,9 +143,9 @@ namespace writerfilter
{ {
startElement( "exception" ); startElement( "exception" );
chars("getPropertyValue(\""); chars(std::string("getPropertyValue(\""));
chars(sName); chars(sName);
chars("\")"); chars(std::string("\")"));
endElement( ); endElement( );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment