compilerplugins/clang/unusedmethods.cxx | 24 ++++++-
compilerplugins/clang/unusedmethods.py | 1
sc/inc/addincfg.hxx | 2
sc/inc/clkernelthread.hxx | 4 -
sc/inc/convuno.hxx | 39 ------------
sc/inc/filtopt.hxx | 4 -
sc/inc/grouparealistener.hxx | 4 -
sc/inc/scabstdlg.hxx | 2
sc/inc/simpleformulacalc.hxx | 1
sc/qa/unit/helper/qahelper.hxx | 21 ------
sc/source/core/tool/clkernelthread.cxx | 16 -----
sc/source/core/tool/grouparealistener.cxx | 16 -----
sc/source/core/tool/userlist.cxx | 5 -
sc/source/filter/excel/xepivot.cxx | 10 +--
sc/source/filter/excel/xestream.cxx | 5 -
sc/source/filter/excel/xltoolbar.hxx | 1
sc/source/filter/inc/XclExpChangeTrack.hxx | 5 -
sc/source/filter/inc/XclImpChangeTrack.hxx | 7 --
sc/source/filter/inc/addressconverter.hxx | 19 ------
sc/source/filter/inc/autofilterbuffer.hxx | 3
sc/source/filter/inc/biff.hxx | 8 --
sc/source/filter/inc/biffinputstream.hxx | 7 --
sc/source/filter/inc/defnamesbuffer.hxx | 8 --
sc/source/filter/inc/drawingmanager.hxx | 13 ----
sc/source/filter/inc/excimp8.hxx | 1
sc/source/filter/inc/excrecds.hxx | 1
sc/source/filter/inc/externallinkbuffer.hxx | 3
sc/source/filter/inc/formel.hxx | 9 --
sc/source/filter/inc/formulabase.hxx | 1
sc/source/filter/inc/fprogressbar.hxx | 4 -
sc/source/filter/inc/htmlpars.hxx | 9 --
sc/source/filter/inc/lotfntbf.hxx | 12 ---
sc/source/filter/inc/lotimpop.hxx | 7 --
sc/source/filter/inc/lotrange.hxx | 19 ------
sc/source/filter/inc/namebuff.hxx | 15 ----
sc/source/filter/inc/richstring.hxx | 1
sc/source/filter/inc/stylesbuffer.hxx | 10 ---
sc/source/filter/inc/tokstack.hxx | 26 --------
sc/source/filter/inc/tool.h | 4 -
sc/source/filter/inc/worksheethelper.hxx | 2
sc/source/filter/inc/xcl97rec.hxx | 2
sc/source/filter/inc/xecontent.hxx | 1
sc/source/filter/inc/xename.hxx | 2
sc/source/filter/inc/xepage.hxx | 3
sc/source/filter/inc/xepivot.hxx | 9 --
sc/source/filter/inc/xerecord.hxx | 2
sc/source/filter/inc/xestream.hxx | 8 --
sc/source/filter/inc/xestyle.hxx | 2
sc/source/filter/inc/xetable.hxx | 9 --
sc/source/filter/inc/xichart.hxx | 11 ---
sc/source/filter/inc/xiescher.hxx | 25 --------
sc/source/filter/inc/xipivot.hxx | 1
sc/source/filter/inc/xistream.hxx | 2
sc/source/filter/inc/xistring.hxx | 2
sc/source/filter/inc/xistyle.hxx | 5 -
sc/source/filter/inc/xladdress.hxx | 2
sc/source/filter/inc/xlformula.hxx | 2
sc/source/filter/inc/xlpivot.hxx | 2
sc/source/filter/inc/xlroot.hxx | 4 -
sc/source/filter/oox/defnamesbuffer.cxx | 39 ------------
sc/source/filter/oox/drawingmanager.cxx | 6 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx | 1
sc/source/filter/xml/XMLExportIterator.hxx | 3
sc/source/filter/xml/XMLStylesExportHelper.cxx | 11 ---
sc/source/filter/xml/XMLStylesExportHelper.hxx | 3
sc/source/filter/xml/xmlcelli.cxx | 1
sc/source/filter/xml/xmlcelli.hxx | 3
sc/source/filter/xml/xmldpimp.hxx | 3
sc/source/filter/xml/xmlexprt.hxx | 2
sc/source/filter/xml/xmlimprt.cxx | 1
sc/source/filter/xml/xmlimprt.hxx | 6 -
sc/source/filter/xml/xmlsubti.hxx | 5 -
sc/source/ui/Accessibility/AccessibleDocument.cxx | 8 --
sc/source/ui/Accessibility/AccessibleDocumentBase.cxx | 5 -
sc/source/ui/attrdlg/scdlgfact.cxx | 10 ---
sc/source/ui/attrdlg/scdlgfact.hxx | 2
sc/source/ui/drawfunc/fudraw.cxx | 7 --
sc/source/ui/drawfunc/futext.cxx | 52 -----------------
sc/source/ui/formdlg/privsplt.cxx | 18 -----
sc/source/ui/inc/AccessibilityHints.hxx | 6 -
sc/source/ui/inc/AccessibleCellBase.hxx | 1
sc/source/ui/inc/AccessibleDocument.hxx | 2
sc/source/ui/inc/AccessibleDocumentBase.hxx | 1
sc/source/ui/inc/AccessiblePageHeader.hxx | 3
sc/source/ui/inc/AccessiblePreviewTable.hxx | 3
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 2
sc/source/ui/inc/AccessibleText.hxx | 12 ---
sc/source/ui/inc/acredlin.hxx | 28 ---------
sc/source/ui/inc/anyrefdg.hxx | 5 -
sc/source/ui/inc/asciiopt.hxx | 3
sc/source/ui/inc/cbutton.hxx | 6 -
sc/source/ui/inc/cellsh.hxx | 3
sc/source/ui/inc/checklistmenu.hxx | 2
sc/source/ui/inc/client.hxx | 1
sc/source/ui/inc/condformatdlgentry.hxx | 1
sc/source/ui/inc/condformatuno.hxx | 11 ---
sc/source/ui/inc/content.hxx | 2
sc/source/ui/inc/csvcontrol.hxx | 2
sc/source/ui/inc/csvgrid.hxx | 3
sc/source/ui/inc/csvtablebox.hxx | 4 -
sc/source/ui/inc/datastream.hxx | 2
sc/source/ui/inc/docfunc.hxx | 1
sc/source/ui/inc/drawview.hxx | 3
sc/source/ui/inc/drwtrans.hxx | 4 -
sc/source/ui/inc/filtdlg.hxx | 1
sc/source/ui/inc/fudraw.hxx | 3
sc/source/ui/inc/futext.hxx | 2
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/inc/impex.hxx | 16 -----
sc/source/ui/inc/inputwin.hxx | 5 -
sc/source/ui/inc/mvtabdlg.hxx | 1
sc/source/ui/inc/namedlg.hxx | 3
sc/source/ui/inc/navipi.hxx | 3
sc/source/ui/inc/prevwsh.hxx | 2
sc/source/ui/inc/printfun.hxx | 11 ---
sc/source/ui/inc/privsplt.hxx | 8 --
sc/source/ui/inc/simpref.hxx | 2
sc/source/ui/inc/sortkeydlg.hxx | 1
sc/source/ui/inc/tabvwsh.hxx | 10 ---
sc/source/ui/inc/tphfedit.hxx | 1
sc/source/ui/inc/tpsort.hxx | 1
sc/source/ui/inc/uiitems.hxx | 9 --
sc/source/ui/inc/validate.hxx | 14 ----
sc/source/ui/inc/viewdata.hxx | 4 -
sc/source/ui/inc/viewfunc.hxx | 9 --
sc/source/ui/optdlg/calcoptionsdlg.hxx | 7 --
sc/source/ui/sidebar/CellLineStyleControl.hxx | 10 ---
sc/source/ui/vba/vbaname.hxx | 3
sc/source/ui/vba/vbanames.hxx | 1
sc/source/ui/vba/vbapane.hxx | 2
130 files changed, 38 insertions(+), 833 deletions(-)
New commits:
commit 96d44c9b077a6cc8068067a795dc63248ab90fea
Author: Noel Grandin <n...@peralex.com>
Date: Wed Jul 22 10:20:03 2015 +0200
loplugin:unusedmethods sc
Change-Id: I7bdb1889a942d63370731764a58f4ab524dedd8a
Reviewed-on: https://gerrit.libreoffice.org/17287
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/compilerplugins/clang/unusedmethods.cxx
b/compilerplugins/clang/unusedmethods.cxx
index 692e91e..c22c1db 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -74,13 +74,31 @@ public:
bool VisitVarDecl( const VarDecl* );
};
-static std::string niceName(const FunctionDecl* functionDecl)
+/**
+ * We need to include the template params when we are building the set
+ * of functions we have walked already, because we need to rewalk anything
instantiated with different params
+ */
+enum class NiceNameIncludeTemplateParams { NO, YES };
+static std::string niceName(const FunctionDecl* functionDecl,
NiceNameIncludeTemplateParams eIncludeTemplateParams =
NiceNameIncludeTemplateParams::NO)
{
std::string s =
compat::getReturnType(*functionDecl).getCanonicalType().getAsString()
+ " ";
if (isa<CXXMethodDecl>(functionDecl)) {
- s +=
dyn_cast<CXXMethodDecl>(functionDecl)->getParent()->getQualifiedNameAsString()
+ "::";
+ const CXXRecordDecl* recordDecl =
dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
+ s += recordDecl->getQualifiedNameAsString();
+ if (eIncludeTemplateParams == NiceNameIncludeTemplateParams::YES
+ && isa<ClassTemplateSpecializationDecl>(recordDecl))
+ {
+ const ClassTemplateSpecializationDecl* templateDecl =
dyn_cast<ClassTemplateSpecializationDecl>(recordDecl);
+ s += "<";
+ for(size_t i=0; i < templateDecl->getTemplateArgs().size(); i++)
+ {
+ s += " ," +
templateDecl->getTemplateArgs()[i].getAsType().getAsString();
+ }
+ s += ">";
+ }
+ s += "::";
}
s += functionDecl->getNameAsString() + "(";
bool bFirst = true;
@@ -164,7 +182,7 @@ bool UnusedMethods::VisitCallExpr(CallExpr* expr)
// if the function is templated. However, if we are inside a template
function,
// calling another function on the same template, the same problem occurs.
// Rather than tracking all of that, just traverse anything we have not
already traversed.
- if (traversedFunctionSet.insert(niceName(calleeFunctionDecl)).second)
+ if (traversedFunctionSet.insert(niceName(calleeFunctionDecl,
NiceNameIncludeTemplateParams::YES)).second)
TraverseFunctionDecl(calleeFunctionDecl);
logCallToRootMethods(calleeFunctionDecl);
diff --git a/compilerplugins/clang/unusedmethods.py
b/compilerplugins/clang/unusedmethods.py
index 640b42c..f8c5ae2 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -56,6 +56,7 @@ exclusionSet = set([
"_Bool connectivity::OColumn::isWritable() const",
"_Bool IDocumentLinksAdministration::GetData(const class rtl::OUString
&,const class rtl::OUString &,class com::sun::star::uno::Any &) const",
"_Bool IDocumentLinksAdministration::SetData(const class rtl::OUString
&,const class rtl::OUString &,const class com::sun::star::uno::Any &)",
+ "_Bool ScImportExport::ImportData(const class rtl::OUString &,const class
com::sun::star::uno::Any &)",
# instantiated from templates, not sure why it is not being picked up
"class basegfx::B2DPolygon OutputDevice::PixelToLogic(const class
basegfx::B2DPolygon &,const class MapMode &) const",
"type-parameter-0-0 * detail::cloner::clone(type-parameter-0-0 *const)",
diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx
index 74e86c9..f99c8ed 100644
--- a/sc/inc/addincfg.hxx
+++ b/sc/inc/addincfg.hxx
@@ -25,8 +25,6 @@
class ScAddInCfg : public utl::ConfigItem
{
private:
- com::sun::star::uno::Sequence<OUString> GetPropertyNames();
-
virtual void ImplCommit() SAL_OVERRIDE;
public:
diff --git a/sc/inc/clkernelthread.hxx b/sc/inc/clkernelthread.hxx
index 358da11..ef53a5e 100644
--- a/sc/inc/clkernelthread.hxx
+++ b/sc/inc/clkernelthread.hxx
@@ -34,8 +34,6 @@ public:
CLBuildKernelThread();
virtual ~CLBuildKernelThread();
- void finish();
-
void push(CLBuildKernelWorkItem item);
osl::Condition maCompilationDoneCondition;
@@ -47,8 +45,6 @@ private:
osl::Mutex maQueueMutex;
osl::Condition maQueueCondition;
std::queue<CLBuildKernelWorkItem> maQueue;
- static void produce();
- static void consume();
};
}
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 6c2c5ec..f2c4c20 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -50,27 +50,15 @@ public:
static inline void FillApiRange(
::com::sun::star::table::CellRangeAddress&
rApiRange,
const ScRange& rScRange );
- // CellAddress -> CellRangeAddress
- static inline void FillApiRange(
- ::com::sun::star::table::CellRangeAddress&
rApiRange,
- const ::com::sun::star::table::CellAddress&
rApiAddress );
// CellRangeAddress-Start -> CellAddress
static inline void FillApiStartAddress(
::com::sun::star::table::CellAddress& rApiAddress,
const ::com::sun::star::table::CellRangeAddress&
rApiRange );
- // CellRangeAddress-End -> CellAddress
- static inline void FillApiEndAddress(
- ::com::sun::star::table::CellAddress& rApiAddress,
- const ::com::sun::star::table::CellRangeAddress&
rApiRange );
/** Returns true, if the passed ranges have at least one common cell. */
static inline bool Intersects(
const ::com::sun::star::table::CellRangeAddress&
rApiARange1,
const ::com::sun::star::table::CellRangeAddress&
rApiARange2 );
- /** Returns true, if the passed address rApiInner is inside the passed
range rApiOuter. */
- static inline bool Contains(
- const ::com::sun::star::table::CellRangeAddress&
rApiOuter,
- const ::com::sun::star::table::CellAddress&
rApiInner );
/** Returns true, if the passed range rApiInner is completely inside the
passed range rApiOuter. */
static inline bool Contains(
const ::com::sun::star::table::CellRangeAddress&
rApiOuter,
@@ -112,15 +100,6 @@ inline void ScUnoConversion::FillApiRange(
rApiRange.EndRow = rScRange.aEnd.Row();
}
-inline void ScUnoConversion::FillApiRange(
- ::com::sun::star::table::CellRangeAddress& rApiRange,
- const ::com::sun::star::table::CellAddress& rApiAddress )
-{
- rApiRange.StartColumn = rApiRange.EndColumn = rApiAddress.Column;
- rApiRange.StartRow = rApiRange.EndRow = rApiAddress.Row;
- rApiRange.Sheet = rApiAddress.Sheet;
-}
-
inline void ScUnoConversion::FillApiStartAddress(
::com::sun::star::table::CellAddress& rApiAddress,
const ::com::sun::star::table::CellRangeAddress& rApiRange )
@@ -130,15 +109,6 @@ inline void ScUnoConversion::FillApiStartAddress(
rApiAddress.Sheet = rApiRange.Sheet;
}
-inline void ScUnoConversion::FillApiEndAddress(
- ::com::sun::star::table::CellAddress& rApiAddress,
- const ::com::sun::star::table::CellRangeAddress& rApiRange )
-{
- rApiAddress.Column = rApiRange.EndColumn;
- rApiAddress.Row = rApiRange.EndRow;
- rApiAddress.Sheet = rApiRange.Sheet;
-}
-
inline bool ScUnoConversion::Intersects(
const ::com::sun::star::table::CellRangeAddress& rApiRange1,
const ::com::sun::star::table::CellRangeAddress& rApiRange2 )
@@ -150,15 +120,6 @@ inline bool ScUnoConversion::Intersects(
inline bool ScUnoConversion::Contains(
const ::com::sun::star::table::CellRangeAddress& rApiOuter,
- const ::com::sun::star::table::CellAddress& rApiInner )
-{
- return (rApiOuter.Sheet == rApiInner.Sheet) &&
- (rApiOuter.StartColumn <= rApiInner.Column) && (rApiInner.Column <=
rApiOuter.EndColumn) &&
- (rApiOuter.StartRow <= rApiInner.Row) && (rApiInner.Row <=
rApiOuter.EndRow);
-}
-
-inline bool ScUnoConversion::Contains(
- const ::com::sun::star::table::CellRangeAddress& rApiOuter,
const ::com::sun::star::table::CellRangeAddress& rApiInner )
{
return (rApiOuter.Sheet == rApiInner.Sheet) &&
diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx
index a9381ce..ee188c4 100644
--- a/sc/inc/filtopt.hxx
+++ b/sc/inc/filtopt.hxx
@@ -42,10 +42,6 @@ public:
virtual void Notify( const com::sun::star::uno::Sequence<OUString>&
aPropertyNames ) SAL_OVERRIDE;
bool GetWK3Flag() const { return bWK3Flag; }
- double GetExcelColScale() const { return fExcelColScale; }
- double GetExcelRowScale() const { return fExcelRowScale; }
-
- // values are never modified by office
};
#endif
diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
index 71de7ee..d19c9fec 100644
--- a/sc/inc/grouparealistener.hxx
+++ b/sc/inc/grouparealistener.hxx
@@ -60,10 +60,6 @@ public:
void collectFormulaCells( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW
nRow2, std::vector<ScFormulaCell*>& rCells ) const;
void collectFormulaCells( SCROW nRow1, SCROW nRow2,
std::vector<ScFormulaCell*>& rCells ) const;
- ScAddress getTopCellPos() const;
- const ScRange& getRange() const;
- SCROW getGroupLength() const;
-
private:
void notifyCellChange( const SfxHint& rHint, const ScAddress& rPos );
void notifyBulkChange( const BulkDataHint& rHint );
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 3fcedfc..aab5be0 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -217,7 +217,6 @@ public:
virtual bool GetRenameTable () const = 0;
virtual void GetTabNameString( OUString& rString ) const = 0;
virtual void SetForceCopyTable () = 0;
- virtual void EnableCopyTable (bool bFlag=true) = 0;
virtual void EnableRenameTable (bool bFlag=true) = 0;
};
@@ -231,7 +230,6 @@ class AbstractScNamePasteDlg : public VclAbstractDialog
{
public:
virtual std::vector<OUString> GetSelectedNames() const = 0;
- virtual bool IsAllSelected() const = 0;
};
class AbstractScPivotFilterDlg : public VclAbstractDialog
diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index 340c9d8..2d20f6d 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -46,7 +46,6 @@ public:
double GetValue();
svl::SharedString GetString();
short GetFormatType() const { return mnFormatType; }
- sal_uLong GetFormatIndex() const { return mnFormatIndex; }
bool HasColRowName();
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 829c127..b95331c 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -197,27 +197,6 @@ inline std::string print(const ScAddress& rAddr)
return str.str();
}
-namespace CppUnit {
-
-template<>
-struct assertion_traits<ScRange>
-{
- static bool equal( const ScRange& x, const ScRange& y )
- {
- return x == y;
- }
-
- static std::string toString( const ScRange& x )
- {
- std::stringstream str;
- str << "Start: " << print(x.aStart);
- str << "\nEnd: " << print(x.aEnd);
- return str.str();
- }
-};
-
-}
-
class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
{
static const FileFormat aFileFormats[];
diff --git a/sc/source/core/tool/clkernelthread.cxx
b/sc/source/core/tool/clkernelthread.cxx
index 6c5afc0..9a83a1e 100644
--- a/sc/source/core/tool/clkernelthread.cxx
+++ b/sc/source/core/tool/clkernelthread.cxx
@@ -76,22 +76,6 @@ void CLBuildKernelThread::push(CLBuildKernelWorkItem item)
sc::FormulaGroupInterpreter::getStatic();
}
-void CLBuildKernelThread::produce()
-{
-}
-
-void CLBuildKernelThread::consume()
-{
-}
-
-void CLBuildKernelThread::finish()
-{
- SAL_INFO("sc.opencl", "telling thread to finish");
- CLBuildKernelWorkItem aWorkItem;
- aWorkItem.meWhatToDo = CLBuildKernelWorkItem::FINISH;
- push(aWorkItem);
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index ac9ea7f..82a7204 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -325,12 +325,6 @@ void FormulaGroupAreaListener::collectFormulaCells(
}
}
-ScAddress FormulaGroupAreaListener::getTopCellPos() const
-{
- const ScFormulaCell* p = getTopCell();
- return p ? p->aPos : ScAddress();
-}
-
const ScFormulaCell* FormulaGroupAreaListener::getTopCell() const
{
size_t nBlockSize = 0;
@@ -339,16 +333,6 @@ const ScFormulaCell*
FormulaGroupAreaListener::getTopCell() const
return pp ? *pp : NULL;
}
-const ScRange& FormulaGroupAreaListener::getRange() const
-{
- return maRange;
-}
-
-SCROW FormulaGroupAreaListener::getGroupLength() const
-{
- return mnGroupLen;
-}
-
void FormulaGroupAreaListener::notifyCellChange( const SfxHint& rHint, const
ScAddress& rPos )
{
// Determine which formula cells within the group need to be notified of
this change.
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index a140fa9..3f3cac7 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -326,11 +326,6 @@ ScUserList::iterator ScUserList::begin()
return maData.begin();
}
-ScUserList::const_iterator ScUserList::begin() const
-{
- return maData.begin();
-}
-
void ScUserList::clear()
{
maData.clear();
diff --git a/sc/source/filter/excel/xepivot.cxx
b/sc/source/filter/excel/xepivot.cxx
index 78b4b32..9b4b081 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -185,12 +185,11 @@ void XclExpPCItem::WriteBody( XclExpStream& rStrm )
}
XclExpPCField::XclExpPCField(
- const XclExpRoot& rRoot, const XclExpPivotCache& rPCache, sal_uInt16
nFieldIdx,
+ const XclExpRoot& rRoot, sal_uInt16 nFieldIdx,
const ScDPObject& rDPObj, const ScRange& rRange ) :
XclExpRecord( EXC_ID_SXFIELD ),
XclPCField( EXC_PCFIELD_STANDARD, nFieldIdx ),
XclExpRoot( rRoot ),
- mrPCache( rPCache ),
mnTypeFlags( 0 )
{
// general settings for the standard field, insert all items from source
range
@@ -221,12 +220,11 @@ XclExpPCField::XclExpPCField(
}
XclExpPCField::XclExpPCField(
- const XclExpRoot& rRoot, const XclExpPivotCache& rPCache, sal_uInt16
nFieldIdx,
+ const XclExpRoot& rRoot, sal_uInt16 nFieldIdx,
const ScDPObject& rDPObj, const ScDPSaveGroupDimension& rGroupDim,
const XclExpPCField& rBaseField ) :
XclExpRecord( EXC_ID_SXFIELD ),
XclPCField( EXC_PCFIELD_STDGROUP, nFieldIdx ),
XclExpRoot( rRoot ),
- mrPCache( rPCache ),
mnTypeFlags( 0 )
{
// add base field info (always using first base field, not predecessor of
this field) ***
@@ -750,7 +748,7 @@ void XclExpPivotCache::AddStdFields( const ScDPObject&
rDPObj )
aColRange.aStart.SetCol( nScCol );
aColRange.aEnd.SetCol( nScCol );
maFieldList.AppendNewRecord( new XclExpPCField(
- GetRoot(), *this, GetFieldCount(), rDPObj, aColRange ) );
+ GetRoot(), GetFieldCount(), rDPObj, aColRange ) );
}
}
@@ -771,7 +769,7 @@ void XclExpPivotCache::AddGroupFields( const ScDPObject&
rDPObj )
{
// insert the new grouping field
XclExpPCFieldRef xNewGroupField( new XclExpPCField(
- GetRoot(), *this, GetFieldCount(), rDPObj,
*pGroupDim, *pCurrStdField ) );
+ GetRoot(), GetFieldCount(), rDPObj, *pGroupDim,
*pCurrStdField ) );
maFieldList.AppendRecord( xNewGroupField );
// register new grouping field at current grouping
field, building a chain
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index fa649ee..bbd768d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -781,11 +781,6 @@ static ScRange lcl_ToRange( const XclRange& rRange )
return aRange;
}
-OString XclXmlUtils::ToOString( const XclRange& rRange )
-{
- return ToOString( lcl_ToRange( rRange ) );
-}
-
OString XclXmlUtils::ToOString( const XclRangeList& rRanges )
{
ScRangeList aRanges;
diff --git a/sc/source/filter/excel/xltoolbar.hxx
b/sc/source/filter/excel/xltoolbar.hxx
index 3a9658c..892ec61 100644
--- a/sc/source/filter/excel/xltoolbar.hxx
+++ b/sc/source/filter/excel/xltoolbar.hxx
@@ -53,7 +53,6 @@ class ScCTB : public TBBase
std::vector<TBVisualData> rVisualData;
sal_uInt32 ectbid;
std::vector< ScTBC > rTBC;
- bool ImportCustomToolBar_Impl( ScCTBWrapper&, CustomToolBarImportHelper& );
public:
ScCTB(sal_uInt16);
virtual ~ScCTB(){}
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index df1e4d7..cff08cf 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -74,13 +74,8 @@ public:
virtual ~XclExpUserBViewList();
inline iterator begin () { return aViews.begin(); }
-
inline iterator end () { return aViews.end(); }
- inline const_iterator begin () const { return aViews.begin(); }
-
- inline const_iterator end () const { return aViews.end(); }
-
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
};
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx
b/sc/source/filter/inc/XclImpChangeTrack.hxx
index bf7801d..ce80abd 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -79,8 +79,6 @@ private:
SCTAB ReadTabNum();
void ReadDateTime( DateTime& rDateTime );
- inline void ReadString( OUString& rString );
-
bool CheckRecord( sal_uInt16 nOpCode );
void ReadFormula(
@@ -144,11 +142,6 @@ inline void XclImpChangeTrack::Read2DRange( ScRange&
rRange )
rRange.aEnd.SetCol( static_cast<SCCOL>(pStrm->ReaduInt16()) );
}
-inline void XclImpChangeTrack::ReadString( OUString& rString )
-{
- rString = pStrm->ReadUniString();
-}
-
// derived class for special 3D ref handling
class XclImpChTrFmlConverter : public ExcelToSc8
diff --git a/sc/source/filter/inc/addressconverter.hxx
b/sc/source/filter/inc/addressconverter.hxx
index 27f060b..abe6aec 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -137,18 +137,6 @@ struct BinRange
inline explicit BinRange( const ::com::sun::star::table::CellAddress&
rFirst, const ::com::sun::star::table::CellAddress& rLast ) : maFirst( rFirst
), maLast( rLast ) {}
inline explicit BinRange( const
::com::sun::star::table::CellRangeAddress& rRange ) : maFirst(
rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow
) {}
- inline void set( const BinAddress& rFirst, const BinAddress& rLast
)
- { maFirst = rFirst; maLast = rLast; }
- inline void set( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32
nCol2, sal_Int32 nRow2 )
- { maFirst.set( nCol1, nRow1 ); maLast.set( nCol2,
nRow2 ); }
- inline void set( const ::com::sun::star::table::CellAddress&
rFirst, const ::com::sun::star::table::CellAddress& rLast )
- { maFirst.set( rFirst ); maLast.set( rLast ); }
- inline void set( const ::com::sun::star::table::CellRangeAddress&
rRange )
- { maFirst.set( rRange.StartColumn, rRange.StartRow
); maLast.set( rRange.EndColumn, rRange.EndRow ); }
-
- inline sal_Int32 getColCount() const { return maLast.mnCol -
maFirst.mnCol + 1; }
- inline sal_Int32 getRowCount() const { return maLast.mnRow -
maFirst.mnRow + 1; }
-
void read( SequenceInputStream& rStrm );
void read( BiffInputStream& rStrm, bool bCol16Bit = true,
bool bRow32Bit = false );
};
@@ -280,13 +268,6 @@ public:
inline const ::com::sun::star::table::CellAddress&
getMaxAddress() const { return maMaxPos; }
- /** Returns the column overflow status. */
- inline bool isColOverflow() const { return mbColOverflow; }
- /** Returns the row overflow status. */
- inline bool isRowOverflow() const { return mbRowOverflow; }
- /** Returns the sheet overflow status. */
- inline bool isTabOverflow() const { return mbTabOverflow; }
-
/** Checks if the passed column index is valid.
@param nCol The column index to check.
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx
b/sc/source/filter/inc/autofilterbuffer.hxx
index 5a10a2d..65ae36b 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -172,9 +172,6 @@ public:
inline FilterSettingsBase& createFilterSettings()
{ mxSettings.reset( new FilterSettingsType( *this ) ); return
*mxSettings; }
- /** Returns the index of the column in the filtered range this object is
related to. */
- inline sal_Int32 getColumnId() const { return mnColId; }
-
/** Returns converted UNO API filter settings representing all filter
settings of this column. */
ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index 088382e..9d3ca7b 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -29,23 +29,19 @@
// Stream wrapper class
class ScBiffReader
{
- protected:
+protected:
sal_uInt16 mnId;
sal_uInt16 mnLength;
sal_uInt32 mnOffset;
SvStream *mpStream;
bool mbEndOfFile;
- public:
+public:
ScBiffReader( SfxMedium& rMedium );
~ScBiffReader();
bool recordsLeft() { return mpStream && !mpStream->IsEof(); }
bool IsEndOfFile() { return mbEndOfFile; }
- void SetEof( bool bValue ){ mbEndOfFile = bValue; }
bool nextRecord();
- sal_uInt16 getId() { return mnId; }
- sal_uInt16 getLength() { return mnLength; }
- SvStream& getStream() { return *mpStream; }
};
#endif
diff --git a/sc/source/filter/inc/biffinputstream.hxx
b/sc/source/filter/inc/biffinputstream.hxx
index 7eb816a..74c1c890 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -36,13 +36,8 @@ class BiffInputRecordBuffer
public:
explicit BiffInputRecordBuffer( BinaryInputStream& rInStrm );
- /** Returns the wrapped binary base stream. */
- inline const BinaryInputStream& getBaseStream() const { return mrInStrm; }
-
/** Sets a decoder object and decrypts buffered record data. */
void setDecoder( const BiffDecoderRef& rxDecoder );
- /** Returns the current decoder object. */
- inline BiffDecoderRef getDecoder() const { return mxDecoder; }
/** Enables/disables usage of current decoder. */
void enableDecoder( bool bEnable );
@@ -63,8 +58,6 @@ public:
inline sal_uInt16 getRecId() const { return mnRecId; }
/** Returns the current record size. */
inline sal_uInt16 getRecSize() const { return mnRecSize; }
- /** Returns the current read position in the current record body. */
- inline sal_uInt16 getRecPos() const { return mnRecPos; }
/** Returns the number of remaining bytes in the current record body. */
inline sal_uInt16 getRecLeft() const { return mnRecSize - mnRecPos; }
diff --git a/sc/source/filter/inc/defnamesbuffer.hxx
b/sc/source/filter/inc/defnamesbuffer.hxx
index 4177543..187a46a 100644
--- a/sc/source/filter/inc/defnamesbuffer.hxx
+++ b/sc/source/filter/inc/defnamesbuffer.hxx
@@ -114,7 +114,6 @@ public:
void createNameObject( sal_Int32 nIndex );
/** Converts the formula string or BIFF token array for this defined name.
*/
void convertFormula();
- ApiTokenSequence getTokens();
std::unique_ptr<ScTokenArray> getScTokens();
/** Returns true, if this defined name is global in the document. */
inline bool isGlobalName() const { return mnCalcSheet < 0; }
@@ -135,12 +134,6 @@ public:
bool getAbsoluteRange(
::com::sun::star::table::CellRangeAddress& orRange ) const;
private:
- /** Imports the OOXML or BIFF12 definition of the name. */
- void implImportOoxFormula();
- /** Imports the BIFF definition of the name. */
- void implImportBiffFormula();
-
-private:
typedef ::std::unique_ptr< StreamDataSequence > StreamDataSeqPtr;
typedef ::std::unique_ptr< BiffInputStreamPos > BiffStreamPosPtr;
@@ -150,7 +143,6 @@ private:
sal_Unicode mcBuiltinId; /// Identifier for built-in
defined names.
StreamDataSeqPtr mxFormula; /// Formula data for BIFF12 import.
BiffStreamPosPtr mxBiffStrm; /// Cached BIFF stream for formula
import.
- sal_uInt16 mnFmlaSize; /// Cached BIFF formula size for
formula import.
};
typedef std::shared_ptr< DefinedName > DefinedNameRef;
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 021127a..129a1f9 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -60,18 +60,9 @@ public:
explicit BiffDrawingBase( const WorksheetHelper& rHelper,
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage >& rxDrawPage );
- /** Sets the object with the passed identifier to be skipped on import. */
- void setSkipObj( sal_uInt16 nObjId );
-
/** Final processing after import of the all drawing objects. */
void finalizeImport();
- /** Derived classes may want to know that a shape has been inserted. Will
- be called from the convertAndInsert() implementation. */
- virtual void notifyShapeInserted(
- const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& rxShape,
- const ::com::sun::star::awt::Rectangle& rShapeRect
) = 0;
-
private:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
mxDrawPage; /// UNO draw page used to insert
the shapes.
@@ -83,10 +74,6 @@ class BiffSheetDrawing : public BiffDrawingBase
public:
explicit BiffSheetDrawing( const WorksheetHelper& rHelper );
- /** Called when a new UNO shape has been inserted into the draw page. */
- virtual void notifyShapeInserted(
- const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& rxShape,
- const ::com::sun::star::awt::Rectangle& rShapeRect
) SAL_OVERRIDE;
};
} // namespace xls
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index b8e32b7..e50cfd4 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -55,7 +55,6 @@ public:
void ReadBasic(); // 0xD3
void Labelsst(); // 0xFD
- void Hlink(); // 0x01B8
void FeatHdr(); // 0x0867
void Feat(); // 0x0868
diff --git a/sc/source/filter/inc/excrecds.hxx
b/sc/source/filter/inc/excrecds.hxx
index edfb231..6a12db8 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -360,7 +360,6 @@ public:
~ExcFilterCondition();
inline bool IsEmpty() const { return (nType ==
EXC_AFTYPE_NOTUSED); }
- inline bool HasEqual() const { return (nOper ==
EXC_AFOPER_EQUAL); }
sal_uLong GetTextBytes() const;
void SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double
fV, OUString* pT );
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx
b/sc/source/filter/inc/externallinkbuffer.hxx
index 28633b7..08a2ff8 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -86,9 +86,6 @@ public:
/** Imports the DDEITEM_STRING record containing a string in a link
result. */
void importDdeItemString( SequenceInputStream& rStrm );
- /** Returns true, if the name refers to an OLE object. */
- inline bool isOleObject() const { return maExtNameModel.mbOleObj; }
-
#if 0
/** Returns the sheet cache index if this is a sheet-local external name.
*/
sal_Int32 getSheetCacheIndex() const;
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 2fb7040..35a2c85 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -117,12 +117,11 @@ protected:
sal_Int32 nBytesLeft;
inline void Ignore( const long nSeekRel );
- inline void Read( sal_Char& nByte );
inline void Read( sal_uInt8& nByte );
inline void Read( sal_uInt16& nUINT16 );
inline void Read( sal_Int16& nINT16 );
inline void Read( double& fDouble );
- inline void Read( sal_uInt32& nUINT32 );
+ inline void Read( sal_uInt32& nUINT32 );
LotusConverterBase( SvStream& rStr, svl::SharedStringPool& rSPool,
sal_uInt16 nNewBuffer );
virtual ~LotusConverterBase();
@@ -143,12 +142,6 @@ inline void LotusConverterBase::Ignore( const long
nSeekRel )
nBytesLeft -= nSeekRel;
}
-inline void LotusConverterBase::Read( sal_Char& nByte )
-{
- aIn.ReadChar( nByte );
- nBytesLeft--;
-}
-
inline void LotusConverterBase::Read( sal_uInt8& nByte )
{
aIn.ReadUChar( nByte );
diff --git a/sc/source/filter/inc/formulabase.hxx
b/sc/source/filter/inc/formulabase.hxx
index ebf6755..ec96e58 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -308,7 +308,6 @@ class ApiTokenIterator
public:
explicit ApiTokenIterator( const ApiTokenSequence& rTokens,
sal_Int32 nSpacesOpCode, bool bSkipSpaces );
inline bool is() const { return mpToken != mpTokenEnd; }
- inline const ApiToken* get() const { return mpToken; }
inline const ApiToken* operator->() const { return mpToken; }
inline const ApiToken& operator*() const { return *mpToken; }
diff --git a/sc/source/filter/inc/fprogressbar.hxx
b/sc/source/filter/inc/fprogressbar.hxx
index 5b2a844..0344289 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -116,8 +116,6 @@ public:
@return A reference to an ScfProgressBar connected to the segment. */
ScfProgressBar& GetSegmentProgressBar( sal_Int32 nSegment );
- /** Returns true, if any progress segment has been started. */
- inline bool IsStarted() const { return mbInProgress; }
/** Returns true, if the current progress segment is already full. */
bool IsFull() const;
@@ -191,8 +189,6 @@ public:
/** Set progress bar to the specified position. */
inline void ProgressAbs( sal_Size nPos ) { maProgress.ProgressAbs(
nPos ); }
- /** Increase progress bar by 1. */
- inline void Progress( sal_Size nDelta = 1 ) { maProgress.Progress(
nDelta ); }
private:
/** Initializes and starts the progress bar. */
diff --git a/sc/source/filter/inc/htmlpars.hxx
b/sc/source/filter/inc/htmlpars.hxx
index de1ccfd..c7f526b 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -251,8 +251,6 @@ struct ScHTMLPos
{ mnCol = nCol; mnRow = nRow; }
inline void Set( const ScAddress& rAddr )
{ Set( rAddr.Col(), rAddr.Row() ); }
- inline void Move( SCsCOL nColDiff, SCsROW nRowDiff )
- { mnCol = mnCol + nColDiff; mnRow = mnRow +
nRowDiff; }
inline ScAddress MakeAddr() const
{ return ScAddress( mnCol, mnRow, 0 ); }
};
@@ -276,13 +274,8 @@ struct ScHTMLSize
inline explicit ScHTMLSize() : mnCols( 0 ), mnRows( 0 ) {}
inline explicit ScHTMLSize( SCCOL nCols, SCROW nRows ) :
mnCols( nCols ), mnRows( nRows ) {}
-
- inline SCCOLROW Get( ScHTMLOrient eOrient ) const
- { return (eOrient == tdCol) ? mnCols : mnRows; }
inline void Set( SCCOL nCols, SCROW nRows )
{ mnCols = nCols; mnRows = nRows; }
- inline void Expand( SCsCOL nColDiff, SCsROW nRowDiff )
- { mnCols = mnCols + nColDiff; mnRows = mnRows +
nRowDiff; }
};
inline bool operator==( const ScHTMLSize& rSize1, const ScHTMLSize& rSize2 )
@@ -363,8 +356,6 @@ public:
inline const OUString& GetTableName() const { return maTableName; }
/** Returns the unique identifier of the table. */
inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; }
- /** Returns the table size. */
- inline const ScHTMLSize& GetSize() const { return maSize; }
/** Returns the cell spanning of the specified cell. */
ScHTMLSize GetSpan( const ScHTMLPos& rCellPos ) const;
diff --git a/sc/source/filter/inc/lotfntbf.hxx
b/sc/source/filter/inc/lotfntbf.hxx
index 6cf450d..3529d6e 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -63,24 +63,12 @@ private:
else
pTmpName = new OUString( rNew );
}
- inline void Font( SvxFontItem& rNew )
- {
- if( pFont )
- delete pFont;
- pFont = &rNew;
- }
inline void Height( SvxFontHeightItem& rNew )
{
if( pHeight )
delete pHeight;
pHeight = &rNew;
}
- inline void Color( SvxColorItem& rNew )
- {
- if( pColor )
- delete pColor;
- pColor = &rNew;
- }
inline void Type( const sal_uInt16 nNew ) { nType =
nNew; }
};
diff --git a/sc/source/filter/inc/lotimpop.hxx
b/sc/source/filter/inc/lotimpop.hxx
index 4cdd130..fb6704c 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -52,7 +52,6 @@ private:
void Numbercell(); // 0x0017 23
void Smallnumcell(); // 0x0018 24
ScFormulaCell* Formulacell( sal_uInt16 nRecLen ); // 0x0019 25
- void Formulastring( ScFormulaCell& ); // 0x001a 26
// 0x001b 27
special
void NamedSheet(); // 14000
void RowPresentation( sal_uInt16 nRecLen ); //
2007
@@ -70,7 +69,6 @@ private:
inline void Read( sal_uInt8& );
inline void Read( sal_uInt16& );
inline void Read( sal_Int16& );
- inline void Read( sal_uInt32& );
inline void Read( double& ); // 10-Byte-IEEE
lesen
inline void Read( LotAttrWK3& );
void Read( OUString& ); // 0-terminierten
String einlesen
@@ -123,11 +121,6 @@ inline void ImportLotus::Read( sal_Int16& r )
pIn->ReadInt16( r );
}
-inline void ImportLotus::Read( sal_uInt32& r )
-{
- pIn->ReadUInt32( r );
-}
-
inline void ImportLotus::Read( double& r )
{
r = ScfTools::ReadLongDouble( *pIn );
diff --git a/sc/source/filter/inc/lotrange.hxx
b/sc/source/filter/inc/lotrange.hxx
index 62356e2..1e01f35 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -107,10 +107,7 @@ public:
inline sal_uInt16 GetIndex( SCCOL nCol, SCROW nRow );
inline sal_uInt16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE,
SCROW nRowE );
sal_uInt16 GetIndex( const LotusRange& );
- inline void Append( SCCOL nCol, SCROW nRow, const OUString& );
- inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW
nRowE, const OUString& );
void Append( LotusRange* pLR, const OUString& rName );
- inline static void SetEing( const SCCOL nCol, const SCROW nRow );
};
inline LR_ID LotusRangeList::GetIndex( SCCOL nCol, SCROW nRow )
@@ -125,22 +122,6 @@ inline LR_ID LotusRangeList::GetIndex( SCCOL nColS, SCROW
nRowS, SCCOL nColE, SC
return GetIndex( aRef );
}
-inline void LotusRangeList::Append( SCCOL nCol, SCROW nRow, const OUString&
rName )
-{
- Append( new LotusRange( nCol, nRow ), rName );
-}
-
-inline void LotusRangeList::Append( SCCOL nColS, SCROW nRowS, SCCOL nColE,
SCROW nRowE, const OUString& r )
-{
- Append( new LotusRange( nColS, nRowS, nColE, nRowE ), r );
-}
-
-inline void LotusRangeList::SetEing( const SCCOL nCol, const SCROW nRow )
-{
- nEingCol = nCol;
- nEingRow = nRow;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/namebuff.hxx
b/sc/source/filter/inc/namebuff.hxx
index ae296ae..511b233 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -96,8 +96,6 @@ public:
inline NameBuffer( RootData*, sal_uInt16 nNewBase );
virtual ~NameBuffer();
- inline const OUString* Get( sal_uInt16 nIndex ) const;
- inline sal_uInt16 GetLastIndex() const;
inline void SetBase( sal_uInt16 nNewBase = 0 );
void operator <<( const OUString& rNewString );
};
@@ -112,22 +110,9 @@ inline NameBuffer::NameBuffer( RootData* p, sal_uInt16
nNewBase ) : ExcRoot( p )
nBase = nNewBase;
}
-inline const OUString* NameBuffer::Get ( sal_uInt16 n ) const
-{
- if( n < nBase || n >= maHashes.size() )
- return NULL;
- return &(maHashes[n]->aString);
-}
-inline sal_uInt16 NameBuffer::GetLastIndex () const
-{
- int size = maHashes.size() + nBase;
- OSL_ENSURE( size <= 0xFFFF, "*NameBuffer::GetLastIndex(): I'm sick and
tired!" );
-
- return static_cast<sal_uInt16>( size );
-}
inline void NameBuffer::SetBase( sal_uInt16 nNewBase )
{
diff --git a/sc/source/filter/inc/richstring.hxx
b/sc/source/filter/inc/richstring.hxx
index 7dc2eb6..4cfe3a9 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -127,7 +127,6 @@ public:
const FontPortionModel& rModel)
{ mvModels.insert(it, rModel); }
- ::std::vector< FontPortionModel >::const_iterator begin() const { return
mvModels.begin(); }
::std::vector< FontPortionModel >::iterator begin() { return
mvModels.begin(); }
/** Appends a rich-string font identifier. */
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index ca99252..de9aded 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -387,8 +387,6 @@ public:
/** Final processing after import of all style settings. */
void finalizeImport();
- /** Returns the protection model structure. */
- inline const ProtectionModel& getModel() const { return maModel; }
/** Returns the converted API protection data struct. */
inline const ApiProtectionData& getApiData() const { return maApiData; }
@@ -471,8 +469,6 @@ public:
/** Final processing after import of all style settings. */
void finalizeImport( bool bRTL );
- /** Returns the border model structure. */
- inline const BorderModel& getModel() const { return maModel; }
/** Returns the converted API border data struct. */
inline const ApiBorderData& getApiData() const { return maApiData; }
@@ -582,10 +578,6 @@ public:
/** Final processing after import of all style settings. */
void finalizeImport();
- /** Returns the fill pattern model structure, if extant. */
- inline const PatternFillModel* getPatternModel() const { return
mxPatternModel.get(); }
- /** Returns the fill gradient model structure, if extant. */
- inline const GradientFillModel* getGradientModel() const { return
mxGradientModel.get(); }
/** Returns the converted API fill data struct. */
inline const ApiSolidFillData& getApiData() const { return maApiData; }
@@ -667,8 +659,6 @@ public:
FontRef getFont() const;
/** Returns the alignment data of this style. */
inline const Alignment& getAlignment() const { return maAlignment; }
- /** Returns the cell protection data of this style. */
- inline const Protection& getProtection() const { return maProtection; }
void applyPatternToAttrList(
AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal_Int32 nForceScNumFmt );
diff --git a/sc/source/filter/inc/tokstack.hxx
b/sc/source/filter/inc/tokstack.hxx
index 8baef98..b103179 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -202,7 +202,7 @@ public:
// only for Range-Names
const TokenId Store( const sal_uInt16 nIndex );
- inline const TokenId Store( const sal_Int16 nWert );
+ ;
const TokenId Store( const OUString& rString );
const TokenId Store( const ScSingleRefData& rTr );
const TokenId Store( const ScComplexRefData& rTr );
@@ -216,10 +216,8 @@ public:
const TokenId StoreExtRef( sal_uInt16 nFileId, const
OUString& rTabName, const ScSingleRefData& rRef );
const TokenId StoreExtRef( sal_uInt16 nFileId, const
OUString& rTabName, const ScComplexRefData& rRef );
- inline const TokenId LastId() const;
inline const ScTokenArray* operator []( const TokenId& rId );
void Reset();
- inline E_TYPE GetType( const TokenId& rId ) const;
bool IsSingleOp( const TokenId& rId, const
DefTokenId eId ) const;
const OUString* GetExternal( const TokenId& rId ) const;
ScMatrix* GetMatrix( unsigned int n ) const;
@@ -350,16 +348,6 @@ inline const TokenId TokenPool::Store()
return nId;
}
-inline const TokenId TokenPool::Store( const sal_Int16 nWert )
-{
- return Store( ( double ) nWert );
-}
-
-inline const TokenId TokenPool::LastId() const
-{
- return static_cast<TokenId>(nElementAkt); // correct, as Ausgabe with
Offset 1!
-}
-
const inline ScTokenArray* TokenPool::operator []( const TokenId& rId )
{
pScToken->ClearScTokenArray();
@@ -375,19 +363,7 @@ const inline ScTokenArray* TokenPool::operator []( const
TokenId& rId )
return pScToken;
}
-inline E_TYPE TokenPool::GetType( const TokenId& rId ) const
-{
- E_TYPE nRet;
-
- sal_uInt16 nId = (sal_uInt16) rId - 1;
-
- if( nId < nElementAkt )
- nRet = pType[ nId ] ;
- else
- nRet = T_Error;
- return nRet;
-}
#endif
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 3e6e799..f5e632d 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -117,10 +117,6 @@ public:
~FormCache();
inline const SfxUInt32Item* GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt );
- void SetDefaultFormat( sal_uInt8 nD = 0xFF )
- {
- nDefaultFormat = nD;
- }
};
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index 27bb7e3..663baad 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -274,8 +274,6 @@ public:
@descr Row default formatting is converted directly, other settings
are cached and converted in the finalizeWorksheetImport() call. */
void setRowModel( const RowModel& rModel );
- /** Specifies that the passed row needs to set its height manually. */
- void setManualRowHeight( sal_Int32 nRow );
/** Inserts a value cell directly into the Calc sheet. */
void putValue( const com::sun::star::table::CellAddress& rAddress, double
fValue );
diff --git a/sc/source/filter/inc/xcl97rec.hxx
b/sc/source/filter/inc/xcl97rec.hxx
index 5b1c744..d9c4aaf 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -118,7 +118,6 @@ public:
inline sal_uInt16 GetObjType() const { return mnObjType; }
inline void SetId( sal_uInt16 nId ) { nObjId = nId; }
- inline sal_uInt16 GetId() const { return nObjId; }
inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; }
inline SCTAB GetTab() const { return mnScTab; }
@@ -143,7 +142,6 @@ public:
itself. The svx base code does not receive the correct shape ID after
the
EscherEx::StartShape() call, which would result in deleting the object
in
EscherEx::EndShape(). */
- inline void SetOwnEscher( bool bOwnEscher = true ) {
mbOwnEscher = bOwnEscher; }
/** Returns true, if the object has created the escher data itself.
@descr See SetOwnEscher() for details. */
inline bool IsOwnEscher() const { return mbOwnEscher; }
diff --git a/sc/source/filter/inc/xecontent.hxx
b/sc/source/filter/inc/xecontent.hxx
index d986d75..3fdf8dd 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -109,7 +109,6 @@ public:
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
void WriteEmbeddedData( XclExpStream& rStrm );
- void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay;
}
/** Builds file name from the passed file URL. Tries to convert to
relative file name.
@param rnLevel (out-param) The parent directory level.
diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index aebd747..9d2844a 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -41,8 +41,6 @@ public:
/** Inserts the Calc name with the passed index and returns the Excel NAME
index. */
sal_uInt16 InsertName( SCTAB nTab, sal_uInt16 nScNameIdx );
- /** Inserts the Calc database range with the passed index and returns the
Excel NAME index. */
- sal_uInt16 InsertDBRange( sal_uInt16 nScDBRangeIdx );
/** Inserts a new built-in defined name, referring to the passed sheet
range. */
sal_uInt16 InsertBuiltInName( sal_Unicode cBuiltIn, const
ScRange& rRange );
diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx
index ea1d82c..3f1d161 100644
--- a/sc/source/filter/inc/xepage.hxx
+++ b/sc/source/filter/inc/xepage.hxx
@@ -115,9 +115,6 @@ public:
/** Creates all records containing the current page settings. */
explicit XclExpChartPageSettings( const XclExpRoot& rRoot );
- /** Returns read-only access to the page data. */
- inline const XclPageData& GetPageData() const { return maData; }
-
/** Writes all page settings records to the stream. */
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index dafd0884..450c3a4 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -66,19 +66,17 @@ class XclExpPCField : public XclExpRecord, public
XclPCField, protected XclExpRo
public:
/** Creates a standard pivot cache field, filled from sheet source data. */
explicit XclExpPCField( const XclExpRoot& rRoot,
- const XclExpPivotCache& rPCache, sal_uInt16
nFieldIdx,
+ sal_uInt16 nFieldIdx,
const ScDPObject& rDPObj, const ScRange& rRange );
/** Creates a child grouping pivot cache field, filled from the passed
grouping info. */
explicit XclExpPCField( const XclExpRoot& rRoot,
- const XclExpPivotCache& rPCache, sal_uInt16
nFieldIdx,
+ sal_uInt16 nFieldIdx,
const ScDPObject& rDPObj, const
ScDPSaveGroupDimension& rGroupDim,
const XclExpPCField& rBaseField );
virtual ~XclExpPCField();
/** Sets the passed field as direct grouping child field of this field. */
void SetGroupChildField( const XclExpPCField& rChildField );
- /** Converts this standard field into a numeric grouping field. */
- void ConvertToNumGroup( const ScDPObject& rDPObj, const
ScDPSaveNumGroupDimension& rNumGroupDim );
/** Returns the name of this cache field. */
inline const OUString& GetFieldName() const { return maFieldInfo.maName; }
@@ -152,7 +150,6 @@ private:
virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE;
private:
- const XclExpPivotCache& mrPCache; /// Parent pivot cache containing
this field.
XclExpPCItemList maOrigItemList; /// List with original items.
XclExpPCItemList maGroupItemList; /// List with grouping items.
ScfUInt16Vec maIndexVec; /// Indexes into maItemList.
@@ -171,8 +168,6 @@ public:
/** Returns true, if the item index list will be written. */
bool HasItemIndexList() const;
- /** Returns the stream identifier used to create the cache stream. */
- inline sal_uInt16 GetStreamId() const { return maPCInfo.mnStrmId; }
/** Returns the list index of the cache used in pivot table records. */
inline sal_uInt16 GetCacheIndex() const { return mnListIdx; }
diff --git a/sc/source/filter/inc/xerecord.hxx
b/sc/source/filter/inc/xerecord.hxx
index f1e516f..df1383d 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -238,8 +238,6 @@ public:
/** Returns the Boolean value of the record. */
inline bool GetBool() const { return mbValue; }
- /** Sets a new Boolean record value. */
- inline void SetBool( bool bValue ) { mbValue = bValue; }
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
diff --git a/sc/source/filter/inc/xestream.hxx
b/sc/source/filter/inc/xestream.hxx
index 90549b7..77d79a8 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -93,13 +93,6 @@ public:
/** Returns the position inside of current record (starts by 0 in every
CONTINUE). */
inline sal_uInt16 GetRawRecPos() const { return mnCurrSize; }
- /** Returns the maximum size of a record. */
- inline sal_uInt16 GetMaxRecSize() const { return mnMaxRecSize; }
- /** Sets maximum record size (valid only for current record). */
- inline void SetMaxRecSize( sal_uInt16 nMax ) { mnCurrMaxSize =
nMax; }
- /** Sets maximum size of CONTINUE records (valid only for current record).
*/
- inline void SetMaxContSize( sal_uInt16 nMax ) { mnMaxContSize =
nMax; }
-
/** Sets data slice length. 0 = no slices. */
void SetSliceSize( sal_uInt16 nSize );
@@ -272,7 +265,6 @@ public:
static OString ToOString( const ScRangeList& rRangeList );
static OStringBuffer& ToOString( OStringBuffer& s, const XclAddress&
rAddress );
static OString ToOString( const XclExpString& s );
- static OString ToOString( const XclRange& rRange );
static OString ToOString( const XclRangeList& rRangeList );
static OUString ToOUString( const char* s );
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index d918666..9e2c215 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -553,8 +553,6 @@ public:
/** Returns true, if this record represents an Excel built-in style. */
inline bool IsBuiltIn() const { return mnStyleId !=
EXC_STYLE_USERDEF; }
- inline const OUString& GetName() const { return maName; }
-
virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
private:
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 46e919d..31e879d 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -309,8 +309,6 @@ protected:
/** Sets this record to a new column position. */
inline void SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol =
nXclCol; }
- /** Sets this record to a new row position. */
- inline void SetXclRow( sal_uInt32 nXclRow ) { maXclPos.mnRow =
nXclRow; }
private:
XclAddress maXclPos; /// Address of the cell.
@@ -498,11 +496,6 @@ protected:
explicit XclExpMultiCellBase( sal_uInt16 nRecId, sal_uInt16
nMulRecId,
sal_Size nContSize, const XclAddress& rXclPos );
- /** Sets the size of the remaining contents of one cell (without the XF
index). */
- inline void SetContSize( sal_Size nContSize ) { mnContSize =
nContSize; }
- /** Returns the size of the remaining contents of one cell (without the XF
index). */
- inline sal_Size GetContSize() const { return mnContSize; }
-
/** Returns the number of cells this record represents. */
sal_uInt16 GetCellCount() const;
@@ -887,8 +880,6 @@ public:
inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; }
inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; }
private:
- /** Initializes the record data. Called from constructors. */
- void Init( sal_uInt16 nXclRow, XclExpRowOutlineBuffer*
pOutlineBfr );
/** Inserts a cell at the specified list position, tries to merge with
neighbors. */
void InsertCell( XclExpCellRef xCell, size_t nPos, bool
bIsMergedBase );
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 5e41c34..cc1522f 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -322,8 +322,6 @@ public:
/** Returns true, if the area format is set to automatic. */
inline bool IsAutoArea() const { return !mxEscherFmt &&
(!mxAreaFmt || mxAreaFmt->IsAuto()); }
- /** Returns true, if the area style is set to something visible. */
- inline bool HasArea() const { return mxEscherFmt || IsAutoArea()
|| mxAreaFmt->HasArea(); }
protected:
/** Converts and writes the contained line formatting to the passed
property set. */
@@ -774,12 +772,8 @@ public:
/** Returns the axes set identifier this series is assigned to
(primary/secondary). */
inline sal_uInt16 GetGroupIdx() const { return mnGroupIdx; }
- /** Returns the 0-based series index described by this series. */
- inline sal_uInt16 GetSeriesIdx() const { return mnSeriesIdx; }
/** Returns the 0-based index of the parent series (e.g. of a trend line).
*/
inline sal_uInt16 GetParentIdx() const { return mnParentIdx; }
- /** Returns the format index of the series used for automatic line and
area colors. */
- inline sal_uInt16 GetFormatIdx() const { return mxSeriesFmt ?
mxSeriesFmt->GetFormatIdx() : EXC_CHDATAFORMAT_DEFAULT; }
/** Returns true, if the series is child of another series (e.g. trend
line). */
inline bool HasParentSeries() const { return mnParentIdx !=
EXC_CHSERIES_INVALID; }
/** Returns true, if the series contains child series (e.g. trend lines).
*/
@@ -985,8 +979,6 @@ public:
inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; }
/** Returns true, if this chart type group contains at least one valid
series. */
inline bool IsValidGroup() const { return !maSeries.empty(); }
- /** Returns true, if the series in this chart type group are stacked on
each other (no percentage). */
- inline bool IsStacked() const { return maType.IsStacked(); }
/** Returns true, if the series in this chart type group are stacked on
each other as percentage. */
inline bool IsPercent() const { return maType.IsPercent(); }
/** Returns true, if the chart is three-dimensional. */
@@ -1246,9 +1238,6 @@ private:
/** Reads a CHTYPEGROUP record group containing chart type and chart
settings. */
void ReadChTypeGroup( XclImpStream& rStrm );
- /** Updates text formatting of the passed axis title with global text
formatting. */
- void UpdateAxisTitle( XclImpChTextRef xTitle );
-
/** Creates a coordinate system that contains all chart types for this
axes set. */
css::uno::Reference< css::chart2::XCoordinateSystem >
CreateCoordSystem( css::uno::Reference<
css::chart2::XDiagram > xDiagram ) const;
diff --git a/sc/source/filter/inc/xiescher.hxx
b/sc/source/filter/inc/xiescher.hxx
index e034c2b..e123a14 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -462,8 +462,6 @@ public:
/** Returns true, if a linked cell address is present. */
inline bool HasCellLink() const { return mxCellLink != 0; }
- /** Returns true, if a linked source cell range is present. */
- inline bool HasSourceRange() const { return mxSrcRange != 0; }
/** Returns the SdrObject from the passed control shape and sets the
bounding rectangle. */
SdrObject* CreateSdrObjectFromShape(
@@ -587,7 +585,6 @@ protected:
virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE;
protected:
- void ApplyGrouping( XclImpOptionButtonObj& rLeader, sal_Int32 nRefVal );
sal_uInt16 mnNextInGroup; /// Next option button in a group.
sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a
group.
};
@@ -1173,28 +1170,6 @@ public:
OUString GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId );
private:
-
- /** Reads and returns a bitmap from WMF/PICT format. */
- static void ReadWmf( Graphic& rGraphic, XclImpStream& rStrm );
- /** Reads and returns a bitmap from BMP format. */
- static void ReadBmp( Graphic& rGraphic, XclImpStream& rStrm );
-
- /** Reads contents of an DFF record and append data to internal DFF
stream. */
- void ReadDffRecord( XclImpStream& rStrm );
- /** Reads a BIFF8 OBJ record following an MSODRAWING record. */
- void ReadObj8( XclImpStream& rStrm );
- /** Reads the TXO record and following CONTINUE records containing string
and formatting. */
- void ReadTxo( XclImpStream& rStrm );
-
- /** Reads a BIFF3-BIFF5 NOTE record. */
- void ReadNote3( XclImpStream& rStrm );
- /** Reads a BIFF8 NOTE record. */
- void ReadNote8( XclImpStream& rStrm );
-
- /** Returns the size of the progress bar shown while processing all
objects. */
- sal_Size GetProgressSize() const;
-
-private:
typedef ::std::map< sal_uInt16, OUString > DefObjNameMap;
typedef boost::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef;
typedef ::std::map< SCTAB, XclImpSheetDrawingRef > XclImpSheetDrawingMap;
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index dce9795..7ceeebf 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -307,7 +307,6 @@ public:
sal_uInt16 GetFieldCount() const;
const XclImpPTField* GetField( sal_uInt16 nFieldIdx ) const;
XclImpPTField* GetFieldAcc( sal_uInt16 nFieldIdx );
- const OUString& GetFieldName( sal_uInt16 nFieldIdx ) const;
const XclImpPTField* GetDataField( sal_uInt16 nDataFieldIdx ) const;
OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const;
diff --git a/sc/source/filter/inc/xistream.hxx
b/sc/source/filter/inc/xistream.hxx
index 72bb9ab..45a9165 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -308,8 +308,6 @@ public:
void StoreGlobalPosition();
/** Seeks to the stored global user position. */
void SeekGlobalPosition();
- /** Invalidates global user position. */
- inline void DeleteGlobalPosition() { mbHasGlobPos = false; }
/** Returns record reading state: false = record overread. */
inline bool IsValid() const { return mbValid; }
diff --git a/sc/source/filter/inc/xistring.hxx
b/sc/source/filter/inc/xistring.hxx
index 9d95b3b..9105dbb 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -44,8 +44,6 @@ public:
inline void SetText( const OUString& rText ) { maString = rText; }
/** Sets the passed formatting buffer. */
inline void SetFormats( const XclFormatRunVec& rFormats ) {
maFormats = rFormats; }
- /** Insert a formatting run to the format buffer. */
- inline void AppendFormat( sal_uInt16 nChar, sal_uInt16 nFontIdx )
{ AppendFormat( maFormats, nChar, nFontIdx ); }
/** Reads and appends the formatting information (run count and runs) from
stream. */
inline void ReadFormats( XclImpStream& rStrm ) { ReadFormats(
rStrm, maFormats ); }
/** Reads and appends nRunCount formatting runs from stream. */
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 2b69c1b..9a767fe 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -98,12 +98,8 @@ public:
/** Returns the text encoding for strings used with this font. */
rtl_TextEncoding GetFontEncoding() const;
- /** Returns true, if this font contains characters for Western scripts. */
- inline bool HasWesternChars() const { return mbHasWstrn; }
/** Returns true, if this font contains characters for Asian scripts
(CJK). */
inline bool HasAsianChars() const { return mbHasAsian; }
- /** Returns true, if this font contains characters for Complex scripts
(CTL). */
- inline bool HasComplexChars() const { return mbHasCmplx; }
/** Reads a FONT record for all BIFF versions. */
void ReadFont( XclImpStream& rStrm );
@@ -390,7 +386,6 @@ public:
void ReadXF( XclImpStream& rStrm );
inline sal_uInt8 GetHorAlign() const { return maAlignment.mnHorAlign; }
- inline sal_uInt8 GetVerAlign() const { return maAlignment.mnVerAlign; }
inline sal_uInt16 GetFontIndex() const { return mnXclFont; }
/** Creates a Calc item set containing an item set with all cell
properties.
diff --git a/sc/source/filter/inc/xladdress.hxx
b/sc/source/filter/inc/xladdress.hxx
index 2750a4c..68b386c 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -77,8 +77,6 @@ struct XclRange
inline explicit XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1,
sal_uInt16 nCol2, sal_uInt32 nRow2 ) :
maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {}
- inline void Set( const XclAddress& rFirst, const XclAddress& rLast
)
- { maFirst = rFirst; maLast = rLast; }
inline void Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16
nCol2, sal_uInt32 nRow2 )
{ maFirst.Set( nCol1, nRow1 ); maLast.Set( nCol2,
nRow2 ); }
diff --git a/sc/source/filter/inc/xlformula.hxx
b/sc/source/filter/inc/xlformula.hxx
index 5576f51..2f10c3d 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -490,8 +490,6 @@ class XclTokenArrayHelper
public:
// token identifiers ------------------------------------------------------
- /** Returns the base token ID of the passed (classified) token ID. */
- inline static sal_uInt8 GetBaseTokenId( sal_uInt8 nTokenId ) { return
nTokenId & EXC_TOKID_MASK; }
/** Returns the classified token ID from a base ID and the token class. */
inline static sal_uInt8 GetTokenId( sal_uInt8 nBaseId, sal_uInt8
nTokenClass );
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 07f059a..601cd2f 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -387,8 +387,6 @@ public:
/** Sets the item to 'boolean' type and adds the passed Boolean value. */
void SetBool( bool bValue );
- /** Returns the current item type. */
- inline XclPCItemType GetType() const { return meType; }
/** Returns the text representation of the item. */
inline const OUString& ConvertToText() const { return maText; }
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 7e98ed8..b47043b 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -138,8 +138,6 @@ public:
XclRoot& operator=( const XclRoot& rRoot );
- /** Returns this root instance - for code readability in derived classes.
*/
- inline const XclRoot& GetRoot() const { return *this; }
/** Returns old RootData struct. Deprecated. */
inline RootData& GetOldRoot() const { return *mrData.mxRD; }
@@ -149,8 +147,6 @@ public:
inline XclOutput GetOutput() const { return mrData.meOutput; }
/** Returns true, if currently a document is imported. */
inline bool IsImport() const { return !mrData.mbExport; }
- /** Returns true, if currently a document is exported. */
- inline bool IsExport() const { return mrData.mbExport; }
/** Returns the text encoding to import/export byte strings. */
inline rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc;
}
/** Returns the system language, i.e. for number formats. */
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index fa2a0cf..69cf01a 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -251,8 +251,7 @@ DefinedName::DefinedName( const WorkbookHelper& rHelper ) :
mpScRangeData(NULL),
mnTokenIndex( -1 ),
mnCalcSheet( 0 ),
- mcBuiltinId( BIFF_DEFNAME_UNKNOWN ),
- mnFmlaSize( 0 )
+ mcBuiltinId( BIFF_DEFNAME_UNKNOWN )
{
}
@@ -345,42 +344,6 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
mnTokenIndex = nIndex;
}
-ApiTokenSequence
-DefinedName::getTokens()
-{
- // convert and set formula of the defined name
- ApiTokenSequence aTokens;
- switch( getFilterType() )
- {
- case FILTER_OOXML:
- {
- if( mxFormula.get() )
- {
- SequenceInputStream aStrm( *mxFormula );
- aTokens = importBiff12Formula( mnCalcSheet, aStrm );
- }
- else
- aTokens = importOoxFormula( mnCalcSheet );
- }
- break;
- case FILTER_BIFF:
- {
- OSL_ENSURE( mxBiffStrm.get(), "DefinedName::convertFormula -
missing BIFF stream" );
- if( mxBiffStrm.get() )
- {
- BiffInputStream& rStrm = mxBiffStrm->getStream();
- BiffInputStreamPosGuard aStrmGuard( rStrm );
- if( mxBiffStrm->restorePosition() )
- aTokens = importBiffFormula( mnCalcSheet, rStrm,
&mnFmlaSize );
- }
- }
- break;
- case FILTER_UNKNOWN:
- break;
- }
- return aTokens;
-}
-
std::unique_ptr<ScTokenArray> DefinedName::getScTokens()
{
ScTokenArray aTokenArray;
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index 2b9dc40..aabd92c 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -63,12 +63,6 @@ BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper&
rHelper ) :
{
}
-void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >&
/*rxShape*/, const css::awt::Rectangle& rShapeRect )
-{
- // collect all shape positions in the WorksheetHelper base class
- extendShapeBoundingBox( rShapeRect );
-}
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index 4e0b9d6..64ae602 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 41e59dc..d0e5a65 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 de8a6a0..ae59270 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 2f44ce6..d6d49bb7 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 997275a..7712e52 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 e5d02f8..c9ed567 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 ff006f3..47f0393 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 32ce760..0c26018 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 2ddf1a6..959fcb6 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 c26a710..527e823 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 2e4e98a..89d6d55 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 >
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 7a78098..f94d6b2 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2500,14 +2500,6 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any
> ScAccessibleDocument::
return aEmpty;
}
-void ScAccessibleDocument::SwitchViewFireFocus()
-{
- if (mpAccessibleSpreadsheet)
- {
- mpAccessibleSpreadsheet->FireFirstCellFocus();
- }
-}
-
sal_Int32 SAL_CALL ScAccessibleDocument::getForeground( )
throw (uno::RuntimeException, std::exception)
{
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
index 599c2b6..02fd77a 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
@@ -36,9 +36,4 @@ ScAccessibleDocumentBase::~ScAccessibleDocumentBase()
{
}
-void ScAccessibleDocumentBase::SwitchViewFireFocus()
-{
- CommitFocusGained();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 5b9fb73..53f7363 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -470,11 +470,6 @@ void AbstractScMoveTableDlg_Impl::SetForceCopyTable()
return pDlg->SetForceCopyTable();
}
-void AbstractScMoveTableDlg_Impl::EnableCopyTable(bool bFlag)
-{
- return pDlg->EnableCopyTable( bFlag);
-}
-
void AbstractScMoveTableDlg_Impl::EnableRenameTable(bool bFlag)
{
return pDlg->EnableRenameTable( bFlag);
@@ -490,11 +485,6 @@ std::vector<OUString>
AbstractScNamePasteDlg_Impl::GetSelectedNames() const
return pDlg->GetSelectedNames();
}
-bool AbstractScNamePasteDlg_Impl::IsAllSelected() const
-{
- return false;
-}
-
const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem()
{
return pDlg->GetOutputItem();
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 99b9d83..647c8d5 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -268,7 +268,6 @@ class AbstractScMoveTableDlg_Impl : public
AbstractScMoveTableDlg
virtual bool GetRenameTable () const SAL_OVERRIDE;
virtual void GetTabNameString( OUString& rString ) const SAL_OVERRIDE;
virtual void SetForceCopyTable () SAL_OVERRIDE;
- virtual void EnableCopyTable (bool bFlag=true) SAL_OVERRIDE;
virtual void EnableRenameTable (bool bFlag=true) SAL_OVERRIDE;
};
@@ -282,7 +281,6 @@ class AbstractScNamePasteDlg_Impl : public
AbstractScNamePasteDlg
{
DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg )
virtual std::vector<OUString> GetSelectedNames() const
SAL_OVERRIDE;
- virtual bool IsAllSelected() const
SAL_OVERRIDE;
};
class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 2817e52..caa5102 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -669,13 +669,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
return bReturn;
}
-// II
-void FuDraw::SelectionHasChanged()
-{
- const SdrHdlList& rHdlList = pView->GetHdlList();
- ((SdrHdlList&)rHdlList).ResetFocusHdl();
-}
-
/*************************************************************************
|*
|* enable function
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index ce7cf5c..2cd2f5f 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -619,58 +619,6 @@ void FuText::Deactivate()
/*************************************************************************
|*
-|* Selektion hat sich geaendert
-|*
-\************************************************************************/
-
-void FuText::SelectionHasChanged()
-{
- pView->SetDragMode(SDRDRAG_MOVE);
- SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_OBJECT_ROTATE );
- rBindings.Invalidate( SID_OBJECT_MIRROR );
-
- pTextObj = NULL;
-
- if ( pView->AreObjectsMarked() )
- {
- const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-
- if (rMarkList.GetMarkCount() == 1)
- {
- SdrMark* pMark = rMarkList.GetMark(0);
- SdrObject* pObj = pMark->GetMarkedSdrObj();
-
- sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
-
- if (nSdrObjKind == OBJ_TEXT ||
- nSdrObjKind == OBJ_TITLETEXT ||
- nSdrObjKind == OBJ_OUTLINETEXT /* ||
- pObj->ISA(SdrTextObj) */ )
- {
- pTextObj = static_cast<SdrTextObj*>(pObj);
- }
- }
- }
-
- if (!pTextObj)
- {
- /**********************************************************************
- * Kein Textobjekt im EditMode, daher CreateMode setzen
- **********************************************************************/
- sal_uInt16 nObj = OBJ_TEXT;
- sal_uInt16 nIdent;
- sal_uInt32 nInvent;
- pView->TakeCurrentObj(nIdent, nInvent);
-
- pView->SetCurrentObj(nObj);
-
- pView->SetCreateMode();
- }
-}
-
-/*************************************************************************
-|*
|* Objekt in Edit-Mode setzen
|*
\************************************************************************/
diff --git a/sc/source/ui/formdlg/privsplt.cxx
b/sc/source/ui/formdlg/privsplt.cxx
index e568ed5..311c078 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -241,24 +241,6 @@ void ScPrivatSplit::SetYRange(Range cRgeY)
#*
#* Klasse: ScPrivatSplit
#*
-#* Funktion: Liefert die relative x-Verschiebung zurueck
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-short ScPrivatSplit::GetDeltaX()
-{
- return nDeltaX;
-}
-
-/*************************************************************************
-#* Member: GetDeltaY
-#*------------------------------------------------------------------------
-#*
-#* Klasse: ScPrivatSplit
-#*
#* Funktion: Liefert die relative y-Verschiebung zurueck
#*
#* Input: ---
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx
b/sc/source/ui/inc/AccessibilityHints.hxx
index dcba897..165a968 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -42,9 +42,6 @@ public:
ScAccWinFocusLostHint(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xOld );
virtual ~ScAccWinFocusLostHint();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- GetOldAccessible() const { return xOldAccessible; }
};
class ScAccWinFocusGotHint : public SfxHint
@@ -55,9 +52,6 @@ public:
ScAccWinFocusGotHint(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xNew );
virtual ~ScAccWinFocusGotHint();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- GetNewAccessible() const { return xNewAccessible; }
};
class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx
b/sc/source/ui/inc/AccessibleCellBase.hxx
index 8037f1f..562afed 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -148,7 +148,6 @@ protected:
throw (::com::sun::star::uno::RuntimeException, std::exception);
public:
const ScAddress& GetCellAddress() const { return maCellAddress; }
- bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
};
#endif
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx
b/sc/source/ui/inc/AccessibleDocument.hxx
index df29b57..3e1d94f 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -298,8 +298,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( )
throw (::com::sun::star::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
-protected:
- void SwitchViewFireFocus() SAL_OVERRIDE;
};
#endif
diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx
b/sc/source/ui/inc/AccessibleDocumentBase.hxx
index de14751..78af557 100644
--- a/sc/source/ui/inc/AccessibleDocumentBase.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx
@@ -30,7 +30,6 @@ public:
ScAccessibleDocumentBase(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent);
- virtual void SwitchViewFireFocus();
protected:
virtual ~ScAccessibleDocumentBase();
};
diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx
b/sc/source/ui/inc/AccessiblePageHeader.hxx
index 86bfd28..74817c4 100644
--- a/sc/source/ui/inc/AccessiblePageHeader.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeader.hxx
@@ -73,9 +73,6 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
- //===== internal ========================================================
- void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; }
-
protected:
virtual OUString SAL_CALL createAccessibleDescription()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL createAccessibleName() throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx
b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index a985fc3..d4068a0 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -166,9 +166,6 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
- //===== internal ========================================================
- void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; }
-
protected:
virtual OUString SAL_CALL createAccessibleDescription()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL createAccessibleName()
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 3bc2d3c..ad8fc597 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -288,8 +288,6 @@ private:
bool IsCompleteSheetSelected();
void SelectCell(sal_Int32 nRow, sal_Int32 nCol, bool bDeselect);
- void CreateSortedMarkedCells();
- void AddMarkedRange(const ScRange& rRange);
static ScDocument* GetDocument(ScTabViewShell* pViewShell);
static Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos
eSplitPos);
diff --git a/sc/source/ui/inc/AccessibleText.hxx
b/sc/source/ui/inc/AccessibleText.hxx
index 649e79e..0b01911 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -54,8 +54,6 @@ public:
SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; }
virtual void UpdateData() = 0;
- virtual void SetDoUpdate(bool bValue) = 0;
- virtual bool IsDirty() const = 0;
DECL_LINK( NotifyHdl, EENotify* );
private:
@@ -74,8 +72,6 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SAL_OVERRIDE { ScCellTextData::Notify(rBC, rHint); }
virtual void UpdateData() SAL_OVERRIDE {
ScCellTextData::UpdateData(); }
- virtual void SetDoUpdate(bool bValue) SAL_OVERRIDE {
ScCellTextData::SetDoUpdate(bValue); }
- virtual bool IsDirty() const SAL_OVERRIDE { return
ScCellTextData::IsDirty(); }
};
// ScAccessibleCellTextData: shared data between sub objects of a accessible
cell text object
@@ -124,8 +120,6 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate )
SAL_OVERRIDE;
virtual void UpdateData() SAL_OVERRIDE { }
- virtual void SetDoUpdate(bool /* bValue */) SAL_OVERRIDE {
}
- virtual bool IsDirty() const SAL_OVERRIDE { return false; }
DECL_LINK( NotifyHdl, EENotify* );
protected:
@@ -224,8 +218,6 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ )
SAL_OVERRIDE { return NULL; }
virtual void UpdateData() SAL_OVERRIDE { }
- virtual void SetDoUpdate(bool /* bValue */) SAL_OVERRIDE {
}
- virtual bool IsDirty() const SAL_OVERRIDE { return false; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
@@ -254,8 +246,6 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ )
SAL_OVERRIDE { return NULL; }
virtual void UpdateData() SAL_OVERRIDE { }
- virtual void SetDoUpdate(bool /* bValue */) SAL_OVERRIDE {
}
- virtual bool IsDirty() const SAL_OVERRIDE { return false; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
@@ -300,8 +290,6 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate )
SAL_OVERRIDE;
virtual void UpdateData() SAL_OVERRIDE {}
- virtual void SetDoUpdate( bool /* bValue */ ) SAL_OVERRIDE
{}
- virtual bool IsDirty() const SAL_OVERRIDE { return false; }
};
#endif
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index da61f5a..d3d7706 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -45,37 +45,9 @@ class ScDocument;
#define FLT_DATE_BETWEEN 4
#define FLT_DATE_SAVE 5
-class ScViewEntryPtr
-{
-private:
- OUString* pAction;
- OUString* pPos;
- OUString* pAuthor;
- OUString* pDate;
- OUString* pComment;
- void* pData;
-
-public:
-
- OUString* GetpAction() {return pAction; }
- OUString* GetpPos() {return pPos; }
- OUString* GetpAuthor() {return pAuthor; }
- OUString* GetpDate() {return pDate; }
- OUString* GetpComment() {return pComment;}
- void* GetpData() {return pData; }
-
- void SetpAction (OUString* pString) {pAction= pString;}
- void SetpPos (OUString* pString) {pPos = pString;}
- void SetpAuthor (OUString* pString) {pAuthor= pString;}
- void SetpDate (OUString* pString) {pDate = pString;}
- void SetpComment(OUString* pString) {pComment=pString;}
- void SetpData (void* pdata) {pData =pdata;}
-};
-
class ScRedlinData : public RedlinData
{
public:
-
ScRedlinData();
virtual ~ScRedlinData();
SCTAB nTable;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 8341ba8..77b073a 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -96,9 +96,6 @@ public:
static void enableInput(bool _bInput);
-protected:
- vcl::Window* GetWindow(){ return m_pWindow; }
-
public:
static bool CanInputStart( const formula::RefEdit *pEdit ){ return
!!pEdit; }
bool CanInputDone( bool bForced ){ return pRefEdit &&
(bForced || !pRefBtn); }
@@ -135,8 +132,6 @@ protected:
virtual void RefInputStart( formula::RefEdit* pEdit,
formula::RefButton* pButton = NULL ) SAL_OVERRIDE;
virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE;
- void ShowSimpleReference(const OUString& rStr);
- void ShowFormulaReference(const OUString& rStr);
bool ParseWithNames( ScRangeList& rRanges, const OUString&
rStr, ScDocument* pDoc );
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 9e4c845..6099fda 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -62,10 +62,7 @@ public:
void ReadFromString( const OUString& rString );
OUString WriteToString() const;
- void InterpretColumnList( const OUString& rString );
-
rtl_TextEncoding GetCharSet() const { return eCharSet; }
- bool GetCharSetSystem() const { return bCharSetSystem; }
const OUString& GetFieldSeps() const { return aFieldSeps; }
bool IsMergeSeps() const { return bMergeFieldSeps; }
bool IsQuotedAsText() const { return bQuotedFieldAsText; }
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index 2e8c8b1..45c6a13 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -38,12 +38,6 @@ public:
const Size& rSize,
bool bState,
bool bBtnIn = false );
-
- void Draw( const Point& rAt,
- bool bState,
- bool bBtnIn = false )
- { Draw( rAt, aBtnSize, bState, bBtnIn ); }
-
void Draw( bool bState,
bool bBtnIn = false )
{ Draw( aBtnPos, aBtnSize, bState, bBtnIn ); }
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 6e03ef1..59a0868 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -93,9 +93,6 @@ public:
void ExecuteDB( SfxRequest& rReq );
void GetDBState( SfxItemSet& rSet );
- void ExecImageMap(SfxRequest& rReq); // ImageMap
- void GetImageMapState(SfxItemSet& rSet);
-
void GetClipState( SfxItemSet& rSet );
void GetHLinkState( SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index f4e714a..123ca41 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -334,8 +334,6 @@ private:
DECL_LINK( EdModifyHdl, void* );
private:
- SvTreeListEntry* findEntry( SvTreeListEntry* pParent, const OUString&
rText );
-
VclPtr<Edit> maEdSearch;
VclPtr<ScCheckListBox> maChecks;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
