diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2019-01-31 06:57:50 +0300 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-02-06 16:15:03 +0100 |
commit | 08aa78cc52ea49fea2454096e97875f1d4b4cecc (patch) | |
tree | fc8bd2f052b7a17fc81b2999f566ccf6c30d5bad | |
parent | 9dad5c6df175785cae1d7b76328f4dc5eef0b6fc (diff) |
tdf#87884: UnoControlTabPageModel is using tabs w/o WB_NOBORDER
No border attribute is a special case for vcl/TabControl, so by defualt
created with corresponding UNO interface tabs were invisible.
To create invisible tabs there is already "tabcontrolnotabs"(?)
Change-Id: I3cc9baef9106f6c3fb5688daadbb5844d2b2a008
Reviewed-on: https://gerrit.libreoffice.org/67188
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 18f2e73f51c0f09c94f1a2b701d8e064adb39bf5)
Reviewed-on: https://gerrit.libreoffice.org/67400
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 57f18a22ad45..2eb26ff41a94 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1488,7 +1488,10 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase( "tabpagecontainer" ) ) { - pNewWindow = VclPtr<TabControl>::Create( pParent, nWinBits ); + // TabControl has a special case for tabs without border: they are displayed + // in a different way, so we need to ensure that this style is not set, so + // we can guarantee normal tab behavior + pNewWindow = VclPtr<TabControl>::Create( pParent, nWinBits & (~WB_NOBORDER)); *ppNewComp = new VCLXTabPageContainer; } else if ( aServiceName == "animatedimages" ) |