diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-10-31 22:01:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-02 09:55:20 +0100 |
| commit | a0eab90bd1f7fc31978da3f7be0ec86781baf8bc (patch) | |
| tree | db82393a579042e4463f65dc47b5f30688d4df70 /framework | |
| parent | 22c88a039a557343ab11fbf7abc8f2a087e1a3c2 (diff) | |
toolbox always has flat style
ever since
commit c1cd6af623e86b5b1b45f9d09dc17d6fbb907f02
Author: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon May 10 14:51:02 2004 +0000
INTEGRATION: CWS nwf (1.64.66); FILE MERGED
2004/03/31 09:28:33 ssa 1.64.66.1: #i25130# force flat toolbox buttons
except for a completely and utterly undocumented hack of a registry key,
introduced in
commit 736dc0956a50315ec72ad126406556657a750d37
Author: Rüdiger Timm <rt@openoffice.org>
Date: Thu Apr 17 14:19:46 2003 +0000
INTEGRATION: CWS vcl08 (1.57.2.4.18); FILE MERGED
2003/04/14 17:46:27 ssa 1.57.2.4.18.1: #108699# disabled flat toolbox buttons not exported anymore
which only seems to apply to Windows.
So just remove this.
Change-Id: Idf315b8c89c3119883a5e6880d003d379fe6faec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105155
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/addonstoolbarwrapper.cxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarwrapper.cxx | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 04193ac336c0..f2b56cee1526 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -118,7 +118,6 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument { // Fill toolbar with container contents pToolBarManager->FillAddonToolbar( m_aConfigData ); - pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() ); pToolBar->EnableCustomize(); ::Size aActSize( pToolBar->GetSizePixel() ); ::Size aSize( pToolBar->CalcWindowSizePixel() ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 13e0efca691e..2dceb5bb1116 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1619,7 +1619,6 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar, void ) VclPtrInstance<ToolBox> pOverflowToolBar( pToolBar, WB_BORDER | WB_SCROLL ); pOverflowToolBar->SetLineSpacing(true); - pOverflowToolBar->SetOutStyle( pToolBar->GetOutStyle() ); m_aOverflowManager.set( new ToolBarManager( m_xContext, m_xFrame, OUString(), pOverflowToolBar ) ); m_aOverflowManager->FillOverflowToolbar( pToolBar ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 28367830c9f7..8e26d09b8982 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -158,7 +158,6 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) { // Fill toolbar with container contents pToolBarManager->FillToolbar( m_xConfigData ); - pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() ); pToolBar->EnableCustomize(); ::Size aActSize( pToolBar->GetSizePixel() ); ::Size aSize( pToolBar->CalcWindowSizePixel() ); @@ -173,7 +172,6 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) m_bPersistent = false; if ( pToolBar && pToolBarManager ) { - pToolBar->SetOutStyle( SvtMiscOptions().GetToolboxStyle() ); pToolBar->EnableCustomize(); ::Size aActSize( pToolBar->GetSizePixel() ); ::Size aSize( pToolBar->CalcWindowSizePixel() ); |