summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2019-01-31 06:57:50 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-02-06 16:14:32 +0100
commitbc08bef01363537eac91daacc37529326d26a2b6 (patch)
tree65f9541925be9d8c7f0f799c14817ec96261aea0 /toolkit
parent621a9995faddd8e4262601f245674885e891a986 (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/67401
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 71a2be7b0e4b..31d1fe549e97 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1467,7 +1467,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" )