[Libreoffice-commits] .: 2 commits - binfilter/bf_sd binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Jan 5 02:01:21 PST 2011
binfilter/bf_sd/source/ui/docshell/makefile.mk | 1
binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx | 28 +-
binfilter/bf_sd/source/ui/docshell/sd_grdocsh.cxx | 4
binfilter/bf_sd/source/ui/unoidl/makefile.mk | 2
binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx | 22 -
binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx | 6
binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx | 5
binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx | 21 -
binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx | 26 +-
binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx | 75 +++---
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 134 ++++++------
binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx | 12 -
binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx | 15 -
binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx | 40 +--
binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx | 4
binfilter/inc/bf_sd/anminfo.hxx | 2
binfilter/inc/bf_sd/imapinfo.hxx | 11
20 files changed, 215 insertions(+), 201 deletions(-)
New commits:
commit c0d6947333d89d11208d869a405af041c68a1ce8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 5 10:01:05 2011 +0000
WaE: this dir is warning free now
diff --git a/binfilter/bf_sd/source/ui/unoidl/makefile.mk b/binfilter/bf_sd/source/ui/unoidl/makefile.mk
index 32304f4..8360009 100644
--- a/binfilter/bf_sd/source/ui/unoidl/makefile.mk
+++ b/binfilter/bf_sd/source/ui/unoidl/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
index a8c0b2e..eec0599 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_UnoDocumentSettings.cxx
@@ -556,10 +556,10 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
if( *pValues >>= aPrinterName )
{
bOk = sal_True;
- SfxPrinter *pPrinter = pDocSh->GetPrinter( sal_True );
- if (pPrinter)
+ SfxPrinter *pLclPrinter = pDocSh->GetPrinter( sal_True );
+ if (pLclPrinter)
{
- SfxPrinter *pNewPrinter = new SfxPrinter ( pPrinter->GetOptions().Clone(), aPrinterName );
+ SfxPrinter *pNewPrinter = new SfxPrinter ( pLclPrinter->GetOptions().Clone(), aPrinterName );
pDocSh->SetPrinter( pNewPrinter );
}
}
@@ -688,11 +688,11 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
}
case HANDLE_UPDATEFROMTEMPLATE:
{
- sal_Bool bValue;
- if( *pValues >>= bValue )
+ sal_Bool bLclValue;
+ if( *pValues >>= bLclValue )
{
SfxDocumentInfo& rInfo = pDocSh->GetDocInfo();
- rInfo.SetQueryLoadTemplate( bValue );
+ rInfo.SetQueryLoadTemplate( bLclValue );
bOk = sal_True;
}
}
@@ -897,17 +897,17 @@ void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, A
break;
case HANDLE_PRINTERNAME:
{
- SfxPrinter *pPrinter = pDocSh->GetPrinter( sal_False );
- *pValue <<= pPrinter ? OUString ( pPrinter->GetName()) : OUString();
+ SfxPrinter *pLclPrinter = pDocSh->GetPrinter( sal_False );
+ *pValue <<= pLclPrinter ? OUString ( pLclPrinter->GetName()) : OUString();
}
break;
case HANDLE_PRINTERJOB:
{
- SfxPrinter *pPrinter = pDocSh->GetPrinter( sal_False );
- if (pPrinter)
+ SfxPrinter *pLclPrinter = pDocSh->GetPrinter( sal_False );
+ if (pLclPrinter)
{
SvMemoryStream aStream;
- pPrinter->Store( aStream );
+ pLclPrinter->Store( aStream );
aStream.Seek ( STREAM_SEEK_TO_END );
sal_uInt32 nSize = aStream.Tell();
aStream.Seek ( STREAM_SEEK_TO_BEGIN );
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
index 4191e41..122d3e6 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
@@ -52,7 +52,7 @@ extern "C"
{
#endif
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -67,7 +67,7 @@ void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString&
xNewKey->createKey( rServices.getConstArray()[i]);
}
-sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
+sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{
if( pRegistryKey )
{
@@ -86,7 +86,7 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
return sal_True;
}
-void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx
index 0629501..bb8fe0d 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unocpres.cxx
@@ -292,7 +292,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createIn
return xRef;
}
-uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments )
+uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstanceWithArguments( const uno::Sequence< uno::Any >& /*aArguments*/ )
throw(uno::Exception, uno::RuntimeException)
{
return createInstance();
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx
index 67c0821..e2c3f09 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unodoc.cxx
@@ -56,7 +56,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdDrawingDocument_getSupportedServiceN
}
uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
{
SolarMutexGuard aGuard;
@@ -95,7 +95,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SdPresentationDocument_getSupportedSer
}
uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
{
SolarMutexGuard aGuard;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
index d986b89..b2eff35 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogsfm.cxx
@@ -366,7 +366,7 @@ void SAL_CALL SdUnoGraphicStyleFamily::removeByName( const OUString& Name )
{
pSSPool = (SfxStyleSheetBasePool*)pDoc->GetStyleSheetPool();
if( pSSPool )
- SfxStyleSheetBase* pStyleSheet = pSSPool->Find( getInternalStyleName(Name), SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
+ /*SfxStyleSheetBase* pStyleSheet =*/ pSSPool->Find( getInternalStyleName(Name), SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
}
if( NULL == pStyleSheet || pStyleSheet->IsUserDefined() )
@@ -415,7 +415,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdUnoGraphicStyleFamily::createInstan
return (::cppu::OWeakObject*)new SdUnoGraphicStyle();
}
-uno::Reference< uno::XInterface > SAL_CALL SdUnoGraphicStyleFamily::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments )
+uno::Reference< uno::XInterface > SAL_CALL SdUnoGraphicStyleFamily::createInstanceWithArguments( const uno::Sequence< uno::Any >& /*aArguments*/ )
throw(uno::Exception, uno::RuntimeException)
{
return (::cppu::OWeakObject*)new SdUnoGraphicStyle();
@@ -442,6 +442,7 @@ void SdUnoGraphicStyleFamily::createStyle( SfxStyleSheetBase* pStyleSheet, uno::
DBG_ASSERT( pStyleSheet, "need a style for insert! [CL]" );
DBG_ASSERT( pDoc, "need a document here! [CL]" );
+ (void)pDoc;
uno::WeakReference< uno::XInterface > xRef;
uno::Reference< style::XStyle > xStyle;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
index 442d442..3d3b726 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unolayer.cxx
@@ -70,7 +70,7 @@ const SfxItemPropertyMap* ImplGetSdLayerPropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_LAYER_PRINTABLE), WID_LAYER_PRINTABLE,&::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN(UNO_NAME_LAYER_VISIBLE), WID_LAYER_VISIBLE, &::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, &::getCppuType((const OUString*)0), 0, 0 },
- { 0,0,0,0,0}
+ { 0,0,0,0,0,0 }
};
return aSdLayerPropertyMap_Impl;
@@ -135,9 +135,10 @@ OUString SdLayer::convertToExternalName( const String& rName )
/** */
SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) throw()
-: aPropSet(ImplGetSdLayerPropertyMap()),
- pLayerManager(pLayerManager_), pLayer(pSdrLayer_),
- mxLayerManager(pLayerManager_)
+ : pLayerManager(pLayerManager_)
+ , mxLayerManager(pLayerManager_)
+ , pLayer(pSdrLayer_)
+ , aPropSet(ImplGetSdLayerPropertyMap())
{
}
@@ -263,10 +264,10 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
return aValue;
}
-void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdLayer::addPropertyChangeListener( const OUString&/* aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
/** */
sal_Bool SdLayer::get( LayerAttribute what ) throw()
@@ -342,7 +343,7 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void)
}
-void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& rxParent)
+void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& /*rxParent*/)
throw (::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException)
{
@@ -449,7 +450,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal
return xLayer;
}
-void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& xLayer ) throw(container::NoSuchElementException, uno::RuntimeException)
+void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& /*xLayer*/ ) throw(container::NoSuchElementException, uno::RuntimeException)
{
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index 499aa7b..96d5e2f 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -136,7 +136,7 @@ SdUnoForbiddenCharsTable::~SdUnoForbiddenCharsTable()
EndListening( *mpModel );
}
-void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw()
+void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) throw()
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
@@ -173,7 +173,7 @@ const SfxItemPropertyMap* ImplGetDrawModelPropertyMap()
{ MAP_CHAR_LEN(sUNO_Prop_AutomContFocus ), WID_MODEL_CONTFOCUS, &::getBooleanCppuType(), 0, 0},
{ MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, &::getBooleanCppuType(), 0, 0},
{ MAP_CHAR_LEN("BasicLibraries"), WID_MODEL_BASICLIBS,&::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 },
- { 0,0,0,0,0 }
+ { 0,0,0,0,0,0 }
};
return aDrawModelPropertyMap_Impl;
@@ -183,8 +183,8 @@ const SfxItemPropertyMap* ImplGetDrawModelPropertyMap()
SdXImpressDocument::SdXImpressDocument( SdDrawDocShell* pShell ) throw()
: SfxBaseModel( pShell ),
pDocShell( pShell ),
- aPropSet( ImplGetDrawModelPropertyMap() ),
- mbClipBoard( sal_False )
+ mbClipBoard( sal_False ),
+ aPropSet( ImplGetDrawModelPropertyMap() )
{
if( pDocShell )
{
@@ -1224,10 +1224,10 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property
return aAny;
}
-void SAL_CALL SdXImpressDocument::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdXImpressDocument::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
// XLinkTargetSupplier
uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks()
@@ -1259,7 +1259,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFa
}
// XAnyCompareFactory
-uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& PropertyName )
+uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& /*PropertyName*/ )
throw (uno::RuntimeException)
{
return SvxCreateNumRuleCompare();
@@ -1267,7 +1267,7 @@ uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL SdXImpressDocument
// XRenderable
sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelection,
- const uno::Sequence< beans::PropertyValue >& rxOptions )
+ const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@@ -1300,8 +1300,8 @@ sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelect
return nRet;
}
-uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( sal_Int32 nRenderer, const uno::Any& rSelection,
- const uno::Sequence< beans::PropertyValue >& rxOptions )
+uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( sal_Int32 /*nRenderer*/, const uno::Any& /*rSelection*/,
+ const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@@ -1386,7 +1386,7 @@ IMPL_LINK( ImplRenderPaintProc, _ImplRenderPaintProc, SdrPaintProcRec*, pRecord
return 0;
}
-void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& rSelection,
+void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& /*rSelection*/,
const uno::Sequence< beans::PropertyValue >& rxOptions )
throw (lang::IllegalArgumentException, uno::RuntimeException)
{
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
index c83583f..0ecc5c5 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
@@ -147,7 +147,7 @@ const SfxItemPropertyMap* ImplGetShapePropertyMap( sal_Bool bImpress, sal_Bool b
{ MAP_CHAR_LEN(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, &::getCppuType((const sal_Int32*)0), 0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OBJ_VERB), WID_VERB, &::getCppuType((const sal_Int32*)0), 0, 0},
{ MAP_CHAR_LEN("IsAnimation"), WID_ISANIMATION, &::getBooleanCppuType(), 0, 0},
- { 0,0,0,0,0}
+ { 0,0,0,0,0,0 }
};
static const SfxItemPropertyMap aDraw_SdXShapePropertyMap_Impl[] =
@@ -156,7 +156,7 @@ const SfxItemPropertyMap* ImplGetShapePropertyMap( sal_Bool bImpress, sal_Bool b
{ MAP_CHAR_LEN(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, &::getCppuType((const presentation::ClickAction*)0),0, 0},
{ MAP_CHAR_LEN(UNO_NAME_OBJ_STYLE), WID_STYLE, &ITYPE(style::XStyle), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { 0,0,0,0,0}
+ { 0,0,0,0,0,0 }
};
if( bImpress )
@@ -167,7 +167,7 @@ const SfxItemPropertyMap* ImplGetShapePropertyMap( sal_Bool bImpress, sal_Bool b
SfxItemPropertyMap aEmpty_SdXShapePropertyMap_Impl[] =
{
- { 0,0,0,0,0}
+ { 0,0,0,0,0,0 }
};
const SvEventDescription* ImplGetSupportedMacroItems()
@@ -203,16 +203,16 @@ static int SortFunc( const void* p1, const void* p2 )
return ( pCmp1->nOrder < pCmp2->nOrder ? -1 : pCmp1->nOrder > pCmp2->nOrder ? 1 : 0 );
}
-SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw()
-: maPropSet( pModel?
+SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw() :
+ mpShape( pShape ),
+ maPropSet( pModel?
ImplGetShapePropertyMap(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF )
: aEmpty_SdXShapePropertyMap_Impl ),
mpMap( pModel?
ImplGetShapePropertyMap(pModel->IsImpressDocument(), pShape->getShapeKind() == OBJ_GRAF )
: aEmpty_SdXShapePropertyMap_Impl ),
mpModel(pModel),
- mpImplementationId( NULL ),
- mpShape( pShape )
+ mpImplementationId( NULL )
{
pShape->setMaster( this );
}
@@ -499,23 +499,23 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
uno::Reference< drawing::XShape > xShape;
aValue >>= xShape;
- SdrObject* pObj = NULL;
+ SdrObject* pLclObj = NULL;
if(xShape.is())
- pObj = GetSdrObjectFromXShape( xShape );
+ pLclObj = GetSdrObjectFromXShape( xShape );
- if( pObj == NULL || !pObj->ISA( SdrPathObj ) )
+ if( pLclObj == NULL || !pLclObj->ISA( SdrPathObj ) )
throw lang::IllegalArgumentException();
- pInfo->pPathObj = (SdrPathObj*)pObj;
+ pInfo->pPathObj = (SdrPathObj*)pLclObj;
SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL;
if( pDoc )
{
- pInfo = pDoc->GetAnimationInfo(pObj);
+ pInfo = pDoc->GetAnimationInfo(pLclObj);
if( pInfo == NULL )
{
pInfo = new SdAnimationInfo(pDoc);
- pObj->InsertUserData( pInfo );
+ pLclObj->InsertUserData( pInfo );
}
pInfo->bInvisibleInPresentation = sal_True;
}
@@ -878,7 +878,7 @@ void SdXShape::SetEmptyPresObj( sal_Bool bEmpty ) throw()
OutlinerParaObject* pOutlinerParaObject = pObj->GetOutlinerParaObject();
pOutliner->SetText( *pOutlinerParaObject );
- SfxStyleSheetPool* pStyle = pOutliner->GetStyleSheetPool();
+ /*SfxStyleSheetPool* pStyle =*/ pOutliner->GetStyleSheetPool();
const sal_Bool bVertical = pOutliner->IsVertical();
pOutliner->Clear();
@@ -1064,7 +1064,9 @@ void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumen
pObj->SetStyleSheet( (SfxStyleSheet*)pStyleSheet->getStyleSheet(), sal_False );
- SdDrawDocument* pDoc = mpModel? mpModel->GetDoc() : NULL;
+ SdDrawDocument* pDoc = NULL;
+ if (mpModel)
+ pDoc = mpModel->GetDoc();
}
uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException )
@@ -1177,22 +1179,23 @@ uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw
return new SdUnoEventsAccess( this );
}
-SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw()
-: mpShape( pShape ), mxShape( pShape ),
- maStrOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ),
- maStrServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.documents.Events") ),
- maStrEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ),
- maStrPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ),
- maStrClickAction( RTL_CONSTASCII_USTRINGPARAM("ClickAction") ),
- maStrBookmark( RTL_CONSTASCII_USTRINGPARAM("Bookmark") ),
- maStrEffect( RTL_CONSTASCII_USTRINGPARAM("Effect") ),
- maStrPlayFull( RTL_CONSTASCII_USTRINGPARAM("PlayFull") ),
- maStrVerb( RTL_CONSTASCII_USTRINGPARAM("Verb") ),
- maStrSoundURL( RTL_CONSTASCII_USTRINGPARAM("SoundURL") ),
- maStrSpeed( RTL_CONSTASCII_USTRINGPARAM("Speed") ),
- maStrStarBasic( RTL_CONSTASCII_USTRINGPARAM("StarBasic") ),
+SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw() :
+ maStrOnClick(RTL_CONSTASCII_USTRINGPARAM("OnClick")),
+ maStrServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.documents.Events")),
+ maStrEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
+ maStrPresentation(RTL_CONSTASCII_USTRINGPARAM("Presentation")),
maStrLibrary(RTL_CONSTASCII_USTRINGPARAM("Library")),
- maStrMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName"))
+ maStrMacroName(RTL_CONSTASCII_USTRINGPARAM("MacroName")),
+ maStrClickAction(RTL_CONSTASCII_USTRINGPARAM("ClickAction")),
+ maStrBookmark(RTL_CONSTASCII_USTRINGPARAM("Bookmark") ),
+ maStrEffect(RTL_CONSTASCII_USTRINGPARAM("Effect") ),
+ maStrPlayFull(RTL_CONSTASCII_USTRINGPARAM("PlayFull") ),
+ maStrVerb(RTL_CONSTASCII_USTRINGPARAM("Verb") ),
+ maStrSoundURL(RTL_CONSTASCII_USTRINGPARAM("SoundURL")),
+ maStrSpeed(RTL_CONSTASCII_USTRINGPARAM("Speed")),
+ maStrStarBasic(RTL_CONSTASCII_USTRINGPARAM("StarBasic")),
+ mpShape(pShape),
+ mxShape(pShape)
{
}
@@ -1238,8 +1241,8 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
presentation::AnimationEffect eEffect;
presentation::AnimationSpeed eSpeed;
OUString aStrSoundURL;
- sal_Bool bPlayFull;
- sal_Int32 nVerb;
+ sal_Bool bPlayFull(sal_False);
+ sal_Int32 nVerb(0);
OUString aStrMacro;
OUString aStrLibrary;
OUString aStrBookmark;
@@ -1441,6 +1444,9 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno
bOk = sal_True;
}
break;
+
+ default:
+ break;
}
}
else
@@ -1526,6 +1532,9 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
case presentation::ClickAction_VANISH:
nPropertyCount += 4;
break;
+
+ default:
+ break;
}
uno::Sequence< beans::PropertyValue > aProperties( nPropertyCount );
@@ -1674,6 +1683,8 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName )
pProperties->Value = aAny;
pProperties->State = beans::PropertyState_DIRECT_VALUE;
break;
+ default:
+ break;
}
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index 5a0506a..515c7fd 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -109,7 +109,7 @@ const SfxItemPropertyMap* ImplGetDrawPagePropertyMap( sal_Bool bImpress )
{ MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},
{ MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
static const SfxItemPropertyMap aGraphicPagePropertyMap_Impl[] =
@@ -126,7 +126,7 @@ const SfxItemPropertyMap* ImplGetDrawPagePropertyMap( sal_Bool bImpress )
{ MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ MAP_CHAR_LEN(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, &::getCppuType((const OUString*)0), 0, 0},
{ MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
if( bImpress )
@@ -152,7 +152,7 @@ const SfxItemPropertyMap* ImplGetMasterPagePropertyMap( PageKind ePageKind )
{ MAP_CHAR_LEN("BackgroundFullSize"), WID_PAGE_BACKFULL, &::getBooleanCppuType(), 0, 0},
{ MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
static const SfxItemPropertyMap aHandoutMasterPagePropertyMap_Impl[] =
@@ -167,7 +167,7 @@ const SfxItemPropertyMap* ImplGetMasterPagePropertyMap( PageKind ePageKind )
{ MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0},
{ MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ MAP_CHAR_LEN("IsBackgroundDark" ), WID_PAGE_ISDARK, &::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
if( ePageKind == PK_HANDOUT )
@@ -214,8 +214,8 @@ sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno:
***********************************************************************/
SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPage, const SfxItemPropertyMap* pMap ) throw()
: SvxFmDrawPage( (SdrPage*) pInPage ),
- mpModel ( _pModel ),
maPropSet ( (pInPage&& (pInPage->GetPageKind() != PK_STANDARD) && (pInPage->GetPageKind() != PK_HANDOUT) )?&pMap[1]:pMap ),
+ mpModel ( _pModel ),
mbHasBackgroundObject(sal_False),
mrBHelper( maMutex )
{
@@ -416,16 +416,16 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetOrientation( eOri );
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetOrientation( eOri );
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetOrientation( eOri );
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetOrientation( eOri );
}
}
break;
@@ -483,16 +483,16 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
if( ! ( aValue >>= bVisible ) )
throw lang::IllegalArgumentException();
- SdrPage* pPage = GetPage();
- if( pPage )
+ SdrPage* pLclPage = GetPage();
+ if( pLclPage )
{
- SdDrawDocument* pDoc = (SdDrawDocument*)pPage->GetModel();
+ SdDrawDocument* pDoc = (SdDrawDocument*)pLclPage->GetModel();
if( pDoc->GetMasterPageCount() )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
- SetOfByte aVisibleLayers = pPage->GetMasterPageVisibleLayers(0);
+ SetOfByte aVisibleLayers = pLclPage->GetMasterPageVisibleLayers(0);
aVisibleLayers.Set(rLayerAdmin.GetLayerID(String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" )), FALSE), bVisible);
- pPage->SetMasterPageVisibleLayers(aVisibleLayers, 0);
+ pLclPage->SetMasterPageVisibleLayers(aVisibleLayers, 0);
}
}
break;
@@ -503,16 +503,16 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
if( ! ( aValue >>= bVisible ) )
throw lang::IllegalArgumentException();
- SdrPage* pPage = GetPage();
- if( pPage )
+ SdrPage* pLclPage = GetPage();
+ if( pLclPage )
{
- SdDrawDocument* pDoc = (SdDrawDocument*)pPage->GetModel();
+ SdDrawDocument* pDoc = (SdDrawDocument*)pLclPage->GetModel();
if( pDoc->GetMasterPageCount() )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
- SetOfByte aVisibleLayers = pPage->GetMasterPageVisibleLayers(0);
+ SetOfByte aVisibleLayers = pLclPage->GetMasterPageVisibleLayers(0);
aVisibleLayers.Set(rLayerAdmin.GetLayerID(String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" )), FALSE), bVisible);
- pPage->SetMasterPageVisibleLayers(aVisibleLayers, 0);
+ pLclPage->SetMasterPageVisibleLayers(aVisibleLayers, 0);
}
}
@@ -628,14 +628,14 @@ uno::Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyN
}
case WID_PAGE_BACKVIS:
{
- SdrPage* pPage = GetPage();
- if( pPage )
+ SdrPage* pLclPage = GetPage();
+ if( pLclPage )
{
- SdDrawDocument* pDoc = (SdDrawDocument*)pPage->GetModel();
+ SdDrawDocument* pDoc = (SdDrawDocument*)pLclPage->GetModel();
if( pDoc->GetMasterPageCount() )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
- SetOfByte aVisibleLayers = pPage->GetMasterPageVisibleLayers(0);
+ SetOfByte aVisibleLayers = pLclPage->GetMasterPageVisibleLayers(0);
aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BCKGRND" )), FALSE));
}
else
@@ -647,14 +647,14 @@ uno::Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyN
}
case WID_PAGE_BACKOBJVIS:
{
- SdrPage* pPage = GetPage();
- if( pPage )
+ SdrPage* pLclPage = GetPage();
+ if( pLclPage )
{
- SdDrawDocument* pDoc = (SdDrawDocument*)pPage->GetModel();
+ SdDrawDocument* pDoc = (SdDrawDocument*)pLclPage->GetModel();
if( pDoc->GetMasterPageCount() )
{
SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin();
- SetOfByte aVisibleLayers = pPage->GetMasterPageVisibleLayers(0);
+ SetOfByte aVisibleLayers = pLclPage->GetMasterPageVisibleLayers(0);
aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(String( RTL_CONSTASCII_USTRINGPARAM( "LAYER_BACKGRNDOBJ" )), FALSE));
}
else
@@ -687,10 +687,10 @@ uno::Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyN
return aAny;
}
-void SAL_CALL SdGenericDrawPage::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdGenericDrawPage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
uno::Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) const throw()
{
@@ -772,11 +772,13 @@ uno::Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *p
case PRESOBJ_NOTES:
aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("NotesShape") );
break;
+ default:
+ break;
}
- SvxShape* pShape = SvxShape::getImplementation( xShape );
- if( pShape )
- pShape->SetShapeType( aShapeType );
+ SvxShape* pLclShape = SvxShape::getImplementation( xShape );
+ if( pLclShape )
+ pLclShape->SetShapeType( aShapeType );
}
// SdXShape aggregiert SvxShape
@@ -808,14 +810,14 @@ uno::Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks(
//----------------------------------------------------------------------
-void SdGenericDrawPage::setBackground( const uno::Any& rValue ) throw(lang::IllegalArgumentException)
+void SdGenericDrawPage::setBackground( const uno::Any& /*rValue*/ ) throw(lang::IllegalArgumentException)
{
DBG_ERROR( "Don't call me, I'm useless!" );
}
//----------------------------------------------------------------------
-void SdGenericDrawPage::getBackground( uno::Any& rValue ) throw()
+void SdGenericDrawPage::getBackground( uno::Any& /*rValue*/ ) throw()
{
DBG_ERROR( "Don't call me, I'm useless!" );
}
@@ -870,16 +872,16 @@ void SdGenericDrawPage::SetLftBorder( sal_Int32 nValue )
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetLftBorder( nValue );
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetLftBorder( nValue );
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetLftBorder( nValue );
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetLftBorder( nValue );
}
}
}
@@ -894,16 +896,16 @@ void SdGenericDrawPage::SetRgtBorder( sal_Int32 nValue )
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetRgtBorder( nValue );
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetRgtBorder( nValue );
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetRgtBorder( nValue );
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetRgtBorder( nValue );
}
}
}
@@ -918,16 +920,16 @@ void SdGenericDrawPage::SetUppBorder( sal_Int32 nValue )
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetUppBorder( nValue );
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetUppBorder( nValue );
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetUppBorder( nValue );
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetUppBorder( nValue );
}
}
}
@@ -942,21 +944,21 @@ void SdGenericDrawPage::SetLwrBorder( sal_Int32 nValue )
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetLwrBorder( nValue );
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetLwrBorder( nValue );
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetLwrBorder( nValue );
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetLwrBorder( nValue );
}
}
}
-static void refreshpage( SdDrawDocument* pDoc, const PageKind ePageKind )
+static void refreshpage( SdDrawDocument* /*pDoc*/, const PageKind /*ePageKind*/ )
{
}
@@ -973,16 +975,16 @@ void SdGenericDrawPage::SetWidth( sal_Int32 nWidth )
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetSize(aSize);
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetSize(aSize);
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetSize(aSize);
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetSize(aSize);
}
refreshpage( pDoc, ePageKind );
@@ -1002,16 +1004,16 @@ void SdGenericDrawPage::SetHeight( sal_Int32 nHeight )
USHORT i, nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
- pPage->SetSize(aSize);
+ SdPage* pLclPage = pDoc->GetMasterSdPage(i, ePageKind);
+ pLclPage->SetSize(aSize);
}
nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
- SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
- pPage->SetSize(aSize);
+ SdPage* pLclPage = pDoc->GetSdPage(i, ePageKind);
+ pLclPage->SetSize(aSize);
}
refreshpage( pDoc, ePageKind );
@@ -1295,8 +1297,8 @@ uno::Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames()
// SdDrawPage
//========================================================================
-SdDrawPage::SdDrawPage( SdXImpressDocument* mpModel, SdPage* pPage ) throw()
-: SdGenericDrawPage( mpModel, pPage, ImplGetDrawPagePropertyMap( mpModel->IsImpressDocument() ) )
+SdDrawPage::SdDrawPage( SdXImpressDocument* pInModel, SdPage* pInPage ) throw()
+: SdGenericDrawPage( pInModel, pInPage, ImplGetDrawPagePropertyMap( pInModel->IsImpressDocument() ) )
{
}
@@ -1762,11 +1764,11 @@ void SdDrawPage::getBackground( uno::Any& rValue ) throw()
// class SdMasterPage
//========================================================================
-SdMasterPage::SdMasterPage( SdXImpressDocument* mpModel, SdPage* pPage ) throw()
-: SdGenericDrawPage( mpModel, pPage, ImplGetMasterPagePropertyMap( pPage ? pPage->GetPageKind() : PK_STANDARD ) ),
+SdMasterPage::SdMasterPage( SdXImpressDocument* pInModel, SdPage* pInPage ) throw()
+: SdGenericDrawPage( pInModel, pInPage, ImplGetMasterPagePropertyMap( pInPage ? pInPage->GetPageKind() : PK_STANDARD ) ),
mpBackgroundObj(NULL)
{
- if( pPage && GetPage()->GetPageKind() == PK_STANDARD )
+ if( pInPage && GetPage()->GetPageKind() == PK_STANDARD )
{
sal_uInt32 nMasterIndex = 0;
sal_uInt32 nMasterCount = GetPage()->GetPresObjList()->Count();
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx
index e7d6d6f..6d6dc7e 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopback.cxx
@@ -52,7 +52,7 @@ const SfxItemPropertyMap* ImplGetPageBackgroundPropertyMap()
static const SfxItemPropertyMap aPageBackgroundPropertyMap_Impl[] =
{
FILL_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aPageBackgroundPropertyMap_Impl;
@@ -95,7 +95,7 @@ SdUnoPageBackground::~SdUnoPageBackground() throw()
delete mpSet;
}
-void SdUnoPageBackground::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SdUnoPageBackground::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
@@ -286,10 +286,10 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert
return aAny;
}
-void SAL_CALL SdUnoPageBackground::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPageBackground::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
// XPropertyState
beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUString& PropertyName )
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
index 03c167e..03bf9db 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopres.cxx
@@ -65,19 +65,18 @@ const SfxItemPropertyMap* ImplGetPresentationPropertyMap()
{ MAP_CHAR_LEN(UNO_NAME_SHOW_USEPEN), ATTR_PRESENT_PEN, &::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, &::getBooleanCppuType(), 0, 0 },
{ MAP_CHAR_LEN("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, &::getBooleanCppuType(), 0, 0 },
- { 0,0,0,0,0}
+ { 0,0,0,0,0,0 }
};
return aPresentationPropertyMap_Impl;
}
-SfxItemPropertyMap map_impl[] = { 0,0,0,0 };
-
///////////////////////////////////////////////////////////////////////////////
SdXPresentation::SdXPresentation(SdXImpressDocument& rMyModel) throw()
-: maPropSet(ImplGetPresentationPropertyMap()), mrModel(rMyModel)
+ : mrModel(rMyModel)
+ , maPropSet(ImplGetPresentationPropertyMap())
{
}
@@ -408,19 +407,19 @@ uno::Any SAL_CALL SdXPresentation::getPropertyValue( const OUString& PropertyNam
return any;
}
-void SAL_CALL SdXPresentation::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SdXPresentation::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
-void SAL_CALL SdXPresentation::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SdXPresentation::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
-void SAL_CALL SdXPresentation::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SdXPresentation::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
-void SAL_CALL SdXPresentation::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+void SAL_CALL SdXPresentation::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
index 2d2a28c..e34f4dd 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopsfm.cxx
@@ -357,6 +357,8 @@ void SdUnoPseudoStyleFamily::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
case HINT_MODELCLEARED:
bGoneDead = sal_True;
break;
+ default:
+ break;
}
}
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
index 75365b9..75c709b 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
@@ -81,7 +81,7 @@ const SfxItemPropertyMap* ImplGetFullPropertyMap()
TEXT_PROPERTIES
CONNECTOR_PROPERTIES
SPECIAL_DIMENSIONING_PROPERTIES
- {0,0,0,0,0}
+ {0,0,0,0,0,0}
};
return aFullPropertyMap_Impl;
@@ -90,12 +90,12 @@ const SfxItemPropertyMap* ImplGetFullPropertyMap()
//UNO3_GETIMPLEMENTATION_IMPL( SdUnoPseudoStyle );
SdUnoPseudoStyle::SdUnoPseudoStyle( SdXImpressDocument* pModel, SfxStyleSheetBase* pStyleSheet ) throw()
-: mxModel( pModel ),
- mpModel( pModel ),
- mpPage( NULL ),
- mpStyleSheet( pStyleSheet ),
+: mpStyleSheet( pStyleSheet ),
meObject( PO_TITLE ),
- maPropSet( ImplGetFullPropertyMap() )
+ maPropSet( ImplGetFullPropertyMap() ),
+ mpPage( NULL ),
+ mpModel( pModel ),
+ mxModel( pModel )
{
if( mpStyleSheet )
StartListening( mpStyleSheet->GetPool() );
@@ -103,12 +103,12 @@ SdUnoPseudoStyle::SdUnoPseudoStyle( SdXImpressDocument* pModel, SfxStyleSheetBas
SdUnoPseudoStyle::SdUnoPseudoStyle( SdXImpressDocument* pModel, SdPage* pPage,
SfxStyleSheetBase* pStyleSheet, PresentationObjects eObject ) throw()
-: mpModel( pModel ),
- mxModel( pModel ),
- mpPage( pPage ),
- mpStyleSheet( pStyleSheet ),
+: mpStyleSheet( pStyleSheet ),
meObject( eObject ),
- maPropSet( (eObject >= PO_OUTLINE_2 && eObject <= PO_OUTLINE_9) ? &ImplGetFullPropertyMap()[1] : ImplGetFullPropertyMap() )
+ maPropSet( (eObject >= PO_OUTLINE_2 && eObject <= PO_OUTLINE_9) ? &ImplGetFullPropertyMap()[1] : ImplGetFullPropertyMap() ),
+ mpPage( pPage ),
+ mpModel( pModel ),
+ mxModel( pModel )
{
if( mpStyleSheet )
StartListening( mpStyleSheet->GetPool() );
@@ -151,7 +151,7 @@ sal_Int64 SAL_CALL SdUnoPseudoStyle::getSomething( const ::com::sun::star::uno::
}
else
{
- return NULL;
+ return 0;
}
}
@@ -200,7 +200,7 @@ OUString SAL_CALL SdUnoPseudoStyle::getName( )
return OUString();
}
-void SAL_CALL SdUnoPseudoStyle::setName( const OUString& aName )
+void SAL_CALL SdUnoPseudoStyle::setName( const OUString& /*aName*/ )
throw(uno::RuntimeException)
{
}
@@ -233,7 +233,7 @@ OUString SAL_CALL SdUnoPseudoStyle::getParentStyle( )
return aName;
}
-void SAL_CALL SdUnoPseudoStyle::setParentStyle( const OUString& aParentStyle )
+void SAL_CALL SdUnoPseudoStyle::setParentStyle( const OUString& /*aParentStyle*/ )
throw(container::NoSuchElementException, uno::RuntimeException)
{
}
@@ -416,7 +416,7 @@ uno::Any SAL_CALL SdUnoPseudoStyle::getPropertyValue( const OUString& PropertyNa
// since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
if( ( *pMap->pType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
aAny >>= nValue;
aAny <<= (sal_Int16)nValue;
}
@@ -429,10 +429,10 @@ uno::Any SAL_CALL SdUnoPseudoStyle::getPropertyValue( const OUString& PropertyNa
return aAny;
}
-void SAL_CALL SdUnoPseudoStyle::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdUnoPseudoStyle::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdUnoPseudoStyle::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
-void SAL_CALL SdUnoPseudoStyle::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPseudoStyle::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPseudoStyle::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPseudoStyle::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
+void SAL_CALL SdUnoPseudoStyle::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {}
// XPropertyState
beans::PropertyState SAL_CALL SdUnoPseudoStyle::getPropertyState( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException)
@@ -599,7 +599,7 @@ uno::Any SAL_CALL SdUnoPseudoStyle::getPropertyDefault( const OUString& aPropert
}
/** detect if the StyleSheetPool dies or if this instances style sheet is erased */
-void SdUnoPseudoStyle::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SdUnoPseudoStyle::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
sal_Bool bGoneDead = sal_False;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx
index 325e2dc..835eb21 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unostyls.cxx
@@ -139,7 +139,7 @@ sal_Bool SAL_CALL SdUnoStyleFamilies::hasByName( const OUString& aName )
{
// is the model still valid?
if( NULL == mpModel->GetDoc() )
- return NULL;
+ return sal_False;
// is it the graphic style?
if( aName.compareToAscii( sUNO_Graphic_Style_Family_Name ) == 0 )
@@ -278,8 +278,6 @@ sal_uInt16 SdUnoStyleFamilies::getLayoutIndexByName( const OUString& rName ) thr
{
const String aName( rName );
- USHORT nIndex = 0;
-
SdDrawDocument* pDoc = mpModel->GetDoc();
if( NULL != pDoc )
{
diff --git a/binfilter/inc/bf_sd/anminfo.hxx b/binfilter/inc/bf_sd/anminfo.hxx
index 7954bca..4668a53 100644
--- a/binfilter/inc/bf_sd/anminfo.hxx
+++ b/binfilter/inc/bf_sd/anminfo.hxx
@@ -92,7 +92,7 @@ public:
SdAnimationInfo(const SdAnimationInfo& rAnmInfo);
virtual ~SdAnimationInfo();
- virtual SdrObjUserData* Clone(SdrObject* pObj) const {DBG_BF_ASSERT(0, "STRIP"); return NULL;} //STRIP001 virtual SdrObjUserData* Clone(SdrObject* pObj) const;
+ virtual SdrObjUserData* Clone(SdrObject* /*pObj*/) const {DBG_BF_ASSERT(0, "STRIP"); return NULL;}
virtual void WriteData(SvStream& rOut);
virtual void ReadData(SvStream& rIn);
diff --git a/binfilter/inc/bf_sd/imapinfo.hxx b/binfilter/inc/bf_sd/imapinfo.hxx
index 7cb1d8a..a3d1796 100644
--- a/binfilter/inc/bf_sd/imapinfo.hxx
+++ b/binfilter/inc/bf_sd/imapinfo.hxx
@@ -50,19 +50,22 @@ class SdIMapInfo : public SdrObjUserData, public SfxListener
public:
SdIMapInfo() :
- SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ) {};
+ SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ),
+ SfxListener() {}
SdIMapInfo( const ImageMap& rImageMap ) :
SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ),
- aImageMap( rImageMap ) {};
+ SfxListener(),
+ aImageMap( rImageMap ) {}
SdIMapInfo( const SdIMapInfo& rIMapInfo ) :
SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ),
- aImageMap( rIMapInfo.aImageMap ) {};
+ SfxListener(),
+ aImageMap( rIMapInfo.aImageMap ) {}
virtual ~SdIMapInfo() {};
- virtual SdrObjUserData* Clone( SdrObject* pObj ) const { return new SdIMapInfo( *this ); }
+ virtual SdrObjUserData* Clone( SdrObject* /*pObj*/ ) const { return new SdIMapInfo( *this ); }
virtual void WriteData( SvStream& rOStm );
virtual void ReadData( SvStream& rIStm );
commit 293a23b98eaff48d98e9e33d71a33cb5937d9e39
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 21:36:43 2011 +0000
WaE: this dir is warning free now
diff --git a/binfilter/bf_sd/source/ui/docshell/makefile.mk b/binfilter/bf_sd/source/ui/docshell/makefile.mk
index bae4b68..9d20982 100644
--- a/binfilter/bf_sd/source/ui/docshell/makefile.mk
+++ b/binfilter/bf_sd/source/ui/docshell/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
index a77c4b3..e21030d 100644
--- a/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
+++ b/binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx
@@ -87,13 +87,13 @@ void SdDrawDocShell::Construct()
SdDrawDocShell::SdDrawDocShell(SfxObjectCreateMode eMode, BOOL bDataObject, DocumentType eDocumentType) :
SfxObjectShell(eMode),
- pPrinter(NULL),
+ pProgress(NULL),
pDoc(NULL),
+ pPrinter(NULL),
+ eDocType(eDocumentType),
bUIActive(FALSE),
- pProgress(NULL),
bSdDataObj(bDataObject),
bOwnPrinter(FALSE),
- eDocType(eDocumentType),
mbNewDocument( sal_True )
{
Construct();
@@ -149,7 +149,7 @@ void SdDrawDocShell::SetVisArea(const Rectangle& rRect)
Rectangle SdDrawDocShell::GetVisArea(USHORT nAspect) const
{
- Rectangle aVisArea;
+ Rectangle aLclVisArea;
if( ( ASPECT_THUMBNAIL == nAspect ) || ( ASPECT_DOCPRINT == nAspect ) )
{
@@ -159,14 +159,14 @@ Rectangle SdDrawDocShell::GetVisArea(USHORT nAspect) const
aSrcMapMode.SetMapUnit(MAP_100TH_MM);
aSize = Application::GetDefaultDevice()->LogicToLogic(aSize, &aSrcMapMode, &aDstMapMode);
- aVisArea.SetSize(aSize);
+ aLclVisArea.SetSize(aSize);
}
else
{
- aVisArea = SfxInPlaceObject::GetVisArea(nAspect);
+ aLclVisArea = SfxInPlaceObject::GetVisArea(nAspect);
}
- return (aVisArea);
+ return (aLclVisArea);
}
@@ -278,8 +278,8 @@ BOOL SdDrawDocShell::InitNew( SvStorage * pStor )
{
BOOL bRet = SfxInPlaceObject::InitNew( pStor );
- Rectangle aVisArea( Point(0, 0), Size(14100, 10000) );
- SetVisArea(aVisArea);
+ Rectangle aLclVisArea( Point(0, 0), Size(14100, 10000) );
+ SetVisArea(aLclVisArea);
if (bRet)
{
@@ -305,12 +305,12 @@ BOOL SdDrawDocShell::Load( SvStorage* pStore )
if( bRet )
{
SdFilter* pFilter = NULL;
- SfxMedium* pMedium = 0L;
+ SfxMedium* pLclMedium = 0L;
if( bBinary )
{
- pMedium = new SfxMedium( pStore );
- pFilter = new SdBINFilter( *pMedium, *this, sal_True );
+ pLclMedium = new SfxMedium( pStore );
+ pFilter = new SdBINFilter( *pLclMedium, *this, sal_True );
}
else if( bXML )
{
@@ -322,8 +322,8 @@ BOOL SdDrawDocShell::Load( SvStorage* pStore )
if(pFilter)
delete pFilter;
- if(pMedium)
- delete pMedium;
+ if(pLclMedium)
+ delete pLclMedium;
}
}
else
diff --git a/binfilter/bf_sd/source/ui/docshell/sd_grdocsh.cxx b/binfilter/bf_sd/source/ui/docshell/sd_grdocsh.cxx
index 7702a45..a51ad96 100644
--- a/binfilter/bf_sd/source/ui/docshell/sd_grdocsh.cxx
+++ b/binfilter/bf_sd/source/ui/docshell/sd_grdocsh.cxx
@@ -50,8 +50,8 @@ TYPEINIT1(SdGraphicDocShell, SdDrawDocShell);
SFX_IMPL_OBJECTFACTORY_LOD(SdGraphicDocShell, sdraw, SvGlobalName(BF_SO3_SDRAW_CLASSID), Sd)
-SdGraphicDocShell::SdGraphicDocShell(SfxObjectCreateMode eMode, BOOL bDataObject, DocumentType eDocType)
-: SdDrawDocShell(eMode, bDataObject, eDocType)
+SdGraphicDocShell::SdGraphicDocShell(SfxObjectCreateMode eMode, BOOL bDataObject, DocumentType eInDocType)
+: SdDrawDocShell(eMode, bDataObject, eInDocType)
{
SetStyleFamily( 2 );
}
More information about the Libreoffice-commits
mailing list