[Libreoffice-commits] core.git: sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 28 08:22:26 UTC 2020
sw/source/uibase/docvw/DashedLine.cxx | 6 +++---
sw/source/uibase/inc/DashedLine.hxx | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit dd2fcfcadcb3027f5ae727697be77943358cfd28
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 27 20:02:44 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 28 10:21:43 2020 +0200
SwDashedLine doesn't have to inherit from FixedLine
Change-Id: I8a903910a3563608d4762a57b3e125360ebca6c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101497
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
index de46be7cdd47..eb7d59066e2c 100644
--- a/sw/source/uibase/docvw/DashedLine.cxx
+++ b/sw/source/uibase/docvw/DashedLine.cxx
@@ -19,9 +19,9 @@
#include <vcl/settings.hxx>
#include <memory>
-SwDashedLine::SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ) :
- FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ),
- m_pColorFn( pColorFn )
+SwDashedLine::SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() )
+ : Control( pParent, WB_DIALOGCONTROL | WB_HORZ )
+ , m_pColorFn( pColorFn )
{
}
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx
index 0492be67e589..38a3eab69fe1 100644
--- a/sw/source/uibase/inc/DashedLine.hxx
+++ b/sw/source/uibase/inc/DashedLine.hxx
@@ -9,11 +9,11 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
-#include <vcl/fixed.hxx>
+#include <vcl/ctrl.hxx>
/** Class for displaying a dashed line in the Writer GUI.
*/
-class SwDashedLine : public FixedLine
+class SwDashedLine : public Control
{
Color& (*m_pColorFn)();
More information about the Libreoffice-commits
mailing list