solenv/clang-format/blacklist | 2 +- svtools/inc/svmedit.hxx | 6 +----- svtools/inc/svmedit2.hxx | 2 +- svtools/source/edit/svmedit.cxx | 2 +- svtools/source/uno/unoiface.cxx | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-)
New commits: commit f58d42349525be3838cf7568c9840d9e3dacddad Author: Caolán McNamara <[email protected]> AuthorDate: Mon Feb 17 20:55:15 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 18 11:04:18 2020 +0100 move svmedit.hxx internal to svtools Change-Id: I52469e2029f292e7d5e9002cb9d098c14576a00d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88892 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 26b8d719f413..1e6c83b9f158 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6669,7 +6669,6 @@ include/svtools/slidesorterbaropt.hxx include/svtools/soerr.hxx include/svtools/statusbarcontroller.hxx include/svtools/stringtransfer.hxx -include/svtools/svmedit.hxx include/svtools/svparser.hxx include/svtools/svtdllapi.h include/svtools/tabbar.hxx @@ -13130,6 +13129,7 @@ svl/source/undo/undo.cxx svl/source/uno/pathservice.cxx svl/unx/source/svdde/ddedummy.cxx svtools/inc/strings.hxx +svtools/inc/svmedit.hxx svtools/inc/svmedit2.hxx svtools/inc/table/defaultinputhandler.hxx svtools/inc/table/gridtablerenderer.hxx diff --git a/include/svtools/svmedit.hxx b/svtools/inc/svmedit.hxx similarity index 93% rename from include/svtools/svmedit.hxx rename to svtools/inc/svmedit.hxx index 361a1c5b7391..bafa79ea1ebc 100644 --- a/include/svtools/svmedit.hxx +++ b/svtools/inc/svmedit.hxx @@ -22,10 +22,7 @@ #include <vcl/vclmedit.hxx> -#include <svtools/svtdllapi.h> - - -class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit +class MultiLineEdit : public VclMultiLineEdit { public: MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ); @@ -33,7 +30,6 @@ public: virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) override; }; - #endif // INCLUDED_SVTOOLS_SVMEDIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svmedit2.hxx b/svtools/inc/svmedit2.hxx index 896d13009284..7d45700349a9 100644 --- a/svtools/inc/svmedit2.hxx +++ b/svtools/inc/svmedit2.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVTOOLS_SVMEDIT2_HXX #define INCLUDED_SVTOOLS_SVMEDIT2_HXX -#include <svtools/svmedit.hxx> +#include "svmedit.hxx" class TextAttrib; diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index e8666a83ddd1..207cbdb894af 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/svmedit.hxx> +#include <svmedit.hxx> #include <unoiface.hxx> MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 8dd0f390144e..7f10167cf64a 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -21,7 +21,7 @@ #include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> -#include <svtools/svmedit.hxx> +#include <svmedit.hxx> #include <unoiface.hxx> #include <com/sun/star/awt/LineEndFormat.hpp> #include <cppuhelper/queryinterface.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
