[Libreoffice-commits] .: binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Dec 23 13:45:17 PST 2010
binfilter/bf_xmloff/source/chart/xmloff_PropertyMaps.cxx | 10 ++---
binfilter/bf_xmloff/source/chart/xmloff_SchXMLAutoStylePoolP.cxx | 2 -
binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx | 12 +++---
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 11 ++----
binfilter/bf_xmloff/source/chart/xmloff_XMLChartPropertyContext.cxx | 12 +++---
binfilter/bf_xmloff/source/chart/xmloff_XMLChartStyleContext.cxx | 14 +++----
binfilter/bf_xmloff/source/chart/xmloff_XMLErrorIndicatorPropertyHdl.cxx | 4 +-
binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx | 18 +++++-----
binfilter/bf_xmloff/source/chart/xmloff_XMLTextOrientationHdl.cxx | 4 +-
9 files changed, 43 insertions(+), 44 deletions(-)
New commits:
commit aafbb073f21927a6ea32094543494ea95fe2a9e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 23 21:45:11 2010 +0000
throw out some more warnings
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_PropertyMaps.cxx b/binfilter/bf_xmloff/source/chart/xmloff_PropertyMaps.cxx
index 18d3fc5..0ca6bf8 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_PropertyMaps.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_PropertyMaps.cxx
@@ -200,7 +200,7 @@ void XMLChartExportPropertyMapper::ContextFilter(
{
try
{
- sal_Bool bAuto;
+ sal_Bool bAuto(sal_False);
uno::Any aAny = rPropSet->getPropertyValue( aAutoPropName );
aAny >>= bAuto;
if( bAuto )
@@ -373,9 +373,9 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
// ----------------------------------------
XMLChartImportPropertyMapper::XMLChartImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper,
- const SvXMLImport& rImport ) :
- SvXMLImportPropertyMapper( rMapper, const_cast< SvXMLImport & >( rImport )),
- mrImport( const_cast< SvXMLImport & > ( rImport ))
+ const SvXMLImport& rInImport ) :
+ SvXMLImportPropertyMapper( rMapper, const_cast< SvXMLImport & >( rInImport )),
+ mrImport( const_cast< SvXMLImport & > ( rInImport ))
{
// chain shape mapper for drawing properties
@@ -507,7 +507,7 @@ sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
return bRet;
}
-void XMLChartImportPropertyMapper::finished( ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const
+void XMLChartImportPropertyMapper::finished( ::std::vector< XMLPropertyState >& , sal_Int32 , sal_Int32 ) const
{
}
}//end of namespace binfilter
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLAutoStylePoolP.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLAutoStylePoolP.cxx
index 4107816..6de41dc 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLAutoStylePoolP.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLAutoStylePoolP.cxx
@@ -61,7 +61,7 @@ void SchXMLAutoStylePoolP::exportStyleAttributes(
if( nFamily == XML_STYLE_FAMILY_SCH_CHART_ID )
{
::std::vector< XMLPropertyState >::const_iterator iter = rProperties.begin();
- for( iter; (iter != rProperties.end()); iter++ )
+ for( ; (iter != rProperties.end()); ++iter )
{
UniReference< XMLPropertySetMapper > aPropMapper =
mrSchXMLExport.GetPropertySetMapper();
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx
index 8bd6eea..f2b25ac 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLParagraphContext.cxx
@@ -35,10 +35,10 @@ namespace binfilter {
using namespace rtl;
using namespace ::com::sun::star;
-SchXMLParagraphContext::SchXMLParagraphContext( SvXMLImport& rImport,
+SchXMLParagraphContext::SchXMLParagraphContext( SvXMLImport& rInImport,
const OUString& rLocalName,
OUString& rText ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TEXT, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_TEXT, rLocalName ),
mrText( rText )
{
}
@@ -52,11 +52,11 @@ void SchXMLParagraphContext::EndElement()
}
SvXMLImportContext* SchXMLParagraphContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
- if( nPrefix == XML_NAMESPACE_TEXT )
+ if( nInPrefix == XML_NAMESPACE_TEXT )
{
if( rLocalName.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_TAB_STOP )))
{
@@ -68,7 +68,7 @@ SvXMLImportContext* SchXMLParagraphContext::CreateChildContext(
}
}
- return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
void SchXMLParagraphContext::Characters( const OUString& rChars )
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
index 54b2a1e..1846847 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
@@ -1418,8 +1418,8 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
SvXMLImportContext( rImport, nPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
- mnSeriesIndex( nSeries ),
mrStyleList( rStyleList ),
+ mnSeriesIndex( nSeries ),
meContextType( eContextType )
{}
@@ -1432,17 +1432,16 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
::rtl::OUString aValue;
::rtl::OUString sAutoStyleName;
- sal_Int32 nRepeat = 1;
for( sal_Int16 i = 0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- if( nPrefix == XML_NAMESPACE_CHART )
+ if( nLclPrefix == XML_NAMESPACE_CHART )
{
- if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
sAutoStyleName = xAttrList->getValueByIndex( i );
}
}
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_XMLChartPropertyContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_XMLChartPropertyContext.cxx
index f0aa85b..ccc4c20 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_XMLChartPropertyContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_XMLChartPropertyContext.cxx
@@ -36,13 +36,13 @@ TYPEINIT1( XMLChartPropertyContext, SvXMLImportContext );
using namespace ::com::sun::star;
XMLChartPropertyContext::XMLChartPropertyContext(
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState >& rProps,
const UniReference< SvXMLImportPropertyMapper >& rMapper ) :
- SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, rProps, rMapper )
+ SvXMLPropertySetContext( rInImport, nPrfx, rLName, xAttrList, rProps, rMapper )
{
}
@@ -50,10 +50,10 @@ XMLChartPropertyContext::~XMLChartPropertyContext()
{}
SvXMLImportContext* XMLChartPropertyContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
+ ::std::vector< XMLPropertyState > &rInProperties,
const XMLPropertyState& rProp )
{
SvXMLImportContext *pContext = 0;
@@ -61,7 +61,7 @@ SvXMLImportContext* XMLChartPropertyContext::CreateChildContext(
switch( xMapper->getPropertySetMapper()->GetEntryContextId( rProp.mnIndex ) )
{
case XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE:
- pContext = new XMLSymbolImageContext( GetImport(), nPrefix, rLocalName, rProp, rProperties );
+ pContext = new XMLSymbolImageContext( GetImport(), nInPrefix, rLocalName, rProp, rInProperties );
break;
}
@@ -69,7 +69,7 @@ SvXMLImportContext* XMLChartPropertyContext::CreateChildContext(
if( !pContext )
{
pContext = SvXMLPropertySetContext::CreateChildContext(
- nPrefix, rLocalName, xAttrList, rProperties, rProp );
+ nInPrefix, rLocalName, xAttrList, rInProperties, rProp );
}
return pContext;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_XMLChartStyleContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_XMLChartStyleContext.cxx
index 5997a28..e102351 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_XMLChartStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_XMLChartStyleContext.cxx
@@ -62,12 +62,12 @@ void XMLChartStyleContext::SetAttribute(
// CTOR
XMLChartStyleContext::XMLChartStyleContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily ) :
+ SvXMLStylesContext& rStyles, sal_uInt16 nInFamily ) :
- XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ),
+ XMLPropStyleContext( rInImport, nPrfx, rLName, xAttrList, rStyles, nInFamily ),
mrStyles( rStyles )
{}
@@ -95,25 +95,25 @@ void XMLChartStyleContext::FillPropertySet(
}
SvXMLImportContext *XMLChartStyleContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext* pContext = NULL;
- if( XML_NAMESPACE_STYLE == nPrefix &&
+ if( XML_NAMESPACE_STYLE == nInPrefix &&
IsXMLToken( rLocalName, ::binfilter::xmloff::token::XML_PROPERTIES ) )
{
UniReference < SvXMLImportPropertyMapper > xImpPrMap =
GetStyles()->GetImportPropertyMapper( GetFamily() );
if( xImpPrMap.is() )
pContext = new XMLChartPropertyContext(
- GetImport(), nPrefix, rLocalName, xAttrList,
+ GetImport(), nInPrefix, rLocalName, xAttrList,
GetProperties(), xImpPrMap );
}
if( !pContext )
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
+ pContext = XMLPropStyleContext::CreateChildContext( nInPrefix, rLocalName,
xAttrList );
return pContext;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_XMLErrorIndicatorPropertyHdl.cxx b/binfilter/bf_xmloff/source/chart/xmloff_XMLErrorIndicatorPropertyHdl.cxx
index 3a58080..0a22502 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_XMLErrorIndicatorPropertyHdl.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_XMLErrorIndicatorPropertyHdl.cxx
@@ -38,7 +38,7 @@ XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl()
{}
sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImpValue,
- uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+ uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bValue;
SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
@@ -83,7 +83,7 @@ sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImp
}
sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( ::rtl::OUString& rStrExpValue,
- const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const
+ const uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
::rtl::OUStringBuffer aBuffer;
chart::ChartErrorIndicatorType eType;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
index d5161b9..f31b57e 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
@@ -57,12 +57,12 @@ static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
};
XMLSymbolImageContext::XMLSymbolImageContext(
- SvXMLImport& rImport, sal_uInt16 nPrfx,
+ SvXMLImport& rInImport, sal_uInt16 nPrfx,
const ::rtl::OUString& rLName,
const XMLPropertyState& rProp,
::std::vector< XMLPropertyState > &rProps ) :
XMLElementPropertyContext(
- rImport, nPrfx, rLName, rProp, rProps )
+ rInImport, nPrfx, rLName, rProp, rProps )
{
}
@@ -72,18 +72,18 @@ XMLSymbolImageContext::~XMLSymbolImageContext()
void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLTokenMap aTokenMap( aSymbolImageAttrTokenMap );
- ::rtl::OUString aLocalName;
+ ::rtl::OUString aLclLocalName;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i = 0; i < nAttrCount; i++ )
{
const ::rtl::OUString& rAttrName = xAttrList->getNameByIndex( i );
- sal_uInt16 nPrefix =
+ sal_uInt16 nLclPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
- &aLocalName );
+ &aLclLocalName );
const ::rtl::OUString& rValue = xAttrList->getValueByIndex( i );
- switch( aTokenMap.Get( nPrefix, aLocalName ) )
+ switch( aTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_SYMBOL_IMAGE_HREF:
msURL = rValue;
@@ -99,7 +99,7 @@ void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttri
}
SvXMLImportContext* XMLSymbolImageContext::CreateChildContext(
- sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nInPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext* pContext = NULL;
@@ -110,14 +110,14 @@ SvXMLImportContext* XMLSymbolImageContext::CreateChildContext(
{
mxBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64();
if( mxBase64Stream.is() )
- pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
+ pContext = new XMLBase64ImportContext( GetImport(), nInPrefix,
rLocalName, xAttrList,
mxBase64Stream );
}
}
if( ! pContext )
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_XMLTextOrientationHdl.cxx b/binfilter/bf_xmloff/source/chart/xmloff_XMLTextOrientationHdl.cxx
index 94c8885..8e92728 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_XMLTextOrientationHdl.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_XMLTextOrientationHdl.cxx
@@ -40,7 +40,7 @@ XMLTextOrientationHdl::~XMLTextOrientationHdl()
sal_Bool XMLTextOrientationHdl::importXML(
const ::rtl::OUString& rStrImpValue,
::com::sun::star::uno::Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bRetval( sal_False );
@@ -61,7 +61,7 @@ sal_Bool XMLTextOrientationHdl::importXML(
sal_Bool XMLTextOrientationHdl::exportXML(
::rtl::OUString& rStrExpValue,
const ::com::sun::star::uno::Any& rValue,
- const SvXMLUnitConverter& rUnitConverter ) const
+ const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
sal_Bool bVal;
sal_Bool bRetval( sal_False );
More information about the Libreoffice-commits
mailing list