[Libreoffice-commits] .: comphelper/source cui/source filter/source framework/source sfx2/source svl/source svx/source
comphelper/source/misc/mediadescriptor.cxx|8 ++--
cui/source/customize/cfgutil.cxx | 24 +++---
filter/source/config/cache/filtercache.cxx|4 +-
framework/source/dispatch/dispatchinformationprovider.cxx |4 +-
framework/source/services/pathsettings.cxx| 12 +++
sfx2/source/appl/appserv.cxx |8 ++--
sfx2/source/appl/workwin.cxx |8 ++--
svl/source/config/itemholder2.cxx |4 +-
svx/source/unodraw/recoveryui.cxx |4 +-
9 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit fa6665282e2a7c8753eb35b2f03499134413caca
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 5 10:49:59 2012 +0100
Some cppcheck cleaning
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 90b713c..038e718 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -369,8 +369,8 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
}
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException )
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -750,8 +750,8 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const
::rtl::OUString sURL, s
return xUriRef-getUriReference();
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f5fb4a8..02055ae 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -172,8 +172,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
if (xStyle.is())
xStyle-getPropertyValue(STYLEPROP_UINAME) = aStyle.sLabel;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ aStyle.sLabel = ::rtl::OUString(); }
@@ -212,8 +212,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
else
xFamilyInfo-getPropertyValue(STYLEPROP_UINAME) =
aFamilyInfo.sLabel;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ return ::std::vector SfxStyleInfo_Impl (); }
@@ -236,8 +236,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
xFamilies-getByName(sFamily) = xStyleSet;
lStyleNames = xStyleSet-getElementNames();
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ return ::std::vector SfxStyleInfo_Impl (); }
@@ -259,8 +259,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
continue;
xStyle-getPropertyValue(PROP_UINAME) = aStyleInfo.sLabel;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ continue; }
@@ -513,8 +513,8 @@ void SfxConfigGroupListBox_Impl::InitModule()
pEntry-SetUserData(pInfo);
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
@@ -879,8 +879,8 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference
XComponentContext xC
sUIName =
lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)
), ::rtl::OUString());
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(css::uno::Exception)
{ sUIName = ::rtl::OUString(); }
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index b623e13..ca1af31 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -931,8 +931,8 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const
::rtl::OUString sDirect
{
aValue = xAccess-getByName(sKey);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{
[Libreoffice-commits] .: comphelper/source
comphelper/source/container/embeddedobjectcontainer.cxx | 30
+++
comphelper/source/eventattachermgr/eventattachermgr.cxx |2
comphelper/source/misc/docpasswordhelper.cxx | 16 +--
comphelper/source/misc/documentinfo.cxx | 18 ++--
comphelper/source/misc/locale.cxx |4
comphelper/source/misc/logging.cxx|4
comphelper/source/misc/mediadescriptor.cxx|4
comphelper/source/misc/mimeconfighelper.cxx | 42
+-
comphelper/source/misc/numbers.cxx|2
comphelper/source/misc/regpathhelper.cxx |8 -
comphelper/source/misc/sequenceashashmap.cxx |4
comphelper/source/misc/storagehelper.cxx |2
comphelper/source/misc/string.cxx |2
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 10 +-
comphelper/source/property/genericpropertyset.cxx |4
comphelper/source/property/propagg.cxx|2
comphelper/source/property/property.cxx |2
comphelper/source/property/propertybag.cxx|2
comphelper/source/xml/ofopxmlhelper.cxx | 16 +--
19 files changed, 87 insertions(+), 87 deletions(-)
New commits:
commit 00a67c0f9056729695e6004707d64b448756fa6f
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Mon Dec 12 23:01:55 2011 -0200
Fix for fdo43460 Part VII getLength() to isEmpty()
Part VII
Module
comphelper
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 30edd51..8300443 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -324,7 +324,7 @@ uno::Reference embed::XEmbeddedObject
EmbeddedObjectContainer::GetEmbeddedOb
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::GetEmbeddedObject );
-OSL_ENSURE( rName.getLength(), Empty object name!);
+OSL_ENSURE( !rName.isEmpty(), Empty object name!);
uno::Reference embed::XEmbeddedObject xObj;
EmbeddedObjectContainerNameMap::iterator aIt =
pImpl-maObjectContainer.find( rName );
@@ -402,7 +402,7 @@ uno::Reference embed::XEmbeddedObject
EmbeddedObjectContainer::CreateEmbedde
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::CreateEmbeddedObject );
-if ( !rNewName.getLength() )
+if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
OSL_ENSURE( !HasEmbeddedObject(rNewName), Object to create already
exists!);
@@ -444,7 +444,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const
::com::sun::star::uno::Re
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::AddEmbeddedObject );
#if OSL_DEBUG_LEVEL 1
-OSL_ENSURE( rName.getLength(), Added object doesn't have a name!);
+OSL_ENSURE( !rName.isEmpty(), Added object doesn't have a name!);
uno::Reference container::XNameAccess xAccess( pImpl-mxStorage,
uno::UNO_QUERY );
uno::Reference embed::XEmbedPersist xEmb( xObj, uno::UNO_QUERY );
uno::Reference embed::XLinkageSupport xLink( xEmb, uno::UNO_QUERY );
@@ -508,7 +508,7 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject(
const uno::Reference em
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::StoreEmbeddedObject );
uno::Reference embed::XEmbedPersist xPersist( xObj, uno::UNO_QUERY );
-if ( !rName.getLength() )
+if ( rName.isEmpty() )
rName = CreateUniqueObjectName();
#if OSL_DEBUG_LEVEL 1
@@ -561,7 +561,7 @@ uno::Reference embed::XEmbeddedObject
EmbeddedObjectContainer::InsertEmbedde
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( InputStream ) );
-if ( !rNewName.getLength() )
+if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
// store it into the container storage
@@ -623,7 +623,7 @@ uno::Reference embed::XEmbeddedObject
EmbeddedObjectContainer::InsertEmbedde
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( MediaDescriptor ) );
-if ( !rNewName.getLength() )
+if ( rNewName.isEmpty() )
rNewName = CreateUniqueObjectName();
uno::Reference embed::XEmbeddedObject xObj;
@@ -658,7 +658,7 @@ uno::Reference embed::XEmbeddedObject
EmbeddedObjectContainer::InsertEmbedde
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::InsertEmbeddedLink );
-
