[Libreoffice-commits] core.git: drawinglayer/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Wed Dec 18 07:50:27 UTC 2019


 drawinglayer/source/tools/emfphelperdata.cxx |    2 +-
 drawinglayer/source/tools/emfphelperdata.hxx |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4644edc92a93cb80ebe0e409975ff1303927461f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Dec 18 09:50:55 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Dec 18 08:49:10 2019 +0100

    Fix debug build after 7732444c5d4e79ae0218932afe85bcc4b56a00a4
    
    UnitTypeToString was defined static in emfphelperdata.cxx, and was
    absent in any header included in emfpfont.cxx, so it's unclear how
    could it pass all the build tests.
    
    Change-Id: I87f966d3cde5d04ab3d364ee0d583adbdc2cc2c0
    Reviewed-on: https://gerrit.libreoffice.org/85355
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index f3deca577e94..99d88a27bdb4 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -160,7 +160,7 @@ namespace emfplushelper
         return "";
     }
 
-    static OUString UnitTypeToString(sal_uInt16 nType)
+    OUString UnitTypeToString(sal_uInt16 nType)
     {
         switch (nType)
         {
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx
index 19677d9438e8..a6560359fe52 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -166,6 +166,8 @@ namespace emfplushelper
     };
 
     const char* emfTypeToName(sal_uInt16 type);
+    OUString UnitTypeToString(sal_uInt16 nType);
+
     struct EMFPObject
     {
         virtual ~EMFPObject();


More information about the Libreoffice-commits mailing list