dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 4 ++--
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3e2f43e3d848e3e6e8e339e46118c7db40595e40
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 17 20:43:23 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Feb 18 09:54:27 2020 +0100
VclMultiLineEdit is sufficient here
Change-Id: I119959aa220b83b127f2886ed4e6e13717899733
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88887
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 075b4df0b644..87118362511b 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -22,7 +22,7 @@
#include <vcl/tabpage.hxx>
#include "IClipBoardTest.hxx"
-class MultiLineEdit;
+class VclMultiLineEdit;
namespace dbaui
{
@@ -31,7 +31,7 @@ namespace dbaui
class OTableDesignHelpBar : public TabPage, public IClipboardTest
{
private:
- VclPtr<MultiLineEdit> m_pTextWin;
+ VclPtr<VclMultiLineEdit> m_pTextWin;
protected:
virtual void Resize() override;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index bc2b3a489f10..7c76297d14a0 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -18,9 +18,9 @@
*/
#include <TableDesignHelpBar.hxx>
-#include <svtools/svmedit.hxx>
-#include <vcl/settings.hxx>
#include <vcl/event.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/vclmedit.hxx>
#include <helpids.h>
#include <memory>
using namespace dbaui;
@@ -28,7 +28,7 @@ using namespace dbaui;
OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) :
TabPage( pParent, WB_3DLOOK )
{
- m_pTextWin = VclPtr<MultiLineEdit>::Create( this, WB_VSCROLL | WB_LEFT |
WB_BORDER | WB_NOTABSTOP | WB_READONLY);
+ m_pTextWin = VclPtr<VclMultiLineEdit>::Create( this, WB_VSCROLL | WB_LEFT
| WB_BORDER | WB_NOTABSTOP | WB_READONLY);
m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW);
m_pTextWin->SetReadOnly();
m_pTextWin->SetControlBackground(
GetSettings().GetStyleSettings().GetFaceColor() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
