summaryrefslogtreecommitdiff
path: root/sd/source/ui/sidebar
diff options
context:
space:
mode:
authorKatarina Behrens <bubli@bubli.org>2013-06-19 18:08:11 +0200
committerKatarina Behrens <bubli@bubli.org>2013-07-31 21:02:26 +0200
commit4438fca46a16a59f9a24fc6c8221beaf4b039c57 (patch)
treef4a86ec81cef557308cedca823dfe625ffb701cc /sd/source/ui/sidebar
parentf89637e329e765bce0bd513c843e4e2b673c38fd (diff)
sidebar: Converted custom animations pane to .ui
Change-Id: I50b38c984b0f4b179dff84281033a328e30c3275
Diffstat (limited to 'sd/source/ui/sidebar')
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.cxx14
-rw-r--r--sd/source/ui/sidebar/CustomAnimationPanel.hxx8
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx2
3 files changed, 14 insertions, 10 deletions
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index c2f8350c3f2b..f2b38af7ba1d 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -22,22 +22,22 @@
namespace sd {
- extern ::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase);
+ extern ::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
extern sal_Int32 getCustomAnimationPanelMinimumHeight (::Window* pParent);
}
-
-
-
namespace sd { namespace sidebar {
CustomAnimationPanel::CustomAnimationPanel (
::Window* pParentWindow,
- ViewShellBase& rViewShellBase)
+ ViewShellBase& rViewShellBase,
+ const cssu::Reference<css::frame::XFrame>& rxFrame
+ )
: PanelBase(
pParentWindow,
- rViewShellBase)
+ rViewShellBase),
+ mxFrame( rxFrame )
{
#ifdef DEBUG
SetText(OUString("sd:CustomAnimationPanel"));
@@ -58,7 +58,7 @@ CustomAnimationPanel::~CustomAnimationPanel (void)
::Window* pParentWindow,
ViewShellBase& rViewShellBase)
{
- return createCustomAnimationPanel(pParentWindow, rViewShellBase);
+ return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame);
}
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
index 2fb71c1b4ec6..9c2732bca9e0 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx
@@ -19,7 +19,7 @@
#define SD_SIDEBAR_CUSTOM_ANIMATION_PANEL_HXX
#include "PanelBase.hxx"
-
+#include <sfx2/sidebar/ControlFactory.hxx>
namespace sd { namespace sidebar {
@@ -29,7 +29,8 @@ class CustomAnimationPanel
public:
CustomAnimationPanel (
::Window* pParentWindow,
- ViewShellBase& rViewShellBase);
+ ViewShellBase& rViewShellBase,
+ const cssu::Reference<css::frame::XFrame>& rxFrame);
virtual ~CustomAnimationPanel (void);
// ILayoutableWindow
@@ -39,6 +40,9 @@ protected:
virtual ::Window* CreateWrappedControl (
::Window* pParentWindow,
ViewShellBase& rViewShellBase);
+
+private:
+ cssu::Reference<css::frame::XFrame> mxFrame;
};
} } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index c2f0a7441eb2..f1677f32de07 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -180,7 +180,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
#define EndsWith(s,t) s.endsWithAsciiL(t,strlen(t))
if (EndsWith(rsUIElementResourceURL, gsResourceNameCustomAnimations))
- pControl = new CustomAnimationPanel(pParentWindow, *pBase);
+ pControl = new CustomAnimationPanel(pParentWindow, *pBase, xFrame);
else if (EndsWith(rsUIElementResourceURL, gsResourceNameLayouts))
pControl = new LayoutMenu(pParentWindow, *pBase, xSidebar);
else if (EndsWith(rsUIElementResourceURL, gsResourceNameAllMasterPages))