sc/source/ui/condformat/condformatdlg.cxx | 4 +---
sc/source/ui/condformat/condformatmgr.cxx | 11 +++++------
sc/source/ui/dbgui/sortkeydlg.cxx | 1 -
sc/source/ui/inc/condformatdlg.hxx | 4 ----
sc/source/ui/inc/condformatmgr.hxx | 5 ++---
sc/source/ui/inc/sortkeydlg.hxx | 3 ---
6 files changed, 8 insertions(+), 20 deletions(-)
New commits:
commit 4ee829af622a2932ffad8f9712e2563579746cf0
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Dec 6 18:15:33 2012 +0100
-Werror,-Wunused-private-field
Change-Id: I1866be3b7feb42f0b1a24bf214a1276b76f883b5
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 3398188..6236432 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -368,9 +368,7 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent,
ScDocument* pDoc, const ScCond
maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos,
eType ),
maPos(rPos),
mpDoc(pDoc),
- mpFormat(pFormat),
- mpLastEdit(NULL),
- meType(eType)
+ mpLastEdit(NULL)
{
rtl::OUStringBuffer aTitle( GetText() );
aTitle.append(rtl::OUString(" "));
diff --git a/sc/source/ui/condformat/condformatmgr.cxx
b/sc/source/ui/condformat/condformatmgr.cxx
index 5a5ea1b..af9e383 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -37,12 +37,11 @@
#define ITEMID_CONDITION 2
-ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent,
ScDocument* pDoc, ScConditionalFormatList* pFormatList, const ScAddress& rPos):
+ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent,
ScDocument* pDoc, ScConditionalFormatList* pFormatList):
SvTabListBox(pParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP),
maHeaderBar( pParent, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
mpDoc(pDoc),
- mpFormatList(pFormatList),
- mrPos(rPos)
+ mpFormatList(pFormatList)
{
Size aBoxSize( pParent->GetOutputSizePixel() );
@@ -142,9 +141,9 @@ IMPL_LINK_NOARG(ScCondFormatManagerWindow, HeaderEndDragHdl)
return 0;
}
-ScCondFormatManagerCtrl::ScCondFormatManagerCtrl(Window* pParent, ScDocument*
pDoc, ScConditionalFormatList* pFormatList, const ScAddress& rPos):
+ScCondFormatManagerCtrl::ScCondFormatManagerCtrl(Window* pParent, ScDocument*
pDoc, ScConditionalFormatList* pFormatList):
Control(pParent, ScResId(CTRL_TABLE)),
- maWdManager(this, pDoc, pFormatList, rPos)
+ maWdManager(this, pDoc, pFormatList)
{
}
@@ -172,7 +171,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window*
pParent, ScDocument* pDoc
maBtnCancel(this, ScResId(BTN_CANCEL)),
maFlLine(this, ScResId(FL_LINE)),
mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) :
NULL),
- maCtrlManager(this, pDoc, mpFormatList, rPos),
+ maCtrlManager(this, pDoc, mpFormatList),
mpDoc(pDoc),
maPos(rPos),
mbModified(false)
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 45d65ca..76a8747 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -109,7 +109,6 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent,
ScSortKeyItems& rItems)
: m_aSortWin(pParent, rItems)
, m_rScrolledWindow(*pParent->get<VclScrolledWindow>("SortCriteriaPage"))
, m_rVertScroll(m_rScrolledWindow.getVertScrollBar())
- , nThumbPos(0)
{
m_rVertScroll.EnableDrag();
m_rVertScroll.Show();
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 588d04d..5541c49 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -112,12 +112,8 @@ private:
ScAddress maPos;
ScDocument* mpDoc;
- const ScConditionalFormat* mpFormat;
-
formula::RefEdit* mpLastEdit;
- condformat::dialog::ScCondFormatDialogType meType;
-
DECL_LINK( EdRangeModifyHdl, Edit* );
protected:
diff --git a/sc/source/ui/inc/condformatmgr.hxx
b/sc/source/ui/inc/condformatmgr.hxx
index c13ff6b..d3c9099 100644
--- a/sc/source/ui/inc/condformatmgr.hxx
+++ b/sc/source/ui/inc/condformatmgr.hxx
@@ -50,13 +50,12 @@ private:
HeaderBar maHeaderBar;
ScDocument* mpDoc;
ScConditionalFormatList* mpFormatList;
- const ScAddress& mrPos;
std::map<SvTreeListEntry*, sal_Int32> maMapLBoxEntryToCondIndex;
DECL_LINK( HeaderEndDragHdl, void* );
public:
- ScCondFormatManagerWindow( Window* pParent, ScDocument* pDoc,
ScConditionalFormatList* pFormatList, const ScAddress& rPos );
+ ScCondFormatManagerWindow( Window* pParent, ScDocument* pDoc,
ScConditionalFormatList* pFormatList );
void DeleteSelection();
ScConditionalFormat* GetSelection();
@@ -66,7 +65,7 @@ public:
class ScCondFormatManagerCtrl : Control
{
public:
- ScCondFormatManagerCtrl(Window* pParent, ScDocument* pDoc,
ScConditionalFormatList* pFormatList, const ScAddress& rPos);
+ ScCondFormatManagerCtrl(Window* pParent, ScDocument* pDoc,
ScConditionalFormatList* pFormatList);
ScConditionalFormat* GetSelection();
void DeleteSelection();
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index ddec0f6..dd394f1 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -69,7 +69,6 @@ class ScSortKeyWindow
{
private:
VclBox* m_pBox;
- sal_Int32 nScrollPos;
sal_Int32 nItemHeight;
ScSortKeyItems& mrSortKeyItems;
@@ -93,8 +92,6 @@ private:
VclScrolledWindow& m_rScrolledWindow;
ScrollBar& m_rVertScroll;
- sal_Int32 nThumbPos;
-
DECL_LINK(ScrollHdl, ScrollBar*);
public:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
