[Libreoffice-commits] .: 4 commits - editeng/source linguistic/inc linguistic/source svx/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Dec 23 05:03:33 PST 2010
editeng/source/misc/unolingu.cxx | 8 ++++----
linguistic/inc/misc.hxx | 2 +-
linguistic/source/iprcache.cxx | 4 ++--
linguistic/source/lngprophelp.cxx | 5 +++--
linguistic/source/lngsvcmgr.cxx | 2 +-
linguistic/source/misc.cxx | 2 +-
svx/source/engine3d/scene3d.cxx | 1 +
xmloff/source/script/XMLEventImportHelper.cxx | 2 +-
8 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit 2aeed988ed40def635adcd42fb0ed073fd1a2752
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 23 12:51:59 2010 +0000
cppcheck: uninit member variable
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 43e0db6..0988535 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -93,6 +93,7 @@ ImpRemap3DDepth::ImpRemap3DDepth(sal_uInt32 nOrdNum, double fMinimalDepth)
ImpRemap3DDepth::ImpRemap3DDepth(sal_uInt32 nOrdNum)
: mnOrdNum(nOrdNum),
+ mfMinimalDepth(0.0),
mbIsScene(sal_True)
{
}
commit 7dbb9fc213647ee88a82c661f920802428bbd496
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 23 12:51:01 2010 +0000
cppcheck: prefer prefix variant
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index b6f2dce..12a9e65 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -55,7 +55,7 @@ XMLEventImportHelper::~XMLEventImportHelper()
FactoryMap::iterator aEnd = aFactoryMap.end();
for(FactoryMap::iterator aIter = aFactoryMap.begin();
aIter != aEnd;
- aIter++ )
+ ++aIter)
{
delete aIter->second;
}
commit d97871b2789a80e60b3dbf8ede280eb1c70c01da
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 23 12:38:55 2010 +0000
fix these ones up
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 84ddce2..a35dd21 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -264,9 +264,9 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
for (int k = 0; k < nNumServices; ++k)
{
- OUString aService( A2OU( apServices[k] ) );
- OUString aActiveList( A2OU( apCurLists[k] ) );
- OUString aLastFoundList( A2OU( apLastFoundLists[k] ) );
+ OUString aService( ::rtl::OUString::createFromAscii( apServices[k] ) );
+ OUString aActiveList( ::rtl::OUString::createFromAscii( apCurLists[k] ) );
+ OUString aLastFoundList( ::rtl::OUString::createFromAscii( apLastFoundLists[k] ) );
INT32 i;
//
@@ -364,7 +364,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck )
for (int i = 0; i < 2; ++i)
{
const sal_Char *pSubNodeName = (i == 0) ? apCurLists[k] : apLastFoundLists[k];
- OUString aSubNodeName( A2OU(pSubNodeName) );
+ OUString aSubNodeName( ::rtl::OUString::createFromAscii(pSubNodeName) );
list_entry_map_t &rCurMap = (i == 0) ? aCurSvcs[k] : aLastFoundSvcs[k];
list_entry_map_t::const_iterator aIt( rCurMap.begin() );
commit a1a44faaf9859c7ed6d8f93cf78f5ae63fc61a01
Author: serval <serval2412 at yahoo.fr>
Date: Wed Dec 22 21:33:57 2010 +0000
RTL_CONSTASCII_USTRINGPARAM
diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx
index e28a4f1..5853e81 100644
--- a/linguistic/inc/misc.hxx
+++ b/linguistic/inc/misc.hxx
@@ -77,7 +77,7 @@ namespace linguistic
{
// ascii to OUString conversion
-#define A2OU(x) ::rtl::OUString::createFromAscii( x )
+#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
/// Flags to be used with the multi-path related functions
/// @see GetDictionaryPaths, GetLinguisticPaths
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index f831505..185e1e7 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -100,7 +100,7 @@ static void lcl_AddAsPropertyChangeListener(
for (int i = 0; i < NUM_FLUSH_PROPS; ++i)
{
rPropSet->addPropertyChangeListener(
- A2OU(aFlushProperties[i].pPropName), xListener );
+ ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener );
}
}
}
@@ -115,7 +115,7 @@ static void lcl_RemoveAsPropertyChangeListener(
for (int i = 0; i < NUM_FLUSH_PROPS; ++i)
{
rPropSet->removePropertyChangeListener(
- A2OU(aFlushProperties[i].pPropName), xListener );
+ ::rtl::OUString::createFromAscii(aFlushProperties[i].pPropName), xListener );
}
}
}
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 5ccd55c..5a81077 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -82,7 +82,7 @@ PropertyChgHelper::PropertyChgHelper(
OUString *pName = aPropNames.getArray();
for (INT32 i = 0; i < nCHCount; ++i)
{
- pName[i] = A2OU( aCH[i] );
+ pName[i] = ::rtl::OUString::createFromAscii( aCH[i] );
}
SetDefaultValues();
@@ -119,7 +119,8 @@ void PropertyChgHelper::AddPropNames( const char *pNewNames[], INT32 nCount )
OUString *pName = GetPropNames().getArray();
for (INT32 i = 0; i < nCount; ++i)
{
- pName[ nLen + i ] = A2OU( pNewNames[ i ] );
+ pName[ nLen + i ] = ::rtl::OUString::createFromAscii( pNewNames[ i ] );
+
}
}
}
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 4b32b4d..a46918c 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1653,7 +1653,7 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName )
{
DBG_ASSERT( 0, "node name missing" );
}
- OUString aNodeName( A2OU(pNodeName) );
+ OUString aNodeName( ::rtl::OUString::createFromAscii(pNodeName) );
for (INT32 i = 0; i < nLen; ++i)
{
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index edfdaac..a107d7f 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -892,7 +892,7 @@ uno::Reference< XInterface > GetOneInstanceService( const char *pServiceName )
{
try
{
- xRef = xMgr->createInstance( A2OU( pServiceName ) );
+ xRef = xMgr->createInstance( ::rtl::OUString::createFromAscii( pServiceName ) );
}
catch (uno::Exception &)
{
More information about the Libreoffice-commits
mailing list