summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-07-24 21:50:58 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-07-24 21:50:58 +0200
commitee35719f07d500aa19b6d0a166446e3135044e70 (patch)
tree391ce5f5f7be2c4d564780e25ff2671e5b6ec370 /sd
parent309e09b044b351711dee174d56f947eb1c619aaa (diff)
-Werror,-Wunused-private-field
Change-Id: I3104a661b7c00851f6e444eb6899483bfc9c7417
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx5
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hxx2
3 files changed, 1 insertions, 8 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index ceb7333d08c8..c4f892b5f2ed 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -195,8 +195,6 @@ private:
EffectSequenceHelper* mpEffectSequence;
- OUString maName;
-
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio;
::com::sun::star::uno::Any maTarget;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 86f2afd1f2ca..c4892adddf40 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -412,14 +412,12 @@ namespace sd
SlideTransitionPane::SlideTransitionPane(
Window * pParent,
ViewShellBase & rBase,
- const Size& rMinSize,
SdDrawDocument* pDoc,
const css::uno::Reference<css::frame::XFrame>& rxFrame ) :
PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui", rxFrame ),
mrBase( rBase ),
mpDrawDoc( pDoc ),
- maMinSize( rMinSize ),
mbHasSelection( false ),
mbUpdatingControls( false ),
mbIsMainViewChangePending( false ),
@@ -1089,8 +1087,7 @@ vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& r
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
{
- Size aMinSize( pParent->LogicToPixel( Size( 72, 216 ), MAP_APPFONT ) );
- pWindow = VclPtr<SlideTransitionPane>::Create( pParent, rBase, aMinSize, pDocSh->GetDoc(), rxFrame );
+ pWindow = VclPtr<SlideTransitionPane>::Create( pParent, rBase, pDocSh->GetDoc(), rxFrame );
}
return pWindow;
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index 24606c146dca..eac11eba8b94 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -54,7 +54,6 @@ public:
explicit SlideTransitionPane(
Window * pParent,
ViewShellBase & rBase,
- const Size& rMinSize,
SdDrawDocument* pDoc,
const css::uno::Reference<css::frame::XFrame>& rxFrame );
virtual ~SlideTransitionPane();
@@ -101,7 +100,6 @@ private:
ViewShellBase & mrBase;
SdDrawDocument * mpDrawDoc;
- Size maMinSize;
VclPtr<ListBox> mpLB_SLIDE_TRANSITIONS;
VclPtr<FixedText> mpFT_SPEED;