[Libreoffice-commits] .: 6 commits - binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 24 06:27:40 PST 2010
binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx | 4
binfilter/bf_svx/source/xml/svx_xmleohlp.cxx | 2
binfilter/bf_sw/source/core/fields/sw_flddropdown.cxx | 2
binfilter/bf_xmloff/source/chart/PropertyMap.hxx | 4
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 13
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 214 +++++-----
binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx | 8
writerfilter/source/doctok/WW8PieceTableImpl.cxx | 6
8 files changed, 129 insertions(+), 124 deletions(-)
New commits:
commit 945aaa60f91ed894e8c4870538dccdd63fe083a5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 14:23:42 2010 +0000
throw out some more warnings
diff --git a/binfilter/bf_xmloff/source/chart/PropertyMap.hxx b/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
index c4b0d6a..c51b1ac 100644
--- a/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
+++ b/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
@@ -76,10 +76,10 @@ namespace binfilter {
#define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE_NAME ( XML_SCH_CTF_START + 22 )
#define XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE ( XML_SCH_CTF_START + 23 )
-#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t }
+#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, 0 }
#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, XML_SCH_CONTEXT_##c }
#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t | MID_FLAG_SPECIAL_ITEM, XML_SCH_CONTEXT_SPECIAL_##c }
-#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0 }
+#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
// ---------------------------------------------------------
// PropertyMap for Chart properties drawing- and
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
index eadef49..13b1e83 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
@@ -88,9 +88,9 @@ SchXMLExportHelper::SchXMLExportHelper(
SvXMLAutoStylePoolP& rASPool ) :
mrExport( rExport ),
mrAutoStylePool( rASPool ),
+ mnDomainAxes( 0 ),
mnSeriesCount( 0 ),
mnSeriesLength( 0 ),
- mnDomainAxes( 0 ),
mbHasSeriesLabels( sal_False ),
mbHasCategoryLabels( sal_False ),
mbRowSourceColumns( sal_True )
@@ -211,8 +211,6 @@ void SchXMLExportHelper::parseDocument( uno::Reference< chart::XChartDocument >&
{
uno::Reference< chart::XDiagram > xDiagram = rChartDoc->getDiagram();
- // determine if data is in rows
- sal_Bool bSwitchData = sal_False;
uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY );
::rtl::OUString sChartType ( xDiagram->getDiagramType());
if( xDiaProp.is())
@@ -566,6 +564,8 @@ void SchXMLExportHelper::parseDocument( uno::Reference< chart::XChartDocument >&
case chart::ChartLegendPosition_BOTTOM:
msString = GetXMLToken(XML_BOTTOM);
break;
+ default:
+ break;
}
// export anchor position
@@ -820,7 +820,6 @@ void SchXMLExportHelper::exportPlotArea( uno::Reference< chart::XDiagram > xDiag
// variables for autostyles
uno::Reference< beans::XPropertySet > xPropSet;
std::vector< XMLPropertyState > aPropertyStates;
- sal_Int32 nStyleFamily = XML_STYLE_FAMILY_SCH_CHART_ID;
::rtl::OUString aASName;
sal_Bool bHasTwoYAxes = sal_False;
sal_Bool bIs3DChart = sal_False;
@@ -857,7 +856,7 @@ void SchXMLExportHelper::exportPlotArea( uno::Reference< chart::XDiagram > xDiag
if( xDocProp.is())
{
uno::Any aAny;
- sal_Bool bFirstCol, bFirstRow;
+ sal_Bool bFirstCol(sal_False), bFirstRow(sal_False);
try
{
@@ -995,7 +994,6 @@ void SchXMLExportHelper::exportPlotArea( uno::Reference< chart::XDiagram > xDiag
msStringBuffer.setLength( 0 );
SvXMLElementExport* pSeries = NULL;
::rtl::OUString aSeriesASName;
- sal_Bool bWrite = sal_False;
sal_Int32 nAttachedAxis;
sal_Int32 nNumberOfLinesInBarChart = 0;
@@ -1631,10 +1629,9 @@ void SchXMLExportHelper::exportAxes( uno::Reference< chart::XDiagram > xDiagram,
// variables for autostyles
const ::rtl::OUString sNumFormat( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )));
- sal_Int32 nNumberFormat;
+ sal_Int32 nNumberFormat(0);
uno::Reference< beans::XPropertySet > xPropSet;
std::vector< XMLPropertyState > aPropertyStates;
- sal_Int32 nStyleFamily = XML_STYLE_FAMILY_SCH_CHART_ID;
::rtl::OUString aASName;
// get some properties from document first
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
index 1846847..6466606 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
@@ -63,23 +63,23 @@ static SvXMLEnumMapEntry aXMLAxisClassMap[] =
};
SchXMLPlotAreaContext::SchXMLPlotAreaContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const ::rtl::OUString& rLocalName,
+ SvXMLImport& rInImport, const ::rtl::OUString& rLocalName,
uno::Sequence< chart::ChartSeriesAddress >& rSeriesAddresses,
::rtl::OUString& rCategoriesAddress,
::rtl::OUString& rChartAddress,
::rtl::OUString& rTableNumberList) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
mrSeriesAddresses( rSeriesAddresses ),
mrCategoriesAddress( rCategoriesAddress ),
- mrChartAddress( rChartAddress ),
- mrTableNumberList( rTableNumberList ),
mnDomainOffset( 0 ),
mnNumOfLines( 0 ),
mbStockHasVolume( sal_False ),
mnSeries( 0 ),
mnMaxSeriesLength( 0 ),
- maSceneImportHelper( rImport )
+ maSceneImportHelper( rInImport ),
+ mrChartAddress( rChartAddress ),
+ mrTableNumberList( rTableNumberList )
{
// get Diagram
uno::Reference< chart::XChartDocument > xDoc( rImpHelper.GetChartDocument(), uno::UNO_QUERY );
@@ -157,14 +157,14 @@ SchXMLPlotAreaContext::~SchXMLPlotAreaContext()
{}
SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = 0;
const SvXMLTokenMap& rTokenMap = mrImportHelper.GetPlotAreaElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLocalName ))
+ switch( rTokenMap.Get( nInPrefix, rLocalName ))
{
case XML_TOK_PA_AXIS:
pContext = new SchXMLAxisContext( mrImportHelper, GetImport(), rLocalName, mxDiagram, maAxes );
@@ -184,39 +184,39 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext(
case XML_TOK_PA_CATEGORIES:
pContext = new SchXMLCategoriesDomainContext( mrImportHelper, GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
mrCategoriesAddress );
break;
case XML_TOK_PA_WALL:
- pContext = new SchXMLWallFloorContext( mrImportHelper, GetImport(), nPrefix, rLocalName, mxDiagram,
+ pContext = new SchXMLWallFloorContext( mrImportHelper, GetImport(), nInPrefix, rLocalName, mxDiagram,
SchXMLWallFloorContext::CONTEXT_TYPE_WALL );
break;
case XML_TOK_PA_FLOOR:
- pContext = new SchXMLWallFloorContext( mrImportHelper, GetImport(), nPrefix, rLocalName, mxDiagram,
+ pContext = new SchXMLWallFloorContext( mrImportHelper, GetImport(), nInPrefix, rLocalName, mxDiagram,
SchXMLWallFloorContext::CONTEXT_TYPE_FLOOR );
break;
case XML_TOK_PA_LIGHT_SOURCE:
- pContext = maSceneImportHelper.create3DLightContext( nPrefix, rLocalName, xAttrList );
+ pContext = maSceneImportHelper.create3DLightContext( nInPrefix, rLocalName, xAttrList );
break;
// elements for stock charts
case XML_TOK_PA_STOCK_GAIN:
- pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nPrefix, rLocalName, mxDiagram,
+ pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nInPrefix, rLocalName, mxDiagram,
SchXMLStockContext::CONTEXT_TYPE_GAIN );
break;
case XML_TOK_PA_STOCK_LOSS:
- pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nPrefix, rLocalName, mxDiagram,
+ pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nInPrefix, rLocalName, mxDiagram,
SchXMLStockContext::CONTEXT_TYPE_LOSS );
break;
case XML_TOK_PA_STOCK_RANGE:
- pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nPrefix, rLocalName, mxDiagram,
+ pContext = new SchXMLStockContext( mrImportHelper, GetImport(), nInPrefix, rLocalName, mxDiagram,
SchXMLStockContext::CONTEXT_TYPE_RANGE );
break;
default:
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -245,45 +245,45 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
for( sal_Int16 i = 0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- ::rtl::OUString aValue = xAttrList->getValueByIndex( i );
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ ::rtl::OUString aLclValue = xAttrList->getValueByIndex( i );
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ))
{
case XML_TOK_PA_X:
- GetImport().GetMM100UnitConverter().convertMeasure( maPosition.X, aValue );
+ GetImport().GetMM100UnitConverter().convertMeasure( maPosition.X, aLclValue );
break;
case XML_TOK_PA_Y:
- GetImport().GetMM100UnitConverter().convertMeasure( maPosition.Y, aValue );
+ GetImport().GetMM100UnitConverter().convertMeasure( maPosition.Y, aLclValue );
break;
case XML_TOK_PA_WIDTH:
- GetImport().GetMM100UnitConverter().convertMeasure( maSize.Width, aValue );
+ GetImport().GetMM100UnitConverter().convertMeasure( maSize.Width, aLclValue );
break;
case XML_TOK_PA_HEIGHT:
- GetImport().GetMM100UnitConverter().convertMeasure( maSize.Height, aValue );
+ GetImport().GetMM100UnitConverter().convertMeasure( maSize.Height, aLclValue );
break;
case XML_TOK_PA_STYLE_NAME:
- msAutoStyleName = aValue;
+ msAutoStyleName = aLclValue;
break;
case XML_TOK_PA_CHART_ADDRESS:
- mrChartAddress = aValue;
+ mrChartAddress = aLclValue;
break;
case XML_TOK_PA_TABLE_NUMBER_LIST:
- mrTableNumberList = aValue;
+ mrTableNumberList = aLclValue;
break;
case XML_TOK_PA_DS_HAS_LABELS:
{
- if( aValue.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_BOTH )))
+ if( aLclValue.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_BOTH )))
bColHasLabels = bRowHasLabels = sal_True;
- else if( aValue.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_ROW )))
+ else if( aLclValue.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_ROW )))
bRowHasLabels = sal_True;
- else if( aValue.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_COLUMN )))
+ else if( aLclValue.equals( ::binfilter::xmloff::token::GetXMLToken( ::binfilter::xmloff::token::XML_COLUMN )))
bColHasLabels = sal_True;
}
break;
default:
- maSceneImportHelper.processSceneAttribute( nPrefix, aLocalName, aValue );
+ maSceneImportHelper.processSceneAttribute( nLclPrefix, aLclLocalName, aLclValue );
break;
}
}
@@ -444,6 +444,8 @@ void SchXMLPlotAreaContext::EndElement()
OUString( RTL_CONSTASCII_USTRINGPARAM(
"DataErrorProperties" )));
break;
+ default:
+ break;
}
aAny >>= xProp;
}
@@ -527,10 +529,10 @@ void SchXMLPlotAreaContext::EndElement()
// ========================================
SchXMLAxisContext::SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const ::rtl::OUString& rLocalName,
+ SvXMLImport& rInImport, const ::rtl::OUString& rLocalName,
uno::Reference< chart::XDiagram > xDiagram,
::std::vector< SchXMLAxis >& aAxes ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
mxDiagram( xDiagram ),
maAxes( aAxes )
@@ -584,14 +586,18 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
}
break;
case SCH_XML_AXIS_SERIES:
- uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
- if( xSuppl.is())
{
- if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )), aTrueBool );
- xResult = uno::Reference< drawing::XShape >( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
+ uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
+ if( xSuppl.is())
+ {
+ if( xDiaProp.is())
+ xDiaProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )), aTrueBool );
+ xResult = uno::Reference< drawing::XShape >( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
+ }
}
break;
+ default:
+ break;
}
if( bHasControllersLocked && xDoc.is())
@@ -665,6 +671,8 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
}
}
break;
+ default:
+ break;
}
// enable grid
@@ -706,31 +714,30 @@ void SchXMLAxisContext::StartElement( const uno::Reference< xml::sax::XAttribute
{
// parse attributes
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- ::rtl::OUString aValue;
- SchXMLImport& rImport = ( SchXMLImport& )GetImport();
+ SchXMLImport& rLclImport = ( SchXMLImport& )GetImport();
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetAxisAttrTokenMap();
for( sal_Int16 i = 0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- ::rtl::OUString aValue = xAttrList->getValueByIndex( i );
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ ::rtl::OUString aLclValue = xAttrList->getValueByIndex( i );
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ))
{
case XML_TOK_AXIS_CLASS:
{
USHORT nEnumVal;
- if( rImport.GetMM100UnitConverter().convertEnum( nEnumVal, aValue, aXMLAxisClassMap ))
+ if( rLclImport.GetMM100UnitConverter().convertEnum( nEnumVal, aLclValue, aXMLAxisClassMap ))
maCurrentAxis.eClass = ( SchXMLAxisClass )nEnumVal;
}
break;
case XML_TOK_AXIS_NAME:
- maCurrentAxis.aName = aValue;
+ maCurrentAxis.aName = aLclValue;
break;
case XML_TOK_AXIS_STYLE_NAME:
- msAutoStyleName = aValue;
+ msAutoStyleName = aLclValue;
break;
}
}
@@ -936,6 +943,8 @@ void SchXMLAxisContext::EndElement()
}
}
break;
+ default:
+ break;
}
// set properties
@@ -958,19 +967,19 @@ void SchXMLAxisContext::EndElement()
}
SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = 0;
- SchXMLImport& rImport = ( SchXMLImport& )GetImport();
+ SchXMLImport& rLclImport = ( SchXMLImport& )GetImport();
- if( nPrefix == XML_NAMESPACE_CHART )
+ if( nInPrefix == XML_NAMESPACE_CHART )
{
if( IsXMLToken( rLocalName, XML_TITLE ) )
{
uno::Reference< drawing::XShape > xTitleShape = getTitleShape();
- pContext = new SchXMLTitleContext( mrImportHelper, rImport, rLocalName,
+ pContext = new SchXMLTitleContext( mrImportHelper, rLclImport, rLocalName,
maCurrentAxis.aTitle,
xTitleShape,
maCurrentAxis.aPosition );
@@ -984,17 +993,17 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
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_CLASS ) )
+ if( IsXMLToken( aLclLocalName, XML_CLASS ) )
{
if( IsXMLToken( xAttrList->getValueByIndex( i ), XML_MINOR ) )
bIsMajor = sal_False;
}
- else if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ else if( IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
sAutoStyleName = xAttrList->getValueByIndex( i );
}
}
@@ -1006,7 +1015,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
}
if( ! pContext )
- pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( rLclImport, nInPrefix, rLocalName );
return pContext;
}
@@ -1015,7 +1024,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext(
SchXMLSeriesContext::SchXMLSeriesContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const ::rtl::OUString& rLocalName,
+ SvXMLImport& rInImport, const ::rtl::OUString& rLocalName,
uno::Reference< chart::XDiagram >& xDiagram,
std::vector< SchXMLAxis >& rAxes,
::com::sun::star::chart::ChartSeriesAddress& rSeriesAddress,
@@ -1025,16 +1034,16 @@ SchXMLSeriesContext::SchXMLSeriesContext(
sal_Int32& rDomainOffset,
sal_Int32& rNumOfLines,
sal_Bool& rStockHasVolume ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
+ mrImportHelper( rImpHelper ),
mxDiagram( xDiagram ),
mrAxes( rAxes ),
- mrImportHelper( rImpHelper ),
mrSeriesAddress( rSeriesAddress ),
mrStyleList( rStyleList ),
mnSeriesIndex( nSeriesIndex ),
mnDataPointIndex( 0 ),
- mrDomainOffset( rDomainOffset ),
mrMaxSeriesLength( rMaxSeriesLength ),
+ mrDomainOffset( rDomainOffset ),
mrNumOfLines( rNumOfLines ),
mrStockHasVolume( rStockHasVolume ),
mpAttachedAxis( NULL )
@@ -1049,18 +1058,17 @@ void SchXMLSeriesContext::StartElement( const uno::Reference< xml::sax::XAttribu
{
// parse attributes
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- ::rtl::OUString aValue;
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetSeriesAttrTokenMap();
mnAttachedAxis = 1;
for( sal_Int16 i = 0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
+ ::rtl::OUString aLclLocalName;
::rtl::OUString aValue = xAttrList->getValueByIndex( i );
- USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nLclPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ))
{
case XML_TOK_SERIES_CELL_RANGE:
mrSeriesAddress.DataRangeAddress = aValue;
@@ -1127,14 +1135,14 @@ void SchXMLSeriesContext::EndElement()
}
SvXMLImportContext* SchXMLSeriesContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContext* pContext = 0;
const SvXMLTokenMap& rTokenMap = mrImportHelper.GetSeriesElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLocalName ))
+ switch( rTokenMap.Get( nInPrefix, rLocalName ))
{
case XML_TOK_SERIES_DOMAIN:
{
@@ -1143,7 +1151,7 @@ SvXMLImportContext* SchXMLSeriesContext::CreateChildContext(
mrDomainOffset++;
pContext = new SchXMLCategoriesDomainContext(
mrImportHelper, GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
mrSeriesAddress.DomainRangeAddresses[ nIndex ] );
}
break;
@@ -1151,21 +1159,21 @@ SvXMLImportContext* SchXMLSeriesContext::CreateChildContext(
case XML_TOK_SERIES_MEAN_VALUE_LINE:
pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
mrStyleList, mnSeriesIndex + mrDomainOffset,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_MEAN_VALUE_LINE );
break;
case XML_TOK_SERIES_REGRESSION_CURVE:
pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
mrStyleList, mnSeriesIndex + mrDomainOffset,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_REGRESSION_CURVE );
break;
case XML_TOK_SERIES_ERROR_INDICATOR:
pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
mrStyleList, mnSeriesIndex + mrDomainOffset,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_ERROR_INDICATOR );
break;
@@ -1176,7 +1184,7 @@ SvXMLImportContext* SchXMLSeriesContext::CreateChildContext(
break;
default:
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -1185,11 +1193,11 @@ SvXMLImportContext* SchXMLSeriesContext::CreateChildContext(
// ========================================
SchXMLDataPointContext::SchXMLDataPointContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const ::rtl::OUString& rLocalName,
+ SvXMLImport& rInImport, const ::rtl::OUString& rLocalName,
uno::Reference< chart::XDiagram >& xDiagram,
::std::list< chartxml::DataRowPointStyle >& rStyleList,
sal_Int32 nSeries, sal_Int32& rIndex ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
mxDiagram( xDiagram ),
mrStyleList( rStyleList ),
@@ -1212,14 +1220,14 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
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 );
- else if( IsXMLToken( aLocalName, XML_REPEATED ) )
+ else if( IsXMLToken( aLclLocalName, XML_REPEATED ) )
nRepeat = xAttrList->getValueByIndex( i ).toInt32();
}
}
@@ -1238,11 +1246,11 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
SchXMLCategoriesDomainContext::SchXMLCategoriesDomainContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
::rtl::OUString& rAddress ) :
- SvXMLImportContext( rImport, nPrefix, rLocalName ),
+ SvXMLImportContext( rInImport, nInPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
mrAddress( rAddress )
{
@@ -1259,11 +1267,11 @@ void SchXMLCategoriesDomainContext::StartElement( const uno::Reference< xml::sax
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_TABLE &&
- IsXMLToken( aLocalName, XML_CELL_RANGE_ADDRESS ) )
+ if( nLclPrefix == XML_NAMESPACE_TABLE &&
+ IsXMLToken( aLclLocalName, XML_CELL_RANGE_ADDRESS ) )
{
mrAddress = xAttrList->getValueByIndex( i );
}
@@ -1274,12 +1282,12 @@ void SchXMLCategoriesDomainContext::StartElement( const uno::Reference< xml::sax
SchXMLWallFloorContext::SchXMLWallFloorContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
uno::Reference< chart::XDiagram >& xDiagram,
ContextType eContextType ) :
- SvXMLImportContext( rImport, nPrefix, rLocalName ),
+ SvXMLImportContext( rInImport, nInPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
mxWallFloorSupplier( xDiagram, uno::UNO_QUERY ),
meContextType( eContextType )
@@ -1300,11 +1308,11 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
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 &&
- IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( nLclPrefix == XML_NAMESPACE_CHART &&
+ IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
{
sAutoStyleName = xAttrList->getValueByIndex( i );
}
@@ -1337,12 +1345,12 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
SchXMLStockContext::SchXMLStockContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
uno::Reference< chart::XDiagram >& xDiagram,
ContextType eContextType ) :
- SvXMLImportContext( rImport, nPrefix, rLocalName ),
+ SvXMLImportContext( rInImport, nInPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
mxStockPropProvider( xDiagram, uno::UNO_QUERY ),
meContextType( eContextType )
@@ -1363,11 +1371,11 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
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 &&
- IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( nLclPrefix == XML_NAMESPACE_CHART &&
+ IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
{
sAutoStyleName = xAttrList->getValueByIndex( i );
}
@@ -1410,13 +1418,13 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- sal_uInt16 nPrefix,
+ SvXMLImport& rInImport,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
::std::list< chartxml::DataRowPointStyle >& rStyleList,
sal_Int32 nSeries, ContextType eContextType ) :
- SvXMLImportContext( rImport, nPrefix, rLocalName ),
+ SvXMLImportContext( rInImport, nInPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
mrStyleList( rStyleList ),
mnSeriesIndex( nSeries ),
commit c3f1dcea5ecc7407a7a586151449b032c5396c88
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:38:32 2010 +0000
cppcheck: prefer prefix variant
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx
index 468fd15..2bec7b0 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx
@@ -190,8 +190,8 @@ void XMLTextParagraphExport::exportListAndSectionChange(
(aNew != aNewStack.rend()) &&
(*aOld) == (*aNew) )
{
- aOld++;
- aNew++;
+ ++aOld;
+ ++aNew;
}
// close all elements of aOld ...
@@ -207,7 +207,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
pRedlineExport->ExportStartOrEndRedline(*aOldForward,
sal_False);
pSectionExport->ExportSectionEnd(*aOldForward, bAutoStyles);
- aOldForward++;
+ ++aOldForward;
}
if (aOldForward != aOldStack.end())
{
@@ -225,7 +225,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
if ( !bAutoStyles && (NULL != pRedlineExport) )
pRedlineExport->ExportStartOrEndRedline(*aNew, sal_True);
pSectionExport->ExportSectionStart(*aNew, bAutoStyles);
- aNew++;
+ ++aNew;
}
// start new list
commit 937cfafe2f960e89971f11ea48ff6b42546cd827
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:35:17 2010 +0000
cppcheck: prefer prefix variant
diff --git a/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx b/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
index bcc2d5a..6394b51 100644
--- a/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_UnoNameItemTable.cxx
@@ -150,7 +150,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
maItemSetVector.erase( aIter );
return;
}
- aIter++;
+ ++aIter;
}
if( !hasByName( Name ) )
@@ -185,7 +185,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
(*aIter)->Put( *pNewItem );
return;
}
- aIter++;
+ ++aIter;
}
// if it is not in our own sets, modify the pool!
commit d504fd813b76d872c0da7a105c3cc32a8faef1fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:28:52 2010 +0000
cppcheck: prefer prefix variant
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index f9c56e1..d50b126 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -270,7 +270,7 @@ struct OUStringLess
/*N*/ {
/*?*/ SvXMLEmbeddedObjectHelper_Impl::iterator aIter = mpStreamMap->begin();
/*?*/ SvXMLEmbeddedObjectHelper_Impl::iterator aEnd = mpStreamMap->end();
-/*?*/ for( aIter; aIter != aEnd; aIter++ )
+/*?*/ for( aIter; aIter != aEnd; ++aIter )
/*?*/ {
/*?*/ if( aIter->second )
/*?*/ {
commit 418740b5e0e6450ece081b25f9168c8dfe2be60e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:26:39 2010 +0000
cppcheck: prefer prefix variant
diff --git a/writerfilter/source/doctok/WW8PieceTableImpl.cxx b/writerfilter/source/doctok/WW8PieceTableImpl.cxx
index 37edf27..3b22856 100644
--- a/writerfilter/source/doctok/WW8PieceTableImpl.cxx
+++ b/writerfilter/source/doctok/WW8PieceTableImpl.cxx
@@ -89,7 +89,7 @@ WW8PieceTableImpl::findCp(const Cp & rCp) const
tEntries::const_iterator aEnd = mEntries.end();
for (tEntries::const_iterator aIt = mEntries.begin(); aIt != aEnd;
- aIt++)
+ ++aIt)
{
if (aIt->getCp() <= rCp)
{
@@ -115,12 +115,12 @@ WW8PieceTableImpl::findFc(const Fc & rFc) const
else
{
for (tEntries::const_iterator aIt = mEntries.begin();
- aIt != aEnd; aIt++)
+ aIt != aEnd; ++aIt)
{
if (aIt->getFc() <= rFc)
{
tEntries::const_iterator aItNext = aIt;
- aItNext++;
+ ++aItNext;
if (aItNext != aEnd)
{
commit 6dfdb2e010b0668986dc20fd424fe4a8b655be34
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 13:26:12 2010 +0000
cppcheck: prefer prefix variant
diff --git a/binfilter/bf_sw/source/core/fields/sw_flddropdown.cxx b/binfilter/bf_sw/source/core/fields/sw_flddropdown.cxx
index 3466c66..506c46b 100644
--- a/binfilter/bf_sw/source/core/fields/sw_flddropdown.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_flddropdown.cxx
@@ -122,7 +122,7 @@ Sequence<OUString> SwDropDownField::GetItemSequence() const
int i = 0;
vector<String>::const_iterator aIt;
- for (aIt = aValues.begin(); aIt != aValues.end(); aIt++)
+ for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt)
{
pSeq[i] = ::rtl::OUString(*aIt);
More information about the Libreoffice-commits
mailing list