[Libreoffice-commits] .: binfilter/bf_sc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 3 13:52:55 PST 2011
binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx | 7
binfilter/bf_sc/source/filter/xml/makefile.mk | 1
binfilter/bf_sc/source/filter/xml/sc_XMLCalculationSettingsContext.cxx | 76 -
binfilter/bf_sc/source/filter/xml/sc_XMLCellRangeSourceContext.cxx | 16
binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx | 25
binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx | 44
binfilter/bf_sc/source/filter/xml/sc_XMLColumnRowGroupExport.cxx | 8
binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx | 18
binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx | 154 +-
binfilter/bf_sc/source/filter/xml/sc_XMLDetectiveContext.cxx | 48
binfilter/bf_sc/source/filter/xml/sc_XMLEmptyContext.cxx | 10
binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLExportDataPilot.cxx | 12
binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx | 15
binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx | 29
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx | 28
binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx | 33
binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx | 36
binfilter/bf_sc/source/filter/xml/sc_XMLTableMasterPageExport.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeResizer.cxx | 28
binfilter/bf_sc/source/filter/xml/sc_XMLTableShapesContext.cxx | 12
binfilter/bf_sc/source/filter/xml/sc_XMLTableSourceContext.cxx | 32
binfilter/bf_sc/source/filter/xml/sc_XMLTextPContext.cxx | 20
binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx | 564 +++++-----
binfilter/bf_sc/source/filter/xml/sc_xmlannoi.cxx | 20
binfilter/bf_sc/source/filter/xml/sc_xmlbodyi.cxx | 64 -
binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx | 97 -
binfilter/bf_sc/source/filter/xml/sc_xmlcoli.cxx | 69 -
binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx | 22
binfilter/bf_sc/source/filter/xml/sc_xmlcvali.cxx | 162 +-
binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx | 260 ++--
binfilter/bf_sc/source/filter/xml/sc_xmldrani.cxx | 196 +--
binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx | 54
binfilter/bf_sc/source/filter/xml/sc_xmlfilti.cxx | 164 +-
binfilter/bf_sc/source/filter/xml/sc_xmlfonte.cxx | 20
binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx | 140 +-
binfilter/bf_sc/source/filter/xml/sc_xmllabri.cxx | 34
binfilter/bf_sc/source/filter/xml/sc_xmlnexpi.cxx | 79 -
binfilter/bf_sc/source/filter/xml/sc_xmlrowi.cxx | 56
binfilter/bf_sc/source/filter/xml/sc_xmlsceni.cxx | 20
binfilter/bf_sc/source/filter/xml/sc_xmlsorti.cxx | 50
binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx | 141 +-
binfilter/bf_sc/source/filter/xml/sc_xmlstyli.cxx | 100 -
binfilter/bf_sc/source/filter/xml/sc_xmlsubti.cxx | 21
binfilter/bf_sc/source/filter/xml/sc_xmltabi.cxx | 42
binfilter/bf_sc/source/filter/xml/xmlstyle.hxx | 2
binfilter/bf_sc/source/filter/xml/xmlsubti.hxx | 2
47 files changed, 1479 insertions(+), 1556 deletions(-)
New commits:
commit 8fa816c1e569d121e36b5459c3ad0338104104b0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 3 21:51:40 2011 +0000
WaE: this directory is warning free now
diff --git a/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx b/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx
index 3b3ec80..632ad67 100644
--- a/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -114,8 +114,11 @@ struct ScMyDefaultStyle
sal_Int32 nRepeat;
sal_Bool bIsAutoStyle;
- ScMyDefaultStyle() : nIndex(-1), bIsAutoStyle(sal_True),
- nRepeat(1) {}
+ ScMyDefaultStyle()
+ : nIndex(-1)
+ , nRepeat(1)
+ , bIsAutoStyle(sal_True)
+ {}
};
typedef std::vector<ScMyDefaultStyle> ScMyDefaultStyleList;
diff --git a/binfilter/bf_sc/source/filter/xml/makefile.mk b/binfilter/bf_sc/source/filter/xml/makefile.mk
index be7ab41..97f4877 100644
--- a/binfilter/bf_sc/source/filter/xml/makefile.mk
+++ b/binfilter/bf_sc/source/filter/xml/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLCalculationSettingsContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLCalculationSettingsContext.cxx
index d0776e8..1c1cd0f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLCalculationSettingsContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLCalculationSettingsContext.cxx
@@ -51,12 +51,12 @@ using namespace xmloff::token;
//------------------------------------------------------------------
-ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport,
+ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
fIterationEpsilon(0.001),
nIterationCount(100),
nYear2000(1930),
@@ -74,40 +74,40 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
{
- if (IsXMLToken(aLocalName, XML_CASE_SENSITIVE))
+ if (IsXMLToken(aLclLocalName, XML_CASE_SENSITIVE))
{
if (IsXMLToken(sValue, XML_FALSE))
bIgnoreCase = sal_True;
}
- else if (IsXMLToken(aLocalName, XML_PRECISION_AS_SHOWN))
+ else if (IsXMLToken(aLclLocalName, XML_PRECISION_AS_SHOWN))
{
if (IsXMLToken(sValue, XML_TRUE))
bCalcAsShown = sal_True;
}
- else if (IsXMLToken(aLocalName, XML_SEARCH_CRITERIA_MUST_APPLY_TO_WHOLE_CELL))
+ else if (IsXMLToken(aLclLocalName, XML_SEARCH_CRITERIA_MUST_APPLY_TO_WHOLE_CELL))
{
if (IsXMLToken(sValue, XML_FALSE))
bMatchWholeCell = sal_False;
}
- else if (IsXMLToken(aLocalName, XML_AUTOMATIC_FIND_LABELS))
+ else if (IsXMLToken(aLclLocalName, XML_AUTOMATIC_FIND_LABELS))
{
if (IsXMLToken(sValue, XML_FALSE))
bLookUpLabels = sal_False;
}
- else if (IsXMLToken(aLocalName, XML_NULL_YEAR))
+ else if (IsXMLToken(aLclLocalName, XML_NULL_YEAR))
{
sal_Int32 nTemp;
GetScImport().GetMM100UnitConverter().convertNumber(nTemp, sValue);
nYear2000 = static_cast<sal_uInt16>(nTemp);
}
- else if (IsXMLToken(aLocalName, XML_USE_REGULAR_EXPRESSIONS))
+ else if (IsXMLToken(aLclLocalName, XML_USE_REGULAR_EXPRESSIONS))
{
if (IsXMLToken(sValue, XML_FALSE))
bUseRegularExpressions = sal_False;
@@ -120,23 +120,23 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext()
{
}
-SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nInPrefix == XML_NAMESPACE_TABLE)
{
if (IsXMLToken(rLName, XML_NULL_DATE))
- pContext = new ScXMLNullDateContext(GetScImport(), nPrefix, rLName, xAttrList, this);
+ pContext = new ScXMLNullDateContext(GetScImport(), nInPrefix, rLName, xAttrList, this);
else if (IsXMLToken(rLName, XML_ITERATION))
- pContext = new ScXMLIterationContext(GetScImport(), nPrefix, rLName, xAttrList, this);
+ pContext = new ScXMLIterationContext(GetScImport(), nInPrefix, rLName, xAttrList, this);
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -182,24 +182,24 @@ void ScXMLCalculationSettingsContext::EndElement()
}
}
-ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport,
+ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLCalculationSettingsContext* pCalcSet) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLocalName, XML_DATE_VALUE))
+ if (nLclPrefix == XML_NAMESPACE_TABLE && IsXMLToken(aLclLocalName, XML_DATE_VALUE))
{
util::DateTime aDateTime;
GetScImport().GetMM100UnitConverter().convertDateTime(aDateTime, sValue);
@@ -216,12 +216,12 @@ ScXMLNullDateContext::~ScXMLNullDateContext()
{
}
-SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -230,37 +230,37 @@ void ScXMLNullDateContext::EndElement()
{
}
-ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport,
+ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLCalculationSettingsContext* pCalcSet) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
{
- if (IsXMLToken(aLocalName, XML_STATUS))
+ if (IsXMLToken(aLclLocalName, XML_STATUS))
{
if (IsXMLToken(sValue, XML_ENABLE))
pCalcSet->SetIterationStatus(sal_True);
}
- else if (IsXMLToken(aLocalName, XML_STEPS))
+ else if (IsXMLToken(aLclLocalName, XML_STEPS))
{
sal_Int32 nSteps;
GetScImport().GetMM100UnitConverter().convertNumber(nSteps, sValue);
pCalcSet->SetIterationCount(nSteps);
}
- else if (IsXMLToken(aLocalName, XML_MAXIMUM_DIFFERENCE))
+ else if (IsXMLToken(aLclLocalName, XML_MAXIMUM_DIFFERENCE))
{
double fDif;
GetScImport().GetMM100UnitConverter().convertDouble(fDif, sValue);
@@ -274,12 +274,12 @@ ScXMLIterationContext::~ScXMLIterationContext()
{
}
-SvXMLImportContext *ScXMLIterationContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLIterationContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLCellRangeSourceContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLCellRangeSourceContext.cxx
index dbcd5fe..8e6deea 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLCellRangeSourceContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLCellRangeSourceContext.cxx
@@ -57,12 +57,12 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() :
//___________________________________________________________________
ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
- ScXMLImport& rImport,
+ ScXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
ScMyImpCellRangeSource* pCellRangeSource ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
if( !xAttrList.is() ) return;
@@ -73,10 +73,10 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME:
pCellRangeSource->sSourceStr = sValue;
@@ -124,11 +124,11 @@ ScXMLCellRangeSourceContext::~ScXMLCellRangeSourceContext()
}
SvXMLImportContext *ScXMLCellRangeSourceContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLName );
}
void ScXMLCellRangeSourceContext::EndElement()
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx
index 12da0a7..7352b7f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingExportHelper.cxx
@@ -49,9 +49,9 @@ using namespace ::binfilter::xmloff::token;
ScChangeTrackingExportHelper::ScChangeTrackingExportHelper(ScXMLExport& rTempExport)
: rExport(rTempExport),
pChangeTrack(NULL),
- sChangeIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)),
pEditTextObj(NULL),
- pDependings(NULL)
+ pDependings(NULL),
+ sChangeIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX))
{
pChangeTrack = rExport.GetDocument() ? rExport.GetDocument()->GetChangeTrack() : NULL;
pDependings = new ScChangeActionTable();
@@ -138,6 +138,7 @@ void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGenerat
{
sal_uInt32 nActionNumber(pGeneratedAction->GetActionNumber());
DBG_ASSERT(pChangeTrack->IsGenerated(nActionNumber), "a not generated action found");
+ (void)nActionNumber;
SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, sal_True, sal_True);
WriteBigRange(pGeneratedAction->GetBigRange(), XML_CELL_ADDRESS);
String sValue;
@@ -293,9 +294,9 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE_TYPE, XML_FLOAT);
::rtl::OUStringBuffer sBuffer;
SvXMLUnitConverter::convertDouble(sBuffer, fValue);
- ::rtl::OUString sValue(sBuffer.makeStringAndClear());
- if (sValue.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, sValue);
+ ::rtl::OUString sLclValue(sBuffer.makeStringAndClear());
+ if (sLclValue.getLength())
+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, sLclValue);
}
}
@@ -328,7 +329,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScBaseCell* pCell)
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True);
if (sOUString.getLength())
{
- SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
+ SvXMLElementExport aElemD(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
sal_Bool bPrevCharWasSpace(sal_True);
rExport.GetTextParagraphExport()->exportText(sOUString, bPrevCharWasSpace);
}
@@ -401,13 +402,13 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con
else
{
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE_TYPE, XML_STRING);
- String sValue;
- pFormulaCell->GetString(sValue);
- ::rtl::OUString sOUValue(sValue);
+ String sLclValue;
+ pFormulaCell->GetString(sLclValue);
+ ::rtl::OUString sOUValue(sLclValue);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True);
if (sOUValue.getLength())
{
- SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
+ SvXMLElementExport aElemD(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
sal_Bool bPrevCharWasSpace(sal_True);
rExport.GetTextParagraphExport()->exportText(sOUValue, bPrevCharWasSpace);
}
@@ -436,6 +437,8 @@ void ScChangeTrackingExportHelper::WriteCell(const ScBaseCell* pCell, const Stri
case CELLTYPE_FORMULA:
WriteFormulaCell(pCell, sValue);
break;
+ default:
+ break;
}
}
else
@@ -530,7 +533,7 @@ void ScChangeTrackingExportHelper::WriteInsertion(ScChangeAction* pAction)
WriteDependings(pAction);
}
-void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel* pDelAction, const ScChangeActionDel* pLastAction)
+void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel* pDelAction, const ScChangeActionDel* /*pLastAction*/)
{
sal_Int32 nPosition(0);
const ScBigRange& rBigRange = pDelAction->GetBigRange();
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
index a9622fa..7a320c2 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
@@ -44,10 +44,10 @@ ScMyCellInfo::ScMyCellInfo(ScBaseCell* pTempCell, const ::rtl::OUString& rFormul
sFormulaAddress(rFormulaAddress),
sFormula(rFormula),
fValue(rValue),
- nType(nTempType),
- nMatrixFlag(nTempMatrixFlag),
nMatrixCols(nTempMatrixCols),
- nMatrixRows(nTempMatrixRows)
+ nMatrixRows(nTempMatrixRows),
+ nType(nTempType),
+ nMatrixFlag(nTempMatrixFlag)
{
}
@@ -124,17 +124,17 @@ ScMyBaseAction::~ScMyBaseAction()
{
}
-ScMyInsAction::ScMyInsAction(const ScChangeActionType nActionType)
- : ScMyBaseAction(nActionType)
+ScMyInsAction::ScMyInsAction(const ScChangeActionType nInActionType)
+ : ScMyBaseAction(nInActionType)
{
}
-ScMyDelAction::ScMyDelAction(const ScChangeActionType nActionType)
- : ScMyBaseAction(nActionType),
- pInsCutOff(NULL),
- aMoveCutOffs(),
- aGeneratedList(),
- nD(0)
+ScMyDelAction::ScMyDelAction(const ScChangeActionType nInActionType)
+ : ScMyBaseAction(nInActionType)
+ , aGeneratedList()
+ , pInsCutOff(NULL)
+ , aMoveCutOffs()
+ , nD(0)
{
}
@@ -145,9 +145,9 @@ ScMyDelAction::~ScMyDelAction()
}
ScMyMoveAction::ScMyMoveAction()
- : ScMyBaseAction(SC_CAT_MOVE),
- pMoveRanges(NULL),
- aGeneratedList()
+ : ScMyBaseAction(SC_CAT_MOVE)
+ , aGeneratedList()
+ , pMoveRanges(NULL)
{
}
@@ -175,15 +175,15 @@ ScMyRejAction::ScMyRejAction()
{
}
-ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper()
- : sIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)),
- aActions(),
+ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() :
aUsers(),
- nMultiSpanned(0),
- nMultiSpannedSlaveCount(0),
- pCurrentAction(NULL),
+ aActions(),
pDoc(NULL),
pTrack(NULL),
+ pCurrentAction(NULL),
+ sIDPrefix(RTL_CONSTASCII_USTRINGPARAM(SC_CHANGE_ID_PREFIX)),
+ nMultiSpanned(0),
+ nMultiSpannedSlaveCount(0),
bChangeTrack(sal_False)
{
nPrefixLength = sIDPrefix.getLength();
@@ -227,6 +227,8 @@ void ScXMLChangeTrackingImportHelper::StartChangeAction(const ScChangeActionType
pCurrentAction = new ScMyRejAction();
}
break;
+ default:
+ break;
}
}
@@ -297,6 +299,8 @@ void ScXMLChangeTrackingImportHelper::SetPosition(const sal_Int32 nPosition, con
nInt32Max, nInt32Max, nPosition + nCount - 1);
}
break;
+ default:
+ break;
}
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLColumnRowGroupExport.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLColumnRowGroupExport.cxx
index 2d7958b..65e07cc 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLColumnRowGroupExport.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLColumnRowGroupExport.cxx
@@ -59,10 +59,10 @@ sal_Bool ScMyColumnRowGroup::operator<(const ScMyColumnRowGroup& rGroup) const
}
ScMyOpenCloseColumnRowGroup::ScMyOpenCloseColumnRowGroup(ScXMLExport& rTempExport, sal_uInt32 nToken)
- : rExport(rTempExport),
- aTableStart(),
- aTableEnd(),
- rName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XMLTokenEnum(nToken))))
+ : rExport(rTempExport)
+ , rName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XMLTokenEnum(nToken))))
+ , aTableStart()
+ , aTableEnd()
{
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx
index b020f2a..280ff4d 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx
@@ -50,16 +50,16 @@ using namespace xmloff::token;
//___________________________________________________________________
ScXMLConsolidationContext::ScXMLConsolidationContext(
- ScXMLImport& rImport,
+ ScXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
eFunction( SUBTOTAL_FUNC_NONE ),
bLinkToSource( sal_False ),
bTargetAddr(sal_False)
{
- rImport.LockSolarMutex();
+ rInImport.LockSolarMutex();
if( !xAttrList.is() ) return;
sal_Int16 nAttrCount = xAttrList->getLength();
@@ -69,10 +69,10 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_CONSOLIDATION_ATTR_FUNCTION:
eFunction = ScXMLConverter::GetSubTotalFuncFromString( sValue );
@@ -102,11 +102,11 @@ ScXMLConsolidationContext::~ScXMLConsolidationContext()
}
SvXMLImportContext *ScXMLConsolidationContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLName );
}
void ScXMLConsolidationContext::EndElement()
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
index fd98383..fba4896 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
@@ -50,15 +50,15 @@ using rtl::OUString;
//------------------------------------------------------------------
-ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport,
+ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/) :
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
// here are no attributes
- rImport.LockSolarMutex();
+ rInImport.LockSolarMutex();
}
ScXMLDDELinksContext::~ScXMLDDELinksContext()
@@ -66,18 +66,18 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext()
GetScImport().UnlockSolarMutex();
}
-SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(rLName, XML_DDE_LINK))
- pContext = new ScXMLDDELinkContext(GetScImport(), nPrefix, rLName, xAttrList);
+ if ((nInPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(rLName, XML_DDE_LINK))
+ pContext = new ScXMLDDELinkContext(GetScImport(), nInPrefix, rLName, xAttrList);
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -86,21 +86,21 @@ void ScXMLDDELinksContext::EndElement()
{
}
-ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport,
+ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/) :
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
aDDELinkTable(),
aDDELinkRow(),
sApplication(),
sTopic(),
sItem(),
- nMode(SC_DDE_DEFAULT),
nPosition(-1),
nColumns(0),
- nRows(0)
+ nRows(0),
+ nMode(SC_DDE_DEFAULT)
{
// here are no attributes
}
@@ -109,20 +109,20 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext()
{
}
-SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if ((nPrefix == XML_NAMESPACE_OFFICE) && IsXMLToken(rLName, XML_DDE_SOURCE))
- pContext = new ScXMLDDESourceContext(GetScImport(), nPrefix, rLName, xAttrList, this);
- else if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(rLName, XML_TABLE))
- pContext = new ScXMLDDETableContext(GetScImport(), nPrefix, rLName, xAttrList, this);
+ if ((nInPrefix == XML_NAMESPACE_OFFICE) && IsXMLToken(rLName, XML_DDE_SOURCE))
+ pContext = new ScXMLDDESourceContext(GetScImport(), nInPrefix, rLName, xAttrList, this);
+ else if ((nInPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(rLName, XML_TABLE))
+ pContext = new ScXMLDDETableContext(GetScImport(), nInPrefix, rLName, xAttrList, this);
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -152,9 +152,9 @@ void ScXMLDDELinkContext::AddCellToRow(const ScDDELinkCell& aCell)
aDDELinkRow.push_back(aCell);
}
-void ScXMLDDELinkContext::AddRowsToTable(const sal_Int32 nRows)
+void ScXMLDDELinkContext::AddRowsToTable(const sal_Int32 nInRows)
{
- for (sal_Int32 i = 0; i < nRows; i++)
+ for (sal_Int32 i = 0; i < nInRows; i++)
aDDELinkTable.insert(aDDELinkTable.end(), aDDELinkRow.begin(), aDDELinkRow.end());
aDDELinkRow.clear();
}
@@ -193,13 +193,13 @@ void ScXMLDDELinkContext::EndElement()
}
}
-ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
+ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pDDELink(pTempDDELink)
{
if( !xAttrList.is() ) return;
@@ -210,25 +210,27 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- if (nPrefix == XML_NAMESPACE_OFFICE)
+ if (nLclPrefix == XML_NAMESPACE_OFFICE)
{
- if (IsXMLToken(aLocalName, XML_DDE_APPLICATION))
+ if (IsXMLToken(aLclLocalName, XML_DDE_APPLICATION))
pDDELink->SetApplication(sValue);
- else if (IsXMLToken(aLocalName, XML_DDE_TOPIC))
+ else if (IsXMLToken(aLclLocalName, XML_DDE_TOPIC))
pDDELink->SetTopic(sValue);
- else if (IsXMLToken(aLocalName, XML_DDE_ITEM))
+ else if (IsXMLToken(aLclLocalName, XML_DDE_ITEM))
pDDELink->SetItem(sValue);
}
- else if ((nPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(aLocalName, XML_CONVERSION_MODE))
+ else if ((nLclPrefix == XML_NAMESPACE_TABLE) && IsXMLToken(aLclLocalName, XML_CONVERSION_MODE))
+ {
if (IsXMLToken(sValue, XML_INTO_ENGLISH_NUMBER))
pDDELink->SetMode(SC_DDE_ENGLISH);
else if (IsXMLToken(sValue, XML_LET_TEXT))
pDDELink->SetMode(SC_DDE_TEXT);
else
pDDELink->SetMode(SC_DDE_DEFAULT);
+ }
}
}
@@ -236,12 +238,12 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext()
{
}
-SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -251,13 +253,13 @@ void ScXMLDDESourceContext::EndElement()
pDDELink->CreateDDELink();
}
-ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport,
+ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pDDELink(pTempDDELink)
{
// here are no attributes
@@ -267,21 +269,23 @@ ScXMLDDETableContext::~ScXMLDDETableContext()
{
}
-SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = NULL;
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nInPrefix == XML_NAMESPACE_TABLE)
+ {
if (IsXMLToken(rLName, XML_TABLE_COLUMN))
- pContext = new ScXMLDDEColumnContext(GetScImport(), nPrefix, rLName, xAttrList, pDDELink);
+ pContext = new ScXMLDDEColumnContext(GetScImport(), nInPrefix, rLName, xAttrList, pDDELink);
else if (IsXMLToken(rLName, XML_TABLE_ROW))
- pContext = new ScXMLDDERowContext(GetScImport(), nPrefix, rLName, xAttrList, pDDELink);
+ pContext = new ScXMLDDERowContext(GetScImport(), nInPrefix, rLName, xAttrList, pDDELink);
+ }
if (!pContext)
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -290,13 +294,13 @@ void ScXMLDDETableContext::EndElement()
{
}
-ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
+ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pDDELink(pTempDDELink)
{
if( !xAttrList.is() ) return;
@@ -308,11 +312,11 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- if (nPrefix == XML_NAMESPACE_TABLE)
- if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED))
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
+ if (IsXMLToken(aLclLocalName, XML_NUMBER_COLUMNS_REPEATED))
GetScImport().GetMM100UnitConverter().convertNumber(nCols, sValue);
}
pDDELink->AddColumns(nCols);
@@ -322,12 +326,12 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext()
{
}
-SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -336,13 +340,13 @@ void ScXMLDDEColumnContext::EndElement()
{
}
-ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
+ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pDDELink(pTempDDELink),
nRows(1)
{
@@ -354,11 +358,11 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- if (nPrefix == XML_NAMESPACE_TABLE)
- if (IsXMLToken(aLocalName, XML_NUMBER_ROWS_REPEATED))
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
+ if (IsXMLToken(aLclLocalName, XML_NUMBER_ROWS_REPEATED))
GetScImport().GetMM100UnitConverter().convertNumber(nRows, sValue);
}
pDDELink->AddRows(nRows);
@@ -368,19 +372,19 @@ ScXMLDDERowContext::~ScXMLDDERowContext()
{
}
-SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = NULL;
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nInPrefix == XML_NAMESPACE_TABLE)
if (IsXMLToken(rLName, XML_TABLE_CELL))
- pContext = new ScXMLDDECellContext(GetScImport(), nPrefix, rLName, xAttrList, pDDELink);
+ pContext = new ScXMLDDECellContext(GetScImport(), nInPrefix, rLName, xAttrList, pDDELink);
if (!pContext)
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -390,20 +394,20 @@ void ScXMLDDERowContext::EndElement()
pDDELink->AddRowsToTable(nRows);
}
-ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
+ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
- pDDELink(pTempDDELink),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
sValue(),
fValue(),
nCells(1),
bString(sal_True),
bString2(sal_True),
- bEmpty(sal_True)
+ bEmpty(sal_True),
+ pDDELink(pTempDDELink)
{
if( !xAttrList.is() ) return;
@@ -413,31 +417,33 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sTempValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- if (nPrefix == XML_NAMESPACE_TABLE)
- if (IsXMLToken(aLocalName, XML_VALUE_TYPE))
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
+ {
+ if (IsXMLToken(aLclLocalName, XML_VALUE_TYPE))
{
if (IsXMLToken(sTempValue, XML_STRING))
bString = sal_True;
else
bString = sal_False;
}
- else if (IsXMLToken(aLocalName, XML_STRING_VALUE))
+ else if (IsXMLToken(aLclLocalName, XML_STRING_VALUE))
{
sValue = sTempValue;
bEmpty = sal_False;
bString2 = sal_True;
}
- else if (IsXMLToken(aLocalName, XML_VALUE))
+ else if (IsXMLToken(aLclLocalName, XML_VALUE))
{
GetScImport().GetMM100UnitConverter().convertDouble(fValue, sTempValue);
bEmpty = sal_False;
bString2 = sal_False;
}
- else if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED))
+ else if (IsXMLToken(aLclLocalName, XML_NUMBER_COLUMNS_REPEATED))
GetScImport().GetMM100UnitConverter().convertNumber(nCells, sTempValue);
+ }
}
}
@@ -445,12 +451,12 @@ ScXMLDDECellContext::~ScXMLDDECellContext()
{
}
-SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLDetectiveContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLDetectiveContext.cxx
index 7cfd4b2..964dacf 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLDetectiveContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLDetectiveContext.cxx
@@ -83,11 +83,11 @@ sal_Bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp )
//___________________________________________________________________
ScXMLDetectiveContext::ScXMLDetectiveContext(
- ScXMLImport& rImport,
+ ScXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLName,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pDetectiveObjVec( pNewDetectiveObjVec )
{
}
@@ -97,24 +97,24 @@ ScXMLDetectiveContext::~ScXMLDetectiveContext()
}
SvXMLImportContext *ScXMLDetectiveContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = NULL;
const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLName ) )
+ switch( rTokenMap.Get( nInPrefix, rLName ) )
{
case XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED:
- pContext = new ScXMLDetectiveHighlightedContext( GetScImport(), nPrefix, rLName, xAttrList, pDetectiveObjVec );
+ pContext = new ScXMLDetectiveHighlightedContext( GetScImport(), nInPrefix, rLName, xAttrList, pDetectiveObjVec );
break;
case XML_TOK_DETECTIVE_ELEM_OPERATION:
- pContext = new ScXMLDetectiveOperationContext( GetScImport(), nPrefix, rLName, xAttrList );
+ pContext = new ScXMLDetectiveOperationContext( GetScImport(), nInPrefix, rLName, xAttrList );
break;
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
@@ -127,12 +127,12 @@ void ScXMLDetectiveContext::EndElement()
//___________________________________________________________________
ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
- ScXMLImport& rImport,
+ ScXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec ):
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
pDetectiveObjVec( pNewDetectiveObjVec ),
aDetectiveObj(),
bValid( sal_False )
@@ -146,10 +146,10 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE:
{
@@ -180,11 +180,11 @@ ScXMLDetectiveHighlightedContext::~ScXMLDetectiveHighlightedContext()
}
SvXMLImportContext *ScXMLDetectiveHighlightedContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLName );
}
void ScXMLDetectiveHighlightedContext::EndElement()
@@ -209,11 +209,11 @@ void ScXMLDetectiveHighlightedContext::EndElement()
//___________________________________________________________________
ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
- ScXMLImport& rImport,
+ ScXMLImport& rInImport,
USHORT nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
aDetectiveOp(),
bHasType( sal_False )
{
@@ -226,10 +226,10 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
{
OUString sAttrName = xAttrList->getNameByIndex( nIndex );
OUString sValue = xAttrList->getValueByIndex( nIndex );
- OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLclLocalName );
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
+ switch( rAttrTokenMap.Get( nLclPrefix, aLclLocalName ) )
{
case XML_TOK_DETECTIVE_OPERATION_ATTR_NAME:
bHasType = ScXMLConverter::GetDetOpTypeFromString( aDetectiveOp.eOpType, sValue );
@@ -243,7 +243,7 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
break;
}
}
- ScUnoConversion::FillScAddress( aDetectiveOp.aPosition, rImport.GetTables().GetRealCellPos() );
+ ScUnoConversion::FillScAddress( aDetectiveOp.aPosition, rInImport.GetTables().GetRealCellPos() );
}
ScXMLDetectiveOperationContext::~ScXMLDetectiveOperationContext()
@@ -251,11 +251,11 @@ ScXMLDetectiveOperationContext::~ScXMLDetectiveOperationContext()
}
SvXMLImportContext *ScXMLDetectiveOperationContext::CreateChildContext(
- USHORT nPrefix,
+ USHORT nInPrefix,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList )
+ const uno::Reference< xml::sax::XAttributeList>& /*xAttrList*/ )
{
- return new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ return new SvXMLImportContext( GetImport(), nInPrefix, rLName );
}
void ScXMLDetectiveOperationContext::EndElement()
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLEmptyContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLEmptyContext.cxx
index 21f7ad1..def6ec1 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLEmptyContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLEmptyContext.cxx
@@ -38,10 +38,10 @@ namespace binfilter {
//------------------------------------------------------------------
-ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport,
+ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
}
@@ -49,12 +49,12 @@ ScXMLEmptyContext::~ScXMLEmptyContext()
{
}
-SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLEmptyContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new ScXMLEmptyContext(GetScImport(), nPrefix, rLName);
+ SvXMLImportContext *pContext = new ScXMLEmptyContext(GetScImport(), nInPrefix, rLName);
return pContext;
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
index a36095d..620f728 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDDELinks.cxx
@@ -79,6 +79,7 @@ void ScXMLExportDDELinks::WriteCell(const sal_Bool bEmpty, const sal_Bool bStrin
{
::rtl::OUStringBuffer sBuffer;
if (!bEmpty)
+ {
if (bString)
{
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE_TYPE, XML_STRING);
@@ -90,6 +91,7 @@ void ScXMLExportDDELinks::WriteCell(const sal_Bool bEmpty, const sal_Bool bStrin
rExport.GetMM100UnitConverter().convertDouble(sBuffer, fValue);
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, sBuffer.makeStringAndClear());
}
+ }
if (nRepeat > 1)
{
rExport.GetMM100UnitConverter().convertNumber(sBuffer, nRepeat);
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDataPilot.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDataPilot.cxx
index 67d455f..3a8c90c 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDataPilot.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDataPilot.cxx
@@ -279,7 +279,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam)
}
}
-void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc)
+void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& /*xSpreadDoc*/)
{
pDoc = rExport.GetDocument();
if (pDoc)
@@ -451,11 +451,11 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
for (sal_Int32 nMember = 0; nMember < nMemberCount; nMember++)
{
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, ::rtl::OUString(((ScDPSaveMember*)aMembers.GetObject(nMember))->GetName()));
- ::rtl::OUStringBuffer sBuffer;
- SvXMLUnitConverter::convertBool(sBuffer, ((ScDPSaveMember*)aMembers.GetObject(nMember))->GetIsVisible());
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear());
- SvXMLUnitConverter::convertBool(sBuffer, ((ScDPSaveMember*)aMembers.GetObject(nMember))->GetShowDetails());
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_DETAILS, sBuffer.makeStringAndClear());
+ ::rtl::OUStringBuffer sTmpBuffer;
+ SvXMLUnitConverter::convertBool(sTmpBuffer, ((ScDPSaveMember*)aMembers.GetObject(nMember))->GetIsVisible());
+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sTmpBuffer.makeStringAndClear());
+ SvXMLUnitConverter::convertBool(sTmpBuffer, ((ScDPSaveMember*)aMembers.GetObject(nMember))->GetShowDetails());
+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_DETAILS, sTmpBuffer.makeStringAndClear());
SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, sal_True, sal_True);
rExport.CheckAttrList();
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
index 4de6802..f573005 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
@@ -200,6 +200,8 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans
rExport.CheckAttrList();
}
break;
+ default :
+ break;
}
}
@@ -253,6 +255,8 @@ rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const sheet::FilterOpera
case sheet::FilterOperator_TOP_VALUES :
return GetXMLToken(XML_TOP_VALUES);
break;
+ default :
+ break;
}
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
}
@@ -419,7 +423,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
uno::Sequence <table::TableSortField> aSortFields;
sal_Bool bBindFormatsToContent (sal_True);
sal_Bool bCopyOutputData (sal_False);
- sal_Bool bIsCaseSensitive (sal_False);
sal_Bool bIsUserListEnabled (sal_False);
table::CellAddress aOutputPosition;
sal_Int32 nUserListIndex = 0;
@@ -438,12 +441,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
uno::Any aCopyOutputData = aSortProperties[i].Value;
aCopyOutputData >>= bCopyOutputData;
}
-// no longer supported
-/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0)
- {
- uno::Any aIsCaseSensitive = aSortProperties[i].Value;
- aIsCaseSensitive >>= bIsCaseSensitive;
- }*/
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0)
{
uno::Any aIsUserListEnabled = aSortProperties[i].Value;
@@ -544,6 +541,8 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
case table::TableSortFieldType_NUMERIC :
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_NUMBER);
break;
+ default :
+ break;
}
}
else
@@ -726,7 +725,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const ::com::sun::star::uno:
sal_Bool bSortColumns(sal_True);
sal_Bool bFound(sal_False);
- sal_uInt32 nProperty(0);
+ sal_Int32 nProperty(0);
while (!bFound && (nProperty < aSortProperties.getLength()))
{
if (aSortProperties[nProperty].Name.compareToAscii(SC_UNONAME_ISSORTCOLUMNS) == 0)
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx
index e5ec506..fed2605 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportIterator.cxx
@@ -332,7 +332,6 @@ sal_Bool ScMyEmptyDatabaseRangesContainer::GetFirstAddress( table::CellAddress&
void ScMyEmptyDatabaseRangesContainer::SetCellData( ScMyCell& rMyCell )
{
rMyCell.bHasEmptyDatabase = sal_False;
- sal_Int16 nTable = rMyCell.aCellAddress.Sheet;
ScMyEmptyDatabaseRangeList::iterator aItr = aDatabaseList.begin();
if( aItr != aDatabaseList.end() )
{
@@ -486,6 +485,7 @@ void ScMyDetectiveOpContainer::Sort()
ScMyCell::ScMyCell() :
aShapeList(),
aDetectiveObjVec(),
+ bIsAutoStyle( sal_False ),
bHasShape( sal_False ),
bIsMergedBase( sal_False ),
bIsCovered( sal_False ),
@@ -493,15 +493,14 @@ ScMyCell::ScMyCell() :
bHasEmptyDatabase( sal_False ),
bHasDetectiveObj( sal_False ),
bHasDetectiveOp( sal_False ),
- bIsMatrixBase( sal_False ),
- bIsMatrixCovered( sal_False ),
- bHasAnnotation( sal_False ),
- bIsAutoStyle( sal_False ),
bIsEditCell( sal_False ),
bKnowWhetherIsEditCell( sal_False ),
bHasStringValue( sal_False ),
bHasDoubleValue( sal_False ),
- bHasXText( sal_False )
+ bHasXText( sal_False ),
+ bIsMatrixBase( sal_False ),
+ bIsMatrixCovered( sal_False ),
+ bHasAnnotation( sal_False )
{
}
@@ -521,15 +520,15 @@ sal_Bool ScMyExportAnnotation::operator<(const ScMyExportAnnotation& rAnno) cons
ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport)
- : rExport(rTempXMLExport),
- pCellItr(NULL),
- pShapes(NULL),
- pMergedRanges(NULL),
- pAreaLinks(NULL),
- pEmptyDatabaseRanges(NULL),
- pDetectiveObj(NULL),
- pDetectiveOp(NULL),
- nCurrentTable(-1)
+ : pShapes(NULL)
+ , pEmptyDatabaseRanges(NULL)
+ , pMergedRanges(NULL)
+ , pAreaLinks(NULL)
+ , pDetectiveObj(NULL)
+ , pDetectiveOp(NULL)
+ , rExport(rTempXMLExport)
+ , pCellItr(NULL)
+ , nCurrentTable(-1)
{
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
index 9ad9001..9ee78df 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
@@ -136,10 +136,10 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
::rtl::OUString sImputTitle;
aAny >>= sImputTitle;
aAny = xPropertySet->getPropertyValue(sSHOWERR);
- sal_Bool bShowErrorMessage;
+ sal_Bool bShowErrorMessage(sal_False);
aAny >>= bShowErrorMessage;
aAny = xPropertySet->getPropertyValue(sSHOWINP);
- sal_Bool bShowImputMessage;
+ sal_Bool bShowImputMessage(sal_False);
aAny >>= bShowImputMessage;
aAny = xPropertySet->getPropertyValue(sTYPE);
sheet::ValidationType aValidationType;
@@ -223,6 +223,8 @@ rtl::OUString ScMyValidationsContainer::GetCondition(const ScMyValidation& aVali
case sheet::ValidationType_WHOLE :
sCondition += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cell-content-is-whole-number()"));
break;
+ default :
+ break;
}
if (aValidation.sFormula1.getLength() ||
(aValidation.aOperator == sheet::ConditionOperator_BETWEEN &&
@@ -256,6 +258,8 @@ rtl::OUString ScMyValidationsContainer::GetCondition(const ScMyValidation& aVali
case sheet::ConditionOperator_NOT_EQUAL :
sCondition += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!="));
break;
+ default :
+ break;
}
sCondition += aValidation.sFormula1;
}
@@ -407,6 +411,8 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport)
}
}
break;
+ default :
+ break;
}
}
++aItr;
@@ -457,7 +463,7 @@ void ScMyDefaultStyles::FillDefaultStyles(const sal_uInt16 nTable,
sal_Bool bPrevAutoStyle;
sal_Bool bIsAutoStyle;
sal_Bool bResult;
- sal_Int32 nPrevIndex;
+ sal_Int32 nPrevIndex(0);
sal_Int32 nIndex;
sal_Int32 nRepeat(0);
sal_Int32 nEmptyRepeat(0);
@@ -556,18 +562,18 @@ sal_Bool ScMyRowFormatRange::operator< (const ScMyRowFormatRange& rRange) const
}
ScRowFormatRanges::ScRowFormatRanges()
- : pRowDefaults(NULL),
- pColDefaults(NULL),
- aRowFormatRanges(),
- nSize(0)
+ : aRowFormatRanges()
+ , pRowDefaults(NULL)
+ , pColDefaults(NULL)
+ , nSize(0)
{
}
ScRowFormatRanges::ScRowFormatRanges(const ScRowFormatRanges* pRanges)
- : pRowDefaults(pRanges->pRowDefaults),
- pColDefaults(pRanges->pColDefaults),
- aRowFormatRanges(pRanges->aRowFormatRanges),
- nSize(pRanges->nSize)
+ : aRowFormatRanges(pRanges->aRowFormatRanges)
+ , pRowDefaults(pRanges->pRowDefaults)
+ , pColDefaults(pRanges->pColDefaults)
+ , nSize(pRanges->nSize)
{
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx
index 75c499d..c07a08b 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesImportHelper.cxx
@@ -317,13 +317,13 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport)
:
aCellStyles(),
aColDefaultStyles(),
- bPrevRangeAdded(sal_True),
rImport(rTempImport),
- nMaxRanges(0),
+ pStyleName(NULL),
pPrevStyleName(NULL),
+ pCurrency(NULL),
pPrevCurrency(NULL),
- pStyleName(NULL),
- pCurrency(NULL)
+ nMaxRanges(0),
+ bPrevRangeAdded(sal_True)
{
aRowDefaultStyle = aCellStyles.end();
}
@@ -354,11 +354,11 @@ void ScMyStylesImportHelper::ResetAttributes()
nCellType = 0;
}
-ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const ::rtl::OUString* pStyleName)
+ScMyStylesSet::iterator ScMyStylesImportHelper::GetIterator(const ::rtl::OUString* pInStyleName)
{
ScMyStyle aStyle;
- if (pStyleName)
- aStyle.sStyleName = *pStyleName;
+ if (pInStyleName)
+ aStyle.sStyleName = *pInStyleName;
else
DBG_ERROR("here is no stylename given");
ScMyStylesSet::iterator aItr = aCellStyles.find(aStyle);
@@ -455,6 +455,7 @@ void ScMyStylesImportHelper::AddRange()
void ScMyStylesImportHelper::AddColumnStyle(const ::rtl::OUString& sStyleName, const sal_Int32 nColumn, const sal_Int32 nRepeat)
{
DBG_ASSERT(static_cast<sal_uInt32>(nColumn) == aColDefaultStyles.size(), "some columns are absent");
+ (void)nColumn;
ScMyStylesSet::iterator aItr = GetIterator(&sStyleName);
DBG_ASSERT(aItr != aCellStyles.end(), "no column default style");
for (sal_Int32 i = 0; i < nRepeat; i++)
@@ -466,16 +467,16 @@ void ScMyStylesImportHelper::SetRowStyle(const ::rtl::OUString& sStyleName)
aRowDefaultStyle = GetIterator(&sStyleName);
}
-void ScMyStylesImportHelper::SetAttributes(::rtl::OUString* pStyleName,
- ::rtl::OUString* pCurrency, const sal_Int16 nCellType)
+void ScMyStylesImportHelper::SetAttributes(::rtl::OUString* pInStyleName,
+ ::rtl::OUString* pInCurrency, const sal_Int16 nInCellType)
{
- if (this->pStyleName)
- delete this->pStyleName;
- if (this->pCurrency)
- delete this->pCurrency;
- this->pStyleName = pStyleName;
- this->pCurrency = pCurrency;
- this->nCellType = nCellType;
+ if (pStyleName)
+ delete pStyleName;
+ if (pCurrency)
+ delete pCurrency;
+ pStyleName = pInStyleName;
+ pCurrency = pInCurrency;
+ nCellType = nInCellType;
}
void ScMyStylesImportHelper::AddRange(const ScRange& rRange)
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx
index def99d6..1d1b94d 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTableHeaderFooterContext.cxx
@@ -45,21 +45,21 @@ using rtl::OUString;
TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext );
-XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference<
xml::sax::XAttributeList > & xAttrList,
const Reference < XPropertySet > & rPageStylePropSet,
sal_Bool bFooter, sal_Bool bLft ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRON )): OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRON )) ),
sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_FTRSHARED) ) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRSHARED )) ),
sContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_RIGHTFTRCON )) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON )) ),
sContentLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PAGE_LEFTFTRCONT )) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTHDRCONT)) ),
+ bDisplay( sal_True ),
bInsertContent( sal_True ),
bLeft( bLft ),
- bDisplay( sal_True ),
bContainsLeft(sal_False),
bContainsRight(sal_False),
bContainsCenter(sal_False)
@@ -69,7 +69,7 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport,
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
OUString aLName;
- sal_uInt16 nPrefix =
+ /*sal_uInt16 nLclPrefix =*/
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
&aLName );
const OUString& rValue = xAttrList->getValueByIndex( i );
@@ -141,13 +141,13 @@ XMLTableHeaderFooterContext::~XMLTableHeaderFooterContext()
}
SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- if ((nPrefix == XML_NAMESPACE_TEXT) &&
+ if ((nInPrefix == XML_NAMESPACE_TEXT) &&
IsXMLToken(rLocalName, XML_P))
{
if (!xTextCursor.is())
@@ -164,13 +164,13 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext(
}
pContext =
GetImport().GetTextImport()->CreateTextChildContext(GetImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList);
}
else
{
- if (nPrefix == XML_NAMESPACE_STYLE)
+ if (nInPrefix == XML_NAMESPACE_STYLE)
{
if (xHeaderFooterContent.is())
{
@@ -194,14 +194,14 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext(
{
xText->setString(sEmpty);
//SvXMLImport aSvXMLImport( GetImport() );
- uno::Reference<text::XTextCursor> xTextCursor( xText->createTextCursor() );
- pContext = new XMLHeaderFooterRegionContext( GetImport(), nPrefix, rLocalName, xAttrList, xTextCursor);
+ uno::Reference<text::XTextCursor> xLclTextCursor( xText->createTextCursor() );
+ pContext = new XMLHeaderFooterRegionContext( GetImport(), nInPrefix, rLocalName, xAttrList, xLclTextCursor);
}
}
}
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -238,12 +238,12 @@ void XMLTableHeaderFooterContext::EndElement()
TYPEINIT1( XMLHeaderFooterRegionContext, SvXMLImportContext );
-XMLHeaderFooterRegionContext::XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
+XMLHeaderFooterRegionContext::XMLHeaderFooterRegionContext( SvXMLImport& rInImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference<
- xml::sax::XAttributeList > & xAttrList,
+ xml::sax::XAttributeList > & /*xAttrList*/,
uno::Reference< text::XTextCursor >& xCursor ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
xTextCursor ( xCursor )
{
xOldTextCursor = GetImport().GetTextImport()->GetCursor();
@@ -255,23 +255,23 @@ XMLHeaderFooterRegionContext::~XMLHeaderFooterRegionContext()
}
SvXMLImportContext *XMLHeaderFooterRegionContext::CreateChildContext(
- sal_uInt16 nPrefix,
+ sal_uInt16 nInPrefix,
const OUString& rLocalName,
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 =
GetImport().GetTextImport()->CreateTextChildContext(GetImport(),
- nPrefix,
+ nInPrefix,
rLocalName,
xAttrList);
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTableMasterPageExport.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTableMasterPageExport.cxx
index 09e9097..9e29bd2 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTableMasterPageExport.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTableMasterPageExport.cxx
@@ -88,7 +88,7 @@ void XMLTableMasterPageExport::exportHeaderFooter(const ::com::sun::star::uno::R
if( !bDisplay )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
+ SvXMLElementExport aScopedElem( GetExport(), XML_NAMESPACE_STYLE,
aName, sal_True, sal_True );
if (sCenter.getLength() && !sLeft.getLength() && !sRight.getLength())
exportHeaderFooterContent( xCenter, sal_False, sal_False );
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeResizer.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeResizer.cxx
index f25f94d..4809f57 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeResizer.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapeResizer.cxx
@@ -41,9 +41,9 @@ namespace binfilter {
using namespace ::com::sun::star;
ScMyShapeResizer::ScMyShapeResizer(ScXMLImport& rTempImport)
- : aShapes(),
- rImport(rTempImport),
- pCollection(NULL)
+ : rImport(rTempImport)
+ , aShapes()
+ , pCollection(NULL)
{
}
@@ -198,12 +198,12 @@ void ScMyShapeResizer::ResizeShapes()
uno::Reference<beans::XPropertySet> xShapeProps (aItr->xShape, uno::UNO_QUERY);
if(xShapeProps.is())
{
- uno::Any aAny = xShapeProps->getPropertyValue( sStartShape );
+ uno::Any aTmpAny = xShapeProps->getPropertyValue( sStartShape );
uno::Reference<drawing::XShape> xStartShape;
- aAny >>= xStartShape;
- aAny = xShapeProps->getPropertyValue( sEndShape );
+ aTmpAny >>= xStartShape;
+ aTmpAny = xShapeProps->getPropertyValue( sEndShape );
uno::Reference<drawing::XShape> xEndShape;
- aAny >>= xEndShape;
+ aTmpAny >>= xEndShape;
if (!xStartShape.is() && !xEndShape.is())
{
awt::Size aOldSize(aSize);
@@ -225,8 +225,8 @@ void ScMyShapeResizer::ResizeShapes()
if (xStartShape.is())
{
awt::Point aEndPoint;
- uno::Any aAny = xShapeProps->getPropertyValue(sEndPosition);
- aAny >>= aEndPoint;
+ uno::Any aLclAny = xShapeProps->getPropertyValue(sEndPosition);
+ aLclAny >>= aEndPoint;
aPoint.X = aRec.Left() + aEndPoint.X;
aPoint.Y = aRec.Top() + aEndPoint.Y;
sProperty = sEndPosition;
@@ -234,15 +234,15 @@ void ScMyShapeResizer::ResizeShapes()
else
{
awt::Point aStartPoint;
- uno::Any aAny = xShapeProps->getPropertyValue(sStartPosition);
- aAny >>= aStartPoint;
+ uno::Any aLclAny = xShapeProps->getPropertyValue(sStartPosition);
+ aLclAny >>= aStartPoint;
aPoint.X = aRec.Left() + aStartPoint.X;
aPoint.Y = aRec.Top() + aStartPoint.Y;
sProperty = sStartPosition;
}
- uno::Any aAny;
- aAny <<= aPoint;
- xShapeProps->setPropertyValue(sProperty, aAny);
+ uno::Any aLclAny;
+ aLclAny <<= aPoint;
+ xShapeProps->setPropertyValue(sProperty, aLclAny);
}
}
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapesContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapesContext.cxx
index 6460914..117aca0 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapesContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTableShapesContext.cxx
@@ -42,12 +42,12 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------
-ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport,
+ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/) :
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
// here are no attributes
}
@@ -56,7 +56,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext()
{
}
-SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -72,12 +72,12 @@ SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( USHORT nPrefix,
XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)rXMLImport.GetShapeImport().get();
pTableShapeImport->SetOnTable(sal_True);
pContext = rXMLImport.GetShapeImport()->CreateGroupChildContext(
- rXMLImport, nPrefix, rLName, xAttrList, xShapes);
+ rXMLImport, nInPrefix, rLName, xAttrList, xShapes);
}
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTableSourceContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTableSourceContext.cxx
index b6f4ec0..ece3ba5 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTableSourceContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTableSourceContext.cxx
@@ -49,12 +49,12 @@ using namespace xmloff::token;
//------------------------------------------------------------------
-ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
+ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
sLink(),
sTableName(),
sFilterName(),
@@ -66,29 +66,29 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if(nPrefix == XML_NAMESPACE_XLINK)
+ if(nLclPrefix == XML_NAMESPACE_XLINK)
{
- if (IsXMLToken(aLocalName, XML_HREF))
+ if (IsXMLToken(aLclLocalName, XML_HREF))
sLink = GetScImport().GetAbsoluteReference(sValue);
}
- else if (nPrefix == XML_NAMESPACE_TABLE)
+ else if (nLclPrefix == XML_NAMESPACE_TABLE)
{
- if (IsXMLToken(aLocalName, XML_TABLE_NAME))
+ if (IsXMLToken(aLclLocalName, XML_TABLE_NAME))
sTableName = sValue;
- else if (IsXMLToken(aLocalName, XML_FILTER_NAME))
+ else if (IsXMLToken(aLclLocalName, XML_FILTER_NAME))
sFilterName = sValue;
- else if (IsXMLToken(aLocalName, XML_FILTER_OPTIONS))
+ else if (IsXMLToken(aLclLocalName, XML_FILTER_OPTIONS))
sFilterOptions = sValue;
- else if (IsXMLToken(aLocalName, XML_MODE))
+ else if (IsXMLToken(aLclLocalName, XML_MODE))
{
if (IsXMLToken(sValue, XML_COPY_RESULTS_ONLY))
nMode = sheet::SheetLinkMode_VALUE;
}
- else if (IsXMLToken(aLocalName, XML_REFRESH_DELAY))
+ else if (IsXMLToken(aLclLocalName, XML_REFRESH_DELAY))
{
double fTime;
if( SvXMLUnitConverter::convertTime( fTime, sValue ) )
@@ -102,12 +102,12 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext()
{
}
-SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
+ ::com::sun::star::xml::sax::XAttributeList>& /*xAttrList*/ )
{
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLName );
return pContext;
}
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTextPContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTextPContext.cxx
index 961d067..b972e32 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTextPContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTextPContext.cxx
@@ -59,27 +59,27 @@ public:
};
-ScXMLTextTContext::ScXMLTextTContext( ScXMLImport& rImport,
+ScXMLTextTContext::ScXMLTextTContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLTextPContext* pTextPContext) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
if (pTextPContext)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- ::rtl::OUString aLocalName;
+ ::rtl::OUString aLclLocalName;
::rtl::OUString sValue;
sal_Int32 nCount(1);
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
- sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- xAttrList->getNameByIndex( i ), &aLocalName );
+ sal_uInt16 nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ xAttrList->getNameByIndex( i ), &aLclLocalName );
sValue = xAttrList->getValueByIndex( i );
- if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(aLocalName, XML_C))
+ if ((nLclPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(aLclLocalName, XML_C))
nCount = sValue.toInt32();
}
pTextPContext->AddSpaces(nCount);
@@ -92,18 +92,18 @@ ScXMLTextTContext::~ScXMLTextTContext()
//------------------------------------------------------------------
-ScXMLTextPContext::ScXMLTextPContext( ScXMLImport& rImport,
+ScXMLTextPContext::ScXMLTextPContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
ScXMLTableRowCellContext* pTempCellContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
+ xAttrList(xTempAttrList),
pTextPContext(NULL),
pCellContext(pTempCellContext),
- sOUText(),
sLName(rLName),
- xAttrList(xTempAttrList),
+ sOUText(),
nPrefix(nPrfx),
bIsOwn(sal_True)
{
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx
index 078e5fb..ac19646 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLTrackedChangesContext.cxx
@@ -536,14 +536,14 @@ public:
//------------------------------------------------------------------
-ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
+ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ SvXMLImportContext( rInImport, nPrfx, rLName )
{
- rImport.LockSolarMutex();
+ rInImport.LockSolarMutex();
pChangeTrackingImportHelper = pTempChangeTrackingImportHelper;
pChangeTrackingImportHelper->SetChangeTrack(sal_True);
@@ -551,13 +551,13 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ sal_uInt16 nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
{
- if (IsXMLToken(aLocalName, XML_PROTECTION_KEY))
+ if (IsXMLToken(aLclLocalName, XML_PROTECTION_KEY))
{
if (sValue.getLength())
{
@@ -575,39 +575,39 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext()
GetScImport().UnlockSolarMutex();
}
-SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nInPrefix == XML_NAMESPACE_TABLE)
{
if (IsXMLToken(rLocalName, XML_CELL_CONTENT_CHANGE))
{
- pContext = new ScXMLContentChangeContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLContentChangeContext(GetScImport(), nInPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
}
else if (IsXMLToken(rLocalName, XML_INSERTION))
{
- pContext = new ScXMLInsertionContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLInsertionContext(GetScImport(), nInPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
}
else if (IsXMLToken(rLocalName, XML_DELETION))
{
- pContext = new ScXMLDeletionContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionContext(GetScImport(), nInPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
}
else if (IsXMLToken(rLocalName, XML_MOVEMENT))
{
- pContext = new ScXMLMovementContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLMovementContext(GetScImport(), nInPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
}
else if (IsXMLToken(rLocalName, XML_REJECTION))
{
- pContext = new ScXMLRejectionContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLRejectionContext(GetScImport(), nInPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
}
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -616,12 +616,12 @@ void ScXMLTrackedChangesContext::EndElement()
{
}
-ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport,
+ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
aInfo(),
nParagraphCount(0)
{
@@ -630,18 +630,18 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport,
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_OFFICE)
+ if (nLclPrefix == XML_NAMESPACE_OFFICE)
{
- if (IsXMLToken(aLocalName, XML_CHG_AUTHOR))
+ if (IsXMLToken(aLclLocalName, XML_CHG_AUTHOR))
{
aInfo.sUser = sValue;
}
- else if (IsXMLToken(aLocalName, XML_CHG_DATE_TIME))
+ else if (IsXMLToken(aLclLocalName, XML_CHG_DATE_TIME))
{
GetScImport().GetMM100UnitConverter().convertDateTime(aInfo.aDateTime, sValue);
}
@@ -653,23 +653,23 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext()
{
}
-SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext *pContext = 0;
- if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLocalName, XML_P)) )
+ if ((nInPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLocalName, XML_P)) )
{
if(nParagraphCount)
sBuffer.append(static_cast<sal_Unicode>('\n'));
nParagraphCount++;
- pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLocalName, xAttrList, sBuffer);
+ pContext = new ScXMLContentContext( GetScImport(), nInPrefix, rLocalName, xAttrList, sBuffer);
}
if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ pContext = new SvXMLImportContext( GetImport(), nInPrefix, rLocalName );
return pContext;
}
@@ -680,12 +680,12 @@ void ScXMLChangeInfoContext::EndElement()
pChangeTrackingImportHelper->SetActionInfo(aInfo);
}
-ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport,
+ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rInImport,
USHORT nPrfx,
const ::rtl::OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScBigRange& rTempBigRange ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ SvXMLImportContext( rInImport, nPrfx, rLName ),
rBigRange(rTempBigRange)
{
sal_Bool bColumn(sal_False);
@@ -704,39 +704,39 @@ ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport,
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
::rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- ::rtl::OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
+ ::rtl::OUString aLclLocalName;
+ USHORT nLclPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
+ sAttrName, &aLclLocalName );
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
- if (nPrefix == XML_NAMESPACE_TABLE)
+ if (nLclPrefix == XML_NAMESPACE_TABLE)
{
- if (IsXMLToken(aLocalName, XML_COLUMN))
+ if (IsXMLToken(aLclLocalName, XML_COLUMN))
{
SvXMLUnitConverter::convertNumber(nColumn, sValue);
bColumn = sal_True;
}
- else if (IsXMLToken(aLocalName, XML_ROW))
+ else if (IsXMLToken(aLclLocalName, XML_ROW))
{
SvXMLUnitConverter::convertNumber(nRow, sValue);
bRow = sal_True;
}
- else if (IsXMLToken(aLocalName, XML_TABLE))
+ else if (IsXMLToken(aLclLocalName, XML_TABLE))
{
SvXMLUnitConverter::convertNumber(nTable, sValue);
bTable = sal_True;
}
- else if (IsXMLToken(aLocalName, XML_START_COLUMN))
+ else if (IsXMLToken(aLclLocalName, XML_START_COLUMN))
SvXMLUnitConverter::convertNumber(nStartColumn, sValue);
- else if (IsXMLToken(aLocalName, XML_END_COLUMN))
+ else if (IsXMLToken(aLclLocalName, XML_END_COLUMN))
SvXMLUnitConverter::convertNumber(nEndColumn, sValue);
- else if (IsXMLToken(aLocalName, XML_START_ROW))
+ else if (IsXMLToken(aLclLocalName, XML_START_ROW))
SvXMLUnitConverter::convertNumber(nStartRow, sValue);
- else if (IsXMLToken(aLocalName, XML_END_ROW))
+ else if (IsXMLToken(aLclLocalName, XML_END_ROW))
SvXMLUnitConverter::convertNumber(nEndRow, sValue);
- else if (IsXMLToken(aLocalName, XML_START_TABLE))
+ else if (IsXMLToken(aLclLocalName, XML_START_TABLE))
SvXMLUnitConverter::convertNumber(nStartTable, sValue);
- else if (IsXMLToken(aLocalName, XML_END_TABLE))
+ else if (IsXMLToken(aLclLocalName, XML_END_TABLE))
SvXMLUnitConverter::convertNumber(nEndTable, sValue);
}
}
@@ -754,15 +754,15 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext()
{
}
-SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( USHORT nInPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list