summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-11 11:22:17 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-11 17:11:12 +0200
commit6928f43c86d05b9229e24d6d199b3f139031d596 (patch)
tree044dadef89408856888da0684b62209a6e9da315 /sd/source/ui/inc
parent69c9acd0d275fba2b387bd64584227f5ffcfce0d (diff)
-Werror,-Wunused-private-field (various sd)
Change-Id: Ib0756e3730783f2c842a835782452279ad8f189b
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/OutlineView.hxx1
-rw-r--r--sd/source/ui/inc/PreviewRenderer.hxx1
-rw-r--r--sd/source/ui/inc/SdUnoDrawView.hxx4
-rw-r--r--sd/source/ui/inc/SdUnoOutlineView.hxx9
-rw-r--r--sd/source/ui/inc/SdUnoSlideView.hxx10
-rw-r--r--sd/source/ui/inc/dlg_char.hxx1
-rw-r--r--sd/source/ui/inc/dlgpage.hxx2
-rw-r--r--sd/source/ui/inc/headerfooterdlg.hxx1
-rw-r--r--sd/source/ui/inc/morphdlg.hxx2
-rw-r--r--sd/source/ui/inc/paragr.hxx2
-rw-r--r--sd/source/ui/inc/prltempl.hxx2
-rw-r--r--sd/source/ui/inc/sdpreslt.hxx3
-rw-r--r--sd/source/ui/inc/undopage.hxx3
13 files changed, 2 insertions, 39 deletions
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 4bf14d27fae9..c9bda344ae99 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -221,7 +221,6 @@ private:
std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard;
Font maPageNumberFont;
- sal_Int32 mnPageNumberWidthPixel;
Font maBulletFont;
SvxLRSpaceItem maLRSpaceItem;
diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx
index cfdf9a9efa1f..7d83719df9c8 100644
--- a/sd/source/ui/inc/PreviewRenderer.hxx
+++ b/sd/source/ui/inc/PreviewRenderer.hxx
@@ -131,7 +131,6 @@ private:
::std::auto_ptr<VirtualDevice> mpPreviewDevice;
::std::auto_ptr<DrawView> mpView;
DrawDocShell* mpDocShellOfView;
- int mnWidthOfView;
const Color maFrameColor;
const bool mbHasFrame;
static const int snSubstitutionTextSize;
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index ccfd3caf11dd..00cf7228ed11 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -21,7 +21,6 @@
#define SD_UNO_DRAW_VIEW_HXX
#include "DrawSubController.hxx"
-#include "DrawController.hxx"
#include "DrawViewShell.hxx"
#include <cppuhelper/basemutex.hxx>
@@ -35,7 +34,6 @@ class XLayer;
namespace sd {
-class DrawController;
class DrawViewShell;
/** This class implements the DrawViewShell specific part of the controller.
@@ -46,7 +44,6 @@ class SdUnoDrawView
{
public:
SdUnoDrawView (
- DrawController& rController,
DrawViewShell& rViewShell,
View& rView) throw();
virtual ~SdUnoDrawView (void) throw();
@@ -132,7 +129,6 @@ protected:
::com::sun::star::uno::Any getDrawViewMode() const;
private:
- DrawController& mrController;
DrawViewShell& mrDrawViewShell;
sd::View& mrView;
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index 1c812be81b74..7960a124966b 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -29,10 +29,7 @@ namespace css = ::com::sun::star;
namespace sd {
-class DrawController;
class OutlineViewShell;
-class View;
-
/** This class implements the OutlineViewShell specific part of the controller.
*/
@@ -42,9 +39,7 @@ class SdUnoOutlineView
{
public:
SdUnoOutlineView (
- DrawController& rController,
- OutlineViewShell& rViewShell,
- View& rView) throw();
+ OutlineViewShell& rViewShell) throw();
virtual ~SdUnoOutlineView (void) throw();
virtual void SAL_CALL disposing (void);
@@ -107,9 +102,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
- DrawController& mrController;
OutlineViewShell& mrOutlineViewShell;
- sd::View& mrView;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index 8264522de3fb..9cecb799f5ea 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -41,10 +41,6 @@ class SlideSorter;
namespace sd {
-class DrawController;
-class View;
-
-
/** This class implements the SlideSorter specific part of the
controller.
*/
@@ -54,9 +50,7 @@ class SdUnoSlideView
{
public:
SdUnoSlideView (
- DrawController& rController,
- slidesorter::SlideSorter& rSlideSorter,
- View& rView) throw();
+ slidesorter::SlideSorter& rSlideSorter) throw();
virtual ~SdUnoSlideView (void) throw();
// XSelectionSupplier
@@ -111,9 +105,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
- DrawController& mrController;
slidesorter::SlideSorter& mrSlideSorter;
- sd::View& mrView;
/*
virtual void FillPropertyTable (
::std::vector< ::com::sun::star::beans::Property>& rProperties);
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx
index fe5ed827c59e..67175f7785a0 100644
--- a/sd/source/ui/inc/dlg_char.hxx
+++ b/sd/source/ui/inc/dlg_char.hxx
@@ -37,7 +37,6 @@ class SfxObjectShell;
class SdCharDlg : public SfxTabDialog
{
private:
- const SfxItemSet& rOutAttrs;
const SfxObjectShell& rDocShell;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 713e620ec4ce..6089f718b1c7 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -45,8 +45,6 @@ typedef sal_uInt16 ChangeType;
class SdPageDlg : public SfxTabDialog
{
private:
- const SfxItemSet& mrOutAttrs;
-
const SfxObjectShell* mpDocShell;
XColorListRef mpColorList;
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 53dea9e21ec4..20055cd76787 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -57,7 +57,6 @@ private:
HeaderFooterSettings maSlideSettings;
HeaderFooterSettings maNotesHandoutSettings;
- bool mbNotOnTitle;
SdDrawDocument* mpDoc;
SdPage* mpCurrentPage;
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index 6e762754ed4f..a14ad3f04d6d 100644
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -63,8 +63,6 @@ private:
OKButton aBtnOK;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
- SdrObject* pSdrObj1;
- SdrObject* pSdrObj2;
void LoadSettings();
};
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 89d77c7b9d54..5b0bc499d0c9 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -42,8 +42,6 @@
class SdParagraphDlg : public SfxTabDialog
{
private:
- const SfxItemSet& rOutAttrs;
-
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index 7c49f3a27845..f27dd9c9785c 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -66,8 +66,6 @@ private:
ChangeType nBitmapListState;
ChangeType nGradientListState;
ChangeType nHatchingListState;
- ChangeType nLineEndListState;
- ChangeType nDashListState;
PresentationObjects ePO;
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index db744714ce35..014c7c5e418d 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -40,7 +40,6 @@ class SfxItemSet;
namespace sd {
class DrawDocShell;
-class ViewShell;
}
@@ -51,7 +50,6 @@ class SdPresLayoutDlg
public:
SdPresLayoutDlg(
::sd::DrawDocShell* pDocShell,
- ::sd::ViewShell* pViewShell,
::Window* pWindow,
const SfxItemSet& rInAttrs);
@@ -64,7 +62,6 @@ public:
private:
::sd::DrawDocShell* mpDocSh;
- ::sd::ViewShell* mpViewSh;
FixedText maFtLayout;
ValueSet maVS;
OKButton maBtnOK;
diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx
index 10a902fe8613..964d4bb869bf 100644
--- a/sd/source/ui/inc/undopage.hxx
+++ b/sd/source/ui/inc/undopage.hxx
@@ -39,7 +39,6 @@ class SdPageFormatUndoAction : public SdUndoAction
sal_Int32 mnOldRight;
sal_Int32 mnOldUpper;
sal_Int32 mnOldLower;
- sal_Bool mbOldScale;
Orientation meOldOrientation;
sal_uInt16 mnOldPaperBin;
sal_Bool mbOldFullSize;
@@ -63,7 +62,6 @@ public:
sal_Int32 nOldRgt,
sal_Int32 nOldUpr,
sal_Int32 nOldLwr,
- sal_Bool bOldScl,
Orientation eOldOrient,
sal_uInt16 nOPaperBin,
sal_Bool bOFullSize,
@@ -85,7 +83,6 @@ public:
mnOldRight (nOldRgt),
mnOldUpper (nOldUpr),
mnOldLower (nOldLwr),
- mbOldScale (bOldScl),
meOldOrientation(eOldOrient),
mnOldPaperBin (nOPaperBin),
mbOldFullSize (bOFullSize),