[Libreoffice-commits] core.git: include/svtools solenv/clang-format svtools/inc svtools/source

[Caolán McNamara (via logerrit)]

 solenv/clang-format/blacklist                 |    2 +-
 svtools/inc/svmedit2.hxx                      |    1 -
 svtools/source/contnr/DocumentInfoPreview.cxx |    2 +-
 svtools/source/edit/svmedit2.cxx              |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2c80cf671ead686300ea0ece491435c0c67dfc77
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 14 15:32:01 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jan 14 21:25:19 2020 +0100

    svmedit2.hxx doesn't need to be a public header
    
    Change-Id: I8f193478eb74b544a075b477fbeed5dc5b55402e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86781
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index eae0f3714d25..34b66374ca7e 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6952,7 +6952,6 @@ include/svtools/soerr.hxx
 include/svtools/statusbarcontroller.hxx
 include/svtools/stringtransfer.hxx
 include/svtools/svmedit.hxx
-include/svtools/svmedit2.hxx
 include/svtools/svparser.hxx
 include/svtools/svtdllapi.h
 include/svtools/svtresid.hxx
@@ -13612,6 +13611,7 @@ svl/unx/source/svdde/ddedummy.cxx
 svtools/inc/pch/precompiled_svt.cxx
 svtools/inc/pch/precompiled_svt.hxx
 svtools/inc/strings.hxx
+svtools/inc/svmedit2.hxx
 svtools/inc/table/defaultinputhandler.hxx
 svtools/inc/table/gridtablerenderer.hxx
 svtools/inc/table/tablecontrol.hxx
diff --git a/include/svtools/svmedit2.hxx b/svtools/inc/svmedit2.hxx
similarity index 98%
rename from include/svtools/svmedit2.hxx
rename to svtools/inc/svmedit2.hxx
index 6387bbd42921..896d13009284 100644
--- a/include/svtools/svmedit2.hxx
+++ b/svtools/inc/svmedit2.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVTOOLS_SVMEDIT2_HXX
 #define INCLUDED_SVTOOLS_SVMEDIT2_HXX
 
-#include <svtools/svtdllapi.h>
 #include <svtools/svmedit.hxx>
 
 class TextAttrib;
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index dd40b569477a..93b8b27e5790 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -28,7 +28,7 @@
 #include <comphelper/string.hxx>
 #include <rtl/ustring.hxx>
 #include <svtools/DocumentInfoPreview.hxx>
-#include <svtools/svmedit2.hxx>
+#include <svmedit2.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 4687d2535867..fde13f6c7f51 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <svtools/svmedit2.hxx>
+#include <svmedit2.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>