sc/source/filter/inc/lotrange.hxx | 2 --
sc/source/filter/lotus/tool.cxx | 3 ---
sc/source/ui/cctrl/checklistmenu.cxx | 2 --
sc/source/ui/inc/checklistmenu.hxx | 3 ++-
4 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit f9db57dd5bf322382110c8ae1901677c7d88b516
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jun 30 13:43:33 2017 +0300
ScMenuFloatingWindow::MENU_NOT_SELECTED can be constexpr
Change-Id: Idd07133385d6986b3ba09dd58b2d3bba3a17f822
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 0a42c36d2c45..42d56f2ad821 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -71,8 +71,6 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData,
TimeoutHdl, Timer *, void
mpParent->handleMenuTimeout(this);
}
-size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
-
ScMenuFloatingWindow::ScMenuFloatingWindow(vcl::Window* pParent, ScDocument*
pDoc, sal_uInt16 nMenuStackLevel) :
PopupMenuFloatingWindow(pParent),
maOpenTimer(this),
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index 6ac7c4879fc2..9d433568ce26 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -37,7 +37,8 @@ class ScAccessibleFilterMenu;
class ScMenuFloatingWindow : public PopupMenuFloatingWindow
{
public:
- static size_t MENU_NOT_SELECTED;
+ static constexpr size_t MENU_NOT_SELECTED = 999;
+
/**
* Action to perform when an event takes place. Create a sub-class of
* this to implement the desired action.
commit f70665d6f2c6f95f3aa8901349cc6314e0801e36
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jun 30 13:38:02 2017 +0300
Bin two unused static member variables
Change-Id: Ia1d1e56bae260a1085523fc6866ec6526aa16f10
diff --git a/sc/source/filter/inc/lotrange.hxx
b/sc/source/filter/inc/lotrange.hxx
index 254c88c64772..b09416186938 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -89,8 +89,6 @@ private:
LOTUS_ROOT* m_pLotRoot;
LR_ID nIdCnt;
ScComplexRefData aComplRef;
- static SCCOL nEingCol;
- static SCROW nEingRow;
std::vector<LotusRange*> maRanges;
public:
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 3b83d570ce6f..8a758c75f1cf 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -389,9 +389,6 @@ LotusRangeList::LotusRangeList(LOTUS_ROOT* pLotRoot)
pSingRef->SetFlag3D( false );
}
-SCCOL LotusRangeList::nEingCol;
-SCROW LotusRangeList::nEingRow;
-
LotusRangeList::~LotusRangeList ()
{
std::vector<LotusRange*>::iterator pIter;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
