[Libreoffice-commits] .: binfilter/bf_sd
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Jan 9 06:51:19 PST 2011
binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx | 30 ++++++++++-----------
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 8 ++---
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 26 +++++++++---------
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 24 ++++++++---------
binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx | 32 +++++++++++------------
binfilter/bf_sd/source/ui/unoidl/unohelp.hxx | 4 +-
6 files changed, 62 insertions(+), 62 deletions(-)
New commits:
commit 01a02addc52ba6f21f52a52a6bbc7e367c718d7b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Jan 9 06:51:09 2011 -0800
Quite a few compiler warnings.
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
index 3d3b726..e74785f 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -107,23 +107,23 @@ String SdLayer::convertToInternalName( const OUString& rName )
OUString SdLayer::convertToExternalName( const String& rName )
{
const String aCompare( rName );
- if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" )) )
+ if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" )) )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_background) );
}
- else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" )) )
+ else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" )) )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_background_objects) );
}
- else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_LAYOUT" )) )
+ else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_LAYOUT" )) )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_layout) );
}
- else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_CONTROLS" )) )
+ else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_CONTROLS" )) )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_controls) );
}
- else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_MEASURELINES" )) )
+ else if( rName == String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_MEASURELINES" )) )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_LayerName_measurelines) );
}
@@ -190,7 +190,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
{
case WID_LAYER_LOCKED:
{
- sal_Bool bValue;
+ sal_Bool bValue(sal_False);
if(!sd::any2bool( aValue, bValue ))
throw lang::IllegalArgumentException();
set( LOCKED, bValue );
@@ -198,7 +198,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
}
case WID_LAYER_PRINTABLE:
{
- sal_Bool bValue;
+ sal_Bool bValue(sal_False);
if(!sd::any2bool( aValue, bValue ))
throw lang::IllegalArgumentException();
set( PRINTABLE, bValue );
@@ -206,7 +206,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
}
case WID_LAYER_VISIBLE:
{
- sal_Bool bValue;
+ sal_Bool bValue(sal_False);
if(!sd::any2bool( aValue, bValue ))
throw lang::IllegalArgumentException();
set( VISIBLE, bValue );
@@ -217,7 +217,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un
OUString aName;
if(!(aValue >>= aName))
throw lang::IllegalArgumentException();
-
+
pLayer->SetName(SdLayer::convertToInternalName( aName ) );
break;
}
@@ -336,7 +336,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw()
//===== ::com::sun::star::container::XChild =================================
-uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void)
+uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void)
throw (::com::sun::star::uno::RuntimeException)
{
return uno::Reference<uno::XInterface> (mxLayerManager, uno::UNO_QUERY);
@@ -344,7 +344,7 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void)
void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& /*rxParent*/)
- throw (::com::sun::star::lang::NoSupportException,
+ throw (::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException)
{
throw lang::NoSupportException ();
@@ -387,9 +387,9 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SdLayerManager::getUnoTunnel
return *pSeq;
}
-sal_Int64 SAL_CALL SdLayerManager::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL SdLayerManager::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException)
{
- if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+ if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
@@ -583,7 +583,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames()
sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
-
+
SdrLayerAdmin& rLayerAdmin = rModel.pDoc->GetLayerAdmin();
return NULL != rLayerAdmin.GetLayer( SdLayer::convertToInternalName( aName ), FALSE );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 96d5e2f..9e25ebc 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1108,7 +1108,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
}
case WID_MODEL_TABSTOP:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if(!(aValue >>= nValue) || nValue < 0 )
throw lang::IllegalArgumentException();
@@ -1130,7 +1130,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
break;
case WID_MODEL_CONTFOCUS:
{
- sal_Bool bFocus;
+ sal_Bool bFocus(sal_False);
if( !(aValue >>= bFocus ) )
throw lang::IllegalArgumentException();
pDoc->SetAutoControlFocus( bFocus );
@@ -1138,7 +1138,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam
break;
case WID_MODEL_DSGNMODE:
{
- sal_Bool bMode;
+ sal_Bool bMode(sal_False);
if( !(aValue >>= bMode ) )
throw lang::IllegalArgumentException();
pDoc->SetOpenInDesignMode( bMode );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index 0ecc5c5..4d62438 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@
#include "helpids.h"
#include "glob.hrc"
#include "unolayer.hxx"
-#include "imapinfo.hxx"
+#include "imapinfo.hxx"
namespace binfilter {
#ifndef SEQTYPE
@@ -361,7 +361,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName )
sal_uIntPtr nObjId = (sal_uIntPtr)mpShape->getPropertyMap();
SfxExtItemPropertySetInfo* pInfo = NULL;
- SdExtPropertySetInfoCache* pCache = (mpModel && mpModel->IsImpressDocument()) ?
+ SdExtPropertySetInfoCache* pCache = (mpModel && mpModel->IsImpressDocument()) ?
&gImplImpressPropertySetInfoCache : &gImplDrawPropertySetInfoCache;
SdExtPropertySetInfoCache::iterator aIter( pCache->find( nObjId ) );
@@ -410,7 +410,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
break;
case WID_ISANIMATION:
{
- sal_Bool bIsAnimation;
+ sal_Bool bIsAnimation(sal_False);
if(!(aValue >>= bIsAnimation))
throw lang::IllegalArgumentException();
@@ -445,7 +445,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
break;
case WID_BLUESCREEN:
{
- sal_Int32 nColor;
+ sal_Int32 nColor(0);
if(!(aValue >>= nColor))
throw lang::IllegalArgumentException();
@@ -454,7 +454,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
}
case WID_VERB:
{
- sal_Int32 nVerb;
+ sal_Int32 nVerb(0);
if(!(aValue >>= nVerb))
throw lang::IllegalArgumentException();
@@ -463,7 +463,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
}
case WID_DIMCOLOR:
{
- sal_Int32 nColor;
+ sal_Int32 nColor(0);
if(!(aValue >>= nColor))
throw lang::IllegalArgumentException();
@@ -478,7 +478,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
break;
case WID_PRESORDER:
{
- sal_Int32 nPos;
+ sal_Int32 nPos(0);
if(!(aValue >>= nPos))
throw lang::IllegalArgumentException();
@@ -1098,10 +1098,10 @@ uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException
{
if( 0 == pPage->GetMasterPageCount() )
return aAny;
-
+
pPage = pPage->GetMasterPage(0);
}
-
+
String aLayoutName( pPage->GetLayoutName() );
aLayoutName = aLayoutName.Erase(aLayoutName.Search( String( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ) )));
@@ -1157,7 +1157,7 @@ public:
// XNameReplace
virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
+
// XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException);
@@ -1482,7 +1482,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
{
sBuffer.append( aStrLibrary );
}
-
+
pInfo->aBookmark = sBuffer.makeStringAndClear();
bOk = sal_True;
}
@@ -1656,7 +1656,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
pProperties->Value = aAny;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
pProperties++;
-
+
// NOTE: no break here!!!
case presentation::ClickAction_SOUND:
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index 515c7fd..261a3f9 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -196,7 +196,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTun
return *pSeq;
}
-sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException)
{
if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
@@ -352,7 +352,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
case WID_PAGE_DURATION:
case WID_PAGE_CHANGE:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if(!(aValue >>= nValue))
throw lang::IllegalArgumentException();
@@ -384,7 +384,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_WIDTH:
{
- sal_Int32 nWidth;
+ sal_Int32 nWidth(0);
if(!(aValue >>= nWidth))
throw lang::IllegalArgumentException();
@@ -393,7 +393,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_HEIGHT:
{
- sal_Int32 nHeight;
+ sal_Int32 nHeight(0);
if(!(aValue >>= nHeight))
throw lang::IllegalArgumentException();
@@ -402,7 +402,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_ORIENT:
{
- sal_Int32 nEnum;
+ sal_Int32 nEnum(0);
if(!::cppu::enum2int( nEnum, aValue ))
throw lang::IllegalArgumentException();
@@ -432,7 +432,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_EFFECT:
{
- sal_Int32 nEnum;
+ sal_Int32 nEnum(0);
if(!::cppu::enum2int( nEnum, aValue ))
throw lang::IllegalArgumentException();
@@ -444,7 +444,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
break;
case WID_PAGE_SPEED:
{
- sal_Int32 nEnum;
+ sal_Int32 nEnum(0);
if(!::cppu::enum2int( nEnum, aValue ))
throw lang::IllegalArgumentException();
@@ -453,7 +453,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_VISIBLE :
{
- sal_Bool bVisible;
+ sal_Bool bVisible(sal_False);
if( ! ( aValue >>= bVisible ) )
throw lang::IllegalArgumentException();
GetPage()->SetExcluded( bVisible == FALSE );
@@ -471,7 +471,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_BACKFULL:
{
- sal_Bool bFullSize;
+ sal_Bool bFullSize(sal_False);
if( ! ( aValue >>= bFullSize ) )
throw lang::IllegalArgumentException();
GetPage()->SetBackgroundFullSize( bFullSize );
@@ -479,7 +479,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_BACKVIS:
{
- sal_Bool bVisible;
+ sal_Bool bVisible(sal_False);
if( ! ( aValue >>= bVisible ) )
throw lang::IllegalArgumentException();
@@ -499,7 +499,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
}
case WID_PAGE_BACKOBJVIS:
{
- sal_Bool bVisible;
+ sal_Bool bVisible(sal_False);
if( ! ( aValue >>= bVisible ) )
throw lang::IllegalArgumentException();
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
index 03bf9db..a3ebbaa 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -130,8 +130,8 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
{
case ATTR_PRESENT_ALL:
{
- sal_Bool bVal;
-
+ sal_Bool bVal(sal_False);
+
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -146,7 +146,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_CHANGE_PAGE:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -161,8 +161,8 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
case ATTR_PRESENT_ANIMATION_ALLOWED:
{
- sal_Bool bVal;
-
+ sal_Bool bVal(sal_False);
+
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -198,7 +198,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_ENDLESS:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -212,7 +212,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_FULLSCREEN:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -227,7 +227,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
case ATTR_PRESENT_DIANAME:
{
OUString aPresPage;
-
+
aValue >>= aPresPage;
pDoc->SetPresPage(SdDrawPage::getUiNameFromPageApiName(aPresPage));
pDoc->SetCustomShow(false);
@@ -238,7 +238,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_MANUEL:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -252,7 +252,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_MOUSE:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -266,7 +266,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_ALWAYS_ON_TOP:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -280,7 +280,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_NAVIGATOR:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -294,7 +294,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_PEN:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
@@ -308,7 +308,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_PAUSE_TIMEOUT:
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if(!(aValue >>= nValue) || (nValue < 0))
throw lang::IllegalArgumentException();
@@ -317,7 +317,7 @@ void SAL_CALL SdXPresentation::setPropertyValue( const OUString& aPropertyName,
}
case ATTR_PRESENT_SHOW_PAUSELOGO:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
if(! sd::any2bool( aValue, bVal ) )
throw lang::IllegalArgumentException();
diff --git a/binfilter/bf_sd/source/ui/unoidl/unohelp.hxx b/binfilter/bf_sd/source/ui/unoidl/unohelp.hxx
index 07ff678..901890d 100644
--- a/binfilter/bf_sd/source/ui/unoidl/unohelp.hxx
+++ b/binfilter/bf_sd/source/ui/unoidl/unohelp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ inline sal_Bool any2bool( const ::com::sun::star::uno::Any& rAny, sal_Bool& rBoo
}
else
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
if(!(rAny >>= nValue))
return sal_False;
rBool = nValue != 0;
More information about the Libreoffice-commits
mailing list