include/svtools/ruler.hxx | 1
include/svtools/viewdataentry.hxx | 2 -
sc/inc/cellvalue.hxx | 9 ------
sc/inc/colorscale.hxx | 1
sc/inc/column.hxx | 3 --
sc/inc/dociter.hxx | 3 --
sc/inc/document.hxx | 1
sc/inc/dpfilteredcache.hxx | 1
sc/inc/global.hxx | 2 -
sc/inc/rangeutl.hxx | 7 -----
sc/inc/refdata.hxx | 1
sc/inc/refreshtimer.hxx | 1
sc/inc/segmenttree.hxx | 1
sc/inc/table.hxx | 3 --
sc/source/core/data/cellvalue.cxx | 28 +--------------------
sc/source/core/data/colorscale.cxx | 10 -------
sc/source/core/data/column2.cxx | 30 ----------------------
sc/source/core/data/column3.cxx | 10 -------
sc/source/core/data/dociter.cxx | 17 ------------
sc/source/core/data/document.cxx | 8 ------
sc/source/core/data/dpfilteredcache.cxx | 5 ---
sc/source/core/data/global.cxx | 11 --------
sc/source/core/data/segmenttree.cxx | 5 ---
sc/source/core/data/table2.cxx | 11 --------
sc/source/core/tool/rangeutl.cxx | 25 -------------------
sc/source/core/tool/refdata.cxx | 5 ---
sc/source/core/tool/refreshtimer.cxx | 5 ---
sc/source/filter/starcalc/collect.cxx | 13 ---------
sc/source/filter/starcalc/collect.hxx | 1
sc/source/filter/xml/XMLExportIterator.cxx | 12 ++-------
sc/source/filter/xml/XMLExportIterator.hxx | 3 --
sc/source/ui/inc/gridwin.hxx | 2 -
sc/source/ui/inc/reffact.hxx | 1
sc/source/ui/inc/tabview.hxx | 1
sc/source/ui/inc/tabvwsh.hxx | 1
sc/source/ui/view/gridwin.cxx | 38 -----------------------------
sc/source/ui/view/reffact.cxx | 10 -------
sc/source/ui/view/tabview2.cxx | 18 -------------
sc/source/ui/view/tabvwsh4.cxx | 10 -------
svtools/source/contnr/viewdataentry.cxx | 7 -----
svtools/source/control/ruler.cxx | 5 ---
unusedcode.easy | 30 ----------------------
42 files changed, 6 insertions(+), 352 deletions(-)
New commits:
commit 04539b9bba00d4cd1e4673fc1fab0fa1977d53cd
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 15:51:46 2014 +0200
remove unused code Ruler::GetPageWidth()
Change-Id: I7a061b869a699771b321d7143559c5b9f48937c5
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index eb7eadd..8301316 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -739,7 +739,6 @@ public:
long GetWinWidth() const { return mnWinWidth; }
void SetPagePos( long nOff = 0, long nWidth = 0 );
long GetPageOffset() const;
- long GetPageWidth() const;
void SetBorderPos( long nOff = 0 );
long GetBorderOffset() const { return mnBorderOff; }
Rectangle GetExtraRect() const { return maExtraRect; }
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 115eea5..6fbea32 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2763,11 +2763,6 @@ long Ruler::GetPageOffset() const
return mpData->nPageOff;
}
-long Ruler::GetPageWidth() const
-{
- return mpData->nPageWidth;
-}
-
long Ruler::GetNullOffset() const
{
return mpData->nNullOff;
diff --git a/unusedcode.easy b/unusedcode.easy
index 7619af8..495c4ec 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -56,7 +56,6 @@ OutputDevice::PixelToLogic(Region const&, MapMode const&)
const
PanelLayout::dispatch(rtl::OUString const&,
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
RecentDocsView::SetThumbnailSize(long)
Resource::TestRes()
-Ruler::GetPageWidth() const
SalDisplay::PrintInfo() const
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScDocument::CreateFormatTable() const
commit d0edd3dc7d69d181f8452b8faf3863ddac542f9b
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 14:17:52 2014 +0200
remove unused code in ScCellIterator
Specifically:
ScCellIterator::getValue()
ScCellIterator::hasNumeric() const
Change-Id: If15c627789576772bb220ece0b9dd143b1374a1b
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 0a8ef91..b906dd9 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -220,12 +220,10 @@ public:
const EditTextObject* getEditText() const;
ScFormulaCell* getFormulaCell();
const ScFormulaCell* getFormulaCell() const;
- double getValue();
ScCellValue getCellValue() const;
const ScRefCellValue& getRefCellValue() const;
bool hasString() const;
- bool hasNumeric() const;
bool hasEmptyData() const;
bool isEmpty() const;
bool equalsWithoutFormat( const ScAddress& rPos ) const;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 0b3daef..53d8af3 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -960,11 +960,6 @@ const ScFormulaCell* ScCellIterator::getFormulaCell() const
return maCurCell.mpFormula;
}
-double ScCellIterator::getValue()
-{
- return maCurCell.getValue();
-}
-
ScCellValue ScCellIterator::getCellValue() const
{
ScCellValue aRet;
@@ -1001,11 +996,6 @@ bool ScCellIterator::hasString() const
return maCurCell.hasString();
}
-bool ScCellIterator::hasNumeric() const
-{
- return maCurCell.hasNumeric();
-}
-
bool ScCellIterator::hasEmptyData() const
{
if (maCurCell.isEmpty())
diff --git a/unusedcode.easy b/unusedcode.easy
index a35497d..7619af8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -59,8 +59,6 @@ Resource::TestRes()
Ruler::GetPageWidth() const
SalDisplay::PrintInfo() const
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
-ScCellIterator::getValue()
-ScCellIterator::hasNumeric() const
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 988a6c418d58f4031238010cb047cd006d48960b
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 14:07:54 2014 +0200
remove unused cdeo from ScCellValue
Specifically:
ScCellValue::ScCellValue(EditTextObject const&)
ScCellValue::ScCellValue(ScFormulaCell const&)
ScCellValue::hasNumeric() const
ScCellValue::hasString() const
ScCellValue::set(ScFormulaCell const&)
Change-Id: Ief8c07d6e2c7df6c6037fb3e59c00c37e3e0a49a
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 193cb96..dd07d1c 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -43,8 +43,6 @@ struct SC_DLLPUBLIC ScCellValue
ScCellValue( const ScRefCellValue& rCell );
ScCellValue( double fValue );
ScCellValue( const svl::SharedString& rString );
- ScCellValue( const EditTextObject& rEditText );
- ScCellValue( const ScFormulaCell& rFormula );
ScCellValue( const ScCellValue& r );
~ScCellValue();
@@ -54,7 +52,6 @@ struct SC_DLLPUBLIC ScCellValue
void set( double fValue );
void set( const svl::SharedString& rStr );
void set( const EditTextObject& rEditText );
- void set( const ScFormulaCell& rFormula );
void set( ScFormulaCell* pFormula );
/**
@@ -80,10 +77,6 @@ struct SC_DLLPUBLIC ScCellValue
void release( ScColumn& rColumn, SCROW nRow );
- bool hasString() const;
-
- bool hasNumeric() const;
-
bool isEmpty() const;
bool equalsWithoutFormat( const ScCellValue& r ) const;
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index bc7e234..0a9d53d 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -177,9 +177,8 @@ ScCellValue::ScCellValue( const ScRefCellValue& rCell ) :
meType(rCell.meType),
}
ScCellValue::ScCellValue( double fValue ) : meType(CELLTYPE_VALUE),
mfValue(fValue) {}
+
ScCellValue::ScCellValue( const svl::SharedString& rString ) :
meType(CELLTYPE_STRING), mpString(new svl::SharedString(rString)) {}
-ScCellValue::ScCellValue( const EditTextObject& rEditText ) :
meType(CELLTYPE_EDIT), mpEditText(rEditText.Clone()) {}
-ScCellValue::ScCellValue( const ScFormulaCell& rFormula ) :
meType(CELLTYPE_FORMULA), mpFormula(rFormula.Clone()) {}
ScCellValue::ScCellValue( const ScCellValue& r ) : meType(r.meType),
mfValue(r.mfValue)
{
@@ -271,13 +270,6 @@ void ScCellValue::set( const EditTextObject& rEditText )
mpEditText = rEditText.Clone();
}
-void ScCellValue::set( const ScFormulaCell& rFormula )
-{
- clear();
- meType = CELLTYPE_FORMULA;
- mpFormula = rFormula.Clone();
-}
-
void ScCellValue::set( ScFormulaCell* pFormula )
{
clear();
@@ -450,16 +442,6 @@ void ScCellValue::release( ScColumn& rColumn, SCROW nRow )
mfValue = 0.0;
}
-bool ScCellValue::hasString() const
-{
- return hasStringImpl(meType, mpFormula);
-}
-
-bool ScCellValue::hasNumeric() const
-{
- return hasNumericImpl(meType, mpFormula);
-}
-
bool ScCellValue::isEmpty() const
{
return meType == CELLTYPE_NONE;
diff --git a/unusedcode.easy b/unusedcode.easy
index 59e7e4d..a35497d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -61,11 +61,6 @@ SalDisplay::PrintInfo() const
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScCellIterator::getValue()
ScCellIterator::hasNumeric() const
-ScCellValue::ScCellValue(EditTextObject const&)
-ScCellValue::ScCellValue(ScFormulaCell const&)
-ScCellValue::hasNumeric() const
-ScCellValue::hasString() const
-ScCellValue::set(ScFormulaCell const&)
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 39ff662a15683d02ca6a9b1e407b5ed16e460779
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 13:27:12 2014 +0200
remove unused code ScCollection::IndexOf(ScDataObject*) const
Change-Id: I142bc93cbe1ce6c0462ccc63defbd49e519f7f75
diff --git a/sc/source/filter/starcalc/collect.cxx
b/sc/source/filter/starcalc/collect.cxx
index a464105..e64e096 100644
--- a/sc/source/filter/starcalc/collect.cxx
+++ b/sc/source/filter/starcalc/collect.cxx
@@ -124,19 +124,6 @@ ScDataObject* ScCollection::At(sal_uInt16 nIndex) const
}
-
-sal_uInt16 ScCollection::IndexOf(ScDataObject* pScDataObject) const
-{
- sal_uInt16 nIndex = 0xffff;
- for (sal_uInt16 i = 0; ((i < nCount) && (nIndex == 0xffff)); i++)
- {
- if (pItems[i] == pScDataObject) nIndex = i;
- }
- return nIndex;
-}
-
-
-
ScCollection& ScCollection::operator=( const ScCollection& r )
{
// Check for self-assignment
diff --git a/sc/source/filter/starcalc/collect.hxx
b/sc/source/filter/starcalc/collect.hxx
index 33001f8..8e7d308 100644
--- a/sc/source/filter/starcalc/collect.hxx
+++ b/sc/source/filter/starcalc/collect.hxx
@@ -48,7 +48,6 @@ public:
bool Insert(ScDataObject* pScDataObject);
ScDataObject* At(sal_uInt16 nIndex) const;
- sal_uInt16 IndexOf(ScDataObject* pScDataObject) const;
sal_uInt16 GetCount() const;
ScDataObject* operator[]( const sal_uInt16 nIndex) const { return
At(nIndex); }
diff --git a/unusedcode.easy b/unusedcode.easy
index b9d71fc..59e7e4d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -66,7 +66,6 @@ ScCellValue::ScCellValue(ScFormulaCell const&)
ScCellValue::hasNumeric() const
ScCellValue::hasString() const
ScCellValue::set(ScFormulaCell const&)
-ScCollection::IndexOf(ScDataObject*) const
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 6374c59217325721dc2c091338e665a238b7ace3
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 13:25:05 2014 +0200
remove unused code ScColorScaleEntry::UpdateMoveTab(short, short, short)
Change-Id: I32437bb06dc5fd1522361d9591f470d00bb96d77
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 067a5a5..c1257f9 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -68,7 +68,6 @@ public:
void SetFormula(const OUString& rFormula, ScDocument* pDoc, const
ScAddress& rAddr,
formula::FormulaGrammar::Grammar eGrammar =
formula::FormulaGrammar::GRAM_DEFAULT);
- void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab, SCTAB nTabNo);
void UpdateReference( sc::RefUpdateContext& rCxt );
void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt );
void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt );
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 5481d99..7016c16 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -235,16 +235,6 @@ void ScColorScaleEntry::SetValue(double nValue)
mpCell.reset();
}
-void ScColorScaleEntry::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab, SCTAB
nTabNo )
-{
- if(mpCell)
- {
- sc::RefUpdateMoveTabContext aCxt(nOldTab, nNewTab);
- mpCell->UpdateMoveTab(aCxt, nTabNo);
- mpListener.reset(new ScFormulaListener(mpCell.get()));
- }
-}
-
void ScColorScaleEntry::UpdateReference( sc::RefUpdateContext& rCxt )
{
if (!mpCell)
diff --git a/unusedcode.easy b/unusedcode.easy
index fc2c119..b9d71fc 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -67,7 +67,6 @@ ScCellValue::hasNumeric() const
ScCellValue::hasString() const
ScCellValue::set(ScFormulaCell const&)
ScCollection::IndexOf(ScDataObject*) const
-ScColorScaleEntry::UpdateMoveTab(short, short, short)
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 2d257fa7781fff9c56a4cd55b26c3ef7e813c84e
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 13:19:57 2014 +0200
remove unused code in ScColumn
Specifically:
ScColumn::DeleteCellNote(int)
ScColumn::MoveListeners(SvtBroadcaster&, int)
ScColumn::SetRawString(sc::ColumnBlockPosition&, int,
rtl::OUString const&, bool)
Change-Id: I34ec659bce7ae18cc3e9d0e27fcd138bc64201b0
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ba0fcd4..0e4c1d7 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -303,7 +303,6 @@ public:
void SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast =
true );
void SetRawString( SCROW nRow, const svl::SharedString& rStr, bool
bBroadcast = true );
- void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const
OUString& rStr, bool bBroadcast = true );
void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const
svl::SharedString& rStr, bool bBroadcast = true );
void SetValue( SCROW nRow, double fVal );
void SetValues( SCROW nRow, const std::vector<double>& rVals );
@@ -458,7 +457,6 @@ public:
void EndListening( SvtListener& rLst, SCROW nRow );
void StartListening( sc::StartListeningContext& rCxt, SCROW nRow,
SvtListener& rListener );
void EndListening( sc::EndListeningContext& rCxt, SCROW nRow, SvtListener&
rListener );
- void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow );
void StartAllListeners();
void StartNeededListeners(); // only for cells where
NeedsListening()==true
void SetDirtyIfPostponed();
@@ -512,7 +510,6 @@ public:
ScPostIt* GetCellNote( SCROW nRow );
const ScPostIt* GetCellNote( SCROW nRow ) const;
void DeleteCellNotes( sc::ColumnBlockPosition& rBlockPos, SCROW nRow1,
SCROW nRow2 );
- void DeleteCellNote( SCROW nRow );
bool HasCellNotes() const;
void SetCellNote( SCROW nRow, ScPostIt* pNote);
bool IsNotesEmptyBlock(SCROW nStartRow, SCROW nEndRow) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 203ed3e..6fb99ea 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1859,10 +1859,7 @@ void ScColumn::SetCellNote(SCROW nRow, ScPostIt* pNote)
//pNote->UpdateCaptionPos(ScAddress(nCol, nRow, nTab)); // TODO notes
usefull ? slow import with many notes
maCellNotes.set(nRow, pNote);
}
-void ScColumn::DeleteCellNote(SCROW nRow)
-{
- maCellNotes.set_empty(nRow, nRow);
-}
+
void ScColumn::DeleteCellNotes( sc::ColumnBlockPosition& rBlockPos, SCROW
nRow1, SCROW nRow2 )
{
rBlockPos.miCellNotePos =
@@ -2946,31 +2943,6 @@ void ScColumn::StartListening( SvtListener& rLst, SCROW
nRow )
startListening(maBroadcasters, aPos.first, aPos.second, nRow, rLst);
}
-void ScColumn::MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow )
-{
- // Move listeners from the source position to the destination position.
- if (!rSource.HasListeners())
- // No listeners to relocate. Bail out.
- return;
-
- // See if the destination position already has a broadcaster, if not,
create one.
- SvtBroadcaster* pBC = GetBroadcaster(nDestRow);
- if (!pBC)
- {
- pBC = new SvtBroadcaster;
- maBroadcasters.set(nDestRow, pBC);
- }
-
- SvtBroadcaster::ListenersType& rListeners = rSource.GetAllListeners();
- SvtBroadcaster::ListenersType::iterator it = rListeners.begin(), itEnd =
rListeners.end();
- for (; it != itEnd; ++it)
- {
- SvtListener& rLst = **it;
- rLst.StartListening(*pBC);
- rLst.EndListening(rSource);
- }
-}
-
void ScColumn::EndListening( SvtListener& rLst, SCROW nRow )
{
SvtBroadcaster* pBC = GetBroadcaster(nRow);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index b50536b..f006f0e 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2250,16 +2250,6 @@ void ScColumn::SetRawString( SCROW nRow, const
svl::SharedString& rStr, bool bBr
}
void ScColumn::SetRawString(
- sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const OUString& rStr, bool
bBroadcast )
-{
- svl::SharedString aSS = pDocument->GetSharedStringPool().intern(rStr);
- if (!aSS.getData())
- return;
-
- SetRawString(rBlockPos, nRow, aSS, bBroadcast);
-}
-
-void ScColumn::SetRawString(
sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const svl::SharedString&
rStr, bool bBroadcast )
{
if (!ValidRow(nRow))
diff --git a/unusedcode.easy b/unusedcode.easy
index 0302b7e..fc2c119 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -68,9 +68,6 @@ ScCellValue::hasString() const
ScCellValue::set(ScFormulaCell const&)
ScCollection::IndexOf(ScDataObject*) const
ScColorScaleEntry::UpdateMoveTab(short, short, short)
-ScColumn::DeleteCellNote(int)
-ScColumn::MoveListeners(SvtBroadcaster&, int)
-ScColumn::SetRawString(sc::ColumnBlockPosition&, int, rtl::OUString const&,
bool)
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit b709688cae4f3a00525fdd17c20852e55f131308
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 12:53:36 2014 +0200
remove unused data ScComplexRefData::IsDeleted()
Change-Id: I06d44a709f18b457c3d3381e2c6f4636fbffd4f0
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 2d94299..8d9e5fb 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -135,7 +135,6 @@ struct ScComplexRefData
Ref2.InitAddress( nCol2, nRow2, nTab2 );
}
- bool IsDeleted() const;
bool Valid() const;
/** In external references nTab is -1 for the start tab and -1 for the end
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 8a86a1c..9a5bb0c 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -311,11 +311,6 @@ ScComplexRefData& ScComplexRefData::Extend( const
ScComplexRefData & rRef, const
return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos);
}
-bool ScComplexRefData::IsDeleted() const
-{
- return Ref1.IsDeleted() || Ref2.IsDeleted();
-}
-
bool ScComplexRefData::Valid() const
{
return Ref1.Valid() && Ref2.Valid();
diff --git a/unusedcode.easy b/unusedcode.easy
index 652dd99..0302b7e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -71,7 +71,6 @@ ScColorScaleEntry::UpdateMoveTab(short, short, short)
ScColumn::DeleteCellNote(int)
ScColumn::MoveListeners(SvtBroadcaster&, int)
ScColumn::SetRawString(sc::ColumnBlockPosition&, int, rtl::OUString const&,
bool)
-ScComplexRefData::IsDeleted() const
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 297c4d4021c2818cb8a51fabfc074d172927f897
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 12:14:06 2014 +0200
remove unused code ScDBQueryDataIterator::DataAccessInternal::setPos
Change-Id: If59f5b99a792ff5eafc0e027a84ca07b89a86c81
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index a777d44..0a8ef91 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -138,7 +138,6 @@ private:
private:
void incBlock();
void incPos();
- void setPos(size_t nPos);
const sc::CellStoreType* mpCells;
PositionType maCurPos;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 35eb8d5..0b3daef 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -530,13 +530,6 @@ void ScDBQueryDataIterator::DataAccessInternal::incPos()
incBlock();
}
-void ScDBQueryDataIterator::DataAccessInternal::setPos(size_t nPos)
-{
- maCurPos = mpCells->position(maCurPos.first, nPos);
- nRow = nPos;
-}
-
-
ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const
ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :
DataAccess(pParent),
diff --git a/unusedcode.easy b/unusedcode.easy
index 9a4624f..652dd99 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,7 +72,6 @@ ScColumn::DeleteCellNote(int)
ScColumn::MoveListeners(SvtBroadcaster&, int)
ScColumn::SetRawString(sc::ColumnBlockPosition&, int, rtl::OUString const&,
bool)
ScComplexRefData::IsDeleted() const
-ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long)
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 778e685b6dd6694e83de047f8f72548d232c4b4b
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 12:04:38 2014 +0200
remove unused code ScDPFilteredCache::SingleFilter::getMatchValue()
Change-Id: If47b1c5e3c04be18315cd9698c18d6e6bf5b7084
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index e6c9bd0..b95ff52 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -69,7 +69,6 @@ public:
virtual bool match(const ScDPItemData& rCellData) const;
virtual std::vector<ScDPItemData> getMatchValues() const;
- const ScDPItemData& getMatchValue() const;
private:
explicit SingleFilter();
diff --git a/sc/source/core/data/dpfilteredcache.cxx
b/sc/source/core/data/dpfilteredcache.cxx
index 68e8ce2..45ddaf8 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -66,11 +66,6 @@ std::vector<ScDPItemData>
ScDPFilteredCache::SingleFilter::getMatchValues() cons
return aValues;
}
-const ScDPItemData& ScDPFilteredCache::SingleFilter::getMatchValue() const
-{
- return maItem;
-}
-
ScDPFilteredCache::GroupFilter::GroupFilter()
{
}
diff --git a/unusedcode.easy b/unusedcode.easy
index 271724b..9a4624f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -73,7 +73,6 @@ ScColumn::MoveListeners(SvtBroadcaster&, int)
ScColumn::SetRawString(sc::ColumnBlockPosition&, int, rtl::OUString const&,
bool)
ScComplexRefData::IsDeleted() const
ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long)
-ScDPFilteredCache::SingleFilter::getMatchValue() const
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
commit 368d3aba406a2e4557fd5b2b15ff569b6c16857d
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 11:50:57 2014 +0200
remove unused code ScDocument::GetCellCount(short, short) const
Change-Id: I63f6bf43dade896858a78414beaafb9792831946
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5df7de2..82b4d23 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -452,7 +452,6 @@ public:
bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts =
bUse; }
SC_DLLPUBLIC sal_uLong GetCellCount() const; // all cells
- SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const;
sal_uLong GetCodeCount() const; // RPN-Code in formulas
DECL_LINK( GetUserDefinedColor, sal_uInt16 * );
// number
formatter
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index bd5dd1f..9f4229f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5760,14 +5760,6 @@ sal_uLong ScDocument::GetCellCount() const
return nCellCount;
}
-SCSIZE ScDocument::GetCellCount(SCTAB nTab, SCCOL nCol) const
-{
- if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) ||
!maTabs[nTab])
- return 0;
-
- return maTabs[nTab]->GetCellCount(nCol);
-}
-
sal_uLong ScDocument::GetCodeCount() const
{
sal_uLong nCodeCount = 0;
diff --git a/unusedcode.easy b/unusedcode.easy
index 312cb70..271724b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -75,7 +75,6 @@ ScComplexRefData::IsDeleted() const
ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long)
ScDPFilteredCache::SingleFilter::getMatchValue() const
ScDocument::CreateFormatTable() const
-ScDocument::GetCellCount(short, short) const
ScExtIButton::GetSelected() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
commit 5ecbb39b9b8c09da9f9919cf3ddb1bacb48d5a40
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 11:15:04 2014 +0200
remove unused code ScFlatBoolRowSegments::getValue(int)
Change-Id: Ifd3fdbd5fc336064cbcd9d085e8fc5062e95aa77
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index c2f3845..1285327 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -68,7 +68,6 @@ public:
bool setTrue(SCROW nRow1, SCROW nRow2);
bool setFalse(SCROW nRow1, SCROW nRow2);
- bool getValue(SCROW nRow);
bool getRangeData(SCROW nRow, RangeData& rData);
bool getRangeDataLeaf(SCROW nRow, RangeData& rData);
void removeSegment(SCROW nRow1, SCROW nRow2);
diff --git a/sc/source/core/data/segmenttree.cxx
b/sc/source/core/data/segmenttree.cxx
index 2d768e8..22fb163 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -361,11 +361,6 @@ bool ScFlatBoolRowSegments::setFalse(SCROW nRow1, SCROW
nRow2)
return mpImpl->setFalse(static_cast<SCCOLROW>(nRow1),
static_cast<SCCOLROW>(nRow2));
}
-bool ScFlatBoolRowSegments::getValue(SCROW nRow)
-{
- return mpImpl->getValue(static_cast<SCCOLROW>(nRow));
-}
-
bool ScFlatBoolRowSegments::getRangeData(SCROW nRow, RangeData& rData)
{
ScFlatBoolSegmentsImpl::RangeData aData;
diff --git a/unusedcode.easy b/unusedcode.easy
index b25dea4..312cb70 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -77,7 +77,6 @@ ScDPFilteredCache::SingleFilter::getMatchValue() const
ScDocument::CreateFormatTable() const
ScDocument::GetCellCount(short, short) const
ScExtIButton::GetSelected() const
-ScFlatBoolRowSegments::getValue(int)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit af9d999091ee8ea2757b65f32cf41f5d72a1e3e7
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 11:11:13 2014 +0200
remove unused code ScGlobal::GetStandardFormat
full signature:
ScGlobal::GetStandardFormat(double, SvNumberFormatter&,
unsigned long, short)
Change-Id: Ifa2946cdb1d27f3a7bca1541c8f569456cb45b88
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 8cf6ba8..51afdb1 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -560,8 +560,6 @@ public:
const OUString& rTabName );
SC_DLLPUBLIC static sal_uLong GetStandardFormat(
SvNumberFormatter&,
sal_uLong nFormat, short nType );
- SC_DLLPUBLIC static sal_uLong GetStandardFormat( double,
SvNumberFormatter&,
- sal_uLong nFormat, short nType );
SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
SC_DLLPUBLIC static double nScreenPPTX;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 0cc761c..4a154f4 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -198,17 +198,6 @@ sal_uInt16 ScGlobal::GetStandardRowHeight()
return nStdRowHeight;
}
-sal_uLong ScGlobal::GetStandardFormat( double fNumber, SvNumberFormatter&
rFormatter,
- sal_uLong nFormat, short nType )
-{
- const SvNumberformat* pFormat = rFormatter.GetEntry( nFormat );
- if ( pFormat )
- return rFormatter.GetStandardFormat( fNumber, nFormat, nType,
- pFormat->GetLanguage() );
- return rFormatter.GetStandardFormat( nType, eLnge );
-}
-
-
SvNumberFormatter* ScGlobal::GetEnglishFormatter()
{
if ( !pEnglishFormatter )
diff --git a/unusedcode.easy b/unusedcode.easy
index fe0b8d9..b25dea4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -78,7 +78,6 @@ ScDocument::CreateFormatTable() const
ScDocument::GetCellCount(short, short) const
ScExtIButton::GetSelected() const
ScFlatBoolRowSegments::getValue(int)
-ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit 1466096e2248ef6aaa8c0d37e440c6397b59af24
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:44:44 2014 +0200
remove unused code ScGridWindow::HasScenarioRange
Change-Id: Ifd89a7bb3846ae3979ef378853aa9cb0b6585833
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 37d42da..b862aba 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -243,8 +243,6 @@ class ScGridWindow : public Window, public
DropTargetHelper, public DragSourceHe
bool HasScenarioButton( const Point& rPosPixel, ScRange&
rScenRange );
- bool HasScenarioRange( sal_uInt16 nCol, sal_Int32 nRow,
ScRange& rScenRange );
-
bool DropScroll( const Point& rMousePos );
sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 4ff4264..e41a07c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1071,44 +1071,6 @@ void ScGridWindow::DoScenarioMenu( const ScRange&
rScenRange )
CaptureMouse();
}
-bool ScGridWindow::HasScenarioRange( sal_uInt16 nCol, sal_Int32 nRow, ScRange&
rScenRange )
-{
- ScDocument* pDoc = pViewData->GetDocument();
- sal_uInt16 nTab = pViewData->GetTabNo();
- sal_uInt16 nTabCount = pDoc->GetTableCount();
- if ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) &&
!pDoc->IsScenario(nTab) )
- {
- SCTAB i;
- ScMarkData aMarks;
- for (i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
- pDoc->MarkScenario( i, nTab, aMarks, false, SC_SCENARIO_SHOWFRAME
);
- ScRangeList aRanges;
- aMarks.FillRangeListWithMarks( &aRanges, false );
- SCTAB nRangeCount = aRanges.size();
- for (i=0; i<nRangeCount; i++)
- {
- ScRange aRange = *aRanges[i];
- pDoc->ExtendTotalMerge( aRange );
- sal_Bool bTextBelow = ( aRange.aStart.Row() == 0 );
- sal_Bool bIsInScen = sal_False;
- if ( bTextBelow )
- {
- bIsInScen = (aRange.aStart.Col() == nCol && aRange.aEnd.Row()
== nRow-1);
- }
- else
- {
- bIsInScen = (aRange.aStart.Col() == nCol &&
aRange.aStart.Row() == nRow+1);
- }
- if (bIsInScen)
- {
- rScenRange = aRange;
- return true;
- }
- }
- }
- return false;
-}
-
void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool
bDataSelect )
{
delete pFilterBox;
diff --git a/unusedcode.easy b/unusedcode.easy
index 1a8fa5b..fe0b8d9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -79,7 +79,6 @@ ScDocument::GetCellCount(short, short) const
ScExtIButton::GetSelected() const
ScFlatBoolRowSegments::getValue(int)
ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
-ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit a7e69f7c2040203f5560c003af779083cd97e10d
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:41:53 2014 +0200
remove unused code ScMyNotEmptyCellsIterator::GetCell() const
and the consequently unnecessary mpCell field
Change-Id: I95061a904bd88daea8c64c9dcfdb2e91f3f3ac3b
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index afc05fd..31d7fdc 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -625,7 +625,6 @@
ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport
pDetectiveObj(NULL),
pDetectiveOp(NULL),
rExport(rTempXMLExport),
- mpCell(NULL),
nCurrentTable(SCTAB_MAX)
{
}
@@ -664,9 +663,9 @@ void ScMyNotEmptyCellsIterator::SetCellData( ScMyCell&
rMyCell, table::CellAddre
if( (nCellCol == rAddress.Column) && (nCellRow == rAddress.Row) )
{
- mpCell = mpCellItr->GetNext(nCellCol, nCellRow);
- if (mpCell)
- rMyCell.maBaseCell = *mpCell;
+ const ScRefCellValue* pCell = mpCellItr->GetNext(nCellCol, nCellRow);
+ if (pCell)
+ rMyCell.maBaseCell = *pCell;
}
rMyCell.bIsMatrixCovered = false;
@@ -815,9 +814,4 @@ bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell,
ScFormatRangeStyles* pC
return bFoundCell;
}
-const ScRefCellValue* ScMyNotEmptyCellsIterator::GetCell() const
-{
- return mpCell;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx
b/sc/source/filter/xml/XMLExportIterator.hxx
index 857f98c..83380ae 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -348,7 +348,6 @@ class ScMyNotEmptyCellsIterator : boost::noncopyable
ScXMLExport& rExport;
boost::scoped_ptr<ScHorizontalCellIterator> mpCellItr;
- const ScRefCellValue* mpCell;
SCCOL nCellCol;
SCROW nCellRow;
@@ -384,8 +383,6 @@ public:
void SkipTable(SCTAB nSkip);
bool GetNext(ScMyCell& aCell, ScFormatRangeStyles*
pCellStyles);
-
- const ScRefCellValue* GetCell() const;
};
#endif
diff --git a/unusedcode.easy b/unusedcode.easy
index 18bae72..1a8fa5b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -80,7 +80,6 @@ ScExtIButton::GetSelected() const
ScFlatBoolRowSegments::getValue(int)
ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
-ScMyNotEmptyCellsIterator::GetCell() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit 99e5749e80998e674b0f5cf8e5958632f49bbe50
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:34:54 2014 +0200
remove unused code ScRangeStringConverter::GetRangeListFromString
full signature:
ScRangeStringConverter::GetRangeListFromString(
css::uno::Sequence<css::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention,
unsigned short, unsigned short)
Change-Id: I61784cb55fb82caaeed22ddae94017c3ea630990
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 0da652c..fdde8f6 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -180,13 +180,6 @@ public:
sal_Int32& nOffset,
sal_Unicode cSeparator = ' ',
sal_Unicode cQuote = '\'');
- static bool GetRangeListFromString(
- ::com::sun::star::uno::Sequence<
::com::sun::star::table::CellRangeAddress >& rRangeSeq,
- const OUString& rRangeListStr,
- const ScDocument* pDocument,
- formula::FormulaGrammar::AddressConvention eConv,
- sal_Unicode cSeparator = ' ',
- sal_Unicode cQuote = '\'');
/// Range to String core
static void GetStringFromAddress(
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index c0c20e0..14dc78e 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -614,31 +614,6 @@ bool ScRangeStringConverter::GetRangeFromString(
return bResult;
}
-bool ScRangeStringConverter::GetRangeListFromString(
- uno::Sequence< table::CellRangeAddress >& rRangeSeq,
- const OUString& rRangeListStr,
- const ScDocument* pDocument,
- FormulaGrammar::AddressConvention eConv,
- sal_Unicode cSeparator,
- sal_Unicode cQuote )
-{
- bool bRet = true;
- OSL_ENSURE( !rRangeListStr.isEmpty(),
"ScXMLConverter::GetRangeListFromString - empty string!" );
- table::CellRangeAddress aRange;
- sal_Int32 nOffset = 0;
- while( nOffset >= 0 )
- {
- if( GetRangeFromString( aRange, rRangeListStr, pDocument, eConv,
nOffset, cSeparator, cQuote ) && (nOffset >= 0) )
- {
- rRangeSeq.realloc( rRangeSeq.getLength() + 1 );
- rRangeSeq[ rRangeSeq.getLength() - 1 ] = aRange;
- }
- else
- bRet = false;
- }
- return bRet;
-}
-
void ScRangeStringConverter::GetStringFromAddress(
OUString& rString,
const ScAddress& rAddress,
diff --git a/unusedcode.easy b/unusedcode.easy
index 78829ce..18bae72 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -81,7 +81,6 @@ ScFlatBoolRowSegments::getValue(int)
ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
ScMyNotEmptyCellsIterator::GetCell() const
-ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit 44af42016eebc85c8b2f6e21efc2da7e732432fb
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:29:16 2014 +0200
remove unused code ScRefCellValue::commit(ScColumn&, int) const
Change-Id: I2f91a7b6b471d655f19f1f0ed94c4e1d0273ed80
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 94af146..193cb96 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -130,8 +130,6 @@ struct SC_DLLPUBLIC ScRefCellValue
*/
void commit( ScDocument& rDoc, const ScAddress& rPos ) const;
- void commit( ScColumn& rColumn, SCROW nRow ) const;
-
bool hasString() const;
bool hasNumeric() const;
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index d963fa3..bc7e234 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -103,8 +103,7 @@ bool equalsWithoutFormatImpl( const _T& left, const _T&
right )
return false;
}
-template<typename _T>
-void commitToColumn( const _T& rCell, ScColumn& rColumn, SCROW nRow )
+static void commitToColumn( const ScCellValue& rCell, ScColumn& rColumn, SCROW
nRow )
{
switch (rCell.meType)
{
@@ -546,11 +545,6 @@ void ScRefCellValue::commit( ScDocument& rDoc, const
ScAddress& rPos ) const
}
}
-void ScRefCellValue::commit( ScColumn& rColumn, SCROW nRow ) const
-{
- commitToColumn(*this, rColumn, nRow);
-}
-
bool ScRefCellValue::hasString() const
{
return hasStringImpl(meType, mpFormula);
diff --git a/unusedcode.easy b/unusedcode.easy
index a98743e..78829ce 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -82,7 +82,6 @@ ScGlobal::GetStandardFormat(double, SvNumberFormatter&,
unsigned long, short)
ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
ScMyNotEmptyCellsIterator::GetCell() const
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
-ScRefCellValue::commit(ScColumn&, int) const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit 252ca499da21faccc4b6b29ba419fa5ca3c3d0ce
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:20:17 2014 +0200
remove unused code ScTabViewShell::GetForms() const
Change-Id: Ifb4fec75d58f67640043b344eac8a2be598c214d
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 2b609e7..b4b6b68 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -413,7 +413,6 @@ public:
bool IsActive() const { return bIsActive; }
OUString GetFormula(ScAddress& rAddress);
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface
> & GetForms() const;
// ugly hack to call Define Names from Manage Names
void SwitchBetweenRefDialogs(SfxModelessDialog* pDialog);
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 978500e..3095dfa 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1924,14 +1924,4 @@ void ScTabViewShell::GetTbxState( SfxItemSet& rSet )
rSet.Put( SfxUInt16Item( SID_TBXCTL_INSOBJ, nInsObjCtrlState ) );
}
-const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > &
ScTabViewShell::GetForms() const
-{
- if( !pFormShell || !pFormShell->GetCurPage() )
- {
- static ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > aRef;
- return aRef;
- }
- return pFormShell->GetCurPage()->GetForms();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index d2d12a8..a98743e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -83,7 +83,6 @@ ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
ScMyNotEmptyCellsIterator::GetCell() const
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
ScRefCellValue::commit(ScColumn&, int) const
-ScTabViewShell::GetForms() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit b28e4351057323e6ec043a872c1a1c8d09dfb1db
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:13:26 2014 +0200
remove unused code ScTable::GetNote(short, int)
Change-Id: Iad250b204423b897d903053b3ea4c63c01837e79
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index a605edf..9a621ab 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -384,8 +384,6 @@ public:
void GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const;
void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const;
- ScPostIt* GetNote(const SCCOL nCol, const SCROW nRow);
-
ScPostIt* ReleaseNote( SCCOL nCol, SCROW nRow );
size_t GetNoteCount( SCCOL nCol ) const;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 28588af..ab50073 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1502,11 +1502,6 @@ ScFormulaCell* ScTable::GetFormulaCell( SCCOL nCol,
SCROW nRow )
return aCol[nCol].GetFormulaCell(nRow);
}
-ScPostIt* ScTable::GetNote(const SCCOL nCol, const SCROW nRow)
-{
- return pDocument->GetNote(nCol, nRow, nTab);
-}
-
ScPostIt* ScTable::ReleaseNote( SCCOL nCol, SCROW nRow )
{
if (!ValidCol(nCol))
diff --git a/unusedcode.easy b/unusedcode.easy
index 0ba957d..d2d12a8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -84,7 +84,6 @@ ScMyNotEmptyCellsIterator::GetCell() const
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
ScRefCellValue::commit(ScColumn&, int) const
ScTabViewShell::GetForms() const
-ScTable::GetNote(short, int)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit 457304666358d172dfcc9ad13b235f19bfbe2d29
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 10:07:17 2014 +0200
remove unused code ScTable::SetRawString(short, int, rtl::OUString const&)
Change-Id: I098143e76c141e4cf6b9d9aec4cb727680ea7457
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 3f75563..a605edf 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -355,7 +355,6 @@ public:
SCSIZE GetPatternCount( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const;
bool ReservePatternCount( SCCOL nCol, SCSIZE nReserve );
- void SetRawString( SCCOL nCol, SCROW nRow, const OUString& rStr );
void SetRawString( SCCOL nCol, SCROW nRow, const svl::SharedString& rStr );
void GetString( SCCOL nCol, SCROW nRow, OUString& rString ) const;
double* GetValueCell( SCCOL nCol, SCROW nRow );
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 5ac15da..28588af 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1424,12 +1424,6 @@ void ScTable::SetValue( SCCOL nCol, SCROW nRow, const
double& rVal )
aCol[nCol].SetValue( nRow, rVal );
}
-void ScTable::SetRawString( SCCOL nCol, SCROW nRow, const OUString& rStr )
-{
- if (ValidColRow(nCol, nRow))
- aCol[nCol].SetRawString(nRow, rStr);
-}
-
void ScTable::SetRawString( SCCOL nCol, SCROW nRow, const svl::SharedString&
rStr )
{
if (ValidColRow(nCol, nRow))
diff --git a/unusedcode.easy b/unusedcode.easy
index f887677..0ba957d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -85,7 +85,6 @@
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com
ScRefCellValue::commit(ScColumn&, int) const
ScTabViewShell::GetForms() const
ScTable::GetNote(short, int)
-ScTable::SetRawString(short, int, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
commit 1c5797b16669afb6f0cd065f4c37c852c5136f60
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 09:58:45 2014 +0200
remove unused code ScRefreshTimer::StartRefreshTimer()
Change-Id: If96e0de72338aabfb2c4db04fba8f524d48a1d5c
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index b8e24db..2c0b8379 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -50,7 +50,6 @@ public:
bool operator==( const ScRefreshTimer& r ) const;
bool operator!=( const ScRefreshTimer& r ) const;
- void StartRefreshTimer();
void SetRefreshControl( ScRefreshTimerControl * const * pp );
void SetRefreshHandler( const Link& rLink );
sal_uLong GetRefreshDelay() const;
diff --git a/sc/source/core/tool/refreshtimer.cxx
b/sc/source/core/tool/refreshtimer.cxx
index cdaee6b..47f6896 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -84,11 +84,6 @@ bool ScRefreshTimer::operator!=( const ScRefreshTimer& r )
const
return !ScRefreshTimer::operator==( r );
}
-void ScRefreshTimer::StartRefreshTimer()
-{
- Start();
-}
-
void ScRefreshTimer::SetRefreshControl( ScRefreshTimerControl * const * pp )
{
ppControl = pp;
diff --git a/unusedcode.easy b/unusedcode.easy
index 02ae768..f887677 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -83,7 +83,6 @@ ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
ScMyNotEmptyCellsIterator::GetCell() const
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
ScRefCellValue::commit(ScColumn&, int) const
-ScRefreshTimer::StartRefreshTimer()
ScTabViewShell::GetForms() const
ScTable::GetNote(short, int)
ScTable::SetRawString(short, int, rtl::OUString const&)
commit a7672907d84f5e940d2c1776759889570756f607
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 09:57:11 2014 +0200
remove unused code ScSimpleRefDlgWrapper::GetRefString()
Change-Id: I349a7df3516829dee9bc44426b7b5c84a73254ec
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index d55f1dc..6619fa2 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -140,7 +140,6 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
SFX_DECL_CHILDWINDOW_WITHID(Class);
static void SetDefaultPosSize(Point aPos, Size aSize, bool bSet =
true);
- OUString GetRefString();
void SetRefString(const OUString& rStr);
void SetCloseHdl( const Link& rLink );
void SetUnoLinks( const Link& rDone, const Link& rAbort,
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index e2e8046..842908c 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -185,16 +185,6 @@ void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos,
Size aSize, bool bSet)
}
-OUString ScSimpleRefDlgWrapper::GetRefString()
-{
- OUString aResult;
- if(pWindow!=NULL)
- {
- aResult=((ScSimpleRefDlg*)pWindow)->GetRefString();
- }
- return aResult;
-}
-
void ScSimpleRefDlgWrapper::SetAutoReOpen(bool bFlag)
{
bAutoReOpen=bFlag;
diff --git a/unusedcode.easy b/unusedcode.easy
index ad7d69a..02ae768 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -84,7 +84,6 @@ ScMyNotEmptyCellsIterator::GetCell() const
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&,
rtl::OUString const&, ScDocument const*,
formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
ScRefCellValue::commit(ScColumn&, int) const
ScRefreshTimer::StartRefreshTimer()
-ScSimpleRefDlgWrapper::GetRefString()
ScTabViewShell::GetForms() const
ScTable::GetNote(short, int)
ScTable::SetRawString(short, int, rtl::OUString const&)
commit e113771914f006e568689fe973f913fcc95806c0
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 09:27:33 2014 +0200
remove unused code ScTabView::GetParentOrChild(unsigned short)
Change-Id: I7440cb700c9d33acef842e19ff192cca9ef21cf9
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 56f237c..c188d1a 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -516,7 +516,6 @@ public:
void InvalidateSplit();
void ErrorMessage( sal_uInt16 nGlobStrId );
- Window* GetParentOrChild( sal_uInt16 nChildId );
void EnableRefInput(bool bFlag = true);
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 4cb8cd4..84e7740 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1429,24 +1429,6 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
pParent->GrabFocus();
}
-Window* ScTabView::GetParentOrChild( sal_uInt16 nChildId )
-{
- SfxViewFrame* pViewFrm = aViewData.GetViewShell()->GetViewFrame();
-
- if ( pViewFrm->HasChildWindow(nChildId) )
- {
- SfxChildWindow* pChild = pViewFrm->GetChildWindow(nChildId);
- if (pChild)
- {
- Window* pWin = pChild->GetWindow();
- if (pWin && pWin->IsVisible())
- return pWin;
- }
- }
-
- return aViewData.GetDialogParent();
-}
-
void ScTabView::UpdatePageBreakData( bool bForcePaint )
{
ScPageBreakData* pNewData = NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index 73068c9..ad7d69a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -85,7 +85,6 @@
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com
ScRefCellValue::commit(ScColumn&, int) const
ScRefreshTimer::StartRefreshTimer()
ScSimpleRefDlgWrapper::GetRefString()
-ScTabView::GetParentOrChild(unsigned short)
ScTabViewShell::GetForms() const
ScTable::GetNote(short, int)
ScTable::SetRawString(short, int, rtl::OUString const&)
commit 80ff95f62485fc4d8f41686365fbf61663ac62d1
Author: Noel Grandin <n...@peralex.com>
Date: Wed Feb 26 09:25:55 2014 +0200
remove unused code SvViewDataEntry::SetObjectSelected(bool)
Change-Id: I3b41be19f4094affd1d000c8780cf6eb54352696
diff --git a/include/svtools/viewdataentry.hxx
b/include/svtools/viewdataentry.hxx
index 5ddf18b..31681af 100644
--- a/include/svtools/viewdataentry.hxx
+++ b/include/svtools/viewdataentry.hxx
@@ -47,7 +47,6 @@ class SVT_DLLPUBLIC SvViewDataEntry
std::vector<SvViewDataItem> maItems;
sal_uLong nVisPos;
bool mbSelected:1;
- bool mbObjectSelected:1;
bool mbHighlighted:1;
bool mbExpanded:1;
bool mbFocused:1;
@@ -70,7 +69,6 @@ public:
void SetHighlighted( bool bHighlighted );
void SetExpanded( bool bExpanded );
void SetSelectable( bool bSelectable );
- void SetObjectSelected( bool bSelected );
void Init(size_t nSize);
diff --git a/svtools/source/contnr/viewdataentry.cxx
b/svtools/source/contnr/viewdataentry.cxx
index 8719586..06ba463 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -26,7 +26,6 @@ DBG_NAME(SvViewDataEntry);
SvViewDataEntry::SvViewDataEntry() :
nVisPos(0),
mbSelected(false),
- mbObjectSelected(false),
mbHighlighted(false),
mbExpanded(false),
mbFocused(false),
@@ -39,7 +38,6 @@ SvViewDataEntry::SvViewDataEntry() :
SvViewDataEntry::SvViewDataEntry( const SvViewDataEntry& rData ) :
nVisPos(rData.nVisPos),
mbSelected(false),
- mbObjectSelected(false),
mbHighlighted(false),
mbExpanded(rData.mbExpanded),
mbFocused(false),
@@ -98,11 +96,6 @@ void SvViewDataEntry::SetSelected( bool bSelected )
mbHighlighted = bSelected;
}
-void SvViewDataEntry::SetObjectSelected( bool bSelected )
-{
- mbObjectSelected = bSelected;
-}
-
void SvViewDataEntry::SetHighlighted( bool bHighlighted )
{
mbHighlighted = bHighlighted;
diff --git a/unusedcode.easy b/unusedcode.easy
index edd7f8e..73068c9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -104,7 +104,6 @@ SimpleErrorHandler::SimpleErrorHandler()
SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
SotFactory::Find(SvGlobalName const&)
-SvViewDataEntry::SetObjectSelected(bool)
SvdProgressInfo::ReportError()
SvpSalInstance::PostedEventsInQueue()
SvtAccessibilityOptions::GetColorValueSetColumnCount() const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
