[Libreoffice-commits] core.git: toolkit/source

[Caolán McNamara (via logerrit)]

 toolkit/source/awt/vclxtoolkit.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit db9d871b2dc89ac1a09e17ec08a1570dae546025
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 15 11:41:38 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 15 15:02:02 2020 +0200

    aServiceName is lowercase rDescriptor.WindowServiceName already
    
    Change-Id: I5e6ae62b7a1d5eeed641519a1e1c0375d805d7e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98817
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 8d067c05cf4c..3671963c4234 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1384,9 +1384,6 @@ void SVTXRoadmap::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
     VCLXGraphicControl::ImplGetPropertyIds( rIds );
 }
 
-
-
-
 vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
     const css::awt::WindowDescriptor& rDescriptor,
     vcl::Window* pParent, WinBits nWinBits, MessBoxStyle nMessBoxStyle )
@@ -1764,8 +1761,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 }
             break;
             case WindowType::CONTROL:
-                if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
-                        "tabpagecontainer" ) )
+                if ( aServiceName == "tabpagecontainer" )
                 {
                     // 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