basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml | 3 +-- framework/source/uielement/subtoolbarcontroller.cxx | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
New commits: commit b0f97cfc1cd6de86c31c00b9e33d7d5805215826 Author: Maxim Monastirsky <[email protected]> Date: Sun Mar 26 16:27:13 2017 +0300 Remove useless toolbar break Seems to not affect the layout in anyway, but instead always hides the last item when the toolbar is docked. Change-Id: Ib33c6757f4a9b5037648516e3da3b1f9f08acf40 diff --git a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml index 87de703703c4..aec92a8868fa 100644 --- a/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml +++ b/basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml @@ -57,6 +57,5 @@ <toolbar:toolbaritem xlink:href=".uno:InsertFileControl"/> <toolbar:toolbaritem xlink:href=".uno:InsertTreeControl"/> <toolbar:toolbarbreak/> -<toolbar:toolbaritem xlink:href=".uno:SpinButton"/> - <toolbar:toolbarbreak/> + <toolbar:toolbaritem xlink:href=".uno:SpinButton"/> </toolbar:toolbar> commit 91053763a7189c8ac03a59dc996e6333404f846e Author: Maxim Monastirsky <[email protected]> Date: Sun Mar 26 16:20:50 2017 +0300 Fix sub-toolbar tearoff for .uno:ChooseControls Regression of 81d4fbc0daa54889ccb09e6a3fadff9c70d99448 ("tdf#42029 Use a floating toolbar to show clipped items"). Change-Id: Id32a49109477745122d78354a5d3bd94cb126310 diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 2f372633a315..266ebbab247c 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -245,7 +245,6 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow // calc and set size for popup mode Size aSize = pToolBar->CalcPopupWindowSizePixel(); pToolBar->SetSizePixel( aSize ); - pToolBar->SetMenuType( ToolBoxMenuType::NONE ); // open subtoolbox in popup mode vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pToolBar ); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
