summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/xml')
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx1
-rw-r--r--sc/source/filter/xml/XMLExportIterator.hxx3
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx11
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.hxx3
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx1
-rw-r--r--sc/source/filter/xml/xmlcelli.hxx3
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx3
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx1
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx6
-rw-r--r--sc/source/filter/xml/xmlsubti.hxx5
11 files changed, 1 insertions, 38 deletions
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index 4e0b9d668fb6..64ae6020e63c 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -69,7 +69,6 @@ class ScChangeTrackingExportHelper
void AddInsertionAttributes(const ScChangeAction* pAction);
void WriteInsertion(ScChangeAction* pAction);
void AddDeletionAttributes(const ScChangeActionDel* pAction, const ScChangeActionDel* pLastAction);
- void WriteDeletionCells(ScChangeActionDel* pAction);
void WriteCutOffs(const ScChangeActionDel* pAction);
void WriteDeletion(ScChangeAction* pAction);
void WriteMovement(ScChangeAction* pAction);
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 41e59dc975c8..d0e5a65888e8 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -111,9 +111,8 @@ public:
ScMyNoteShapesContainer();
virtual ~ScMyNoteShapesContainer();
- using ScMyIteratorBase::UpdateAddress;
+ using ScMyIteratorBase::UpdateAddress;
void AddNewNote(const ScMyNoteShape& aNote);
- bool HasNotes() { return !aNoteShapeList.empty(); }
const ScMyNoteShapeList& GetNotes() const { return aNoteShapeList; }
virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE;
virtual void Sort() SAL_OVERRIDE;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index de8a6a07f5c4..ae5927008536 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -1095,12 +1095,6 @@ void ScColumnStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 n
aTables[nTable][nField] = aStyle;
}
-OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField)
-{
- bool bTemp;
- return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp));
-}
-
ScRowStyles::Cache::Cache() :
mnTable(-1), mnStart(-1), mnEnd(-1), mnStyle(-1) {}
@@ -1173,9 +1167,4 @@ void ScRowStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nSta
r.insert_back(nStartField, nEndField+1, nStringIndex);
}
-OUString* ScRowStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField)
-{
- return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField));
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 2f44ce658fc0..d6d49bb78837 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -221,7 +221,6 @@ public:
virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) = 0;
sal_Int32 AddStyleName(OUString* pString);
sal_Int32 GetIndexOfStyleName(const OUString& rString, const OUString& rPrefix);
- virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) = 0;
OUString* GetStyleNameByIndex(const sal_Int32 nIndex);
};
@@ -247,7 +246,6 @@ public:
sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField,
bool& bIsVisible);
void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible);
- virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) SAL_OVERRIDE;
};
class ScRowStyles : public ScColumnRowStylesBase
@@ -274,7 +272,6 @@ public:
sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField);
void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex);
void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField);
- virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) SAL_OVERRIDE;
};
#endif
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 997275a0a288..7712e528d2b2 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -158,7 +158,6 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport,
bIsEmpty(true),
mbNewValueType(false),
mbErrorValue(false),
- bIsFirstTextImport(false),
bSolarMutexLocked(false),
bFormulaTextResult(false),
mbPossibleErrorCell(false),
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index e5d02f81dfc3..c9ed567b9f64 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -87,7 +87,6 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
bool bIsEmpty;
bool mbNewValueType;
bool mbErrorValue;
- bool bIsFirstTextImport;
bool bSolarMutexLocked;
bool bFormulaTextResult;
bool mbPossibleErrorCell;
@@ -96,8 +95,6 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
bool mbHasFormatRuns;
bool mbHasStyle;
- sal_Int16 GetCellType(const OUString& sOUValue) const;
-
void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW nRows);
void SetContentValidation( const ScRange& rScRange );
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index ff006f3245c4..47f039301afb 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -494,9 +494,6 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext
ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
-
- ScXMLDataPilotFieldContext* GetDataPilotField() { return pDataPilotField; }
-
ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference<
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 32ce760590a6..0c26018f26b7 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -135,8 +135,6 @@ class ScXMLExport : public SvXMLExport
sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
void CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount);
void CollectShapesAutoStyles(SCTAB nTableCount);
- void WriteTablesView(const com::sun::star::uno::Any& aTableView);
- void WriteView(const com::sun::star::uno::Any& aView);
virtual void _ExportFontDecls() SAL_OVERRIDE;
virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE;
virtual void _ExportAutoStyles() SAL_OVERRIDE;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 2ddf1a692987..959fcb6c657e 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2093,7 +2093,6 @@ ScXMLImport::ScXMLImport(
sPrevCurrency(),
nSolarMutexLocked(0),
nProgressCount(0),
- nStyleFamilyMask( 0 ),
nPrevCellType(0),
bLoadDoc( true ),
bRemoveLastChar(false),
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index c26a71016a81..527e823b3e2f 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -962,7 +962,6 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
OUString sPrevCurrency;
sal_uInt32 nSolarMutexLocked;
sal_Int32 nProgressCount;
- sal_uInt16 nStyleFamilyMask;// Mask of styles to load
sal_Int16 nPrevCellType;
bool bLoadDoc; // Load doc or styles only
bool bRemoveLastChar;
@@ -1019,7 +1018,6 @@ public:
ScMyTables& GetTables() { return aTables; }
- sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
bool IsStylesOnlyMode() const { return !bLoadDoc; }
sal_Int16 GetCellType(const OUString& rStrValue) const;
@@ -1144,10 +1142,8 @@ public:
ScMyImpDetectiveOpArray* GetDetectiveOpArray();
void SetRemoveLastChar(bool bValue) { bRemoveLastChar = bValue; }
- bool GetRemoveLastChar() { return bRemoveLastChar; }
ScXMLChangeTrackingImportHelper* GetChangeTrackingImportHelper();
- void AddViewContext(SvXMLImportContext* pContext) { aViewContextList.push_back(pContext); }
void InsertStyles();
void SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps);
@@ -1155,7 +1151,6 @@ public:
virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) SAL_OVERRIDE;
void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); }
- std::vector<OUString> GetTableStyle() { return aTableStyles; }
ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; }
sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const OUString& rCurrency);
bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const OUString& sCurrencySymbol, const OUString& sBankSymbol);
@@ -1218,7 +1213,6 @@ public:
void SetNamedRanges();
void SetSheetNamedRanges();
void SetLabelRanges();
- void AddDefaultNote( const com::sun::star::table::CellAddress& aCell );
/** Extracts the formula string, the formula grammar namespace URL, and a
grammar enum value from the passed formula attribute value.
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index 2e4e98a3234a..89d6d55c6e90 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -66,9 +66,6 @@ private:
sal_Int16 nCurrentDrawPage;
sal_Int16 nCurrentXShapes;
- void NewRow();
- void NewColumn(bool bIsCovered);
-
void SetTableStyle(const OUString& sStyleName);
public:
ScMyTables(ScXMLImport& rImport);
@@ -91,8 +88,6 @@ public:
SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; }
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >
GetCurrentXSheet() const { return xCurrentSheet; }
- ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >
- GetCurrentXCellRange() const { return xCurrentCellRange; }
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
GetCurrentXDrawPage();
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >