mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: various sillies flagged by MSVC++

Browse Source
This commit is contained in:
Michael Meeks
2011-11-01 09:56:55 +00:00
parent 7cac551743
commit 75c1a8033a
5 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cui/source/dialogs/about.cxx
View File

@@ -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()

1
cui/source/inc/cuitabarea.hxx
View File

@@ -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();

28
cui/source/options/optinet2.cxx
View File

@@ -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" );
}

2
filter/source/svg/svgreader.cxx
View File

@@ -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

40
sfx2/source/appl/appmisc.cxx
View File

@@ -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: */