[Libreoffice-commits] core.git: 2 commits - basic/source cppcanvas/source fpicker/source include/unotools oox/source sc/source sdext/source sd/source slideshow/test starmath/source unotools/source vcl/source vcl/win
Noel Grandin
noel.grandin at collabora.co.uk
Wed Apr 12 10:49:48 UTC 2017
basic/source/classes/sbxmod.cxx | 8 +--
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 ----
fpicker/source/aqua/ControlHelper.mm | 8 +--
include/unotools/readwritemutexguard.hxx | 21 +++++---
oox/source/ppt/timenode.cxx | 5 --
sc/source/core/tool/parclass.cxx | 4 -
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 3 -
sd/source/ui/framework/configuration/Configuration.cxx | 6 --
sd/source/ui/framework/configuration/ConfigurationClassifier.cxx | 9 +--
sd/source/ui/framework/configuration/ConfigurationController.cxx | 9 +--
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 24 ++++------
sd/source/ui/framework/configuration/ConfigurationTracer.cxx | 2
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 5 --
sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 4 -
sd/source/ui/framework/module/ModuleController.cxx | 9 +--
sd/source/ui/view/ToolBarManager.cxx | 6 --
sd/source/ui/view/ViewShellManager.cxx | 2
sdext/source/pdfimport/pdfiadaptor.cxx | 2
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 +--
slideshow/test/demoshow.cxx | 11 +---
starmath/source/ooxmlexport.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 18 +++----
unotools/source/i18n/readwritemutexguard.cxx | 16 +++---
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/outdev/text.cxx | 4 -
vcl/win/gdi/salfont.cxx | 2
26 files changed, 85 insertions(+), 115 deletions(-)
New commits:
commit a3c294e6ad33c43b7c515b9bf543aa4bb27a7d51
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Apr 12 11:32:02 2017 +0200
convert ReadWriteGuardMode to scoped enum
Change-Id: I21ae815d5bbd7b39cd690168738c21925558585e
Reviewed-on: https://gerrit.libreoffice.org/36452
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/unotools/readwritemutexguard.hxx b/include/unotools/readwritemutexguard.hxx
index 94767024a911..b11ea8a1e405 100644
--- a/include/unotools/readwritemutexguard.hxx
+++ b/include/unotools/readwritemutexguard.hxx
@@ -21,6 +21,17 @@
#define INCLUDED_UNOTOOLS_READWRITEMUTEXGUARD_HXX
#include <osl/mutex.hxx>
+#include <o3tl/typed_flags_set.hxx>
+
+enum class ReadWriteGuardMode {
+ ReadOnly = 0x00,
+ Write = 0x01,
+ CriticalChange = 0x02 | Write,
+ BlockCritical = 0x04, // only a block, not a read, exclusive flag!
+};
+namespace o3tl {
+ template<> struct typed_flags<ReadWriteGuardMode> : is_typed_flags<ReadWriteGuardMode, 0x7> {};
+}
namespace utl {
@@ -41,12 +52,6 @@ public:
{}
};
-namespace ReadWriteGuardMode {
-const sal_Int32 nWrite = 0x01;
-const sal_Int32 nCriticalChange = 0x02 | nWrite;
-const sal_Int32 nBlockCritical = 0x04; // only a block, not a read, exclusive flag!
-}
-
/** Enable multiple threads to read simultaneously, but a write blocks all
other reads and writes, and a read blocks any write.
Used in I18N wrappers to be able to maintain a single instance of a wrapper
@@ -67,11 +72,11 @@ const sal_Int32 nBlockCritical = 0x04; // only a block, not a read, exclusi
class ReadWriteGuard
{
ReadWriteMutex& rMutex;
- sal_Int32 nMode;
+ ReadWriteGuardMode nMode;
public:
ReadWriteGuard(
ReadWriteMutex& rMutex,
- sal_Int32 nRequestMode = 0 // read only
+ ReadWriteGuardMode nRequestMode = ReadWriteGuardMode::ReadOnly // read only
);
~ReadWriteGuard();
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index db93ea18c1d5..56f73b94ef94 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -115,7 +115,7 @@ LocaleDataWrapper::~LocaleDataWrapper()
void LocaleDataWrapper::setLanguageTag( const LanguageTag& rLanguageTag )
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nCriticalChange );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::CriticalChange );
maLanguageTag = rLanguageTag;
invalidateData();
}
@@ -1383,7 +1383,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
OUString LocaleDataWrapper::getDate( const Date& rDate ) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
//!TODO: leading zeros et al
sal_Unicode aBuf[128];
sal_Unicode* pBuf = aBuf;
@@ -1429,7 +1429,7 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const
OUString LocaleDataWrapper::getTime( const tools::Time& rTime, bool bSec, bool b100Sec ) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
//!TODO: leading zeros et al
sal_Unicode aBuf[128];
sal_Unicode* pBuf = aBuf;
@@ -1458,7 +1458,7 @@ OUString LocaleDataWrapper::getTime( const tools::Time& rTime, bool bSec, bool b
OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal,
bool bTwoDigitYear ) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
using namespace css::i18n;
sal_Unicode aBuf[20];
sal_Unicode* pBuf;
@@ -1500,7 +1500,7 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa
OUString LocaleDataWrapper::getDuration( const tools::Time& rTime, bool bSec, bool b100Sec ) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
sal_Unicode aBuf[128];
sal_Unicode* pBuf = aBuf;
@@ -1544,7 +1544,7 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal
OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals,
bool bUseThousandSep, bool bTrailingZeros ) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
sal_Unicode aBuf[128]; // big enough for 64-bit long and crazy grouping
// check if digits and separators will fit into fixed buffer or allocate
size_t nGuess = ImplGetNumberStringLengthGuess( *this, nDecimals );
@@ -1563,7 +1563,7 @@ OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals,
OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals,
const OUString& rCurrencySymbol, bool bUseThousandSep ) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
sal_Unicode aBuf[192];
sal_Unicode aNumBuf[128]; // big enough for 64-bit long and crazy grouping
sal_Unicode cZeroChar = getCurrZeroChar();
@@ -1771,7 +1771,7 @@ LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const
OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical );
OUStringBuffer aDebugMsg(rDebugMsg);
aDebugMsg.append('\n');
aDebugMsg.append(maLanguageTag.getBcp47());
@@ -1872,7 +1872,7 @@ css::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() co
void LocaleDataWrapper::setDateAcceptancePatterns(
const css::uno::Sequence< OUString > & rPatterns )
{
- ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nWrite );
+ ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::Write );
if (!aDateAcceptancePatterns.getLength() || !rPatterns.getLength())
{
diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx
index 2932212d3c12..134f06c35747 100644
--- a/unotools/source/i18n/readwritemutexguard.cxx
+++ b/unotools/source/i18n/readwritemutexguard.cxx
@@ -23,14 +23,14 @@
namespace utl {
ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP,
- sal_Int32 nRequestMode )
+ ReadWriteGuardMode nRequestMode )
: rMutex( rMutexP )
{
// don't do anything until a pending write completed (or another
// ReadWriteGuard leaves the ctor phase)
::osl::MutexGuard aGuard( rMutex.maWriteMutex );
nMode = nRequestMode;
- if ( nMode & ReadWriteGuardMode::nWrite )
+ if ( nMode & ReadWriteGuardMode::Write )
{
rMutex.maWriteMutex.acquire();
// wait for any read to complete
@@ -40,12 +40,12 @@ ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP,
{
rMutex.maMutex.acquire();
bWait = (rMutex.nReadCount != 0);
- if ( nMode & ReadWriteGuardMode::nCriticalChange )
+ if ( nMode & ReadWriteGuardMode::CriticalChange )
bWait |= (rMutex.nBlockCriticalCount != 0);
rMutex.maMutex.release();
} while ( bWait );
}
- else if ( nMode & ReadWriteGuardMode::nBlockCritical )
+ else if ( nMode & ReadWriteGuardMode::BlockCritical )
{
rMutex.maMutex.acquire();
++rMutex.nBlockCriticalCount;
@@ -61,9 +61,9 @@ ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP,
ReadWriteGuard::~ReadWriteGuard()
{
- if ( nMode & ReadWriteGuardMode::nWrite )
+ if ( nMode & ReadWriteGuardMode::Write )
rMutex.maWriteMutex.release();
- else if ( nMode & ReadWriteGuardMode::nBlockCritical )
+ else if ( nMode & ReadWriteGuardMode::BlockCritical )
{
rMutex.maMutex.acquire();
--rMutex.nBlockCriticalCount;
@@ -79,7 +79,7 @@ ReadWriteGuard::~ReadWriteGuard()
void ReadWriteGuard::changeReadToWrite()
{
- bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical));
+ bool bOk = !(nMode & (ReadWriteGuardMode::Write | ReadWriteGuardMode::BlockCritical));
DBG_ASSERT( bOk, "ReadWriteGuard::changeReadToWrite: can't" );
if ( bOk )
{
@@ -91,7 +91,7 @@ void ReadWriteGuard::changeReadToWrite()
rMutex.maMutex.release();
rMutex.maWriteMutex.acquire();
- nMode |= ReadWriteGuardMode::nWrite;
+ nMode |= ReadWriteGuardMode::Write;
// wait for any other read to complete
// TODO: set up a waiting thread instead of a loop
bool bWait = true;
commit 05144427303b2aa09108eeb03606fa66da275d2b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Apr 12 11:39:06 2017 +0200
no need to use OUStringToOString in SAL_INFO
Change-Id: I707e0d72aba89b7e644def6f4c251e14f6599ad2
Reviewed-on: https://gerrit.libreoffice.org/36451
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c8a3389051fe..3316b1a2be53 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -463,7 +463,7 @@ SbModule::SbModule( const OUString& rName, bool bVBACompat )
SbModule::~SbModule()
{
- SAL_INFO("basic","Module named " << OUStringToOString( GetName(), RTL_TEXTENCODING_UTF8 ).getStr() << " is destructing");
+ SAL_INFO("basic","Module named " << GetName() << " is destructing");
delete pImage;
delete pBreaks;
delete pClassData;
@@ -476,7 +476,7 @@ SbModule::GetUnoModule()
if ( !mxWrapper.is() )
mxWrapper = new DocObjectWrapper( this );
- SAL_INFO("basic","Module named " << OUStringToOString( GetName(), RTL_TEXTENCODING_UTF8 ).getStr() << " returning wrapper mxWrapper (0x" << mxWrapper.get() <<")" );
+ SAL_INFO("basic","Module named " << GetName() << " returning wrapper mxWrapper (0x" << mxWrapper.get() <<")" );
return mxWrapper;
}
@@ -1031,7 +1031,7 @@ void SbModule::SetVBACompat( bool bCompat )
// Run a Basic-subprogram
void SbModule::Run( SbMethod* pMeth )
{
- SAL_INFO("basic","About to run " << OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() << ", vba compatmode is " << mbVBACompat );
+ SAL_INFO("basic","About to run " << pMeth->GetName() << ", vba compatmode is " << mbVBACompat );
static sal_uInt16 nMaxCallLevel = 0;
@@ -2445,7 +2445,7 @@ void SbUserFormModule::triggerMethod( const OUString& aMethodToRun )
void SbUserFormModule::triggerMethod( const OUString& aMethodToRun, Sequence< Any >& aArguments )
{
- SAL_INFO("basic", "*** trigger " << OUStringToOString( aMethodToRun, RTL_TEXTENCODING_UTF8 ).getStr() << " ***");
+ SAL_INFO("basic", "*** trigger " << aMethodToRun << " ***");
// Search method
SbxVariable* pMeth = SbObjModule::Find( aMethodToRun, SbxClassType::Method );
if( pMeth )
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 38b3921eb215..ad9098defc69 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -3045,10 +3045,7 @@ namespace cppcanvas
}
catch( uno::Exception& )
{
- SAL_WARN("cppcanvas.emf", "" << OUStringToOString(
- comphelper::anyToString( cppu::getCaughtException() ),
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
+ SAL_WARN("cppcanvas.emf", "" << comphelper::anyToString( cppu::getCaughtException() ) );
// convert error to return value
return false;
}
@@ -3106,10 +3103,7 @@ namespace cppcanvas
}
catch( uno::Exception& )
{
- SAL_WARN( "cppcanvas.emf", "" << OUStringToOString(
- comphelper::anyToString( cppu::getCaughtException() ),
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
+ SAL_WARN( "cppcanvas.emf", "" << comphelper::anyToString( cppu::getCaughtException() ) );
return false;
}
}
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index 092d0494808b..6a0d18f4d5ee 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -72,7 +72,7 @@ uno::Any HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlA
NSString* sCFItem = [pButton itemTitleAtIndex:i];
if (nil != sCFItem) {
aItemList[i] = [sCFItem OUString];
- SAL_INFO("fpicker.aqua","Return value[" << (i - 1) << "]: " << OUStringToOString(aItemList[i - 1], RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("fpicker.aqua","Return value[" << (i - 1) << "]: " << aItemList[i - 1]);
}
}
@@ -85,7 +85,7 @@ uno::Any HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlA
NSString* sCFItem = [pButton titleOfSelectedItem];
if (nil != sCFItem) {
OUString sString = [sCFItem OUString];
- SAL_INFO("fpicker.aqua","Return value: " << OUStringToOString(sString, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("fpicker.aqua","Return value: " << sString);
aAny <<= sString;
}
}
@@ -643,7 +643,7 @@ void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int1
rValue >>= sItem;
NSString* sCFItem = [NSString stringWithOUString:sItem];
- SAL_INFO("fpicker.aqua","Adding menu item: " << OUStringToOString(sItem, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("fpicker.aqua","Adding menu item: " << sItem);
[pButton addItemWithTitle:sCFItem];
}
break;
@@ -656,7 +656,7 @@ void ControlHelper::HandleSetListValue(const NSControl* pControl, const sal_Int1
for (sal_Int32 i = 0; i < nItemCount; ++i)
{
NSString* sCFItem = [NSString stringWithOUString:aStringList[i]];
- SAL_INFO("fpicker.aqua","Adding menu item: " << OUStringToOString(aStringList[i], RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("fpicker.aqua","Adding menu item: " << aStringList[i]);
[pButton addItemWithTitle:sCFItem];
}
}
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 6df8304df41a..030baacec2e3 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -203,8 +203,7 @@ namespace oox { namespace ppt {
}
catch( const Exception& e )
{
- SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::addNode() - " <<
- OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::addNode() - " << e.Message );
}
}
@@ -578,7 +577,7 @@ namespace oox { namespace ppt {
}
catch( const Exception& e )
{
- SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::createAndInsert() trying to create a service " << OUStringToOString( rServiceName, RTL_TEXTENCODING_ASCII_US).getStr() << " = " << OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ SAL_INFO("oox.ppt", "OOX: exception raised in TimeNode::createAndInsert() trying to create a service " << rServiceName << " = " << e.Message );
}
return Reference< XAnimationNode >();
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index bd8ca5544a8d..2830bdc47b91 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -501,7 +501,7 @@ void ScParameterClassification::GenerateDocumentation()
if ( !xMap->getSymbol(eOp).isEmpty() )
{
SAL_INFO("sc.core", "GenerateDocumentation, env var name: " << aEnvVarName);
- OStringBuffer aStr(OUStringToOString(xMap->getSymbol(eOp), RTL_TEXTENCODING_UTF8));
+ OUStringBuffer aStr(xMap->getSymbol(eOp));
aStr.append('(');
formula::FormulaByteToken aToken( eOp);
sal_uInt8 nParams = GetMinimumParameters( eOp);
@@ -608,7 +608,7 @@ void ScParameterClassification::GenerateDocumentation()
break;
default:;
}
- SAL_INFO( "sc.core", "" << aStr.getStr() << "\n");
+ SAL_INFO( "sc.core", "" << aStr << "\n");
}
}
fflush( stdout);
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index ea8171ac6575..1416f5948555 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -41,8 +41,7 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest)
{
Reference<container::XNamed> xNamed (rxRequest, UNO_QUERY);
if (xNamed.is())
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " <<
- OUStringToOString(xNamed->getName(), RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << xNamed->getName());
}
#endif
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 4909a8ee1a5d..593742e1deed 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -99,8 +99,7 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour
if (mpResourceContainer->find(rxResourceId) == mpResourceContainer->end())
{
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Configuration::addResource() " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(rxResourceId));
mpResourceContainer->insert(rxResourceId);
PostEvent(rxResourceId, true);
}
@@ -117,8 +116,7 @@ void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxRes
if (iResource != mpResourceContainer->end())
{
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Configuration::removeResource() " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(rxResourceId));
PostEvent(rxResourceId,false);
mpResourceContainer->erase(iResource);
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index f0ed7671129e..4fd6ed2b6c4d 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -148,16 +148,14 @@ void ConfigurationClassifier::CopyResources (
rTarget.push_back(*iResource);
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": copying " <<
- OUStringToOString(FrameworkHelper::ResourceIdToString(*iResource),
- RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(*iResource));
const Reference<XResourceId>* aA = aBoundResources.getConstArray();
for (sal_Int32 i=0; i<nL; ++i)
{
rTarget.push_back(aA[i]);
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": copying " <<
- OUStringToOString(FrameworkHelper::ResourceIdToString(aA[i]),
- RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(aA[i]));
}
}
}
@@ -174,8 +172,7 @@ void ConfigurationClassifier::TraceResourceIdVector (
for (iResource=rResources.begin(); iResource!=rResources.end(); ++iResource)
{
OUString sResource (FrameworkHelper::ResourceIdToString(*iResource));
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " <<
- OUStringToOString(sResource, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << sResource);
}
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index a9d451a8d4dd..fa1f75662a80 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -240,14 +240,12 @@ void SAL_CALL ConfigurationController::requestResourceActivation (
if (rBHelper.bInDispose)
{
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceActivation(): ignoring " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(rxResourceId));
return;
}
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceActivation() " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(rxResourceId));
if (rxResourceId.is())
{
@@ -290,8 +288,7 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation (
ThrowIfDisposed();
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationController::requestResourceDeactivation() " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ FrameworkHelper::ResourceIdToString(rxResourceId));
if (rxResourceId.is())
{
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index 394718cb0957..de2d7386fa45 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -108,16 +108,15 @@ void ConfigurationControllerResourceManager::ActivateResource (
return;
}
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " << OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " <<
+ FrameworkHelper::ResourceIdToString(rxResourceId));
// 1. Get the factory.
const OUString sResourceURL (rxResourceId->getResourceURL());
Reference<XResourceFactory> xFactory (mpResourceFactoryContainer->GetFactory(sResourceURL));
if ( ! xFactory.is())
{
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": no factory found for " <<
- OUStringToOString(sResourceURL, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": no factory found for " << sResourceURL);
return;
}
@@ -235,11 +234,11 @@ void ConfigurationControllerResourceManager::DeactivateResource (
#if OSL_DEBUG_LEVEL >= 1
if (bSuccess)
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": successfully deactivated " << OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": successfully deactivated " <<
+ FrameworkHelper::ResourceIdToString(rxResourceId));
else
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " << OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId), RTL_TEXTENCODING_UTF8).getStr()
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " <<
+ FrameworkHelper::ResourceIdToString(rxResourceId)
<< " failed");
#endif
}
@@ -262,9 +261,8 @@ void ConfigurationControllerResourceManager::AddResource (
#if OSL_DEBUG_LEVEL >= 2
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationControllerResourceManager::AddResource(): added " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResource->getResourceId()),
- RTL_TEXTENCODING_UTF8).getStr() << " -> " << rxResource.get());
+ FrameworkHelper::ResourceIdToString(rxResource->getResourceId()) <<
+ " -> " << rxResource.get());
#endif
}
@@ -279,9 +277,7 @@ ConfigurationControllerResourceManager::ResourceDescriptor
{
#if OSL_DEBUG_LEVEL >= 2
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ConfigurationControllerResourceManager::RemoveResource(): removing " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(rxResourceId),
- RTL_TEXTENCODING_UTF8).getStr() <<
+ FrameworkHelper::ResourceIdToString(rxResourceId) <<
" -> " << &iResource);
#endif
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 79770425b02d..6c903675eec2 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -62,7 +62,7 @@ void ConfigurationTracer::TraceBoundResources (
OUString sLine (aResourceList[nIndex]->getResourceURL());
for (int i=0; i<nIndentation; ++i)
sLine = sIndentation + sLine;
- SAL_INFO("sd.ui","" << OUStringToOString(sLine, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.ui", "" << sLine);
TraceBoundResources(rxConfiguration, aResourceList[nIndex], nIndentation+1);
}
}
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 4535061fb7f7..81517fff0d04 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -320,9 +320,8 @@ void ConfigurationUpdater::CheckPureAnchors (
if (bDeactiveCurrentResource)
{
SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": deactivating pure anchor " <<
- OUStringToOString(
- FrameworkHelper::ResourceIdToString(xResourceId),
- RTL_TEXTENCODING_UTF8).getStr() << "because it has no children");
+ FrameworkHelper::ResourceIdToString(xResourceId) <<
+ "because it has no children");
// Erase element from current configuration.
for (sal_Int32 nI=nIndex; nI<nCount-2; ++nI)
aResources[nI] = aResources[nI+1];
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index adf3ed13f5bf..15ce1e9fdfa0 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -92,9 +92,7 @@ void ResourceFactoryManager::AddFactory (
maFactoryMap[rsURL] = rxFactory;
#if defined VERBOSE && VERBOSE>=1
- SAL_INFO("sd",("ResourceFactoryManager::AddFactory fixed %s %x\n",
- OUStringToOString(rsURL, RTL_TEXTENCODING_UTF8).getStr(),
- rxFactory.get());
+ SAL_INFO("sd", "ResourceFactoryManager::AddFactory fixed " << rsURL << " 0x" << std::hex << rxFactory.get());
#endif
}
}
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 803758e0e5cb..564354cbc34d 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -128,16 +128,14 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
"URL",
aURLs);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::adding factory " <<
- OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::adding factory " << sServiceName);
// Add the resource URLs to the map.
::std::vector<OUString>::const_iterator iResource;
for (iResource=aURLs.begin(); iResource!=aURLs.end(); ++iResource)
{
(*mpResourceToFactoryMap)[*iResource] = sServiceName;
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " <<
- OUStringToOString(*iResource, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": " << *iResource);
}
}
@@ -189,8 +187,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues)
// at the configuration controller.
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(sServiceName, aArguments, xContext);
- SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::created startup service " <<
- OUStringToOString(sServiceName, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ModuleController::created startup service " << sServiceName);
}
catch (Exception&)
{
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 030bf6b8d515..73e87799e06a 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -688,8 +688,7 @@ void ToolBarManager::Implementation::PreUpdate()
for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar)
{
OUString sFullName (GetToolBarResourceName(*iToolBar));
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning off tool bar " <<
- OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning off tool bar " << sFullName);
mxLayouter->destroyElement(sFullName);
maToolBarList.MarkToolBarAsNotActive(*iToolBar);
}
@@ -719,8 +718,7 @@ void ToolBarManager::Implementation::PostUpdate()
for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar)
{
OUString sFullName (GetToolBarResourceName(*iToolBar));
- SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning on tool bar " <<
- OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_INFO("sd.view", OSL_THIS_FUNC << ": turning on tool bar " << sFullName);
mxLayouter->requestElement(sFullName);
maToolBarList.MarkToolBarAsActive(*iToolBar);
}
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 367bdb460682..8990f5aa76ef 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1149,7 +1149,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
if (*iEntry != NULL)
SAL_INFO("sd.view", OSL_THIS_FUNC << ": " <<
*iEntry << " : " <<
- OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr());
+ (*iEntry)->GetName());
else
SAL_INFO("sd.view", OSL_THIS_FUNC << " null");
}
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index ec089db1936d..77a71c1927f9 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -294,7 +294,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
sal_Int32 nAttribs = rSourceData.getLength();
for( sal_Int32 i = 0; i < nAttribs; i++, pAttribs++ )
{
- SAL_INFO("sdext.pdfimport","importer Attrib: " << OUStringToOString( pAttribs->Name, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("sdext.pdfimport", "importer Attrib: " << pAttribs->Name );
if ( pAttribs->Name == "InputStream" )
pAttribs->Value >>= xInput;
else if ( pAttribs->Name == "URL" )
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 956327c1a915..732484fa0eb1 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1290,7 +1290,7 @@ PDFFileImplData* PDFFile::impl_getData() const
OUString aTmp;
for( int i = 0; i < m_pData->m_aDocID.getLength(); i++ )
aTmp += OUString::number((unsigned int)sal_uInt8(m_pData->m_aDocID[i]), 16);
- SAL_INFO("sdext.pdfimport.pdfparse", "DocId is <" << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr() << ">");
+ SAL_INFO("sdext.pdfimport.pdfparse", "DocId is <" << aTmp << ">");
#endif
}
}
@@ -1355,7 +1355,7 @@ PDFFileImplData* PDFFile::impl_getData() const
for( int i = 0; i < aEnt.getLength(); i++ )
aTmp += " " + OUString::number((unsigned int)sal_uInt8(aEnt[i]), 16);
SAL_WARN("sdext.pdfimport.pdfparse",
- "O entry has length " << (int)aEnt.getLength() << ", should be 32 <" << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr() << ">" );
+ "O entry has length " << (int)aEnt.getLength() << ", should be 32 <" << aTmp << ">" );
}
#endif
}
@@ -1375,7 +1375,7 @@ PDFFileImplData* PDFFile::impl_getData() const
for( int i = 0; i < aEnt.getLength(); i++ )
aTmp += " " + OUString::number((unsigned int)sal_uInt8(aEnt[i]), 16);
SAL_WARN("sdext.pdfimport.pdfparse",
- "U entry has length " << (int)aEnt.getLength() << ", should be 32 <" << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr() << ">" );
+ "U entry has length " << (int)aEnt.getLength() << ", should be 32 <" << aTmp << ">" );
}
#endif
}
@@ -1394,7 +1394,7 @@ PDFFileImplData* PDFFile::impl_getData() const
SAL_INFO("sdext.pdfimport.pdfparse", "p entry is " << m_pData->m_nPEntry );
}
- SAL_INFO("sdext.pdfimport.pdfparse", "Encryption dict: sec handler: " << (pFilter ? OUStringToOString( pFilter->getFilteredName(), RTL_TEXTENCODING_UTF8 ).getStr() : "<unknown>") << ", version = " << (int)m_pData->m_nAlgoVersion << ", revision = " << (int)m_pData->m_nStandardRevision << ", key length = " << m_pData->m_nKeyLength );
+ SAL_INFO("sdext.pdfimport.pdfparse", "Encryption dict: sec handler: " << (pFilter ? pFilter->getFilteredName() : OUString("<unknown>")) << ", version = " << (int)m_pData->m_nAlgoVersion << ", revision = " << (int)m_pData->m_nStandardRevision << ", key length = " << m_pData->m_nKeyLength );
break;
}
}
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index acdfd62f8b4e..f3b2fe33673c 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -355,8 +355,7 @@ void ChildWindow::init()
}
catch (const uno::Exception &e)
{
- SAL_INFO("slideshow",( "Exception '%s' thrown\n" ,
- OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("slideshow", "Exception " << e.Message );
}
}
@@ -369,9 +368,7 @@ void ChildWindow::Paint( const Rectangle& /*rRect*/ )
}
catch (const uno::Exception &e)
{
- SAL_INFO("slideshow",( "Exception '%s' thrown\n" ,
- OUStringToOString( e.Message,
- RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("slideshow", "Exception " << e.Message );
}
}
@@ -457,9 +454,7 @@ void DemoWindow::init()
}
catch (const uno::Exception &e)
{
- SAL_INFO("slideshow",( "Exception '%s' thrown\n" ,
- OUStringToOString( e.Message,
- RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("slideshow", "Exception " << e.Message );
}
}
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 23529ebd8906..0aeabe8c6ac5 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -74,7 +74,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/)
}
m_pSerializer->startElementNS( XML_m, XML_t, FSNS( XML_xml, XML_space ), "preserve", FSEND );
const SmTextNode* pTemp = static_cast<const SmTextNode* >(pNode);
- SAL_INFO( "starmath.ooxml", "Text:" << OUStringToOString( pTemp->GetText(), RTL_TEXTENCODING_UTF8 ).getStr());
+ SAL_INFO( "starmath.ooxml", "Text:" << pTemp->GetText());
OUStringBuffer buf(pTemp->GetText());
for(sal_Int32 i=0;i<pTemp->GetText().getLength();i++)
{
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 23706483e3f3..e19d90a28196 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -13350,7 +13350,7 @@ void PDFWriterImpl::ensureUniqueRadioOnValues()
int nKidIndex = rGroupWidget.m_aKidsIndex[nKid];
const OUString& rVal = m_aWidgets[nKidIndex].m_aOnValue;
#if OSL_DEBUG_LEVEL > 1
- SAL_INFO("vcl.pdfwriter", "OnValue: " << OUStringToOString( rVal, RTL_TEXTENCODING_UTF8 ).getStr());
+ SAL_INFO("vcl.pdfwriter", "OnValue: " << rVal);
#endif
if( aOnValues.find( rVal ) == aOnValues.end() )
{
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 5cf1ca62fd74..d68bd989851e 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -818,9 +818,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
}
#if OSL_DEBUG_LEVEL > 2
- SAL_INFO("vcl.gdi", "OutputDevice::DrawText(\""
- << OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ).getStr()
- << "\")");
+ SAL_INFO("vcl.gdi", "OutputDevice::DrawText(\"" << rStr << "\")");
#endif
if ( mpMetaFile )
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 1dc45bc1e7ea..97a7384da70e 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1222,7 +1222,7 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
bool WinSalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
const OUString& rFontFileURL, const OUString& rFontName )
{
- SAL_INFO( "vcl.gdi", "WinSalGraphics::AddTempDevFont(): " << OUStringToOString( rFontFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO( "vcl.gdi", "WinSalGraphics::AddTempDevFont(): " << rFontFileURL );
FontAttributes aDFA;
aDFA.SetFamilyName(rFontName);
More information about the Libreoffice-commits
mailing list