summaryrefslogtreecommitdiff
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
parent69c9acd0d275fba2b387bd64584227f5ffcfce0d (diff)
-Werror,-Wunused-private-field (various sd)
Change-Id: Ib0756e3730783f2c842a835782452279ad8f189b
-rw-r--r--sd/inc/sdabstdlg.hxx3
-rw-r--r--sd/source/filter/html/HtmlOptionsDialog.cxx10
-rw-r--r--sd/source/filter/html/htmlex.hxx1
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx11
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx9
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx1
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.hxx6
-rw-r--r--sd/source/ui/dlg/dlgchar.cxx1
-rw-r--r--sd/source/ui/dlg/dlgpage.cxx1
-rw-r--r--sd/source/ui/dlg/paragr.cxx1
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx4
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx3
-rw-r--r--sd/source/ui/func/fuprlout.cxx2
-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
-rw-r--r--sd/source/ui/slideshow/PaneHider.cxx5
-rw-r--r--sd/source/ui/slideshow/PaneHider.hxx3
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx1
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx1
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx1
-rw-r--r--sd/source/ui/unoidl/SdUnoDrawView.cxx2
-rw-r--r--sd/source/ui/unoidl/SdUnoOutlineView.cxx8
-rw-r--r--sd/source/ui/unoidl/SdUnoSlideView.cxx8
-rw-r--r--sd/source/ui/view/drviewsa.cxx1
-rw-r--r--sd/source/ui/view/outlnvsh.cxx4
-rw-r--r--sd/source/ui/view/outlview.cxx1
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx8
-rw-r--r--sd/source/ui/view/viewshe2.cxx2
43 files changed, 26 insertions, 121 deletions
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 66dcc97eb353..b3324402b0cd 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -45,7 +45,6 @@
namespace sd {
class View;
class DrawDocShell;
- class ViewShell;
class DrawView;
}
@@ -203,7 +202,7 @@ public:
const std::vector<String> &rPageNames, SdCustomShowList* pCSList ) = 0;
virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) = 0;
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
- virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
+ virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0;
virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0;
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 55957eca3ff7..bc39ae88983a 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -62,7 +62,6 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5
XServiceInfo
>
{
- const Reference< XMultiServiceFactory > &mrxMgr;
Sequence< PropertyValue > maMediaDescriptor;
Sequence< PropertyValue > maFilterDataSequence;
::rtl::OUString aDialogTitle;
@@ -70,7 +69,7 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5
public:
- SdHtmlOptionsDialog( const Reference< XMultiServiceFactory >& _rxORB );
+ SdHtmlOptionsDialog();
~SdHtmlOptionsDialog();
// XInterface
@@ -110,9 +109,9 @@ public:
Reference< XInterface >
SAL_CALL SdHtmlOptionsDialog_CreateInstance(
- const Reference< XMultiServiceFactory > & _rxFactory )
+ SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
{
- return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog( _rxFactory ) );
+ return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog );
}
::rtl::OUString SdHtmlOptionsDialog_getImplementationName()
@@ -138,8 +137,7 @@ Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceName
// -----------------------------------------------------------------------------
-SdHtmlOptionsDialog::SdHtmlOptionsDialog( const Reference< XMultiServiceFactory > & xMgr ) :
- mrxMgr ( xMgr ),
+SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
meDocType ( DOCUMENT_TYPE_DRAW )
{
}
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 6c008a6370dc..0b4a4aa3b9a1 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -113,7 +113,6 @@ class HtmlExport
bool mbHeader;
bool mbNotes;
bool mbFrames;
- bool mbKiosk;
String maIndex;
String maEMail;
String maAuthor;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 049fa9f4059f..5db3c269a050 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1149,17 +1149,6 @@ private:
CheckBox* mpCBSmoothEnd;
CheckBox* mpCBAutoRestart;
- FixedLine* mpFLPlay;
- RadioButton* mpRBFromStart;
- RadioButton* mpRBFromLast;
- RadioButton* mpRBFromTime;
- MetricField* mpMFStartTime;
- FixedLine* mpFLStop;
- RadioButton* mpRBStopOnClick;
- RadioButton* mpRBStopOnNextSlide;
- RadioButton* mpRBStopAfterSlides;
- MetricField* mpMFStopAfterSlides;
-
FixedLine* mpFLEnhancements;
FixedText* mpFTSound;
ListBox* mpLBSound;
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 761fe3003336..55393d8ab8fb 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -358,7 +358,7 @@ CustomAnimationListEntry::~CustomAnimationListEntry()
class CustomAnimationTriggerEntryItem : public SvLBoxString
{
public:
- CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent );
+ CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription );
virtual ~CustomAnimationTriggerEntryItem();
virtual sal_uInt16 IsA();
void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* );
@@ -367,14 +367,13 @@ public:
void Clone( SvLBoxItem* pSource );
private:
- CustomAnimationList* mpParent;
OUString maDescription;
};
// --------------------------------------------------------------------
-CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent )
-: SvLBoxString( pEntry, nFlags, aDescription ), mpParent( pParent ), maDescription( aDescription )
+CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription )
+: SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription )
{
}
@@ -672,7 +671,7 @@ void CustomAnimationList::update()
OUString aDescription = String( SdResId( STR_CUSTOMANIMATION_TRIGGER ) );
aDescription += ": ";
aDescription += getShapeDescription( xShape, false );
- pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription, this ) );
+ pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription ) );
Insert( pLBoxEntry );
SvViewData* pViewData = GetViewData( pLBoxEntry );
if( pViewData )
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 0c59799191bd..c809ecb8b198 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -81,7 +81,6 @@ ClientBox::ClientBox( Dialog* pParent, RemoteServer *pServer,
m_bHasScrollBar( false ),
m_bHasActive( false ),
m_bNeedsRecalc( true ),
- m_bHasNew( false ),
m_bInCheckMode( false ),
m_bAdjustActive( false ),
m_bInDelete( false ),
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index fd2b49e55ca0..c9d272e3ecc9 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -35,7 +35,6 @@
#include "svtools/extensionlistbox.hxx"
#include "svtools/fixedhyper.hxx"
#include "cppuhelper/implbase1.hxx"
-#include "unotools/collatorwrapper.hxx"
#include "com/sun/star/lang/Locale.hpp"
#include "com/sun/star/lang/XEventListener.hpp"
@@ -103,7 +102,6 @@ class ClientBox:
bool m_bHasScrollBar;
bool m_bHasActive;
bool m_bNeedsRecalc;
- bool m_bHasNew;
bool m_bInCheckMode;
bool m_bAdjustActive;
bool m_bInDelete;
@@ -136,8 +134,6 @@ class ClientBox:
std::vector< TClientBoxEntry > m_vEntries;
std::vector< TClientBoxEntry > m_vRemovedEntries;
- CollatorWrapper *m_pCollator;
-
void CalcActiveHeight( const long nPos );
long GetTotalHeight() const;
void SetupScrollBar();
@@ -194,4 +190,4 @@ public:
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 2d45e052daf0..f33bfd1065da 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -42,7 +42,6 @@
SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell ) :
SfxTabDialog ( pParent, SdResId( TAB_CHAR ), pAttr ),
- rOutAttrs ( *pAttr ),
rDocShell ( *pDocShell )
{
FreeResource();
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index af8d7a145cf1..bf51813acf5e 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -51,7 +51,6 @@
SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) :
SfxTabDialog ( pParent, SdResId( TAB_PAGE ), pAttr ),
- mrOutAttrs ( *pAttr ),
mpDocShell ( pDocSh )
{
SvxColorListItem aColorListItem(*( (const SvxColorListItem*)
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index c087644a818a..3ef9dbfdf089 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -167,7 +167,6 @@ IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl)
SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr )
: SfxTabDialog( pParent, SdResId( TAB_PARAGRAPH ), pAttr )
-, rOutAttrs( *pAttr )
{
FreeResource();
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index e1a46666f3d0..a00f663d489b 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -505,9 +505,9 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplate
}
// add for SdPresLayoutDlg begin
-AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs)
+AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs)
{
- return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pViewShell, pWindow, rInAttrs ) );
+ return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pWindow, rInAttrs ) );
}
// add for SdPresLayoutDlg end
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 7fd17813f2f8..65c5fad42962 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -277,7 +277,7 @@ public:
const std::vector<String> &rPageNames, SdCustomShowList* pCSList );
virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ); // ad for RemoteDialog
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool );
- virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
+ virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView );
virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView );
virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell );
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 419e97c4b6f0..f785e5073438 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -45,7 +45,6 @@
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "DrawDocShell.hxx"
-#include "ViewShell.hxx"
#define DOCUMENT_TOKEN (sal_Unicode('#'))
@@ -57,12 +56,10 @@
SdPresLayoutDlg::SdPresLayoutDlg(
::sd::DrawDocShell* pDocShell,
- ::sd::ViewShell* pViewShell,
::Window* pWindow,
const SfxItemSet& rInAttrs ):
ModalDialog (pWindow, SdResId(DLG_PRESLT)),
mpDocSh ( pDocShell ),
- mpViewSh ( pViewShell ),
maFtLayout (this, SdResId(FT_LAYOUT)),
maVS (this, SdResId(VS_LAYOUT)),
maBtnOK (this, SdResId(BTN_OK)),
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 725c3da1e135..5641f1a12574 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -159,7 +159,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
else
{
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, mpViewShell, NULL, aSet ) : 0;
+ AbstractSdPresLayoutDlg* pDlg = pFact ? pFact->CreateSdPresLayoutDlg(mpDocSh, NULL, aSet ) : 0;
sal_uInt16 nResult = pDlg ? pDlg->Execute() : RET_CANCEL;
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),
diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx
index b12c28c66eff..c87f7532279d 100644
--- a/sd/source/ui/slideshow/PaneHider.cxx
+++ b/sd/source/ui/slideshow/PaneHider.cxx
@@ -42,10 +42,7 @@ using ::com::sun::star::lang::DisposedException;
namespace sd {
PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
- : mrViewShell(rViewShell),
- mbWindowVisibilitySaved(false),
- mbOriginalLeftPaneWindowVisibility(false),
- mbOriginalRightPaneWindowVisibility(false)
+ : mrViewShell(rViewShell)
{
// Hide the left and right pane windows when a slideshow exists and is
// not full screen.
diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx
index 1ca85b48e696..1b0422b67293 100644
--- a/sd/source/ui/slideshow/PaneHider.hxx
+++ b/sd/source/ui/slideshow/PaneHider.hxx
@@ -50,9 +50,6 @@ private:
/** Remember whether the visibility states of the windows of the panes
has been modified and have to be restored.
*/
- bool mbWindowVisibilitySaved;
- bool mbOriginalLeftPaneWindowVisibility;
- bool mbOriginalRightPaneWindowVisibility;
::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController>
mxConfigurationController;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 04d59212d694..c0102dca2773 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -122,7 +122,6 @@ public:
private:
SharedSdWindow mpWindow;
Size maPageObjectSize;
- double mnModelToWindowScale;
Rectangle maFocusIndicatorBoundingBox;
Rectangle maPageObjectBoundingBox;
Rectangle maPageNumberAreaBoundingBox;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 7b874c0a7715..8fdd9165946a 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -260,9 +260,7 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController
// Create uno controller for the main view shell.
xSubController = Reference<drawing::XDrawSubController>(
new SdUnoSlideView (
- GetViewShellBase().GetDrawController(),
- *mpSlideSorter,
- *GetView()));
+ *mpSlideSorter));
}
return xSubController;
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index 5b1b671f57eb..b044dfeee8ff 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -52,7 +52,6 @@ PageObjectLayouter::PageObjectLayouter (
const sal_Int32 nPageCount)
: mpWindow(rpWindow),
maPageObjectSize(rPageObjectWindowSize.Width(), rPageObjectWindowSize.Height()),
- mnModelToWindowScale(1),
maPageObjectBoundingBox(),
maPageNumberAreaBoundingBox(),
maPreviewBoundingBox(),
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 59a41bd7eeeb..a7817bca7b8d 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -895,7 +895,6 @@ void TableDesignPane::FillDesignPreviewControl()
TableDesignDialog::TableDesignDialog(::Window* pParent, ViewShellBase& rBase )
: ModalDialog( pParent, SdResId( DLG_TABLEDESIGNPANE ))
-, mrBase( rBase )
{
mxFlSep1.reset( new FixedLine( this, SdResId( FL_SEP1 ) ) );
mxFlSep2.reset( new FixedLine( this, SdResId( FL_SEP2 ) ) );
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 5df94d9825c8..12d1e02a6274 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -111,7 +111,6 @@ public:
virtual short Execute();
private:
- ViewShellBase& mrBase;
boost::scoped_ptr< TableDesignPane > mpDesignPane;
boost::scoped_ptr< FixedLine > mxFlSep1;
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index bc1015b26483..fe2c8ad00a26 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -79,7 +79,6 @@ PreviewRenderer::PreviewRenderer (
: mpPreviewDevice (new VirtualDevice()),
mpView(NULL),
mpDocShellOfView(NULL),
- mnWidthOfView(0),
maFrameColor (svtools::ColorConfig().GetColorValue(svtools::DOCBOUNDARIES).nColor),
mbHasFrame(bHasFrame)
{
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index b34f104282a9..95fb31595ad7 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -63,11 +63,9 @@ using namespace ::com::sun::star::drawing;
namespace sd {
SdUnoDrawView::SdUnoDrawView(
- DrawController& rController,
DrawViewShell& rViewShell,
View& rView) throw()
: DrawSubControllerInterfaceBase(m_aMutex),
- mrController(rController),
mrDrawViewShell(rViewShell),
mrView(rView)
{
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 01bc4790697a..879e185b6cb1 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -51,13 +51,9 @@ using namespace ::com::sun::star::uno;
namespace sd {
SdUnoOutlineView::SdUnoOutlineView(
- DrawController& rController,
- OutlineViewShell& rViewShell,
- View& rView) throw()
+ OutlineViewShell& rViewShell) throw()
: DrawSubControllerInterfaceBase(m_aMutex),
- mrController(rController),
- mrOutlineViewShell(rViewShell),
- mrView(rView)
+ mrOutlineViewShell(rViewShell)
{
}
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 041398a9fd4e..b47a3f74a6b0 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -51,13 +51,9 @@ namespace sd {
SdUnoSlideView::SdUnoSlideView (
- DrawController& rController,
- slidesorter::SlideSorter& rSlideSorter,
- View& rView) throw()
+ slidesorter::SlideSorter& rSlideSorter) throw()
: DrawSubControllerInterfaceBase(m_aMutex),
- mrController(rController),
- mrSlideSorter(rSlideSorter),
- mrView(rView)
+ mrSlideSorter(rSlideSorter)
{
}
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 22464d2d56be..f3844e77cb4b 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -434,7 +434,6 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo
// Create uno sub controller for the main view shell.
xSubController = css::uno::Reference<css::drawing::XDrawSubController>(
new SdUnoDrawView (
- GetViewShellBase().GetDrawController(),
*this,
*GetView()));
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index acee1e622371..fbf2b18b2720 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -192,9 +192,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo
// Create uno sub controller for the main view shell.
xSubController = Reference<drawing::XDrawSubController>(
new SdUnoOutlineView (
- GetViewShellBase().GetDrawController(),
- *this,
- *GetView()));
+ *this));
}
return xSubController;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index d7834b3af1d2..43a06aa9127d 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -115,7 +115,6 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh
, mbFirstPaint(sal_True)
, mpProgress(NULL)
, maDocColor( COL_WHITE )
-, mnPageNumberWidthPixel( 0 )
, maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE )
{
sal_Bool bInitOutliner = sal_False;
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 236655b6d9fb..392e47392428 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -122,7 +122,7 @@ class ChangePlaceholderTag : public SmartTag
{
friend class ImageButtonHdl;
public:
- ChangePlaceholderTag( ViewOverlayManager& rManager, ::sd::View& rView, SdrObject& rPlaceholderObj );
+ ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj );
virtual ~ChangePlaceholderTag();
/** returns true if the SmartTag handled the event. */
@@ -140,7 +140,6 @@ protected:
virtual void deselect();
private:
- ViewOverlayManager& mrManager;
SdrObjectWeakRef mxPlaceholderObj;
};
@@ -315,9 +314,8 @@ Pointer ImageButtonHdl::GetPointer() const
// ====================================================================
-ChangePlaceholderTag::ChangePlaceholderTag( ViewOverlayManager& rManager, ::sd::View& rView, SdrObject& rPlaceholderObj )
+ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlaceholderObj )
: SmartTag( rView )
-, mrManager( rManager )
, mxPlaceholderObj( &rPlaceholderObj )
{
}
@@ -565,7 +563,7 @@ bool ViewOverlayManager::CreateTags()
{
if( (*iter)->IsEmptyPresObj() && ((*iter)->GetObjIdentifier() == OBJ_OUTLINETEXT) && (mrBase.GetDrawView()->GetTextEditObject() != (*iter)) )
{
- rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *this, *mrBase.GetMainViewShell()->GetView(), *(*iter) ) );
+ rtl::Reference< SmartTag > xTag( new ChangePlaceholderTag( *mrBase.GetMainViewShell()->GetView(), *(*iter) ) );
maTagVector.push_back(xTag);
bChanges = true;
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index afd7ac04bf98..c1ce1e5e27f3 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -552,7 +552,6 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
pPage->GetSize(),
pPage->GetLftBorder(), pPage->GetRgtBorder(),
pPage->GetUppBorder(), pPage->GetLwrBorder(),
- pPage->IsScaleObjects(),
pPage->GetOrientation(),
pPage->GetPaperBin(),
pPage->IsBackgroundFullSize(),
@@ -603,7 +602,6 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize,
pPage->GetSize(),
pPage->GetLftBorder(), pPage->GetRgtBorder(),
pPage->GetUppBorder(), pPage->GetLwrBorder(),
- pPage->IsScaleObjects(),
pPage->GetOrientation(),
pPage->GetPaperBin(),
pPage->IsBackgroundFullSize(),