[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/vcl vcl/qa vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/toolkit/button.hxx |    2 +-
 vcl/qa/cppunit/lifecycle.cxx   |    4 ++--
 vcl/source/window/builder.cxx  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a1e83bc0079edae1067342d34b22977523bef12d
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 20 14:22:52 2021 +0000
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jan 25 10:21:09 2021 +0100

    drop RadioButton arg defaults
    
    the nBits arg in builder.cxx was in the wrong place
    
    Change-Id: Id4d0dd6919444cb39cf0d9e593f46d324f343a31
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109682
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index 780197d12ec7..6f4ca5481b32 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -220,7 +220,7 @@ public:
 
      true is fairly straightforward, false leads to trick situations and is 
the legacy case
     */
-    explicit        RadioButton(vcl::Window* pParent, bool bUsesExplicitGroup 
= true, WinBits nWinStyle = 0);
+    explicit        RadioButton(vcl::Window* pParent, bool bUsesExplicitGroup, 
WinBits nWinStyle);
     virtual         ~RadioButton() override;
     virtual void    dispose() override;
 
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index f77df28af70f..418cecbf237b 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -127,7 +127,7 @@ void LifecycleTest::testWidgets(vcl::Window *pParent)
             (void)aPtr; // silence unused variable warning
         }
         {
-            ScopedVclPtrInstance< RadioButton > aPtr( pParent );
+            ScopedVclPtrInstance< RadioButton > aPtr( pParent, true, 0 );
             (void)aPtr; // silence unused variable warning
         }
     }
@@ -299,7 +299,7 @@ void LifecycleTest::testLeakage()
     aObjects.push_back(LeakTestObject::Create<CheckBox>(xParent));
     aObjects.push_back(LeakTestObject::Create<Edit>(xParent));
     aObjects.push_back(LeakTestObject::Create<ComboBox>(xParent));
-    aObjects.push_back(LeakTestObject::Create<RadioButton>(xParent));
+    aObjects.push_back(LeakTestObject::Create<RadioButton>(xParent, true, 0));
 
     { // something that looks like a dialog
         
aObjects.push_back(LeakTestObject::Create<Dialog>(xParent,WB_CLIPCHILDREN|WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEABLE));
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9e322c3f1935..0dafe3895180 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1879,7 +1879,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
     {
         extractGroup(id, rMap);
         WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
-        VclPtr<RadioButton> xButton = VclPtr<RadioButton>::Create(pParent, 
nBits);
+        VclPtr<RadioButton> xButton = VclPtr<RadioButton>::Create(pParent, 
true, nBits);
         xButton->SetImageAlign(ImageAlign::Left); //default to left
         xWindow = xButton;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits