[Libreoffice-commits] .: binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Dec 24 06:48:23 PST 2010
binfilter/bf_xmloff/source/chart/makefile.mk | 2
binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx | 64 +++-----
binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx | 80 +++++-----
binfilter/bf_xmloff/source/chart/xmloff_contexts.cxx | 36 ++--
5 files changed, 89 insertions(+), 95 deletions(-)
New commits:
commit 6bbf96e2fb5abc4b0a07e1c227d3cc262bf14182
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 24 14:47:49 2010 +0000
WaE: throw out some more warnings
diff --git a/binfilter/bf_xmloff/source/chart/makefile.mk b/binfilter/bf_xmloff/source/chart/makefile.mk
index 6b1722e..9ece7f4 100644
--- a/binfilter/bf_xmloff/source/chart/makefile.mk
+++ b/binfilter/bf_xmloff/source/chart/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ = ..$/..$/..
PRJNAME = binfilter
TARGET = xmloff_chart
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
index aebd0e1..b6d311b 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
@@ -96,8 +96,8 @@ static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
// ----------------------------------------
SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const ::rtl::OUString& rLocalName ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImport& rInImport, const ::rtl::OUString& rLocalName ) :
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
mbHasOwnTable( sal_False ),
mbHasLegend( sal_False )
@@ -111,7 +111,6 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
{
// parse attributes
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- ::rtl::OUString aValue;
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetChartAttrTokenMap();
awt::Size aChartSize;
// this flag is necessarry for pie charts in the core
@@ -124,11 +123,11 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
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_CHART_CLASS:
{
@@ -468,7 +467,7 @@ void SchXMLChartContext::EndElement()
}
SvXMLImportContext* SchXMLChartContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -480,7 +479,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument();
uno::Reference< beans::XPropertySet > xProp( xDoc, uno::UNO_QUERY );
- switch( rTokenMap.Get( nPrefix, rLocalName ))
+ switch( rTokenMap.Get( nInPrefix, rLocalName ))
{
case XML_TOK_CHART_PLOT_AREA:
pContext = new SchXMLPlotAreaContext( mrImportHelper, GetImport(), rLocalName,
@@ -493,9 +492,9 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( xProp.is())
{
- uno::Any aTrueBool;
- aTrueBool <<= (sal_Bool)(sal_True);
- xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )), aTrueBool );
+ uno::Any aLclTrueBool;
+ aLclTrueBool <<= (sal_Bool)(sal_True);
+ xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )), aLclTrueBool );
SCH_BUILDCHART( xDoc );
}
@@ -553,12 +552,12 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
}
if( mxDrawPage.is())
pContext = GetImport().GetShapeImport()->CreateGroupChildContext(
- GetImport(), nPrefix, rLocalName, xAttrList, mxDrawPage );
+ GetImport(), nInPrefix, rLocalName, xAttrList, mxDrawPage );
break;
}
if( ! pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -709,7 +708,6 @@ uno::Sequence< sal_Int32 > SchXMLChartContext::GetNumberSequenceFromString( cons
::std::vector< sal_Int32 > aVec;
sal_Int32 nLastPos = 0;
sal_Int32 nPos = 0;
- const sal_Int32 nSize = rStr.getLength();
while( nPos != -1 )
{
nPos = rStr.indexOf( aSpace, nLastPos );
@@ -739,12 +737,12 @@ uno::Sequence< sal_Int32 > SchXMLChartContext::GetNumberSequenceFromString( cons
// ----------------------------------------
-SchXMLTitleContext::SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport,
+SchXMLTitleContext::SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rInImport,
const ::rtl::OUString& rLocalName,
::rtl::OUString& rTitle,
uno::Reference< drawing::XShape >& xTitleShape,
awt::Point& rPosition ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
mrTitle( rTitle ),
mxTitleShape( xTitleShape ),
@@ -758,7 +756,6 @@ SchXMLTitleContext::~SchXMLTitleContext()
void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- ::rtl::OUString aValue;
if( mxTitleShape.is())
mrPosition = mxTitleShape->getPosition();
@@ -766,20 +763,20 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
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 );
- if( nPrefix == XML_NAMESPACE_SVG )
+ if( nLclPrefix == XML_NAMESPACE_SVG )
{
- if( IsXMLToken( aLocalName, XML_X ) )
+ if( IsXMLToken( aLclLocalName, XML_X ) )
GetImport().GetMM100UnitConverter().convertMeasure( mrPosition.X, aValue );
- else if( IsXMLToken( aLocalName, XML_Y ) )
+ else if( IsXMLToken( aLclLocalName, XML_Y ) )
GetImport().GetMM100UnitConverter().convertMeasure( mrPosition.Y, aValue );
}
- else if( nPrefix == XML_NAMESPACE_CHART )
+ else if( nLclPrefix == XML_NAMESPACE_CHART )
{
- if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+ if( IsXMLToken( aLclLocalName, XML_STYLE_NAME ) )
msAutoStyleName = aValue;
}
}
@@ -803,19 +800,19 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
}
SvXMLImportContext* SchXMLTitleContext::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;
- if( nPrefix == XML_NAMESPACE_TEXT &&
+ if( nInPrefix == XML_NAMESPACE_TEXT &&
IsXMLToken( rLocalName, XML_P ) )
{
pContext = new SchXMLParagraphContext( GetImport(), rLocalName, mrTitle );
}
else
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -823,9 +820,9 @@ SvXMLImportContext* SchXMLTitleContext::CreateChildContext(
// ----------------------------------------
SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport, const ::rtl::OUString& rLocalName,
+ SvXMLImport& rInImport, const ::rtl::OUString& rLocalName,
::com::sun::star::awt::Point& rPosition ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper ),
mrPosition( rPosition )
{
@@ -861,7 +858,6 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
// parse attributes
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
- ::rtl::OUString aValue;
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetLegendAttrTokenMap();
awt::Point aPosition;
@@ -874,11 +870,11 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
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_LEGEND_POSITION:
{
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
index 844a83f..e4e4598 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
@@ -225,7 +225,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference< frame::XModel > xChartModel,
- const uno::Reference< xml::sax::XAttributeList >& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContext* pContext = 0;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
index 03d1114..ea1d13f 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
@@ -48,10 +48,10 @@ using namespace ::binfilter::xmloff::token;
// ----------------------------------------
SchXMLTableContext::SchXMLTableContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const ::rtl::OUString& rLName,
SchXMLTable& aTable ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_TABLE, rLName ),
mrImportHelper( rImpHelper ),
mrTable( aTable )
{
@@ -66,14 +66,14 @@ SchXMLTableContext::~SchXMLTableContext()
}
SvXMLImportContext *SchXMLTableContext::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.GetTableElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLocalName ))
+ switch( rTokenMap.Get( nInPrefix, rLocalName ))
{
case XML_TOK_TABLE_HEADER_COLS:
case XML_TOK_TABLE_COLUMNS:
@@ -94,7 +94,7 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext(
break;
default:
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -110,10 +110,10 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext(
SchXMLTableColumnsContext::SchXMLTableColumnsContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SvXMLImport& rLclImport,
const ::rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
+ SvXMLImportContext( rLclImport, XML_NAMESPACE_TABLE, rLocalName ),
mrImportHelper( rImpHelper ),
mrTable( aTable )
{
@@ -124,19 +124,19 @@ SchXMLTableColumnsContext::~SchXMLTableColumnsContext()
}
SvXMLImportContext* SchXMLTableColumnsContext::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;
- if( nPrefix == XML_NAMESPACE_TABLE &&
+ if( nInPrefix == XML_NAMESPACE_TABLE &&
IsXMLToken( rLocalName, XML_TABLE_COLUMN ) )
{
pContext = new SchXMLTableColumnContext( mrImportHelper, GetImport(), rLocalName, mrTable );
}
else
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -147,10 +147,10 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
SchXMLTableColumnContext::SchXMLTableColumnContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const ::rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_TABLE, rLocalName ),
mrImportHelper( rImpHelper ),
mrTable( aTable )
{
@@ -165,11 +165,11 @@ void SchXMLTableColumnContext::StartElement( const uno::Reference< xml::sax::XAt
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_NUMBER_COLUMNS_REPEATED ) )
+ if( nLclPrefix == XML_NAMESPACE_TABLE &&
+ IsXMLToken( aLclLocalName, XML_NUMBER_COLUMNS_REPEATED ) )
{
aValue = xAttrList->getValueByIndex( i );
break; // we only need this attribute
@@ -201,10 +201,10 @@ SchXMLTableColumnContext::~SchXMLTableColumnContext()
SchXMLTableRowsContext::SchXMLTableRowsContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const ::rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_TABLE, rLocalName ),
mrImportHelper( rImpHelper ),
mrTable( aTable )
{
@@ -215,20 +215,20 @@ SchXMLTableRowsContext::~SchXMLTableRowsContext()
}
SvXMLImportContext* SchXMLTableRowsContext::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;
- if( nPrefix == XML_NAMESPACE_TABLE &&
+ if( nInPrefix == XML_NAMESPACE_TABLE &&
IsXMLToken( rLocalName, XML_TABLE_ROW ) )
{
pContext = new SchXMLTableRowContext( mrImportHelper, GetImport(), rLocalName, mrTable );
}
else
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -240,10 +240,10 @@ SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext(
SchXMLTableRowContext::SchXMLTableRowContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const ::rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_TABLE, rLocalName ),
mrImportHelper( rImpHelper ),
mrTable( aTable )
{
@@ -261,21 +261,21 @@ SchXMLTableRowContext::~SchXMLTableRowContext()
}
SvXMLImportContext* SchXMLTableRowContext::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;
// <table:table-cell> element
- if( nPrefix == XML_NAMESPACE_TABLE &&
+ if( nInPrefix == XML_NAMESPACE_TABLE &&
IsXMLToken(rLocalName, XML_TABLE_CELL ) )
{
pContext = new SchXMLTableCellContext( mrImportHelper, GetImport(), rLocalName, mrTable );
}
else
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -292,10 +292,10 @@ SvXMLImportContext* SchXMLTableRowContext::CreateChildContext(
SchXMLTableCellContext::SchXMLTableCellContext(
SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
+ SvXMLImport& rInImport,
const ::rtl::OUString& rLocalName,
SchXMLTable& aTable ) :
- SvXMLImportContext( rImport, XML_NAMESPACE_TABLE, rLocalName ),
+ SvXMLImportContext( rInImport, XML_NAMESPACE_TABLE, rLocalName ),
mrImportHelper( rImpHelper ),
mrTable( aTable )
{
@@ -309,7 +309,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
{
sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
::rtl::OUString aValue;
- ::rtl::OUString aLocalName;
+ ::rtl::OUString aLclLocalName;
::rtl::OUString aCellContent;
SchXMLCellType eValueType = SCH_CELL_TYPE_UNKNOWN;
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetCellAttrTokenMap();
@@ -317,9 +317,9 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
for( sal_Int16 i = 0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( 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_CELL_VAL_TYPE:
aValue = xAttrList->getValueByIndex( i );
@@ -357,15 +357,15 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
}
SvXMLImportContext* SchXMLTableCellContext::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;
// <text:p> element
if( mbReadPara &&
- nPrefix == XML_NAMESPACE_TEXT &&
+ nInPrefix == XML_NAMESPACE_TEXT &&
IsXMLToken( rLocalName, XML_P ) )
{
// we have to read a string here (not a float)
@@ -373,7 +373,7 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
}
else
{
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
}
return pContext;
@@ -395,7 +395,7 @@ void SchXMLTableHelper::applyTableSimple(
{
// interpret table like this:
//
- // series ----+---\
+ // series ----+---+
// | |
// categories | |
// | | |
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_contexts.cxx b/binfilter/bf_xmloff/source/chart/xmloff_contexts.cxx
index 6c8d6bf..cd5fa49 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_contexts.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_contexts.cxx
@@ -42,13 +42,13 @@ using namespace ::binfilter::xmloff::token;
// ==================================================
SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- USHORT nPrefix,
+ SvXMLImport& rInImport,
+ USHORT nInPrefix,
const ::rtl::OUString& rLName ) :
- SvXMLImportContext( rImport, nPrefix, rLName ),
+ SvXMLImportContext( rInImport, nInPrefix, rLName ),
mrImportHelper( rImpHelper )
{
- DBG_ASSERT( XML_NAMESPACE_OFFICE == nPrefix &&
+ DBG_ASSERT( XML_NAMESPACE_OFFICE == nInPrefix &&
( IsXMLToken( rLName, XML_DOCUMENT ) ||
IsXMLToken( rLName, XML_DOCUMENT_META) ||
IsXMLToken( rLName, XML_DOCUMENT_STYLES) ||
@@ -60,7 +60,7 @@ SchXMLDocContext::~SchXMLDocContext()
{}
SvXMLImportContext* SchXMLDocContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -68,7 +68,7 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext(
const SvXMLTokenMap& rTokenMap = mrImportHelper.GetDocElemTokenMap();
sal_uInt16 nFlags = GetImport().getImportFlags();
- switch( rTokenMap.Get( nPrefix, rLocalName ))
+ switch( rTokenMap.Get( nInPrefix, rLocalName ))
{
case XML_TOK_DOC_AUTOSTYLES:
if( nFlags & IMPORT_AUTOSTYLES )
@@ -80,21 +80,21 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext(
case XML_TOK_DOC_STYLES:
// for draw styles containing gradients/hatches/markers and dashes
if( nFlags & IMPORT_STYLES )
- pContext = new SvXMLStylesContext( GetImport(), nPrefix, rLocalName, xAttrList );
+ pContext = new SvXMLStylesContext( GetImport(), nInPrefix, rLocalName, xAttrList );
break;
case XML_TOK_DOC_META:
if( nFlags & IMPORT_META )
- pContext = new SfxXMLMetaContext( GetImport(), nPrefix, rLocalName, GetImport().GetModel());
+ pContext = new SfxXMLMetaContext( GetImport(), nInPrefix, rLocalName, GetImport().GetModel());
break;
case XML_TOK_DOC_BODY:
if( nFlags & IMPORT_CONTENT )
- pContext = new SchXMLBodyContext( mrImportHelper, GetImport(), nPrefix, rLocalName );
+ pContext = new SchXMLBodyContext( mrImportHelper, GetImport(), nInPrefix, rLocalName );
break;
}
// call parent when no own context was created
if( ! pContext )
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ pContext = SvXMLImportContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
return pContext;
}
@@ -102,13 +102,13 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext(
// ----------------------------------------
SchXMLBodyContext::SchXMLBodyContext( SchXMLImportHelper& rImpHelper,
- SvXMLImport& rImport,
- USHORT nPrefix,
+ SvXMLImport& rInImport,
+ USHORT nInPrefix,
const ::rtl::OUString& rLName ) :
- SvXMLImportContext( rImport, nPrefix, rLName ),
+ SvXMLImportContext( rInImport, nInPrefix, rLName ),
mrImportHelper( rImpHelper )
{
- DBG_ASSERT( XML_NAMESPACE_OFFICE == nPrefix &&
+ DBG_ASSERT( XML_NAMESPACE_OFFICE == nInPrefix &&
IsXMLToken( rLName, XML_BODY ),
"SchXMLBodyContext instanciated with no <office:body> element" );
}
@@ -121,24 +121,24 @@ void SchXMLBodyContext::EndElement()
}
SvXMLImportContext* SchXMLBodyContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const ::rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = 0;
// <chart:chart> element
- if( nPrefix == XML_NAMESPACE_CHART &&
+ if( nInPrefix == XML_NAMESPACE_CHART &&
IsXMLToken( rLocalName, XML_CHART ) )
{
pContext = mrImportHelper.CreateChartContext( GetImport(),
- nPrefix, rLocalName,
+ nInPrefix, rLocalName,
GetImport().GetModel(),
xAttrList );
}
else
{
- pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
+ pContext = SvXMLImportContext::CreateChildContext( nInPrefix, rLocalName, xAttrList );
}
return pContext;
More information about the Libreoffice-commits
mailing list