diff options
| author | Katarina Behrens <bubli@bubli.org> | 2013-06-19 23:28:15 +0200 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2013-07-31 21:02:26 +0200 |
| commit | 7d2330b6d25617631cb536950151aee0b8b306a6 (patch) | |
| tree | 0ae9603de44ec2475363cbe8f5ceb5cbd569f7d3 | |
| parent | aa98c3060e133d785c0ed2d30da3b32cdb745750 (diff) | |
sidebar: Removed overloaded function & adjusted toolbar code
Change-Id: I491e621a2a8d10ed1743cc8802816c3910784b26
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 19 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx | 5 |
2 files changed, 3 insertions, 21 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 9c5e36d27d0d..40be7b1e96da 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2319,25 +2319,6 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot // ==================================================================== -::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase ) -{ - DialogListBox* pWindow = 0; - - DrawDocShell* pDocSh = rBase.GetDocShell(); - if( pDocSh ) - { - pWindow = new DialogListBox( pParent, WB_CLIPCHILDREN|WB_TABSTOP|WB_AUTOHSCROLL ); - const Size aMinSize( pWindow->LogicToPixel( Size( 80, 256 ), MAP_APPFONT ) ); - pWindow->SetSizePixel(aMinSize); - pWindow->SetBackground(Wallpaper(Color(COL_BLUE))); - - ::Window* pPaneWindow = new CustomAnimationPane( pWindow, rBase, NULL, aMinSize ); - pWindow->SetChildWindow( pPaneWindow, aMinSize ); - pWindow->SetText( pPaneWindow->GetText() ); - } - - return pWindow; -} ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame ) { diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx index 73af7f43ed7d..d090708c0577 100644 --- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx +++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx @@ -30,7 +30,8 @@ namespace sd { class ViewShellBase; - extern ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase ); + extern ::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, + const cssu::Reference<css::frame::XFrame>& rxFrame ); namespace toolpanel { namespace controls { @@ -39,7 +40,7 @@ CustomAnimationPanel::CustomAnimationPanel(Window& i_rParentWindow, ToolPanelVie :SubToolPanel( i_rParentWindow ) ,m_pPanelViewShell( &i_rPanelViewShell ) { - mpWrappedControl = createCustomAnimationPanel( &i_rParentWindow, i_rPanelViewShell.GetViewShellBase() ); + mpWrappedControl = createCustomAnimationPanel( &i_rParentWindow, i_rPanelViewShell.GetViewShellBase(), NULL ); mpWrappedControl->Show(); } |