summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-27 14:20:35 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-30 06:34:42 +0000
commit77d5491e15c96b5864fccd3ffc3d6a7b90e93367 (patch)
tree25619ff045fef52741ebd0ac9a792255e35806fe /sc
parent3e9e667af2d8d307844b29d608b377a04b6bb139 (diff)
loplugin:unusedmethods
Change-Id: I08e9bb65b2530148b80c67f01d51e594fc698acb Reviewed-on: https://gerrit.libreoffice.org/25543 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/biffinputstream.hxx13
-rw-r--r--sc/source/filter/inc/defnamesbuffer.hxx4
-rw-r--r--sc/source/filter/inc/formulabuffer.hxx7
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx3
-rw-r--r--sc/source/filter/oox/biffinputstream.cxx14
-rw-r--r--sc/source/filter/oox/defnamesbuffer.cxx2
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx10
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx23
-rw-r--r--sc/source/ui/formdlg/formula.cxx6
-rw-r--r--sc/source/ui/inc/formula.hxx1
10 files changed, 1 insertions, 82 deletions
diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index a46baca71954..996c567efcd9 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -322,19 +322,6 @@ private:
bool mbCont; /// True = automatic CONTINUE lookup enabled.
};
-class BiffInputStreamPos
-{
-public:
- explicit BiffInputStreamPos( BiffInputStream& rStrm );
-
- void restorePosition();
-
-private:
- BiffInputStream& mrStrm;
- sal_Int64 mnRecHandle;
- sal_Int64 mnRecPos;
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx
index da1024672e03..b47735947bb3 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star {
namespace oox {
namespace xls {
-class BiffInputStreamPos;
-
// codes for built-in names
const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA = '\x00';
const sal_Unicode BIFF_DEFNAME_AUTOOPEN = '\x01'; // Sheet macro executed when workbook is opened.
@@ -127,14 +125,12 @@ public:
private:
typedef ::std::unique_ptr< StreamDataSequence > StreamDataSeqPtr;
- typedef ::std::unique_ptr< BiffInputStreamPos > BiffStreamPosPtr;
ScRangeData* mpScRangeData; /// ScRangeData of the defined name.
sal_Int32 mnTokenIndex; /// Name index used in API token array.
sal_Int16 mnCalcSheet; /// Calc sheet index for sheet-local names.
sal_Unicode mcBuiltinId; /// Identifier for built-in defined names.
StreamDataSeqPtr mxFormula; /// Formula data for BIFF12 import.
- BiffStreamPosPtr mxBiffStrm; /// Cached BIFF stream for formula import.
};
typedef std::shared_ptr< DefinedName > DefinedNameRef;
diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx
index 1cb323b7c217..692fff262782 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -42,9 +42,6 @@ public:
sal_Int32 mnSharedId;
SharedFormulaEntry(
- const css::table::CellAddress& rAddress,
- const OUString& rTokenStr, sal_Int32 nSharedId );
- SharedFormulaEntry(
const ScAddress& rAddress,
const OUString& rTokenStr, sal_Int32 nSharedId );
};
@@ -60,9 +57,6 @@ public:
sal_Int32 mnValueType;
SharedFormulaDesc(
- const css::table::CellAddress& rAddr, sal_Int32 nSharedId,
- const OUString& rCellValue, sal_Int32 nValueType );
- SharedFormulaDesc(
const ScAddress& rAddr, sal_Int32 nSharedId,
const OUString& rCellValue, sal_Int32 nValueType );
};
@@ -72,7 +66,6 @@ public:
OUString maTokenStr;
ScAddress maCellAddress;
TokenAddressItem( const OUString& rTokenStr, const ScAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {}
- TokenAddressItem( const OUString& rTokenStr, const css::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress.Column, rCellAddress.Row, rCellAddress.Sheet ) {}
};
struct TokenRangeAddressItem
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 8090953328df..26ff2b12c784 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -653,9 +653,6 @@ public:
void applyPatternToAttrList(
AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal_Int32 nForceScNumFmt );
- /** Writes all formatting attributes to the passed property map. */
- void writeToPropertyMap( PropertyMap& rPropMap ) const;
-
void writeToDoc( ScDocumentImport& rDoc, const css::table::CellRangeAddress& rRange );
const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false );
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index 0607e067e669..685784b012c3 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -478,20 +478,6 @@ void BiffInputStream::readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAd
ornAddSize = 4 * nFontCount + ::std::max< sal_Int32 >( 0, nPhoneticSize );
}
-BiffInputStreamPos::BiffInputStreamPos( BiffInputStream& rStrm ) :
- mrStrm( rStrm ),
- mnRecHandle( rStrm.getRecHandle() ),
- mnRecPos( rStrm.tell() )
-{
-}
-
-void BiffInputStreamPos::restorePosition()
-{
- bool bValidRec = mrStrm.startRecordByHandle( mnRecHandle );
- if( bValidRec )
- mrStrm.seek( mnRecPos );
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index feb6c2f166cd..acc58ba46755 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -300,7 +300,7 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
return;
// skip BIFF names without stream position (e.g. BIFF3-BIFF4 internal 3D references)
- if( (getFilterType() == FILTER_BIFF) && !mxBiffStrm.get() )
+ if( getFilterType() == FILTER_BIFF )
return;
// convert original name to final Calc name (TODO: filter invalid characters from model name)
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index b265093696ea..4c1eb0529a71 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -344,21 +344,11 @@ FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry(
const OUString& rTokenStr, sal_Int32 nSharedId ) :
maAddress(rAddr), maTokenStr(rTokenStr), mnSharedId(nSharedId) {}
-FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry(
- const css::table::CellAddress& rAddr,
- const OUString& rTokenStr, sal_Int32 nSharedId ) :
- maAddress( ScAddress( rAddr.Column, rAddr.Row, rAddr.Sheet ) ), maTokenStr(rTokenStr), mnSharedId(nSharedId) {}
-
FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc(
const ScAddress& rAddr, sal_Int32 nSharedId,
const OUString& rCellValue, sal_Int32 nValueType ) :
maAddress(rAddr), mnSharedId(nSharedId), maCellValue(rCellValue), mnValueType(nValueType) {}
-FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc(
- const css::table::CellAddress& rAddr, sal_Int32 nSharedId,
- const OUString& rCellValue, sal_Int32 nValueType ) :
- maAddress( ScAddress( rAddr.Column, rAddr.Row, rAddr.Sheet ) ), mnSharedId(nSharedId), maCellValue(rCellValue), mnValueType(nValueType) {}
-
FormulaBuffer::SheetItem::SheetItem() :
mpCellFormulas(nullptr),
mpArrayFormulas(nullptr),
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index f6eaddfdbf76..5e0e09b035f7 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2188,29 +2188,6 @@ void Xf::applyPatternToAttrList( AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal
}
}
-void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const
-{
- StylesBuffer& rStyles = getStyles();
-
- // create and set cell style.
-
- // TODO : We should gradually move things to writeToDoc(), to set cell
- // styles to the document directly.
-
- if( maModel.mbFontUsed )
- rStyles.writeFontToPropertyMap( rPropMap, maModel.mnFontId );
- if( maModel.mbNumFmtUsed )
- rStyles.writeNumFmtToPropertyMap( rPropMap, maModel.mnNumFmtId );
- if( maModel.mbAlignUsed )
- maAlignment.writeToPropertyMap( rPropMap );
- if( maModel.mbProtUsed )
- maProtection.writeToPropertyMap( rPropMap );
- if( maModel.mbBorderUsed )
- rStyles.writeBorderToPropertyMap( rPropMap, maModel.mnBorderId );
- if( maModel.mbAreaUsed )
- rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId );
-}
-
void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRange )
{
const StylesBuffer& rStyles = getStyles();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 177a0bbce184..bf50ba5e2e7a 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -539,12 +539,6 @@ void ScFormulaDlg::setDispatcherLock( bool bLock )
{
ScFormulaReferenceHelper::SetDispatcherLock( bLock );
}
-void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData)
-{
- ScModule* pScMod = SC_MOD();
- ScFormEditData& rData = const_cast<ScFormEditData&>(dynamic_cast<const ScFormEditData&>(*_pData));
- pScMod->SetRefInputHdl(rData.GetInputHandler());
-}
void ScFormulaDlg::deleteFormData()
{
ScModule* pScMod = SC_MOD();
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index fc72393b8020..0efb75d5f6af 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -65,7 +65,6 @@ public:
virtual void showReference(const OUString& _sFormula) override;
virtual void dispatch(bool _bOK, bool _bMatrixChecked) override;
virtual void setDispatcherLock( bool bLock ) override;
- virtual void setReferenceInput(const formula::FormEditData* _pData) override;
virtual void deleteFormData() override;
virtual void clear() override;
virtual void switchBack() override;