[Libreoffice-commits] .: binfilter/bf_sd

[Caolán McNamara]

 binfilter/bf_sd/source/ui/app/makefile.mk     |    1 -
 binfilter/bf_sd/source/ui/app/sd_optsitem.cxx |   18 +++++++++---------
 binfilter/bf_sd/source/ui/app/sd_sdlib.cxx    |    8 ++++----
 binfilter/bf_sd/source/ui/app/sd_sdmod.cxx    |    4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 8069ec1ea449878ed9a7dfb3453c148fb8c03232
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 4 21:31:41 2011 +0000

    WaE: this dir is warning free now

diff --git a/binfilter/bf_sd/source/ui/app/makefile.mk b/binfilter/bf_sd/source/ui/app/makefile.mk
index 1616889..5664a2d 100644
--- a/binfilter/bf_sd/source/ui/app/makefile.mk
+++ b/binfilter/bf_sd/source/ui/app/makefile.mk
@@ -25,7 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 PRJ=..$/..$/..$/..
 BFPRJ=..$/..$/..
 
diff --git a/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx b/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
index 94dc0f5..af6c40b 100644
--- a/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::uno;
 
 // -----------------------------------------------------------------------------
 
-    void SdOptionsItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+    void SdOptionsItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*rPropertyNames*/ ) {}
     void SdOptionsItem::Commit() {}
 
 
@@ -647,12 +647,12 @@ using namespace ::com::sun::star::uno;
 
 /*N*/ BOOL SdOptionsZoom::ReadData( const Any* pValues )
 /*N*/ {
-/*N*/ 	INT32 nX = 1, nY = 1;
+/*N*/ 	INT32 nLclX = 1, nLclY = 1;
 /*N*/ 
-/*N*/ 	if( pValues[0].hasValue() ) nX = ( *(sal_Int32*) pValues[ 0 ].getValue() ); 
-/*N*/ 	if( pValues[1].hasValue() ) nY = ( *(sal_Int32*) pValues[ 1 ].getValue() );  
+/*N*/ 	if( pValues[0].hasValue() ) nLclX = ( *(sal_Int32*) pValues[ 0 ].getValue() );
+/*N*/ 	if( pValues[1].hasValue() ) nLclY = ( *(sal_Int32*) pValues[ 1 ].getValue() );
 /*N*/ 	
-/*N*/ 	SetScale( nX, nY );
+/*N*/ 	SetScale( nLclX, nLclY );
 /*N*/ 
 /*N*/ 	return TRUE;
 /*N*/ }
@@ -661,12 +661,12 @@ using namespace ::com::sun::star::uno;
 
 /*N*/ BOOL SdOptionsZoom::WriteData( Any* pValues ) const
 /*N*/ {
-/*N*/ 	INT32 nX, nY;
+/*N*/ 	INT32 nLclX, nLclY;
 /*N*/ 
-/*N*/ 	GetScale( nX, nY );
+/*N*/ 	GetScale( nLclX, nLclY );
 /*N*/ 
-/*N*/ 	pValues[ 0 ] <<= (sal_Int32) nX; 
-/*N*/ 	pValues[ 1 ] <<= (sal_Int32) nY; 
+/*N*/ 	pValues[ 0 ] <<= (sal_Int32) nLclX;
+/*N*/ 	pValues[ 1 ] <<= (sal_Int32) nLclY;
 /*N*/ 
 /*N*/ 	return TRUE;
 /*N*/ }
diff --git a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
index e3a3c5e..036cbaf 100644
--- a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
@@ -93,7 +93,7 @@ SdDLL::~SdDLL()
 
 void SdDLL::LibInit()
 {
-    SfxApplication* pApp = SFX_APP();
+    /*SfxApplication* pApp =*/ SFX_APP();
 
     SfxObjectFactory *p1 = NULL;
     if(SvtModuleOptions().IsImpress())
@@ -290,15 +290,15 @@ ULONG SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** pFilter, SfxFilt
                 {
                     pStm->Seek( STREAM_SEEK_TO_BEGIN );
 
-                    const String		aFileName( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
-                    GraphicDescriptor	aDesc( *pStm, &aFileName );
+                    const String		aLclFileName( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
+                    GraphicDescriptor	aDesc( *pStm, &aLclFileName );
                     GraphicFilter*		pGrfFilter = GetGrfFilter();
 
                     if( !aDesc.Detect( FALSE ) )
                     {
                         *pFilter = NULL;
                         nReturn = ERRCODE_ABORT;
-                        INetURLObject aURL( aFileName );
+                        INetURLObject aURL( aLclFileName );
                         if( aURL.getExtension().equalsIgnoreAsciiCaseAscii( "cgm" ) )
                         {
                             sal_uInt8 n8;
diff --git a/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx b/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx
index cb594e6..af8eeb6 100644
--- a/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_sdmod.cxx
@@ -94,7 +94,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
     return(0);
 }
 
-void SdModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void SdModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if( rHint.ISA( SfxSimpleHint ) &&
         ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_DEINITIALIZING )
@@ -141,7 +141,7 @@ OutputDevice* SdModule::GetVirtualRefDevice (void)
     return mpVirtualRefDevice;
 }
 
-OutputDevice* SdModule::GetRefDevice (SdDrawDocShell& rDocShell)
+OutputDevice* SdModule::GetRefDevice (SdDrawDocShell& /*rDocShell*/)
 {
     return GetVirtualRefDevice();
 }