[Libreoffice-commits] .: 2 commits - binfilter/bf_sch
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 4 03:37:36 PST 2011
binfilter/bf_sch/source/ui/docshell/makefile.mk | 1
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 40 +++---
binfilter/bf_sch/source/ui/unoidl/makefile.mk | 1
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx | 20 +--
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 45 +++----
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx | 54 ++++----
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 34 ++---
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx | 30 ++--
binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx | 32 ++---
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 61 +++++-----
binfilter/bf_sch/source/ui/unoidl/sch_mapprov.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_register.cxx | 6
binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx | 2
15 files changed, 171 insertions(+), 163 deletions(-)
New commits:
commit 89383435046e03dc08bfdaa192c6c71868430afa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 11:37:23 2011 +0000
WaE: this dir is warning free now
diff --git a/binfilter/bf_sch/source/ui/unoidl/makefile.mk b/binfilter/bf_sch/source/ui/unoidl/makefile.mk
index 041c621..98fa1ce 100644
--- a/binfilter/bf_sch/source/ui/unoidl/makefile.mk
+++ b/binfilter/bf_sch/source/ui/unoidl/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
index a6b2dd5..55ba5a5 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
@@ -421,7 +421,7 @@ void SAL_CALL ChXChartAxis::setPropertyValue( const ::rtl::OUString& aPropertyNa
case SCHATTR_AXIS_AUTO_STEP_MAIN:
case SCHATTR_AXIS_AUTO_STEP_HELP:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
aValue >>= bVal;
if( ! bVal )
{
@@ -446,7 +446,7 @@ void SAL_CALL ChXChartAxis::setPropertyValue( const ::rtl::OUString& aPropertyNa
break;
case SCHATTR_AXIS_LOGARITHM:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
aValue >>= bVal;
if( bVal )
{
@@ -478,7 +478,7 @@ void SAL_CALL ChXChartAxis::setPropertyValue( const ::rtl::OUString& aPropertyNa
ChartAxis* pAxis = mpModel->GetAxis( mnWhichId );
if( pAxis )
bLog = pAxis->IsLogarithm();
- double fVal;
+ double fVal(0.0);
aValue >>= fVal;
if( fVal <= bLog? 1.0: 0.0 )
throw lang::IllegalArgumentException();
@@ -492,7 +492,7 @@ void SAL_CALL ChXChartAxis::setPropertyValue( const ::rtl::OUString& aPropertyNa
case SCHATTR_AXIS_MAX:
{
ChartAxis* pAxis = mpModel->GetAxis( mnWhichId );
- double fVal;
+ double fVal(0.0);
aValue >>= fVal;
if( pAxis &&
pAxis->IsLogarithm() && fVal <= 0.0 )
@@ -511,7 +511,7 @@ void SAL_CALL ChXChartAxis::setPropertyValue( const ::rtl::OUString& aPropertyNa
case SCHATTR_AXIS_NUMFMTPERCENT:
// was mapped from SCHATTR_AXIS_NUMFMT, so don't use standard mechanism
{
- sal_Int32 nFmt;
+ sal_Int32 nFmt(0);
aValue >>= nFmt;
pSet->Put( SfxUInt32Item( nWID, nFmt ));
}
@@ -663,7 +663,7 @@ void SAL_CALL ChXChartAxis::setPropertyValues (
case SCHATTR_AXIS_AUTO_STEP_MAIN:
case SCHATTR_AXIS_AUTO_STEP_HELP:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
*pValue >>= bVal;
if( ! bVal )
{
@@ -689,7 +689,7 @@ void SAL_CALL ChXChartAxis::setPropertyValues (
case SCHATTR_AXIS_LOGARITHM:
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
*pValue >>= bVal;
if( bVal )
{
@@ -721,7 +721,7 @@ void SAL_CALL ChXChartAxis::setPropertyValues (
ChartAxis* pAxis = mpModel->GetAxis( mnWhichId );
if( pAxis )
bLog = pAxis->IsLogarithm();
- double fVal;
+ double fVal(0.0);
*pValue >>= fVal;
if( fVal <= bLog? 1.0: 0.0 )
throw lang::IllegalArgumentException();
@@ -739,7 +739,7 @@ void SAL_CALL ChXChartAxis::setPropertyValues (
case SCHATTR_AXIS_MAX:
{
ChartAxis* pAxis = mpModel->GetAxis( mnWhichId );
- double fVal;
+ double fVal(0.0);
*pValue >>= fVal;
if ( pAxis
&& pAxis->IsLogarithm()
@@ -763,7 +763,7 @@ void SAL_CALL ChXChartAxis::setPropertyValues (
case SCHATTR_AXIS_NUMFMTPERCENT:
// was mapped from SCHATTR_AXIS_NUMFMT, so don't use standard mechanism
{
- sal_Int32 nFmt;
+ sal_Int32 nFmt(0);
*pValue >>= nFmt;
aAttributes.Put( SfxUInt32Item( nWID, nFmt ));
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx
index 0f03b7f..c867d1e 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartData.cxx
@@ -176,7 +176,7 @@ sal_Int64 SAL_CALL ChXChartData::getSomething( const uno::Sequence< sal_Int8 >&
}
// XEventListener listens to disposing of XModel
-void SAL_CALL ChXChartData::disposing( const lang::EventObject& Source ) throw( uno::RuntimeException )
+void SAL_CALL ChXChartData::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException )
{
// XModel is disposed -> mpModel is invalid now
mpModel = NULL;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx
index 598aa44..122f264 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDataChangeEventListener.cxx
@@ -73,7 +73,7 @@ void SAL_CALL ChXChartDataChangeEventListener::chartDataChanged( const chart::Ch
}
// XEventListener
-void SAL_CALL ChXChartDataChangeEventListener::disposing( const lang::EventObject& Source ) throw( uno::RuntimeException )
+void SAL_CALL ChXChartDataChangeEventListener::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException )
{
Reset();
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
index 5a3e86e..e13c403 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
@@ -211,7 +211,7 @@ void ChXChartDocument::SetChartModel( ChartModel* pModel ) throw()
m_aPropSet = SvxItemPropertySet( aSchMapProvider.GetMap( CHMAP_DOC, m_pModel ));
}
-void ChXChartDocument::RefreshData( const chart::ChartDataChangeEvent& aEvent ) throw()
+void ChXChartDocument::RefreshData( const chart::ChartDataChangeEvent& /*aEvent*/ ) throw()
{
osl::Guard< osl::Mutex > aGuard( GetMutex());
@@ -528,7 +528,7 @@ void SAL_CALL ChXChartDocument::setPropertyValue( const ::rtl::OUString& aProper
{
case CHATTR_DIAGRAM_START: // dummy id for "HasLegend"
{
- sal_Bool bVal;
+ sal_Bool bVal(sal_False);
aValue >>= bVal;
m_pModel->SetShowLegend( bVal );
m_pModel->SetLegendHasBeenMoved( FALSE );
@@ -579,7 +579,7 @@ void SAL_CALL ChXChartDocument::setPropertyValue( const ::rtl::OUString& aProper
break;
case CHATTR_EXPORT_TABLE:
{
- sal_Bool bValueToSet;
+ sal_Bool bValueToSet(sal_False);
aValue >>= bValueToSet;
SchChartRange aRange = pData->GetChartRange();
@@ -592,7 +592,7 @@ void SAL_CALL ChXChartDocument::setPropertyValue( const ::rtl::OUString& aProper
break;
case CHATTR_FIRST_COL_LABELS:
{
- sal_Bool bValueToSet;
+ sal_Bool bValueToSet(sal_False);
aValue >>= bValueToSet;
SchChartRange aRange = pData->GetChartRange();
@@ -605,7 +605,7 @@ void SAL_CALL ChXChartDocument::setPropertyValue( const ::rtl::OUString& aProper
break;
case CHATTR_FIRST_ROW_LABELS:
{
- sal_Bool bValueToSet;
+ sal_Bool bValueToSet(sal_False);
aValue >>= bValueToSet;
SchChartRange aRange = pData->GetChartRange();
@@ -688,7 +688,7 @@ void SAL_CALL ChXChartDocument::setPropertyValue( const ::rtl::OUString& aProper
}
else if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ExportForClipboard" )))
{
- sal_Bool bBool;
+ sal_Bool bBool(sal_False);
aValue >>= bBool;
m_pDocShell->SetClipboardExport( bBool );
}
@@ -856,7 +856,7 @@ uno::Any SAL_CALL ChXChartDocument::getPropertyValue( const ::rtl::OUString& aPr
// 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(sal_False);
aAny >>= nValue;
aAny <<= static_cast< sal_Int16 >( nValue );
}
@@ -889,29 +889,29 @@ uno::Any SAL_CALL ChXChartDocument::getPropertyValue( const ::rtl::OUString& aPr
return aAny;
}
-void SAL_CALL ChXChartDocument::addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& xListener )
+void SAL_CALL ChXChartDocument::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartDocument::removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& aListener )
+void SAL_CALL ChXChartDocument::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartDocument::addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXChartDocument::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartDocument::removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXChartDocument::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -1003,7 +1003,7 @@ void SAL_CALL ChXChartDocument::setDiagram( const uno::Reference< chart::XDiagra
// use AddIn
if( m_pModel )
{
- SolarMutexGuard aGuard;
+ SolarMutexGuard aLclGuard;
m_pModel->SetChartAddIn( xAddIn );
// initialize AddIn with this as chart document
@@ -1050,7 +1050,7 @@ void SAL_CALL ChXChartDocument::setDiagram( const uno::Reference< chart::XDiagra
// clear addin
if( m_pModel )
{
- SolarMutexGuard aGuard;
+ SolarMutexGuard aLclGuard;
uno::Reference< util::XRefreshable > xRefreshable;
m_pModel->SetChartAddIn( xRefreshable );
}
@@ -1083,7 +1083,7 @@ void SAL_CALL ChXChartDocument::setDiagram( const uno::Reference< chart::XDiagra
// update local model
if( m_pModel )
{
- SolarMutexGuard aGuard;
+ SolarMutexGuard aLclGuard;
m_pModel = m_pDocShell->GetModelPtr();
}
}
@@ -1373,7 +1373,7 @@ void ChXChartDocument::InitNumberFormatter() throw( uno::RuntimeException )
{
if( m_pModel )
{
- SolarMutexGuard aGuard;
+ SolarMutexGuard aLclGuard;
mrNumberFormatter = new SvNumberFormatsSupplierObj( m_pModel->GetNumFormatter() );
}
else
@@ -1570,11 +1570,10 @@ uno::Reference< drawing::XShapes > ChXChartDocument::GetAdditionalShapes()
DBG_ASSERT( xFoundShapes.is(), "Couldn't create a shape collection!" );
if( xFoundShapes.is())
{
- ::std::vector< uno::Reference< drawing::XShape > >::iterator aIter;
- for( aIter = aShapeVector.begin(); aIter != aShapeVector.end(); ++aIter )
- xFoundShapes->add( *aIter );
+ ::std::vector< uno::Reference< drawing::XShape > >::iterator aLclIter;
+ for( aLclIter = aShapeVector.begin(); aLclIter != aShapeVector.end(); ++aLclIter )
+ xFoundShapes->add( *aLclIter );
}
-// }
}
return xFoundShapes;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx
index 4c54aa0..fa78e1d 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDrawPage.cxx
@@ -48,18 +48,18 @@ const SfxItemPropertyMap* ImplGetChartDrawPageMap()
{
{ MAP_CHAR_LEN( "Width" ), CHART_DRAW_PAGE_WIDTH_ID, &::getCppuType((const sal_Int32*)0), 0, 0 },
{ MAP_CHAR_LEN( "Height" ), CHART_DRAW_PAGE_HEIGHT_ID, &::getCppuType((const sal_Int32*)0), 0, 0 },
- { 0,0,0,0,0 }
+ { 0,0,0,0,0,0 }
};
return aChartDrawPage;
}
-ChXChartDrawPage::ChXChartDrawPage( ChartModel* pModel ) :
- SvxDrawPage( pModel? pModel->GetPage( 0 ): NULL ),
- mpModel( pModel ),
+ChXChartDrawPage::ChXChartDrawPage( ChartModel* pInModel ) :
+ SvxDrawPage( pInModel? pInModel->GetPage( 0 ): NULL ),
+ mpModel( pInModel ),
maPropSet( ImplGetChartDrawPageMap() )
{
- DBG_ASSERT( pModel != NULL, "ChXChartDrawPage: Invalid model (=> invalid page)" );
+ DBG_ASSERT( pInModel != NULL, "ChXChartDrawPage: Invalid model (=> invalid page)" );
}
ChXChartDrawPage::~ChXChartDrawPage() throw()
@@ -150,12 +150,12 @@ void SAL_CALL ChXChartDrawPage::setPropertyValue( const ::rtl::OUString& aProper
{
case CHART_DRAW_PAGE_WIDTH_ID:
{
- const SdrPage* pPage = mpModel->GetPage( 0 );
- if( pPage )
+ const SdrPage* pLclPage = mpModel->GetPage( 0 );
+ if( pLclPage )
{
- sal_Int32 nWidth;
+ sal_Int32 nWidth(0);
aValue >>= nWidth;
- Size aSize = pPage->GetSize();
+ Size aSize = pLclPage->GetSize();
aSize.setWidth( nWidth );
mpModel->ResizePage( aSize );
@@ -164,12 +164,12 @@ void SAL_CALL ChXChartDrawPage::setPropertyValue( const ::rtl::OUString& aProper
break;
case CHART_DRAW_PAGE_HEIGHT_ID:
{
- const SdrPage* pPage = mpModel->GetPage( 0 );
- if( pPage )
+ const SdrPage* pLclPage = mpModel->GetPage( 0 );
+ if( pLclPage )
{
- sal_Int32 nHeight;
+ sal_Int32 nHeight(0);
aValue >>= nHeight;
- Size aSize = pPage->GetSize();
+ Size aSize = pLclPage->GetSize();
aSize.setHeight( nHeight );
mpModel->ResizePage( aSize );
@@ -197,20 +197,20 @@ uno::Any SAL_CALL ChXChartDrawPage::getPropertyValue( const ::rtl::OUString& aPr
{
case CHART_DRAW_PAGE_WIDTH_ID:
{
- const SdrPage* pPage = mpModel->GetPage( 0 );
- if( pPage )
+ const SdrPage* pLclPage = mpModel->GetPage( 0 );
+ if( pLclPage )
{
- Size aSize = pPage->GetSize();
+ Size aSize = pLclPage->GetSize();
aResult <<= aSize.getWidth();
}
}
break;
case CHART_DRAW_PAGE_HEIGHT_ID:
{
- const SdrPage* pPage = mpModel->GetPage( 0 );
- if( pPage )
+ const SdrPage* pLclPage = mpModel->GetPage( 0 );
+ if( pLclPage )
{
- Size aSize = pPage->GetSize();
+ Size aSize = pLclPage->GetSize();
aResult <<= aSize.getHeight();
}
}
@@ -220,29 +220,29 @@ uno::Any SAL_CALL ChXChartDrawPage::getPropertyValue( const ::rtl::OUString& aPr
return aResult;
}
-void SAL_CALL ChXChartDrawPage::addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& xListener )
+void SAL_CALL ChXChartDrawPage::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartDrawPage::removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& aListener )
+void SAL_CALL ChXChartDrawPage::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartDrawPage::addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXChartDrawPage::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartDrawPage::removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXChartDrawPage::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index fc7bb0d..5a34dda 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -255,7 +255,7 @@ awt::Size SAL_CALL ChXChartObject::getSize() throw( uno::RuntimeException )
return awt::Size();
}
-void SAL_CALL ChXChartObject::setSize( const awt::Size& aSize )
+void SAL_CALL ChXChartObject::setSize( const awt::Size& /*aSize*/ )
throw( beans::PropertyVetoException, uno::RuntimeException )
{
// set size is not supported by any chart object except
@@ -597,7 +597,7 @@ uno::Any SAL_CALL ChXChartObject::getPropertyValue( const ::rtl::OUString& Prope
// 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)) && aResultaAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
aResultaAny >>= nValue;
aResultaAny <<= static_cast< sal_Int16 >( nValue );
}
@@ -630,29 +630,29 @@ uno::Any SAL_CALL ChXChartObject::getPropertyValue( const ::rtl::OUString& Prope
return aResultaAny;
}
-void SAL_CALL ChXChartObject::addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& xListener )
+void SAL_CALL ChXChartObject::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartObject::removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& aListener )
+void SAL_CALL ChXChartObject::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartObject::addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXChartObject::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXChartObject::removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXChartObject::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -870,8 +870,8 @@ uno::Sequence< uno::Any > SAL_CALL ChXChartObject::getPropertyValues (
void SAL_CALL ChXChartObject::addPropertiesChangeListener (
- const uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const uno::Reference< beans::XPropertiesChangeListener >& xListener )
+ const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/,
+ const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
throw ( uno::RuntimeException)
{
// Not implemented.
@@ -881,7 +881,7 @@ void SAL_CALL ChXChartObject::addPropertiesChangeListener (
void SAL_CALL ChXChartObject::removePropertiesChangeListener (
- const uno::Reference< beans::XPropertiesChangeListener >& xListener )
+ const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
throw ( uno::RuntimeException)
{
// Not implemented.
@@ -891,8 +891,8 @@ void SAL_CALL ChXChartObject::removePropertiesChangeListener (
void SAL_CALL ChXChartObject::firePropertiesChangeEvent (
- const uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const uno::Reference< beans::XPropertiesChangeListener >& xListener )
+ const uno::Sequence< ::rtl::OUString >& /*aPropertyNames*/,
+ const uno::Reference< beans::XPropertiesChangeListener >& /*xListener*/ )
throw ( uno::RuntimeException)
{
// Not implemented.
@@ -1113,7 +1113,7 @@ uno::Any SAL_CALL ChXChartObject::getPropertyDefault( const ::rtl::OUString& aPr
// 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 <<= static_cast< sal_Int16 >( nValue );
}
@@ -1375,7 +1375,7 @@ void ChXChartObject::GetPropertyValue (const SfxItemPropertyMap & rProperty,
// since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
if( ( *rProperty.pType == ::getCppuType((const sal_Int16*)0)) && rValue.getValueType() == ::getCppuType((const sal_Int32*)0) )
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
rValue >>= nValue;
rValue <<= static_cast< sal_Int16 >( nValue );
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
index 0014186..68f97af 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataPoint.cxx
@@ -157,7 +157,7 @@ void SAL_CALL ChXDataPoint::setPropertyValue( const ::rtl::OUString& aPropertyNa
}
else if( nWID == CHATTR_PIE_SEGMENT_OFFSET ) // member of ChartModel rather than property
{
- sal_Int32 nVal;
+ sal_Int32 nVal(0);
aValue >>= nVal;
short nValToSet = (short)(abs( nVal ) % 101); // cast long->short is ok (range 0..100)
@@ -228,7 +228,7 @@ void SAL_CALL ChXDataPoint::setPropertyValue( const ::rtl::OUString& aPropertyNa
if( pSet->Count() )
{
- sal_Int32 nVal;
+ sal_Int32 nVal(0);
switch( nWID )
{
case SCHATTR_STAT_KIND_ERROR:
@@ -453,7 +453,9 @@ uno::Any SAL_CALL ChXDataPoint::getPropertyValue( const ::rtl::OUString& Propert
break;
case CHDESCR_TEXTANDVALUE:
nVal = chart::ChartDataCaption::VALUE | chart::ChartDataCaption::TEXT;
- // chart::ChartDataCaption::FORMAT (missing)
+ break;
+ default:
+ break;
}
if( bShowSymbol ) nVal |= chart::ChartDataCaption::SYMBOL;
@@ -479,7 +481,7 @@ uno::Any SAL_CALL ChXDataPoint::getPropertyValue( const ::rtl::OUString& Propert
// 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 <<= static_cast< sal_Int16 >( nValue );
}
@@ -506,29 +508,29 @@ uno::Any SAL_CALL ChXDataPoint::getPropertyValue( const ::rtl::OUString& Propert
return aAny;
}
-void SAL_CALL ChXDataPoint::addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& xListener )
+void SAL_CALL ChXDataPoint::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDataPoint::removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& aListener )
+void SAL_CALL ChXDataPoint::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDataPoint::addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXDataPoint::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDataPoint::removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXDataPoint::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -547,7 +549,7 @@ beans::PropertyState SAL_CALL ChXDataPoint::getPropertyState( const ::rtl::OUStr
{
if( pMap->nWID == CHATTR_PIE_SEGMENT_OFFSET )
{
- sal_Int32 nOffset;
+ sal_Int32 nOffset(0);
uno::Any aAny = getPropertyValue( PropertyName );
aAny >>= nOffset;
if( nOffset )
@@ -801,7 +803,7 @@ uno::Any SAL_CALL ChXDataPoint::getPropertyDefault( const ::rtl::OUString& aProp
// 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 <<= static_cast< sal_Int16 >( nValue );
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
index a58ad5c..905f2fd 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDataRow.cxx
@@ -157,7 +157,7 @@ void SAL_CALL ChXDataRow::setPropertyValue( const ::rtl::OUString& aPropertyName
else if( nWID == CHATTR_PIE_SEGMENT_OFFSET ) // member of ChartModel rather than property
{
// (not fully supported yet. problem: getPropertyValue)
- sal_Int32 nVal;
+ sal_Int32 nVal(0);
aValue >>= nVal;
short nValToSet = (short)(abs( nVal ) % 101); // cast long->short is ok (range 0..100)
@@ -234,7 +234,7 @@ void SAL_CALL ChXDataRow::setPropertyValue( const ::rtl::OUString& aPropertyName
if( pSet->Count() )
{
- sal_Int32 nVal;
+ sal_Int32 nVal(0);
switch( nWID )
{
case SCHATTR_STAT_KIND_ERROR:
@@ -329,8 +329,8 @@ void SAL_CALL ChXDataRow::setPropertyValue( const ::rtl::OUString& aPropertyName
if( SCHATTR_DATADESCR_START <= nWID && nWID <= SCHATTR_DATADESCR_END )
{
SfxItemSet rAttr( mpModel->GetDataRowAttr( mnRow ));
- SvxChartDataDescr eNewDataDescr;
- BOOL bNewShowSym;
+ SvxChartDataDescr eNewDataDescr(CHDESCR_NONE);
+ BOOL bNewShowSym(FALSE);
const SfxPoolItem *pPoolItem;
if( rAttr.GetItemState( SCHATTR_DATADESCR_DESCR, TRUE, &pPoolItem ) == SFX_ITEM_SET )
@@ -507,7 +507,9 @@ uno::Any SAL_CALL ChXDataRow::getPropertyValue( const ::rtl::OUString& PropertyN
break;
case CHDESCR_TEXTANDVALUE:
nVal = chart::ChartDataCaption::VALUE | chart::ChartDataCaption::TEXT;
- // chart::ChartDataCaption::FORMAT (missing)
+ break;
+ default:
+ break;
}
if( bShowSymbol ) nVal |= chart::ChartDataCaption::SYMBOL;
@@ -533,7 +535,7 @@ uno::Any SAL_CALL ChXDataRow::getPropertyValue( const ::rtl::OUString& PropertyN
// 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 <<= static_cast< sal_Int16 >( nValue );
}
@@ -560,29 +562,29 @@ uno::Any SAL_CALL ChXDataRow::getPropertyValue( const ::rtl::OUString& PropertyN
return aAny;
}
-void SAL_CALL ChXDataRow::addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& xListener )
+void SAL_CALL ChXDataRow::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDataRow::removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& aListener )
+void SAL_CALL ChXDataRow::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDataRow::addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXDataRow::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDataRow::removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXDataRow::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -736,7 +738,7 @@ uno::Any SAL_CALL ChXDataRow::getPropertyDefault( const ::rtl::OUString& aProper
// 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 <<= static_cast< sal_Int16 >( nValue );
}
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 21ca8ac..aa54236 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -164,9 +164,9 @@ inline void add_listener (uno::Reference<uno::XInterface> xObject, ChXDiagram *
}
ChXDiagram::ChXDiagram( SchChartDocShell* pDocShell, sal_Bool bPreInit ) :
+ mnBaseType( -1 ),
mpModel( NULL ),
maPropSet( aSchMapProvider.GetMap( CHMAP_CHART, NULL )),
- mnBaseType( -1 ),
maListenerList (maMutex)
{
if( bPreInit )
@@ -295,6 +295,9 @@ uno::Any ChXDiagram::GetAnyByItem( SfxItemSet& aSet, const SfxItemPropertyMap* p
break;
case CHDESCR_TEXTANDVALUE:
nVal = chart::ChartDataCaption::VALUE | chart::ChartDataCaption::TEXT;
+ break;
+ default:
+ break;
}
if( bShowSymbol ) nVal |= chart::ChartDataCaption::SYMBOL;
@@ -324,13 +327,13 @@ uno::Any ChXDiagram::GetAnyByItem( SfxItemSet& aSet, const SfxItemPropertyMap* p
// 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 <<= static_cast< sal_Int16 >( nValue );
}
else if( ( *pMap->pType == ::getCppuType((const sal_uInt16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
{
- sal_Int32 nValue;
+ sal_Int32 nValue(0);
aAny >>= nValue;
aAny <<= static_cast< sal_uInt16 >( nValue );
}
@@ -787,7 +790,7 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
throw PropertyVetoException();
USHORT nWID = pMap->nWID;
- sal_Int32 nVal;
+ sal_Int32 nVal(0);
SfxItemSet* pSet;
switch( nWID )
@@ -1003,29 +1006,29 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
case SCHATTR_DATADESCR_DESCR:
{
// symbol
- sal_Int32 nVal;
- aValue >>= nVal;
+ sal_Int32 nLclVal(0);
+ aValue >>= nLclVal;
pSet->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYM,
- ((nVal & chart::ChartDataCaption::SYMBOL) != 0)) );
+ ((nLclVal & chart::ChartDataCaption::SYMBOL) != 0)) );
// display text, percent or both or value
SvxChartDataDescr eDescr = CHDESCR_NONE;
- if( nVal & chart::ChartDataCaption::TEXT )
+ if( nLclVal & chart::ChartDataCaption::TEXT )
{
- if( nVal & chart::ChartDataCaption::PERCENT )
+ if( nLclVal & chart::ChartDataCaption::PERCENT )
eDescr = CHDESCR_TEXTANDPERCENT;
- else if( (nVal & chart::ChartDataCaption::VALUE) )
+ else if( (nLclVal & chart::ChartDataCaption::VALUE) )
eDescr = CHDESCR_TEXTANDVALUE;
else
eDescr = CHDESCR_TEXT;
}
- else if( (nVal & chart::ChartDataCaption::VALUE) )
+ else if( (nLclVal & chart::ChartDataCaption::VALUE) )
{
eDescr = CHDESCR_VALUE;
}
else
{
- if( (nVal & chart::ChartDataCaption::PERCENT) )
+ if( (nLclVal & chart::ChartDataCaption::PERCENT) )
eDescr = CHDESCR_PERCENT;
}
@@ -1055,7 +1058,7 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
case SCHATTR_STYLE_STACKED:
case SCHATTR_STYLE_PERCENT:
{
- sal_Bool bSet;
+ sal_Bool bSet(sal_False);
aValue >>= bSet;
if( bSet )
{
@@ -1077,7 +1080,7 @@ void SAL_CALL ChXDiagram::setPropertyValue( const ::rtl::OUString& aPropertyName
case SCHATTR_STYLE_DEEP:
{
- sal_Bool bSet;
+ sal_Bool bSet(sal_False);
aValue >>= bSet;
// if deep is turned on, 3d must also be set
@@ -1285,29 +1288,29 @@ uno::Any SAL_CALL ChXDiagram::getPropertyValue( const ::rtl::OUString& PropertyN
return aAny;
}
-void SAL_CALL ChXDiagram::addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& xListener )
+void SAL_CALL ChXDiagram::addPropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDiagram::removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const uno::Reference< beans::XPropertyChangeListener >& aListener )
+void SAL_CALL ChXDiagram::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/,
+ const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDiagram::addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXDiagram::addVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
{}
-void SAL_CALL ChXDiagram::removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const uno::Reference< beans::XVetoableChangeListener >& aListener )
+void SAL_CALL ChXDiagram::removeVetoableChangeListener( const ::rtl::OUString& /*PropertyName*/,
+ const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
throw( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
@@ -1437,6 +1440,7 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
pScene = lcl_GetScene( mpModel );
}
if (pScene != NULL)
+ {
if (nWID == OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX)
{
const Matrix4D& aMtx = pScene->GetFullTransform();
@@ -1472,11 +1476,13 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
}
else
bTryAgain = TRUE;
+ }
}
}
// Step3
if (bTryAgain)
+ {
if (aAttributes.GetItemState (nWID, sal_False) == SFX_ITEM_SET)
{
*pPropertyValue = GetAnyByItem (aAttributes, pProperty);
@@ -1498,6 +1504,7 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
sName.GetBuffer(), nWID);
#endif
}
+ }
// Advance to the next property, property name and value.
pPropertyName++;
@@ -1514,15 +1521,15 @@ Sequence<Any> SAL_CALL ChXDiagram::getPropertyValues (
void SAL_CALL ChXDiagram::addPropertiesChangeListener (
- const Sequence<OUString >& aPropertyNames,
- const Reference<beans::XPropertiesChangeListener >& xListener)
+ const Sequence<OUString >& /*aPropertyNames*/,
+ const Reference<beans::XPropertiesChangeListener >& /*xListener*/)
throw (RuntimeException)
{
// Not implemented.
}
void SAL_CALL ChXDiagram::removePropertiesChangeListener (
- const Reference<beans::XPropertiesChangeListener>& xListener)
+ const Reference<beans::XPropertiesChangeListener>& /*xListener*/)
throw (RuntimeException)
{
// Not implemented.
@@ -1530,8 +1537,8 @@ void SAL_CALL ChXDiagram::removePropertiesChangeListener (
void SAL_CALL ChXDiagram::firePropertiesChangeEvent (
- const Sequence<OUString >& aPropertyNames,
- const Reference<beans::XPropertiesChangeListener >& xListener)
+ const Sequence<OUString >& /*aPropertyNames*/,
+ const Reference<beans::XPropertiesChangeListener >& /*xListener*/)
throw (RuntimeException)
{
// Not implemented.
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_mapprov.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_mapprov.cxx
index 13eecce..760784f 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_mapprov.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_mapprov.cxx
@@ -132,7 +132,7 @@ SchUnoPropertyMapProvider aSchMapProvider;
#define SCH_ALIEN_PROPERTIES \
{ MAP_CHAR_LEN( UNONAME_USER_DEF_ATTR ), SCHATTR_USER_DEFINED_ATTR, &::getCppuType((uno::Reference< container::XNameContainer >*)0), 0, 0 }
-#define SCH_MAP_END { 0,0,0,0,0 }
+#define SCH_MAP_END { 0,0,0,0,0,0 }
// ---------------
// map definitions
@@ -197,7 +197,7 @@ SfxItemPropertyMap* SchUnoPropertyMapProvider::CopyMap( const SfxItemPropertyMap
return pNewMap;
}
-SfxItemPropertyMap* SchUnoPropertyMapProvider::GetMap( short nPropertyId, ChartModel *pModel )
+SfxItemPropertyMap* SchUnoPropertyMapProvider::GetMap( short nPropertyId, ChartModel * /*pModel*/ )
{
// ---------------
// map definitions
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
index 774a46e..ea9fe2d 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
@@ -42,12 +42,12 @@ extern uno::Reference< uno::XInterface > SAL_CALL SchDocument_createInstance(con
extern "C" {
void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvironmentTypeName ,
- uno_Environment** ppEnvironment )
+ uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-sal_Bool SAL_CALL component_writeInfo( void* pServiceManager ,
+sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ ,
void* pRegistryKey )
{
uno::Reference< registry::XRegistryKey >
@@ -69,7 +69,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager ,
void* SAL_CALL component_getFactory( const sal_Char* pImplementationName ,
void* pServiceManager ,
- void* pRegistryKey )
+ void* /*pRegistryKey*/ )
{
void* pReturn = NULL ;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx
index 238d6fd..1a36665 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_unodoc.cxx
@@ -55,7 +55,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SchDocument_getSupportedServiceNames()
}
uno::Reference< uno::XInterface > SAL_CALL SchDocument_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+ const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ ) throw( uno::Exception )
{
SolarMutexGuard aGuard;
commit 1235e467641dffb0a139149b18ca70c10e1e2987
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 09:05:05 2011 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_sch/source/ui/docshell/makefile.mk b/binfilter/bf_sch/source/ui/docshell/makefile.mk
index 4b57286..79b5ca1 100644
--- a/binfilter/bf_sch/source/ui/docshell/makefile.mk
+++ b/binfilter/bf_sch/source/ui/docshell/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index bcfa5c7..888174f 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -198,10 +198,10 @@ using namespace ::com::sun::star;
/*N*/ SchChartDocShell::SchChartDocShell(SfxObjectCreateMode eMode) throw() :
/*N*/ SfxObjectShell(eMode),
+/*N*/ pChDoc(NULL),
/*N*/ pUndoManager(NULL),
/*N*/ pPrinter(NULL),
/*N*/ pFontList(NULL),
-/*N*/ pChDoc(NULL),
/*N*/ bInitNewNoNewDoc(FALSE),
/*N*/ bOwnPrinter(FALSE),
/*N*/ mbClipboardExport( FALSE )
@@ -322,11 +322,11 @@ using namespace ::com::sun::star;
/*N*/ pRefDev->GetMapMode().GetMapUnit() == MAP_100TH_MM )
/*N*/ {
/*N*/ // set ref device at document at its outliner as well
-/*N*/ OutputDevice * pRefDev = GetRefDevice();
-/*N*/ if( pRefDev && pRefDev->GetMapMode().GetMapUnit() == MAP_100TH_MM )
+/*N*/ OutputDevice * pLclRefDev = GetRefDevice();
+/*N*/ if( pLclRefDev && pLclRefDev->GetMapMode().GetMapUnit() == MAP_100TH_MM )
/*N*/ {
-/*N*/ pChDoc->SetRefDevice( pRefDev );
-/*N*/ pChDoc->GetOutliner()->SetRefDevice( pRefDev );
+/*N*/ pChDoc->SetRefDevice( pLclRefDev );
+/*N*/ pChDoc->GetOutliner()->SetRefDevice( pLclRefDev );
/*N*/
/*N*/ // re-render chart with new ref-device
/*N*/
@@ -716,20 +716,20 @@ using namespace ::com::sun::star;
/*N*/ {
// #i56310# set SomeData strings according to
// ChartRange in MemChart like it is done in SaveAs
- SvPersist* pParent = GetParent();
- if( pParent )
+ SvPersist* pLclParent = GetParent();
+ if( pLclParent )
{
// determine which is parent application
SvGlobalName aGlobalName;
- ULONG nFileFormat;
+ ULONG nLclFileFormat;
String aAppName, aFullName, aShortName;
- pParent->FillClass( &aGlobalName, &nFileFormat,
+ pLclParent->FillClass( &aGlobalName, &nLclFileFormat,
&aAppName, &aFullName, &aShortName,
SOFFICE_FILEFORMAT_60 );
- if( nFileFormat == SOT_FORMATSTR_ID_STARCALC_60 )
+ if( nLclFileFormat == SOT_FORMATSTR_ID_STARCALC_60 )
pChDoc->GetChartData()->ConvertChartRangeForCalc( FALSE );
- else if( nFileFormat == SOT_FORMATSTR_ID_STARWRITER_60 )
+ else if( nLclFileFormat == SOT_FORMATSTR_ID_STARWRITER_60 )
pChDoc->GetChartData()->ConvertChartRangeForWriter( FALSE );
}
/*N*/ rDocumentStream->SetSize( 0 );
@@ -808,8 +808,8 @@ using namespace ::com::sun::star;
/*N*/ if( bFormatChanges )
/*N*/ {
/*N*/ // convert SomeData-strings from Calc/Writer to data structure
-/*N*/ SvPersist* pParent = GetParent();
-/*N*/ if( pParent )
+/*N*/ SvPersist* pLclParent = GetParent();
+/*N*/ if( pLclParent )
/*N*/ {
/*?*/ // determine which is parent application
@@ -822,7 +822,7 @@ fprintf( stderr, "BM: Conversion routine called\n" );
SvGlobalName aGlobalName;
/*?*/ ULONG nFileFormat;
/*?*/ String aAppName, aFullName, aShortName;
- /*?*/ pParent->FillClass( &aGlobalName, &nFileFormat,
+ /*?*/ pLclParent->FillClass( &aGlobalName, &nFileFormat,
/*?*/ &aAppName, &aFullName, &aShortName,
/*?*/ SOFFICE_FILEFORMAT_60 );
/*?*/
@@ -907,20 +907,20 @@ fprintf( stderr, "BM: Conversion routine called\n" );
/*N*/ // if( bFormatChanges )
/*N*/ // {
/*N*/ // convert data structure from Calc/Writer to SomeData strings
-/*N*/ SvPersist* pParent = GetParent();
-/*N*/ if( pParent )
+/*N*/ SvPersist* pLclParent = GetParent();
+/*N*/ if( pLclParent )
/*N*/ {
/*N*/ // determine which is parent application
/*N*/ SvGlobalName aGlobalName;
-/*N*/ ULONG nFileFormat;
+/*N*/ ULONG nLclFileFormat;
/*N*/ String aAppName, aFullName, aShortName;
-/*N*/ pParent->FillClass( &aGlobalName, &nFileFormat,
+/*N*/ pLclParent->FillClass( &aGlobalName, &nLclFileFormat,
/*N*/ &aAppName, &aFullName, &aShortName,
/*N*/ SOFFICE_FILEFORMAT_60 );
/*N*/
-/*N*/ if( nFileFormat == SOT_FORMATSTR_ID_STARCALC_60 )
+/*N*/ if( nLclFileFormat == SOT_FORMATSTR_ID_STARCALC_60 )
/*?*/ pChDoc->GetChartData()->ConvertChartRangeForCalc( FALSE );
-/*N*/ else if( nFileFormat == SOT_FORMATSTR_ID_STARWRITER_60 )
+/*N*/ else if( nLclFileFormat == SOT_FORMATSTR_ID_STARWRITER_60 )
/*N*/ pChDoc->GetChartData()->ConvertChartRangeForWriter( FALSE );
/*N*/ }
/*N*/ // }
More information about the Libreoffice-commits
mailing list