[Libreoffice-commits] core.git: solenv/clang-format vcl/inc vcl/Library_vcl.mk vcl/source

[Chris Sherlock (via logerrit)]

 solenv/clang-format/excludelist        |    4 ++--
 vcl/Library_vcl.mk                     |    2 +-
 vcl/source/filter/svm/SvmConverter.cxx |   19 ++++++++++---------
 vcl/source/filter/svm/SvmReader.cxx    |    7 ++++---
 vcl/source/gdi/gdimtf.cxx              |    1 -
 5 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit cab2f3790517c6f2c77686869b305d66a1e04fb9
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Sun Aug 22 08:48:59 2021 +1000
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Aug 27 08:42:45 2021 +0200

    vcl: SvmConverter is only used in vcl filters
    
    Change-Id: If198b143d520937193b63985b4c21da0e29308bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120834
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 4489b1991fbe..7cf7ea89c1f2 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14526,7 +14526,6 @@ vcl/inc/spin.hxx
 vcl/inc/strhelper.hxx
 vcl/inc/svdata.hxx
 vcl/inc/svimpbox.hxx
-vcl/inc/svmconverter.hxx
 vcl/inc/test/outputdevice.hxx
 vcl/inc/textlayout.hxx
 vcl/inc/textlineinfo.hxx
@@ -14877,6 +14876,8 @@ vcl/source/edit/textview.cxx
 vcl/source/edit/txtattr.cxx
 vcl/source/edit/vclmedit.cxx
 vcl/source/edit/xtextedt.cxx
+vcl/source/filter/svm/SvmConverter.cxx
+vcl/source/filter/svm/SvmConverter.hxx
 vcl/source/filter/FilterConfigCache.cxx
 vcl/source/filter/FilterConfigCache.hxx
 vcl/source/filter/FilterConfigItem.cxx
@@ -14998,7 +14999,6 @@ vcl/source/gdi/salgdilayout.cxx
 vcl/source/gdi/sallayout.cxx
 vcl/source/gdi/salmisc.cxx
 vcl/source/gdi/scrptrun.cxx
-vcl/source/gdi/svmconverter.cxx
 vcl/source/gdi/textlayout.cxx
 vcl/source/gdi/vectorgraphicdata.cxx
 vcl/source/gdi/virdev.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bda2d5c6b872..a19c23b7b926 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -253,7 +253,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/treelist/uiobject \
     vcl/source/gdi/configsettings \
     vcl/source/gdi/cvtgrf \
-    vcl/source/gdi/svmconverter \
     vcl/source/gdi/embeddedfontshelper \
     vcl/source/gdi/FileDefinitionWidgetDraw \
     vcl/source/gdi/WidgetDefinitionReader \
@@ -457,6 +456,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/filter/jpeg/JpegReader \
     vcl/source/filter/jpeg/JpegWriter \
     vcl/source/filter/jpeg/JpegTransform \
+    vcl/source/filter/svm/SvmConverter \
     vcl/source/filter/svm/SvmReader \
     vcl/source/filter/svm/SvmWriter \
     vcl/source/filter/wmf/emfwr \
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/filter/svm/SvmConverter.cxx
similarity index 99%
rename from vcl/source/gdi/svmconverter.cxx
rename to vcl/source/filter/svm/SvmConverter.cxx
index 126807b8f691..61c1647ebd24 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/filter/svm/SvmConverter.cxx
@@ -17,25 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <algorithm>
-#include <string.h>
-
-#include <o3tl/safeint.hxx>
+#include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <tools/fract.hxx>
 #include <tools/stream.hxx>
+#include <o3tl/safeint.hxx>
+
+#include <vcl/TypeSerializer.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/filter/SvmReader.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
-#include <sal/log.hxx>
-#include <osl/diagnose.h>
+#include <vcl/virdev.hxx>
 
-#include <vcl/TypeSerializer.hxx>
-#include <svmconverter.hxx>
+#include "SvmConverter.hxx"
+
+#include <algorithm>
 #include <memory>
 #include <stack>
+#include <string.h>
 
 // Inlines
 static void ImplReadRect( SvStream& rIStm, tools::Rectangle& rRect )
diff --git a/vcl/inc/svmconverter.hxx b/vcl/source/filter/svm/SvmConverter.hxx
similarity index 100%
rename from vcl/inc/svmconverter.hxx
rename to vcl/source/filter/svm/SvmConverter.hxx
diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx
index 56b2f245cca1..8aec254cfdb9 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -17,17 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/filter/SvmReader.hxx>
 #include <sal/log.hxx>
 #include <osl/thread.h>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
-#include <vcl/dibtools.hxx>
+
+#include <vcl/filter/SvmReader.hxx>
 #include <vcl/TypeSerializer.hxx>
+#include <vcl/dibtools.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 
-#include <svmconverter.hxx>
+#include "SvmConverter.hxx"
 
 namespace
 {
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index cfeaf1d0a4b3..ebdef1127f6d 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -38,7 +38,6 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/mtfxmldump.hxx>
 
-#include <svmconverter.hxx>
 #include <vcl/TypeSerializer.hxx>
 
 #include <com/sun/star/beans/XFastPropertySet.hpp>