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

[Chris Sherlock (via logerrit)]

 drawinglayer/source/tools/emfphelperdata.cxx |    2 +-
 drawinglayer/source/tools/emfppen.cxx        |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a32688d2684eaf8f76269aa0bdd8d0fb2238fd6b
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Tue Dec 10 12:36:20 2019 +1100
Commit:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
CommitDate: Sat Dec 28 12:20:47 2019 +0100

    drawinglayer: improve logging for PenDataCompoundLine record
    
    Change-Id: Ibc89724ceb52d5ad964767e844c4807d85f639c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84839
    Tested-by: Jenkins
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 3dbb663a6f82..6888b2ab2ab0 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1048,7 +1048,7 @@ namespace emfplushelper
 
             if (bIsGetDCProcessing)
             {
-                SAL_INFO("drawinglayer", "EMF+ Resets the current clipping region for the world space to infinity.");
+                SAL_INFO("drawinglayer", "EMF+\t reset the current clipping region for the world space to infinity.");
                 wmfemfhelper::HandleNewClipRegion(::basegfx::B2DPolyPolygon(), mrTargetHolders, mrPropertyHolders);
                 bIsGetDCProcessing = false;
             }
diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx
index d0fc763929fe..c09cd926a1d6 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -160,9 +160,9 @@ namespace emfplushelper
         return "";
     }
 
-    static OUString PenAlignmentToString(sal_uInt32 penalignment)
+    static OUString PenAlignmentToString(sal_uInt32 alignment)
     {
-        switch (penalignment)
+        switch (alignment)
         {
             case PenAlignmentCenter: return "PenAlignmentCenter";
             case PenAlignmentInset: return "PenAlignmentInset";
@@ -322,7 +322,7 @@ namespace emfplushelper
         if (penDataFlags & PenDataAlignment)
         {
             s.ReadInt32(alignment);
-            SAL_WARN("drawinglayer", "EMF+\t\tTODO PenDataAlignment: " << PenAlignmentToString(alignment) << " (0x" << std::hex << alignment << ")");
+            SAL_WARN("drawinglayer", "EMF+\t\t\tTODO PenDataAlignment: " << PenAlignmentToString(alignment) << " (0x" << std::hex << alignment << ")");
         }
         else
         {
@@ -331,6 +331,7 @@ namespace emfplushelper
 
         if (penDataFlags & PenDataCompoundLine)
         {
+            SAL_WARN("drawinglayer", "EMF+\t\t\tTODO PenDataCompoundLine");
             sal_Int32 compoundArrayLen;
             s.ReadInt32(compoundArrayLen);
 
@@ -344,8 +345,8 @@ namespace emfplushelper
             for (i = 0; i < compoundArrayLen; i++)
             {
                 s.ReadFloat(compoundArray[i]);
+                SAL_INFO("drawinglayer", "EMF+\t\t\t\tcompoundArray[" << i << "]: " << compoundArray[i]);
             }
-            SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataCompoundLine: 0x");
         }
 
         if (penDataFlags & PenDataCustomStartCap)