summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2020-07-08 00:46:29 +0300
committerXisco Fauli <xiscofauli@libreoffice.org>2020-07-14 21:53:22 +0200
commitad6d723bb6e37e70702ea467072a1dc077293839 (patch)
tree87f748a53e93d63d008037ca90966f925db4f04f /include
parent944892091ad30c5da192b20d189c7a4388b0c91d (diff)
tdf#134188 tdf#114223 Don't override vertical text button visibility
i.e. restore the fix for tdf#33356, which was removed in commit eeb2d19e77d6dc47c68e8ba0920a02cf64a1247b ("Resolves: tdf#130159 hide writedirection unless CTL is enabled"). But do it in a way that doesn't introduce tdf#114223 (a regression of tdf#33356). We can assume that the visibility state of the button at the point of control initialization is the one set with toolbar customization, as any customization triggers clearing of the whole toolbar, and reconstructing from scratch. Change-Id: I2cdf18e144dd6eb99b8c1e1da968beacddbb3728 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98317 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit d3a98b87824f2e2248a45b97d7eef5e8ad596dd3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98760 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
-rw-r--r--include/svx/verttexttbxctrl.hxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index d283919f6bf8..6dc437ec383a 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -38,6 +38,7 @@ class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base:
*/
class SvxVertCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl_Base
{
+ bool m_bVisible;
public:
explicit SvxVertCTLTextTbxCtrl(const css::uno::Reference<css::uno::XComponentContext>& rContext);