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

[Caolán McNamara (via logerrit)]

 include/vcl/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 d730be5a23db82bd4e43b6d0709b38942e4d636b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 20 14:22:52 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 28 15:32:21 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/+/109718
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 02371c996e95..69a3d5aa420f 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -301,7 +301,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 a4a3f5d9e3d2..dd606aeed4f7 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
         }
     }
@@ -302,7 +302,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 14d6cdeed6ce..641952c35e2d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2001,7 +2001,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
         OUString sWrap = BuilderUtils::extractCustomProperty(rMap);
         if (!sWrap.isEmpty())
             nBits |= WB_WORDBREAK;
-        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;