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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 9 | ||||
| -rw-r--r-- | extensions/source/bibliography/toolbar.hxx | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 12f6cb5cb2df..61e583e238ec 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -232,13 +232,10 @@ BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink) , nSelMenuItem(0) , aLayoutManager(aLink) , nSymbolsSize(SFX_SYMBOLS_SIZE_SMALL) - , nOutStyle(0) { SvtMiscOptions aSvtMiscOptions; nSymbolsSize = aSvtMiscOptions.GetCurrentSymbolsSize(); - nOutStyle = aSvtMiscOptions.GetToolboxStyle(); - SetOutStyle(TOOLBOX_STYLE_FLAT); xSource->Show(); pLbSource->connect_changed(LINK( this, BibToolBar, SelHdl)); @@ -570,12 +567,6 @@ IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) nSymbolsSize = eSymbolsSize; bRebuildToolBar = true; } - else if ( nOutStyle != SvtMiscOptions().GetToolboxStyle() ) - { - nOutStyle = SvtMiscOptions().GetToolboxStyle(); - SetOutStyle( nOutStyle ); - bRebuildToolBar = true; - } if ( bRebuildToolBar ) RebuildToolbar(); diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index e4aa8b852b02..afd1bd3ace38 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -154,7 +154,6 @@ class BibToolBar: public ToolBox OUString aQueryField; Link<void*,void> aLayoutManager; sal_Int16 nSymbolsSize; - sal_Int16 nOutStyle; sal_uInt16 nTBC_SOURCE; sal_uInt16 nTBC_QUERY; |