sfx2/inc/templatedlg.hxx | 1 - sfx2/source/doc/templatedlg.cxx | 13 ++++--------- sfx2/source/doc/templatedlg.src | 6 ------ 3 files changed, 4 insertions(+), 16 deletions(-)
New commits: commit 2c8202b611dcaab72c0ead20339ce4daacca0810 Author: Cédric Bosdonnat <cedric.bosdon...@free.fr> Date: Tue Mar 19 10:13:16 2013 +0100 Template Manager: fixed TabStops for the toolbars Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650 (cherry picked from commit eff94128b8434501a6f9c26a5a47cfd7d408f472) Reviewed-on: https://gerrit.libreoffice.org/2845 Reviewed-by: Noel Power <noel.po...@suse.com> Tested-by: Noel Power <noel.po...@suse.com> diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx index 095292e..0d7eb78 100644 --- a/sfx2/inc/templatedlg.hxx +++ b/sfx2/inc/templatedlg.hxx @@ -128,7 +128,6 @@ private: TabControl maTabControl; TabPage maTabPage; - Control *mpToolbars; Edit *mpSearchEdit; ToolBox *mpViewBar; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index f0a16b35..e9f85eb 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -113,11 +113,10 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) : ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)), maTabControl(this,SfxResId(TAB_CONTROL)), maTabPage(&maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)), - mpToolbars( new Control(&maTabPage,SfxResId(TOOLBARS))), mpSearchEdit(new Edit(&maTabPage,WB_HIDE | WB_BORDER)), - mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))), - mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))), - mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))), + mpViewBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_VIEW))), + mpActionBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_ACTION))), + mpTemplateBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_TEMPLATES))), mpSearchView(new TemplateSearchView(&maTabPage)), maView(new TemplateLocalView(&maTabPage,SfxResId(TEMPLATE_VIEW))), mpOnlineView(new TemplateRemoteView(&maTabPage, WB_VSCROLL,false)), @@ -239,7 +238,6 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg () delete mpTemplateDefaultMenu; delete mpActionMenu; delete mpRepositoryMenu; - delete mpToolbars; } void SfxTemplateManagerDlg::setSaveMode(bool bMode) @@ -318,9 +316,6 @@ void SfxTemplateManagerDlg::Resize() long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(), aActionSize.getHeight()), aTemplateSize.getHeight()); - Size aToolbarsSize (aWinSize.getWidth(), nToolbarsHeight); - mpToolbars->SetSizePixel(aToolbarsSize); - aActionSize.setWidth(3*aActionSize.getWidth()); aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar->GetPosPixel().X()); aTemplateSize.setWidth(aWinSize.getWidth()); @@ -334,7 +329,7 @@ void SfxTemplateManagerDlg::Resize() // Set view position below toolbox Point aViewPos = maView->GetPosPixel(); - aViewPos.setY(aToolbarsSize.getHeight()); + aViewPos.setY(nToolbarsHeight); aViewPos.setX(0); Size aThumbSize(aWinSize.getWidth(), maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY()); maView->SetPosSizePixel(aViewPos, aThumbSize); diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src index 6928ef1..60c2857 100644 --- a/sfx2/source/doc/templatedlg.src +++ b/sfx2/source/doc/templatedlg.src @@ -106,12 +106,6 @@ TabPage TAB_TEMPLATE_MANAGER Size = MAP_APPFONT( 290, 220 ); Hide = TRUE; - Control TOOLBARS - { - Size = MAP_APPFONT( 290 , 20 ); - TabStop = False; - }; - Control TEMPLATE_VIEW { Pos = MAP_APPFONT( 0, 20 );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits