[Libreoffice-commits] .: writerfilter/inc writerfilter/source writerfilter/unocomponent
Miklos Vajna
vmiklos at kemper.freedesktop.org
Sat Jul 28 05:43:48 PDT 2012
writerfilter/inc/resourcemodel/TableManager.hxx | 4 --
writerfilter/source/dmapper/DomainMapper.cxx | 18 +++++-----
writerfilter/source/dmapper/FontTable.cxx | 2 -
writerfilter/source/dmapper/GraphicImport.cxx | 10 ++---
writerfilter/source/dmapper/NumberingManager.cxx | 18 +++++-----
writerfilter/source/dmapper/StyleSheetTable.cxx | 8 ++--
writerfilter/source/resourcemodel/resourcemodel.cxx | 2 -
writerfilter/source/resourcemodel/util.cxx | 2 -
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 6 +--
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx | 6 +--
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx | 10 ++---
11 files changed, 42 insertions(+), 44 deletions(-)
New commits:
commit 351af6e43636ed581c963582bcf58a00faf04f36
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat Jul 28 14:43:19 2012 +0200
writerfilter: drop pointless rtl:: prefix usage
Change-Id: I75e68d0ec70d0d4e95a58cd34780c3a350f7a9d2
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index b17b3ff..bb72934 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -1000,9 +1000,7 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable()
{
(void) e;
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aBuf("resolving of current table failed with: ");
- aBuf.append(OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
- OSL_FAIL(aBuf.getStr());
+ SAL_WARN("writerfilter", "resolving of current table failed with: " << e.Message);
#endif
}
}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index bc8d826..1bc0737 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1437,15 +1437,15 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
default:
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sMessage( "DomainMapper::attribute() - Id: ");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nName ), 10 );
- sMessage += ::rtl::OString(" / 0x");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nName ), 16 );
- sMessage += ::rtl::OString(" value: ");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nIntValue ), 10 );
- sMessage += ::rtl::OString(" / 0x");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nIntValue ), 16 );
- OSL_FAIL( sMessage.getStr()); //
+ OString sMessage("DomainMapper::attribute() - Id: ");
+ sMessage += OString::valueOf( sal_Int32( nName ), 10 );
+ sMessage += " / 0x";
+ sMessage += OString::valueOf( sal_Int32( nName ), 16 );
+ sMessage += " value: ";
+ sMessage += OString::valueOf( sal_Int32( nIntValue ), 10 );
+ sMessage += " / 0x";
+ sMessage += OString::valueOf( sal_Int32( nIntValue ), 16 );
+ SAL_WARN("writerfilter", sMessage.getStr());
#endif
}
}
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 3175ea1..203283d 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -102,7 +102,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
break;
case NS_ooxml::LN_CT_Charset_characterSet:
{
- rtl::OString tmp;
+ OString tmp;
sValue.convertToString( &tmp, RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS );
m_pImpl->pCurrentEntry->nTextEncoding = rtl_getTextEncodingFromMimeCharset( tmp.getStr() );
break;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index a48e732..415fa41 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1244,11 +1244,11 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
break;
default:
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sMessage( "GraphicImport::sprm() - Id: ");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nSprmId ), 10 );
- sMessage += ::rtl::OString(" / 0x");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nSprmId ), 16 );
- OSL_FAIL( sMessage.getStr())
+ OString sMessage( "GraphicImport::sprm() - Id: ");
+ sMessage += OString::valueOf( sal_Int32( nSprmId ), 10 );
+ sMessage += " / 0x";
+ sMessage += OString::valueOf( sal_Int32( nSprmId ), 16 );
+ SAL_WARN("writerfilter", sMessage.getStr());
#endif
;
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 30e8730..335f2f4 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -781,15 +781,15 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
default:
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sMessage( "ListTable::attribute() - Id: ");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nName ), 10 );
- sMessage += ::rtl::OString(" / 0x");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nName ), 16 );
- sMessage += ::rtl::OString(" value: ");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nIntValue ), 10 );
- sMessage += ::rtl::OString(" / 0x");
- sMessage += ::rtl::OString::valueOf( sal_Int32( nIntValue ), 16 );
- OSL_FAIL( sMessage.getStr()); //
+ OString sMessage( "ListTable::attribute() - Id: ");
+ sMessage += OString::valueOf( sal_Int32( nName ), 10 );
+ sMessage += " / 0x";
+ sMessage += OString::valueOf( sal_Int32( nName ), 16 );
+ sMessage += " value: ";
+ sMessage += OString::valueOf( sal_Int32( nIntValue ), 10 );
+ sMessage += " / 0x";
+ sMessage += OString::valueOf( sal_Int32( nIntValue ), 16 );
+ SAL_WARN("writerfilter", sMessage.getStr());
#endif
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 0ed6efc..be06d59 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -873,19 +873,19 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
catch( const lang::WrappedTargetException& rWrapped)
{
(void) rWrapped;
- rtl::OString aMessage("Some style properties could not be set");
+ OString aMessage("Some style properties could not be set");
#if OSL_DEBUG_LEVEL > 0
beans::UnknownPropertyException aUnknownPropertyException;
if( rWrapped.TargetException >>= aUnknownPropertyException )
{
- aMessage += rtl::OString(": " );
- ::rtl::OString sTemp;
+ aMessage += ": ";
+ OString sTemp;
aUnknownPropertyException.Message.convertToString(&sTemp, RTL_TEXTENCODING_ASCII_US, 0 );
aMessage += sTemp;
}
#endif
- OSL_FAIL( aMessage.getStr());
+ SAL_WARN("writerfilter", aMessage.getStr());
}
catch( const uno::Exception& rEx)
{
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index bf70a98..24f5798 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -407,7 +407,7 @@ void WW8StreamHandler::info(const string & info_)
void WW8PropertiesHandler::attribute(Id name, Value & val)
{
- boost::shared_ptr<rtl::OString> pStr(new ::rtl::OString());
+ boost::shared_ptr<OString> pStr(new OString());
OUString aStr = val.getString();
aStr.convertToString(pStr.get(), RTL_TEXTENCODING_ASCII_US,
OUSTRING_TO_OSTRING_CVTFLAGS);
diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx
index 70b99ac..ecb338f 100644
--- a/writerfilter/source/resourcemodel/util.cxx
+++ b/writerfilter/source/resourcemodel/util.cxx
@@ -95,7 +95,7 @@ string toString(uno::Reference< text::XTextRange > textRange)
if (textRange.get())
{
OUString aOUStr = textRange->getString();
- rtl::OString aOStr(aOUStr.getStr(), aOUStr.getLength(), RTL_TEXTENCODING_ASCII_US );
+ 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 0cab73f..d35f3b6 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -105,8 +105,8 @@ public:
(&pNew, reinterpret_cast<const sal_Char *>(&aSeq[0]),
nCount);
- rtl::OString aTmp(pNew);
- OUString aTail(rtl::OStringToOUString
+ OString aTmp(pNew);
+ OUString aTail(OStringToOUString
(aTmp, RTL_TEXTENCODING_ASCII_US));
mString = mString.concat(aTail);
}
@@ -169,7 +169,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
{
uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
- rtl::OString aStr;
+ OString aStr;
aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US,
OUSTRING_TO_OSTRING_CVTFLAGS);
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
index 8c53801..8e65358 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
@@ -106,8 +106,8 @@ public:
(&pNew, reinterpret_cast<const sal_Char *>(&aSeq[0]),
nCount);
- rtl::OString aTmp(pNew);
- OUString aTail(rtl::OStringToOUString
+ OString aTmp(pNew);
+ OUString aTail(OStringToOUString
(aTmp, RTL_TEXTENCODING_ASCII_US));
mString = mString.concat(aTail);
}
@@ -173,7 +173,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
{
uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
- rtl::OString aStr;
+ OString aStr;
aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US,
OUSTRING_TO_OSTRING_CVTFLAGS);
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index e085f3e..43ec23d 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -55,17 +55,17 @@ const sal_Char ScannerTestService::IMPLEMENTATION_NAME[40] = "debugservices.rtft
struct ScannerTestServiceHelper
{
- size_t operator()(const rtl::OString &str) const
+ size_t operator()(const OString &str) const
{
return str.hashCode();
}
- bool operator()(const rtl::OString &str1, const rtl::OString &str2) const
+ bool operator()(const OString &str1, const OString &str2) const
{
return str1.compareTo(str2)==0;
}
};
-typedef ::boost::unordered_set< ::rtl::OString, ScannerTestServiceHelper, ScannerTestServiceHelper > ScannerTestServiceTokenMap;
+typedef ::boost::unordered_set< OString, ScannerTestServiceHelper, ScannerTestServiceHelper > ScannerTestServiceTokenMap;
class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
{
@@ -82,7 +82,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
void dest(char* token, char* /*value*/)
{
- destMap.insert(rtl::OString(token));
+ destMap.insert(OString(token));
if (strcmp(token, "objdata")==0)
{
binBuffer.clear();
@@ -92,7 +92,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
}
void ctrl(char*token, char* /*value*/)
{
- ctrlMap.insert(rtl::OString(token));
+ ctrlMap.insert(OString(token));
}
void lbrace(void)
{
More information about the Libreoffice-commits
mailing list