include/sfx2/sidebar/ControlFactory.hxx | 4 ++--
include/sfx2/sidebar/TabItem.hxx | 2 +-
include/svtools/valueset.hxx | 2 +-
include/vcl/button.hxx | 9 ---------
sfx2/source/sidebar/ControlFactory.cxx | 2 +-
sfx2/source/sidebar/TabItem.cxx | 6 +++---
svx/source/tbxctrls/tbcontrl.cxx | 2 --
vcl/source/control/button.cxx | 5 -----
8 files changed, 8 insertions(+), 24 deletions(-)
New commits:
commit e2205c4876723876bcaf1dd5ce494debab97591a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Feb 1 21:41:22 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Feb 2 12:29:17 2020 +0100
no difference between ImageRadioButton and RadioButton
Change-Id: Iae5b7fe329273f34d3e94f1136acdac0d55d1ced
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87816
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/sfx2/sidebar/ControlFactory.hxx
b/include/sfx2/sidebar/ControlFactory.hxx
index 26ef4a7134e3..7deebf1ab92c 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -23,7 +23,7 @@
#include <vcl/vclptr.hxx>
class CheckBox;
-class ImageRadioButton;
+class RadioButton;
namespace vcl { class Window; }
namespace sfx2 { namespace sidebar {
@@ -40,7 +40,7 @@ public:
*/
static VclPtr<CheckBox> CreateMenuButton (vcl::Window* pParentWindow);
- static VclPtr<ImageRadioButton> CreateTabItem (vcl::Window* pParentWindow);
+ static VclPtr<RadioButton> CreateTabItem (vcl::Window* pParentWindow);
};
diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx
index 43dd79acbede..8d54640a680c 100644
--- a/include/sfx2/sidebar/TabItem.hxx
+++ b/include/sfx2/sidebar/TabItem.hxx
@@ -28,7 +28,7 @@ namespace sfx2 { namespace sidebar {
/** A single button in the tab bar.
*/
class TabItem final
- : public ImageRadioButton
+ : public RadioButton
{
public:
TabItem (vcl::Window* pParentWindow);
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 86036fe7130a..66ba3b212f4f 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -69,7 +69,7 @@ class ListBox
WinBits
WB_RADIOSEL If set the selection will be drawn like an
- ImageRadioButton. This does only make sense if the image
+ RadioButton. This does only make sense if the image
is at least 8 pixel smaller on each side than the item
and also WB_DOUBLEBORDER is set and as color
COL_WINDOWWORKSPACE is specified.
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index d0aa24757ae1..e5a5b7de51f5 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -499,15 +499,6 @@ public:
ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
};
-class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
-{
- ImageRadioButton( const ImageRadioButton & ) = delete;
- ImageRadioButton & operator= ( const ImageRadioButton & )
= delete;
-
-public:
- explicit ImageRadioButton( vcl::Window* pParent );
-};
-
class VCL_DLLPUBLIC TriStateBox final : public CheckBox
{
TriStateBox( const TriStateBox & ) = delete;
diff --git a/sfx2/source/sidebar/ControlFactory.cxx
b/sfx2/source/sidebar/ControlFactory.cxx
index b65f0b9c1779..de5e8123ddf3 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -28,7 +28,7 @@ VclPtr<CheckBox> ControlFactory::CreateMenuButton
(vcl::Window* pParentWindow)
return VclPtr<MenuButton>::Create(pParentWindow);
}
-VclPtr<ImageRadioButton> ControlFactory::CreateTabItem (vcl::Window*
pParentWindow)
+VclPtr<RadioButton> ControlFactory::CreateTabItem (vcl::Window* pParentWindow)
{
return VclPtr<TabItem>::Create(pParentWindow);
}
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index 160bec8a2075..013ff688d19c 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -31,8 +31,8 @@ using namespace css::uno;
namespace sfx2::sidebar {
TabItem::TabItem (vcl::Window* pParentWindow)
- : ImageRadioButton(pParentWindow),
- mbIsLeftButtonDown(false)
+ : RadioButton(pParentWindow, 0)
+ , mbIsLeftButtonDown(false)
{
SetStyle(GetStyle() | WB_TABSTOP | WB_DIALOGCONTROL | WB_NOPOINTERFOCUS);
SetBackground(Theme::GetPaint(Theme::Paint_TabBarBackground).GetWallpaper());
@@ -67,7 +67,7 @@ void TabItem::MouseMove(const MouseEvent& rEvent)
{
if (rEvent.IsEnterWindow() || rEvent.IsLeaveWindow())
Invalidate();
- ImageRadioButton::MouseMove(rEvent);
+ RadioButton::MouseMove(rEvent);
}
void TabItem::MouseButtonDown(const MouseEvent& rMouseEvent)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7b6d2d9acb3b..583030205a36 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2639,8 +2639,6 @@
SvxLineWindow_Impl::SvxLineWindow_Impl(SvxFrameToolBoxControl* pControl, weld::W
&SvxBorderLine::darkColor, &SvxBorderLine::lightColor );
Size aSize = m_xLineStyleLb->SetWidth( 20 ); // 1pt by default
- fprintf(stderr, "width height is %ld %ld\n", aSize.Width(),
aSize.Height());
-
m_xLineStyleLb->SetSelectHdl( LINK( this, SvxLineWindow_Impl, SelectHdl )
);
m_xContainer->set_help_id(HID_POPUP_LINE);
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 7aebb0d1397f..125060a7660c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3691,11 +3691,6 @@ void ImageButton::ImplInitStyle()
SetStyle( nStyle );
}
-ImageRadioButton::ImageRadioButton( vcl::Window* pParent ) :
- RadioButton( pParent, 0 )
-{
-}
-
TriStateBox::TriStateBox( vcl::Window* pParent, WinBits nStyle ) :
CheckBox( pParent, nStyle )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
