[Libreoffice-commits] .: cui/source filter/source sfx2/source
Michael Meeks
michael at kemper.freedesktop.org
Tue Nov 1 04:05:48 PDT 2011
cui/source/dialogs/about.cxx | 8 --------
cui/source/inc/cuitabarea.hxx | 1 +
cui/source/options/optinet2.cxx | 28 ++++++++++++++--------------
filter/source/svg/svgreader.cxx | 2 +-
sfx2/source/appl/appmisc.cxx | 40 +++-------------------------------------
5 files changed, 19 insertions(+), 60 deletions(-)
New commits:
commit 75c1a8033a876b711c7b360565c99f831dd9d2e8
Author: Michael Meeks <michael.meeks at suse.com>
Date: Tue Nov 1 09:56:55 2011 +0000
WaE: various sillies flagged by MSVC++
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 0d77033..b987b4a 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -65,14 +65,6 @@ using namespace ::com::sun::star;
#define SPACE_OFFSET 5
#define SCROLL_TIMER 30
-/** loads the application logo as used in the about dialog and impress slideshow pause screen */
-Image SfxApplication::GetApplicationLogo()
-{
- BitmapEx aBitmap;
- Application::LoadBrandBitmap ("about", aBitmap);
- return Image( aBitmap );
-}
-
/* get good version information */
static String
GetBuildId()
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 1f76ce0..7bb13e2 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -657,6 +657,7 @@ public:
const ResId &aLoad, const ResId &aSave,
const ResId &aEmbed, const ResId &aTableName,
XPropertyListType t, XOutdevItemPool* mpXPool );
+ virtual ~SvxLoadSaveEmbed() {};
XPropertyListRef GetList();
void HideLoadSaveEmbed();
bool GetEmbed();
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a8fe225..17a55ef 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -315,15 +315,15 @@ void SvxProxyTabPage::ReadConfigData_Impl()
}
}
- catch(container::NoSuchElementException &e) {
+ catch(container::NoSuchElementException &) {
OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" );
}
- catch(com::sun::star::lang::WrappedTargetException &e) {
+ catch(com::sun::star::lang::WrappedTargetException &) {
OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" );
}
- catch(RuntimeException &e) {
+ catch(RuntimeException &) {
OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: RuntimeException caught" );
}
@@ -373,16 +373,16 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl()
aNoProxyForED.SetText( aStringValue );
}
}
- catch(beans::UnknownPropertyException &e)
+ catch(beans::UnknownPropertyException &)
{
OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" );
}
- catch(com::sun::star::lang::WrappedTargetException &e) {
+ catch(com::sun::star::lang::WrappedTargetException &) {
OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" );
}
- catch(RuntimeException &e)
+ catch(RuntimeException &)
{
OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" );
}
@@ -407,16 +407,16 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl()
xChangesBatch->commitChanges();
}
- catch(beans::UnknownPropertyException &e)
+ catch(beans::UnknownPropertyException &)
{
OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" );
}
- catch(com::sun::star::lang::WrappedTargetException &e) {
+ catch(com::sun::star::lang::WrappedTargetException &) {
OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" );
}
- catch(RuntimeException &e)
+ catch(RuntimeException &)
{
OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: RuntimeException caught" );
}
@@ -512,23 +512,23 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
xChangesBatch->commitChanges();
}
- catch(com::sun::star::lang::IllegalArgumentException &e) {
+ catch(com::sun::star::lang::IllegalArgumentException &) {
OSL_TRACE( "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" );
}
- catch(beans::UnknownPropertyException &e) {
+ catch(beans::UnknownPropertyException &) {
OSL_TRACE( "SvxProxyTabPage::FillItemSet: UnknownPropertyException caught" );
}
- catch(beans::PropertyVetoException &e) {
+ catch(beans::PropertyVetoException &) {
OSL_TRACE( "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" );
}
- catch(com::sun::star::lang::WrappedTargetException &e) {
+ catch(com::sun::star::lang::WrappedTargetException &) {
OSL_TRACE( "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" );
}
- catch(RuntimeException &e) {
+ catch(RuntimeException &) {
OSL_TRACE( "SvxProxyTabPage::FillItemSet: RuntimeException caught" );
}
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 6b66c50..07f3a16 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -2433,7 +2433,7 @@ struct ShapeRenderingVisitor
if( !maCurrState.maFontStyle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("normal")) )
aFont.SetItalic(ITALIC_NORMAL); // TODO: discriminate
- if( !maCurrState.mnFontWeight != 400.0 )
+ if( maCurrState.mnFontWeight != 400.0 )
aFont.SetWeight(WEIGHT_BOLD); // TODO: discriminate
// extract basic transformations out of CTM
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index fffecd3..ee0b8da 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -309,43 +309,9 @@ static bool impl_loadBitmap(
/** loads the application logo as used in the about dialog and impress slideshow pause screen */
Image SfxApplication::GetApplicationLogo()
{
- Image aAppLogo;
-
- rtl::OUString aAbouts;
- bool bLoaded = false;
- sal_Int32 nIndex = 0;
- do
- {
- bLoaded = impl_loadBitmap(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")),
- aAbouts.getToken( 0, ',', nIndex ), aAppLogo );
- }
- while ( !bLoaded && ( nIndex >= 0 ) );
-
- // fallback to "about.bmp"
- if ( !bLoaded )
- {
- bLoaded = impl_loadBitmap(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.png")), aAppLogo );
- if ( !bLoaded )
- bLoaded = impl_loadBitmap(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.bmp")), aAppLogo );
- }
-
- if ( !bLoaded )
- {
- bLoaded = impl_loadBitmap(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.png")), aAppLogo );
- if ( !bLoaded )
- bLoaded = impl_loadBitmap(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.bmp")), aAppLogo );
- }
-
- return aAppLogo;
+ BitmapEx aBitmap;
+ Application::LoadBrandBitmap ("about", aBitmap);
+ return Image( aBitmap );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list