[Libreoffice-commits] core.git: 2 commits - editeng/source sc/source sfx2/source svl/source sw/source
Tor Lillqvist
tml at collabora.com
Mon Dec 14 22:32:48 PST 2015
editeng/source/items/optitems.cxx | 3 --
editeng/source/items/textitem.cxx | 3 --
sc/source/core/data/attarray.cxx | 2 -
sc/source/core/data/bcaslot.cxx | 2 -
sc/source/core/data/dociter.cxx | 2 -
sc/source/core/data/docpool.cxx | 2 -
sc/source/core/data/documen2.cxx | 2 -
sc/source/core/data/documen7.cxx | 2 -
sc/source/core/data/documen8.cxx | 2 -
sc/source/core/data/drawpage.cxx | 2 -
sc/source/core/data/drwlayer.cxx | 2 -
sc/source/core/data/markarr.cxx | 2 -
sc/source/core/data/markdata.cxx | 2 -
sc/source/core/data/patattr.cxx | 2 -
sc/source/core/data/table3.cxx | 4 ---
sc/source/core/data/table4.cxx | 2 -
sc/source/core/data/table5.cxx | 2 -
sc/source/core/tool/cellform.cxx | 1
sc/source/core/tool/consoli.cxx | 1
sc/source/core/tool/editutil.cxx | 1
sc/source/core/tool/interpr3.cxx | 1
sc/source/core/tool/prnsave.cxx | 2 -
sc/source/core/tool/rechead.cxx | 2 -
sc/source/core/tool/reffind.cxx | 1
sc/source/filter/starcalc/scfobj.cxx | 2 -
sc/source/ui/app/inputhdl.cxx | 2 -
sc/source/ui/app/rfindlst.cxx | 2 -
sc/source/ui/app/uiitems.cxx | 4 ---
sc/source/ui/attrdlg/tabpages.cxx | 2 -
sc/source/ui/docshell/docfunc.cxx | 2 -
sc/source/ui/docshell/docsh.cxx | 2 -
sc/source/ui/docshell/docsh6.cxx | 2 -
sc/source/ui/navipi/navcitem.cxx | 2 -
sc/source/ui/optdlg/tpusrlst.cxx | 2 -
sc/source/ui/optdlg/tpview.cxx | 2 -
sc/source/ui/pagedlg/areasdlg.cxx | 2 -
sc/source/ui/pagedlg/scuitphfedit.cxx | 2 -
sc/source/ui/undo/target.cxx | 3 --
sc/source/ui/undo/undoblk.cxx | 3 --
sc/source/ui/undo/undoblk3.cxx | 3 --
sc/source/ui/view/colrowba.cxx | 2 -
sc/source/ui/view/dbfunc3.cxx | 2 -
sc/source/ui/view/drawvie4.cxx | 2 -
sc/source/ui/view/gridwin2.cxx | 2 -
sc/source/ui/view/output2.cxx | 2 -
sc/source/ui/view/preview.cxx | 2 -
sc/source/ui/view/prevwsh2.cxx | 2 -
sc/source/ui/view/select.cxx | 2 -
sc/source/ui/view/tabcont.cxx | 2 -
sc/source/ui/view/tabview4.cxx | 2 -
sc/source/ui/view/tabview5.cxx | 2 -
sc/source/ui/view/tabvwshb.cxx | 2 -
sc/source/ui/view/tabvwshd.cxx | 2 -
sc/source/ui/view/viewfun2.cxx | 2 -
sc/source/ui/view/viewfun3.cxx | 2 -
sc/source/ui/view/viewfun4.cxx | 2 -
sfx2/source/control/minfitem.cxx | 2 -
sfx2/source/control/sorgitm.cxx | 2 -
sfx2/source/dialog/dinfdlg.cxx | 2 -
sfx2/source/dialog/tplcitem.cxx | 2 -
sfx2/source/dialog/tplpitem.cxx | 4 ---
svl/source/items/globalnameitem.cxx | 3 --
svl/source/items/itemset.cxx | 35 ----------------------------------
svl/source/items/srchitem.cxx | 3 --
sw/source/uibase/utlui/numfmtlb.cxx | 2 -
sw/source/uibase/web/wfrmsh.cxx | 1
sw/source/uibase/web/wtextsh.cxx | 1
67 files changed, 173 deletions(-)
New commits:
commit 87c9465262680dec09efb869800859aa65ab1d19
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Dec 14 22:13:43 2015 +0200
Bin unused function DbgCheckItemSet
Change-Id: Ia08e7ea3381cd450d2dadd8add723574634124e0
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 940a43e..a0ad76f 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -39,39 +39,6 @@ static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0
#include "nranges.cxx"
#include "poolio.hxx"
-
-#ifdef DBG_UTIL
-
-
-const sal_Char *DbgCheckItemSet( const void* pVoid )
-{
- const SfxItemSet *pSet = static_cast<const SfxItemSet*>(pVoid);
- SfxWhichIter aIter( *pSet );
- sal_uInt16 nCount = 0, n = 0;
- for ( sal_uInt16 nWh = aIter.FirstWhich(); nWh; nWh = aIter.NextWhich(), ++n )
- {
- const SfxPoolItem *pItem = pSet->m_pItems[n];
- if ( pItem )
- {
- ++nCount;
- assert((IsInvalidItem(pItem) ||
- pItem->Which() == 0 || pItem->Which() == nWh
- ) && "SfxItemSet: invalid which-id" );
- assert((IsInvalidItem(pItem) || !pItem->Which() ||
- !SfxItemPool::IsWhich(pItem->Which()) ||
- pSet->GetPool()->IsItemFlag(nWh, SfxItemPoolFlags::NOT_POOLABLE) ||
- SFX_ITEMS_NULL != pSet->GetPool()->GetSurrogate(pItem)
- ) && "SfxItemSet: item in set which is not in pool" );
- }
-
- }
- assert(pSet->m_nCount == nCount);
-
- return nullptr;
-}
-
-#endif
-
/**
* Ctor for a SfxItemSet with exactly the Which Ranges, which are known to
* the supplied SfxItemPool.
commit 0585d81a76a99de5fb3ed2e8c34a3fc44cd83b46
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Dec 14 21:50:13 2015 +0200
Bin silly 'STATIC DATA' comments
Change-Id: I50e3772b7b479d2cf1eb644c7334d0f987874ccb
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 54521c2..6677d8e 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -28,9 +28,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::linguistic2;
-// STATIC DATA -----------------------------------------------------------
-
-
// class SfxSpellCheckItem -----------------------------------------------
SfxSpellCheckItem::SfxSpellCheckItem
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 1ab854c..d4417b8 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -102,9 +102,6 @@ using namespace ::com::sun::star::text;
bool SvxFontItem::bEnableStoreUnicodeNames = false;
-// STATIC DATA -----------------------------------------------------------
-
-
SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);}
SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_NONE, 0);}
SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);}
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 8d91cc7..12cb386 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -47,8 +47,6 @@
#include <rtl/strbuf.hxx>
#include <memory>
-// STATIC DATA -----------------------------------------------------------
-
using ::editeng::SvxBorderLine;
ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) :
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index feee464..b5eb089 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -62,8 +62,6 @@
#error BCA_SLOTS_DEFINE DOOMed!
#endif
-// STATIC DATA -----------------------------------------------------------
-
namespace sc {
bool AreaListener::SortByArea::operator ()( const AreaListener& rLeft, const AreaListener& rRight ) const
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 77ac93a..8b79337 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -54,8 +54,6 @@ using ::std::set;
// #define debugiter(...) fprintf(stderr, __VA_ARGS__)
#define debugiter(...)
-// STATIC DATA -----------------------------------------------------------
-
namespace {
template<typename _Iter>
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 4d5ecc1..f8839b9 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -72,8 +72,6 @@
#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39)
#define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20)
-// STATIC DATA -----------------------------------------------------------
-
sal_uInt16* ScDocumentPool::pVersionMap1 = nullptr;
sal_uInt16* ScDocumentPool::pVersionMap2 = nullptr;
sal_uInt16* ScDocumentPool::pVersionMap3 = nullptr;
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d27a5e6..8b11469 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -127,8 +127,6 @@ private:
}
};
-// STATIC DATA -----------------------------------------------------------
-
ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) :
mpCellStringPool(new svl::SharedStringPool(ScGlobal::pCharClass)),
mpFormulaGroupCxt(nullptr),
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index cfa3d2f..71a3c13 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -43,8 +43,6 @@
extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround
-// STATIC DATA -----------------------------------------------------------
-
void ScDocument::StartListeningArea(
const ScRange& rRange, bool bGroupListening, SvtListener* pListener )
{
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 4ff5fc6..15fbb88 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -93,8 +93,6 @@
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
namespace {
inline sal_uInt16 getScaleValue(SfxStyleSheetBase& rStyle, sal_uInt16 nWhich)
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index 4887759..e8e6134 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -24,8 +24,6 @@
#include "document.hxx"
#include "pageuno.hxx"
-// STATIC DATA -----------------------------------------------------------
-
ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) :
FmFormPage(rNewModel, bMasterPage)
{
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index dbf1fe7..1fa2e6c 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -84,8 +84,6 @@
using namespace ::com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
static ScDrawObjFactory* pFac = nullptr;
static E3dObjFactory* pF3d = nullptr;
static sal_uInt16 nInst = 0;
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index f21ce8d..a71e127 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -23,8 +23,6 @@
#include <osl/diagnose.h>
-// STATIC DATA -----------------------------------------------------------
-
ScMarkArray::ScMarkArray() :
nCount( 0 ),
nLimit( 0 ),
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index b8eaac7..2eeae00 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -29,8 +29,6 @@
#include <mdds/flat_segment_tree.hpp>
-// STATIC DATA -----------------------------------------------------------
-
ScMarkData::ScMarkData() :
maTabMarked(),
pMultiSel( nullptr )
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index ea53285..61ab5ca 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -62,8 +62,6 @@
#include "scmod.hxx"
#include "fillinfo.hxx"
-// STATIC DATA -----------------------------------------------------------
-
using sc::HMMToTwips;
using sc::TwipsToHMM;
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ee76080..83e8bdf 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -211,8 +211,6 @@ short Compare( const OUString &sInput1, const OUString &sInput2,
}
-// STATIC DATA -----------------------------------------------------------
-
struct ScSortInfo
{
ScRefCellValue maCell;
@@ -221,8 +219,6 @@ struct ScSortInfo
};
IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo )
-// END OF STATIC DATA -----------------------------------------------------
-
class ScSortInfoArray : boost::noncopyable
{
public:
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 532d47c..7b682cd 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -66,8 +66,6 @@
#include <math.h>
#include <memory>
-// STATIC DATA -----------------------------------------------------------
-
#define _D_MAX_LONG_ (double) 0x7fffffff
extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index c277812..cd846b6 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -51,8 +51,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::sheet::TablePageBreakData;
using ::std::set;
-// STATIC DATA -----------------------------------------------------------
-
#define GET_SCALEVALUE(set,id) static_cast<const SfxUInt16Item&>(set.Get( id )).GetValue()
void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 6d8015b..65eba23 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -31,7 +31,6 @@
#include "sc.hrc"
#include <editutil.hxx>
-// STATIC DATA
// Err527 Workaround
const ScFormulaCell* pLastFormulaTreeTop = nullptr;
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 267e2f6..dd0f101 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -33,7 +33,6 @@
#define SC_CONS_NOTFOUND -1
-// STATIC DATA
static const OpCode eOpCodeTable[] = { // order as for enum ScSubTotalFunc
ocBad, // none
ocAverage,
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index e370e4a..6c30a39 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -50,7 +50,6 @@
using namespace com::sun::star;
-// STATIC DATA
// Delimiters zusaetzlich zu EditEngine-Default:
ScEditUtil::ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index e0ecf96..d11d99c 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -40,7 +40,6 @@
using ::std::vector;
using namespace formula;
-// STATIC DATA
#define MAX_ANZ_DOUBLE_FOR_SORT 100000
const double ScInterpreter::fMaxGammaArgument = 171.624376956302; // found experimental
diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx
index 478f37e..911b411 100644
--- a/sc/source/core/tool/prnsave.cxx
+++ b/sc/source/core/tool/prnsave.cxx
@@ -23,8 +23,6 @@
#include <osl/diagnose.h>
-// STATIC DATA
-
// Daten pro Tabelle
ScPrintSaverTab::ScPrintSaverTab() :
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index 9654131..4736e5d 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -22,8 +22,6 @@
#include <osl/diagnose.h>
-// STATIC DATA
-
ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
rStream( rNewStream )
{
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 94db172..6c99d83 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -22,7 +22,6 @@
#include "compiler.hxx"
#include "document.hxx"
-// STATIC DATA
namespace {
// Include colon; addresses in range reference are handled individually.
diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx
index 6216c84..38f6a30 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -39,8 +39,6 @@ using namespace com::sun::star;
#include "drwlayer.hxx"
#include "chartarr.hxx"
-// STATIC DATA -----------------------------------------------------------
-
void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect,
SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 )
{
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 4138bad..643aa3d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -86,8 +86,6 @@
using namespace formula;
-// STATIC DATA -----------------------------------------------------------
-
bool ScInputHandler::bOptLoaded = false; // Evaluate App options
bool ScInputHandler::bAutoComplete = false; // Is set in KeyInput
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 59c63f5..27d873a 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -20,8 +20,6 @@
#include "rfindlst.hxx"
#include <tools/debug.hxx>
-// STATIC DATA -----------------------------------------------------------
-
#define SC_RANGECOLORS 8
static const ColorData aColNames[SC_RANGECOLORS] =
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 2e6cb51..aa2ec2c 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -26,10 +26,6 @@
#include <osl/diagnose.h>
#include <editeng/editobj.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-
-
/**
* Status update for entry field
*/
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index cd27c35..d7c0899 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -27,8 +27,6 @@
#include "tabpages.hxx"
-// STATIC DATA -----------------------------------------------------------
-
const sal_uInt16 ScTabPageProtection::pProtectionRanges[] =
{
SID_SCATTR_PROTECTION,
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 41d23f5..adc7f2b 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -99,8 +99,6 @@ using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::std::vector;
-// STATIC DATA -----------------------------------------------------------
-
IMPL_LINK_TYPED( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction, void )
{
// #i101118# if drawing layer collects the undo actions, add it there
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 562254d..2baa653 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -139,8 +139,6 @@ using ::com::sun::star::lang::XMultiServiceFactory;
using std::shared_ptr;
using ::std::vector;
-// STATIC DATA -----------------------------------------------------------
-
// Filter names (like in sclib.cxx)
static const sal_Char pFilterSc50[] = "StarCalc 5.0";
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 1e05785..8e45937 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -64,8 +64,6 @@ struct ScStylePair
}
-// STATIC DATA -----------------------------------------------------------
-
// Ole
void ScDocShell::SetVisArea( const Rectangle & rVisArea )
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index bfbf7fe..0eea0c2 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -25,8 +25,6 @@
#include "navipi.hxx"
#include "sc.hrc"
-// STATIC DATA -----------------------------------------------------------
-
ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP,
ScNavigatorDlg& rDlg,
SfxBindings& rBindings )
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 9a4ff48..cc998cb 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -35,8 +35,6 @@
#include "globstr.hrc"
#include "tpusrlst.hxx"
-// STATIC DATA -----------------------------------------------------------
-
#define CR (sal_Unicode)13
#define LF (sal_Unicode)10
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 6455072..a3f0dcb 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -35,8 +35,6 @@
#include <svx/drawitem.hxx>
#include <svx/xtable.hxx>
-// STATIC DATA -----------------------------------------------------------
-
ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent,
const SfxItemSet& rArgSet ) :
SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", &rArgSet),
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 07e270c..5d9f76d 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -37,8 +37,6 @@
#include "compiler.hxx"
#include "markdata.hxx"
-// STATIC DATA ---------------------------------------------------------------
-
// List box positions for print range (PR)
enum {
SC_AREASDLG_PR_ENTIRE = 1,
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index be28c11..63a5d74 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -49,8 +49,6 @@
#include "scuitphfedit.hxx"
#include <memory>
-// STATIC DATA -----------------------------------------------------------
-
// class ScHFEditPage
ScHFEditPage::ScHFEditPage( vcl::Window* pParent,
diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx
index dcf593d..e99abee7 100644
--- a/sc/source/ui/undo/target.cxx
+++ b/sc/source/ui/undo/target.cxx
@@ -19,9 +19,6 @@
#include "target.hxx"
-// STATIC DATA -----------------------------------------------------------
-
-
ScTabViewTarget::~ScTabViewTarget()
{
}
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 6bf50fc..d70e518 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -58,9 +58,6 @@
#include <memory>
#include <set>
-// STATIC DATA -----------------------------------------------------------
-
-
// TODO:
/*A*/ // SetOptimalHeight on Document, if no View
/*B*/ // linked sheets
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index aa04576..1888f09 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -58,9 +58,6 @@
#include "editdataarray.hxx"
#include <rowheightcontext.hxx>
-// STATIC DATA ---------------------------------------------------------------
-
-
// TODO:
/*A*/ // SetOptimalHeight on Document, when no View
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index d18e19f..7b352ae 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -31,8 +31,6 @@
#include "tabview.hxx"
#include <columnspanset.hxx>
-// STATIC DATA -----------------------------------------------------------
-
static OUString lcl_MetricString( long nTwips, const OUString& rText )
{
if ( nTwips <= 0 )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 02bc6c8..aadea8b 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -84,8 +84,6 @@ using ::com::sun::star::sheet::XDimensionsSupplier;
using ::std::list;
using ::std::vector;
-// STATIC DATA -----------------------------------------------------------
-
// outliner
// create outline grouping
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 000d364..b28a9a1 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -51,8 +51,6 @@
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
Point aDragStartDiff;
void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle )
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index f0b0768..b249802 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -55,8 +55,6 @@ using css::sheet::DataPilotFieldOrientation;
using std::vector;
using std::unique_ptr;
-// STATIC DATA -----------------------------------------------------------
-
DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const
{
ScDocument* pDoc = pViewData->GetDocument();
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 718b3cc..f7b9801b 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -81,8 +81,6 @@ using namespace com::sun::star;
const sal_uInt16 SC_SHRINKAGAIN_MAX = 7;
-// STATIC DATA -----------------------------------------------------------
-
class ScDrawStringsVars
{
ScOutputData* pOutput; // connection
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index a2cc775..b1c1b05 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -66,8 +66,6 @@
#include <memory>
-// STATIC DATA -----------------------------------------------------------
-
#define SC_PREVIEW_SHADOWSIZE 2
static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long>& nPages )
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 4da0e2e..10edc68 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -26,8 +26,6 @@
#include "hints.hxx"
#include "sc.hrc"
-// STATIC DATA -----------------------------------------------------------
-
void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
bool bDataChanged = false;
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index a9b4a20..faebc8f 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -40,8 +40,6 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
static Point aSwitchPos; //! Member
static bool bDidSwitch = false;
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index a2f5d10..70fecfa 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -35,8 +35,6 @@
#include "markdata.hxx"
#include <gridwin.hxx>
-// STATIC DATA -----------------------------------------------------------
-
ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
: TabBar(pParent, WB_3DLOOK | WB_MINSCROLL | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
, DropTargetHelper(this)
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 1067f7f..baa16c1 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -31,8 +31,6 @@
extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
-// STATIC DATA -----------------------------------------------------------
-
// --- Referenz-Eingabe / Fill-Cursor
void ScTabView::HideTip()
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index fb96255..d48fde8 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -58,8 +58,6 @@
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
void ScTabView::Init()
{
/* RTL layout of the view windows is done manually, because it depends on
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 223e606..2864c7b 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -65,8 +65,6 @@
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
{
// is called from paint
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index 1602ef5..663c5a1 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -30,8 +30,6 @@
#include "sc.hrc"
#include <gridwin.hxx>
-// STATIC DATA -----------------------------------------------------------
-
//! parent window for dialogs
//! Problem: OLE Server!
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 843d4ce..5b5637c 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -97,8 +97,6 @@ using ::editeng::SvxBorderLine;
using ::std::vector;
using ::std::unique_ptr;
-// STATIC DATA ---------------------------------------------------------------
-
bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData )
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 027f4f8..1e6a216 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -71,8 +71,6 @@
using namespace com::sun::star;
-// STATIC DATA ---------------------------------------------------------------
-
// GlobalName of writer-DocShell from comphelper/classids.hxx
// C U T
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 199813f..c2f08be 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -72,8 +72,6 @@
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
bool bPasteIsDrop = false;
void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index 0c472e8..a6f5e43 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -19,8 +19,6 @@
#include <sfx2/minfitem.hxx>
-// STATIC DATA -----------------------------------------------------------
-
SfxPoolItem* SfxMacroInfoItem::CreateDefault() { DBG_ASSERT(false, "No SfxMacroInfItem factory available"); return nullptr; }
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 8a20231..bfc2cc6 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -22,8 +22,6 @@
#include "sorgitm.hxx"
#include <osl/diagnose.h>
#include <typeinfo>
-// STATIC DATA -----------------------------------------------------------
-
SfxPoolItem* SfxScriptOrganizerItem::CreateDefault() { return new SfxScriptOrganizerItem; }
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index bc3fa4b..0cb152f 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -103,8 +103,6 @@ bool operator==(const util::DateTime &i_rLeft, const util::DateTime &i_rRight)
&& i_rLeft.IsUTC == i_rRight.IsUTC;
}
-// STATIC DATA -----------------------------------------------------------
-
SfxPoolItem* SfxDocumentInfoItem::CreateDefault() { return new SfxDocumentInfoItem; }
const sal_uInt16 HI_NAME = 1;
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 19b194d..714a2aa 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -29,8 +29,6 @@
#include <sfx2/sfx.hrc>
#include "dialog.hrc"
-// STATIC DATA -----------------------------------------------------------
-
// Constructor
SfxTemplateControllerItem::SfxTemplateControllerItem(
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index b8ca54f..c47850d 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -20,10 +20,6 @@
#include <sfx2/tplpitem.hxx>
#include <com/sun/star/frame/status/Template.hpp>
-
-// STATIC DATA -----------------------------------------------------------
-
-
SfxPoolItem* SfxTemplateItem::CreateDefault() { return new SfxTemplateItem; }
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 793d0a7..5e0ea22 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -29,9 +29,6 @@
#include <svl/globalnameitem.hxx>
-// STATIC DATA
-
-
SfxPoolItem* SfxGlobalNameItem::CreateDefault() { return new SfxGlobalNameItem; }
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 23492d5..940a43e 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -35,8 +35,6 @@
#include <tools/solar.h>
#include <rtl/string.hxx>
-// STATIC DATA
-
static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without '0'
#include "nranges.cxx"
#include "poolio.hxx"
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 9cfcbfa..33c7ddc 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -59,9 +59,6 @@ using namespace com::sun::star::util;
#define SRCH_PARA_CONTENT "Content"
#define SRCH_PARA_ASIANOPT "AsianOptions"
-// STATIC DATA
-
-
SfxPoolItem* SvxSearchItem::CreateDefault() { return new SvxSearchItem(0);}
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 20885f2..c41d255 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -47,8 +47,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-// STATIC DATA
-
/**
* Description:
* nFormatType: Display the formats of this Type
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index de1b789..96ca336 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -30,7 +30,6 @@
#include "shells.hrc"
#include "web.hrc"
-// STATIC DATA
#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
// type void(SfxShell*,SfxRequest&) defined in swslots.hxx
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 19f732c..4192095 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -36,7 +36,6 @@
#include <unomid.h>
-// STATIC DATA
#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
// type void(SfxShell*,SfxRequest&) defined in swslots.hxx
More information about the Libreoffice-commits
mailing list