sc/source/filter/oox/revisionfragment.cxx | 3 ---
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 3 +--
sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx | 2 --
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 1 -
sc/source/filter/xml/xmlannoi.cxx | 5 +----
sc/source/filter/xml/xmlannoi.hxx | 4 +---
sc/source/filter/xml/xmlcelli.cxx | 3 +--
sc/source/filter/xml/xmldpimp.hxx | 2 +-
sc/source/filter/xml/xmldrani.hxx | 2 +-
sc/source/filter/xml/xmlexternaltabi.hxx | 4 ++--
sc/source/filter/xml/xmlimprt.cxx | 1 -
sc/source/filter/xml/xmlimprt.hxx | 3 ---
12 files changed, 8 insertions(+), 25 deletions(-)
New commits:
commit 2294215d32a5f015dc9b2f9414f58a4356bf2d6d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Jun 21 15:42:17 2017 +0200
loplugin:unusedfields in sc part2
and mark some fields as being needed to be imported to the model
Change-Id: Icbf846aa1278f4672509dcf6488a7971795b06d8
Reviewed-on: https://gerrit.libreoffice.org/39063
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/filter/oox/revisionfragment.cxx
b/sc/source/filter/oox/revisionfragment.cxx
index f9dc8c085361..ec95dcffab13 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -305,7 +305,6 @@ struct RevisionLogFragment::Impl
{
ScChangeTrack& mrChangeTrack;
- sal_Int32 mnRevIndex;
sal_Int32 mnSheetIndex;
RevisionType meType;
@@ -323,7 +322,6 @@ struct RevisionLogFragment::Impl
explicit Impl( ScChangeTrack& rChangeTrack ) :
mrChangeTrack(rChangeTrack),
- mnRevIndex(-1),
mnSheetIndex(-1),
meType(REV_UNKNOWN),
mbEndOfList(false) {}
@@ -391,7 +389,6 @@ void RevisionLogFragment::finalizeImport() {}
void RevisionLogFragment::importCommon( const AttributeList& rAttribs )
{
- mpImpl->mnRevIndex = rAttribs.getInteger(XML_rId, -1);
mpImpl->mnSheetIndex = rAttribs.getInteger(XML_sId, -1);
}
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 36d317623ec8..f76cb2214a31 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -173,8 +173,7 @@
ScXMLChangeTrackingImportHelper::ScXMLChangeTrackingImportHelper() :
pCurrentAction(nullptr),
sIDPrefix(SC_CHANGE_ID_PREFIX),
nMultiSpanned(0),
- nMultiSpannedSlaveCount(0),
- bChangeTrack(false)
+ nMultiSpannedSlaveCount(0)
{
nPrefixLength = sIDPrefix.getLength();
}
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index f0628f59de49..0f1d18f5cf5e 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -184,7 +184,6 @@ class ScXMLChangeTrackingImportHelper
sal_uInt32 nPrefixLength;
sal_Int16 nMultiSpanned;
sal_Int16 nMultiSpannedSlaveCount;
- bool bChangeTrack;
private:
void ConvertInfo(const ScMyActionInfo& aInfo, OUString& rUser, DateTime&
aDateTime);
@@ -200,7 +199,6 @@ public:
ScXMLChangeTrackingImportHelper();
~ScXMLChangeTrackingImportHelper();
- void SetChangeTrack(bool bValue) { bChangeTrack = bValue; }
void SetProtection(const css::uno::Sequence<sal_Int8>& rProtect) {
aProtect = rProtect; }
void StartChangeAction(const ScChangeActionType nActionType);
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index ccd6f814a0ab..669944978636 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -392,7 +392,6 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext(
ScXMLImport& rImport,
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
rImport.LockSolarMutex();
- pChangeTrackingImportHelper->SetChangeTrack(true);
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
for( sal_Int16 i=0; i < nAttrCount; ++i )
diff --git a/sc/source/filter/xml/xmlannoi.cxx
b/sc/source/filter/xml/xmlannoi.cxx
index 87ea27d814fe..5abb51937c4f 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -44,11 +44,9 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport&
rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const
uno::Reference<xml::sax::XAttributeList>& xAttrList,
- ScXMLAnnotationData& rAnnotationData,
- ScXMLTableRowCellContext*
pTempCellContext) :
+ ScXMLAnnotationData& rAnnotationData) :
ScXMLImportContext( rImport, nPrfx, rLName ),
mrAnnotationData( rAnnotationData ),
- pCellContext(pTempCellContext),
pShapeContext(nullptr)
{
uno::Reference<drawing::XShapes> xLocalShapes
(GetScImport().GetTables().GetCurrentXShapes());
@@ -60,7 +58,6 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport&
rImport,
GetScImport(), nPrfx, rLName, xAttrList, xLocalShapes, true);
}
- pCellContext = pTempCellContext;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
const SvXMLTokenMap& rAttrTokenMap =
GetScImport().GetTableAnnotationAttrTokenMap();
for( sal_Int16 i=0; i < nAttrCount; ++i )
diff --git a/sc/source/filter/xml/xmlannoi.hxx
b/sc/source/filter/xml/xmlannoi.hxx
index d10897c3e568..2c2480e5368a 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -70,8 +70,7 @@ public:
ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<
css::xml::sax::XAttributeList>& xAttrList,
- ScXMLAnnotationData& rAnnotationData,
- ScXMLTableRowCellContext* pCellContext);
+ ScXMLAnnotationData& rAnnotationData);
virtual ~ScXMLAnnotationContext() override;
@@ -98,7 +97,6 @@ private:
OUStringBuffer maAuthorBuffer;
OUStringBuffer maCreateDateBuffer;
OUStringBuffer maCreateDateStringBuffer;
- ScXMLTableRowCellContext* pCellContext;
SvXMLImportContext* pShapeContext;
};
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index e6224c11f842..0de5664fcba2 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -153,7 +153,6 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext(
ScXMLImport& rImport,
{
rtl::math::setNan(&fValue); // NaN by default
- rXMLImport.SetRemoveLastChar(false);
rXMLImport.GetTables().AddColumn(bTempIsCovered);
std::unique_ptr<OUString> xStyleName;
@@ -673,7 +672,7 @@ SvXMLImportContext
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
OSL_ENSURE( !mxAnnotationData.get(),
"ScXMLTableRowCellContext::CreateChildContext - multiple annotations in one
cell" );
mxAnnotationData.reset( new ScXMLAnnotationData );
pContext = new ScXMLAnnotationContext( rXMLImport, nPrefix, rLName,
- xAttrList,
*mxAnnotationData, this);
+ xAttrList,
*mxAnnotationData);
}
break;
case XML_TOK_TABLE_ROW_CELL_DETECTIVE:
diff --git a/sc/source/filter/xml/xmldpimp.hxx
b/sc/source/filter/xml/xmldpimp.hxx
index 2df132e7850d..2b9b6698f6d0 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -302,7 +302,7 @@ class ScXMLDataPilotFieldContext : public ScXMLImportContext
bool bDateValue:1;
bool bAutoStart:1;
bool bAutoEnd:1;
- bool mbHasHiddenMember:1;
+ bool mbHasHiddenMember:1; // TODO: import to
document core
public:
diff --git a/sc/source/filter/xml/xmldrani.hxx
b/sc/source/filter/xml/xmldrani.hxx
index 2533d4b68c68..afdc1cf8d014 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -76,7 +76,7 @@ class ScXMLDatabaseRangeContext : public ScXMLImportContext
bool bContainsSort;
bool bContainsSubTotal;
bool bNative;
- bool bIsSelection;
+ bool bIsSelection; // TODO: import to document core
bool bKeepFormats;
bool bMoveCells;
bool bStripData;
diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx
b/sc/source/filter/xml/xmlexternaltabi.hxx
index 014d75324a07..aa19a5b74b29 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -111,11 +111,11 @@ public:
private:
ScXMLImport& mrScImport;
ScXMLExternalTabData& mrExternalRefInfo;
- OUString maCellString;
+ OUString maCellString;
double mfCellValue;
sal_Int32 mnRepeatCount;
sal_Int32 mnNumberFormat;
- sal_Int16 mnCellType;
+ sal_Int16 mnCellType; // TODO: import to document core
bool mbIsNumeric;
bool mbIsEmpty;
};
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index badfa59d22ad..abd40755e83c 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2176,7 +2176,6 @@ ScXMLImport::ScXMLImport(
nProgressCount(0),
nPrevCellType(0),
bLoadDoc( true ),
- bRemoveLastChar(false),
bNullDateSetted(false),
bSelfImportingXMLSet(false),
mbLockSolarMutex(true),
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index d11e36cc73a5..945e2abc010f 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -942,7 +942,6 @@ class ScXMLImport: public SvXMLImport
sal_Int32 nProgressCount;
sal_Int16 nPrevCellType;
bool bLoadDoc; // Load doc or styles only
- bool bRemoveLastChar;
bool bNullDateSetted;
bool bSelfImportingXMLSet;
bool mbLockSolarMutex;
@@ -1117,8 +1116,6 @@ public:
ScMyImpDetectiveOpArray* GetDetectiveOpArray();
- void SetRemoveLastChar(bool bValue) { bRemoveLastChar = bValue; }
-
ScXMLChangeTrackingImportHelper* GetChangeTrackingImportHelper();
void InsertStyles();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
