sc/source/ui/inc/navipi.hxx | 4 ++-- sc/source/ui/navipi/scenwnd.cxx | 2 +- sd/source/ui/annotations/annotationwindow.cxx | 3 +-- sd/source/ui/annotations/annotationwindow.hxx | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit 5a94413d27d8b799b43bc6d7b44d4b01cc98dc9b Author: Caolán McNamara <[email protected]> AuthorDate: Mon Feb 17 20:47:17 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 18 09:55:02 2020 +0100 VclMultiLineEdit is sufficient here Change-Id: I636eb7bfd0c1d523751661a35edaa30181491de1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88889 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 6c566287cd41..828045c6b2da 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -30,7 +30,6 @@ #include <editeng/crossedoutitem.hxx> #include <svx/svxids.hrc> #include <unotools/useroptions.hxx> -#include <svtools/svmedit.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> @@ -269,7 +268,7 @@ void AnnotationWindow::InitControls() mpTextWindow->SetPointer(PointerStyle::Text); // window control for author and date - mpMeta = VclPtr<MultiLineEdit>::Create(this,0); + mpMeta = VclPtr<VclMultiLineEdit>::Create(this,0); mpMeta->SetReadOnly(); mpMeta->SetRightToLeft(AllSettings::GetLayoutRTL()); mpMeta->AlwaysDisableInput(true); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 9b95dcc34039..d069aa541528 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -22,7 +22,7 @@ #include <vcl/ctrl.hxx> #include <vcl/floatwin.hxx> -#include <svtools/svmedit.hxx> +#include <vcl/vclmedit.hxx> #include <vcl/scrbar.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -81,7 +81,7 @@ class AnnotationWindow : public FloatingWindow bool mbProtected; bool mbMouseOverButton; VclPtr<AnnotationTextWindow> mpTextWindow; - VclPtr<MultiLineEdit> mpMeta; + VclPtr<VclMultiLineEdit> mpMeta; ::tools::Rectangle maRectMetaButton; basegfx::B2DPolygon maPopupTriangle; commit 26e5875d7cd082ccb118720ab17bfa9ea52f9d0c Author: Caolán McNamara <[email protected]> AuthorDate: Mon Feb 17 20:45:56 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 18 09:54:48 2020 +0100 VclMultiLineEdit is sufficient here Change-Id: I0f8d8ae81776f92637880f8ad1a82fcf948c9e5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88888 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index ed8313791ada..44d3c5ad1060 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -29,7 +29,7 @@ #include <sfx2/childwin.hxx> #include <svx/sidebar/PanelLayout.hxx> #include "content.hxx" -#include <svtools/svmedit.hxx> +#include <vcl/vclmedit.hxx> class SfxPoolItem; class ScTabViewShell; @@ -103,7 +103,7 @@ protected: private: VclPtr<ScScenarioListBox> aLbScenario; - VclPtr<MultiLineEdit> aEdComment; + VclPtr<VclMultiLineEdit> aEdComment; }; class ColumnEdit : public SpinField diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index d9de448fb0af..74ac7b069bb1 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -202,7 +202,7 @@ ScScenarioWindow::ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_Li const OUString& aQH_Comment) : Window ( pParent, WB_TABSTOP | WB_DIALOGCONTROL ), aLbScenario ( VclPtr<ScScenarioListBox>::Create(*this) ), - aEdComment ( VclPtr<MultiLineEdit>::Create(this, WB_BORDER | WB_LEFT | WB_READONLY | WB_VSCROLL | WB_TABSTOP) ) + aEdComment ( VclPtr<VclMultiLineEdit>::Create(this, WB_BORDER | WB_LEFT | WB_READONLY | WB_VSCROLL | WB_TABSTOP) ) { vcl::Font aFont( GetFont() ); aFont.SetTransparent( true ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
