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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/PanelTitleBar.cxx | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 0e72b08f566f..c9495eea5d16 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -127,11 +127,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) { switch(nWhich) { - case SID_ATTR_BUTTON_OUTSTYLE3D : - if(rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BUTTON_OUTSTYLE3D ), - aMiscOptions.GetToolboxStyle() != TOOLBOX_STYLE_FLAT))) - bRet = true; - break; case SID_ATTR_BUTTON_BIGSIZE : { if( rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_BUTTON_BIGSIZE ), aMiscOptions.AreCurrentSymbolsLarge() ) ) ) @@ -451,13 +446,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) SvtMiscOptions aMiscOptions; std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); - if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), true, &pItem) ) - { - DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr, "BoolItem expected"); - sal_uInt16 nOutStyle = - static_cast<const SfxBoolItem *>(pItem)->GetValue() ? 0 : TOOLBOX_STYLE_FLAT; - aMiscOptions.SetToolboxStyle( nOutStyle ); - } if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), true, &pItem) ) { diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 104abcc9e294..7483ee8d193d 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -45,7 +45,6 @@ namespace sfx2 SetBackground( Wallpaper() ); m_aToolbox->SetSelectHdl( LINK( this, TitledDockingWindow, OnToolboxItemSelected ) ); - m_aToolbox->SetOutStyle( TOOLBOX_STYLE_FLAT ); m_aToolbox->SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) ); m_aToolbox->Show(); impl_resetToolBox(); diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 1369f1a03606..db45394c9306 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -95,7 +95,6 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, VCLUnoHelper::GetInterface(maToolBox.get()), 0, true)); maToolBox->SetController(mnMenuItemIndex, xController); - maToolBox->SetOutStyle(TOOLBOX_STYLE_FLAT); maToolBox->SetQuickHelpText( mnMenuItemIndex, SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS)); |