tdf#111486 Fix description of SAL_ macros after EMF+ refactor

Change-Id: If235956228d7f807817d9ffff3da652bd6485ffa
Reviewed-on: https://gerrit.libreoffice.org/43834
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>

1 files changed, 37 insertions, 37 deletions

diff --git a/drawinglayer/source/tools/emfpbrush.cxx b/drawinglayer/source/tools/emfpbrush.cxx
index 7b2b4d46d96b..9cad339a567a 100644
--- a/drawinglayer/source/tools/emfpbrush.cxx
+++ b/drawinglayer/source/tools/emfpbrush.cxx
@@ -101,8 +101,8 @@ namespace emfplushelper
 
         s.ReadUInt32(header).ReadUInt32(type);
 
-        SAL_INFO("cppcanvas.emf", "EMF+\tbrush");
-        SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << " type: " << type << std::dec);
+        SAL_INFO("drawinglayer", "EMF+\tbrush");
+        SAL_INFO("drawinglayer", "EMF+\theader: 0x" << std::hex << header << " type: " << type << std::dec);
 
         switch (type)
         {
@@ -112,7 +112,7 @@ namespace emfplushelper
                 s.ReadUInt32(color);
 
                 solidColor = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
-                SAL_INFO("cppcanvas.emf", "EMF+\tsolid color: 0x" << std::hex << color << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tsolid color: 0x" << std::hex << color << std::dec);
                 break;
             }
             case BrushTypeHatchFill:
@@ -127,26 +127,26 @@ namespace emfplushelper
                 hatchStyle = static_cast<EmfPlusHatchStyle>(style);
                 solidColor = ::Color(0xff - (foregroundColor >> 24), (foregroundColor >> 16) & 0xff, (foregroundColor >> 8) & 0xff, foregroundColor & 0xff);
                 secondColor = ::Color(0xff - (backgroundColor >> 24), (backgroundColor >> 16) & 0xff, (backgroundColor >> 8) & 0xff, backgroundColor & 0xff);
-                SAL_INFO("cppcanvas.emf", "EMF+\thatch style " << style << " foregroundcolor: 0x" << solidColor.AsRGBHexString() << " background 0x" << secondColor.AsRGBHexString());
+                SAL_INFO("drawinglayer", "EMF+\thatch style " << style << " foregroundcolor: 0x" << solidColor.AsRGBHexString() << " background 0x" << secondColor.AsRGBHexString());
                 break;
             }
             case BrushTypeTextureFill:
             {
-                SAL_WARN("cppcanvas.emf", "EMF+\tTODO: implement BrushTypeTextureFill brush");
+                SAL_WARN("drawinglayer", "EMF+\tTODO: implement BrushTypeTextureFill brush");
                 break;
             }
             case BrushTypePathGradient:
             {
                 s.ReadUInt32(additionalFlags).ReadInt32(wrapMode);
-                SAL_INFO("cppcanvas.emf", "EMF+\tpath gradient, additional flags: 0x" << std::hex << additionalFlags << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tpath gradient, additional flags: 0x" << std::hex << additionalFlags << std::dec);
                 sal_uInt32 color;
                 s.ReadUInt32(color);
                 solidColor = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
-                SAL_INFO("cppcanvas.emf", "EMF+\tcenter color: 0x" << std::hex << color << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tcenter color: 0x" << std::hex << color << std::dec);
                 s.ReadFloat(areaX).ReadFloat(areaY);
-                SAL_INFO("cppcanvas.emf", "EMF+\tcenter point: " << areaX << "," << areaY);
+                SAL_INFO("drawinglayer", "EMF+\tcenter point: " << areaX << "," << areaY);
                 s.ReadInt32(surroundColorsNumber);
-                SAL_INFO("cppcanvas.emf", "EMF+\t number of surround colors: " << surroundColorsNumber);
+                SAL_INFO("drawinglayer", "EMF+\t number of surround colors: " << surroundColorsNumber);
 
                 if (surroundColorsNumber<0 || sal_uInt32(surroundColorsNumber)>SAL_MAX_INT32 / sizeof(::Color))
                 {
@@ -161,7 +161,7 @@ namespace emfplushelper
                     surroundColors[i] = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
                     if (i == 0)
                         secondColor = surroundColors[0];
-                    SAL_INFO("cppcanvas.emf", "EMF+\tsurround color[" << i << "]: 0x" << std::hex << color << std::dec);
+                    SAL_INFO("drawinglayer", "EMF+\tsurround color[" << i << "]: 0x" << std::hex << color << std::dec);
                 }
 
                 if (additionalFlags & 0x01)
@@ -169,7 +169,7 @@ namespace emfplushelper
                     sal_Int32 pathLength;
 
                     s.ReadInt32(pathLength);
-                    SAL_INFO("cppcanvas.emf", "EMF+\tpath length: " << pathLength);
+                    SAL_INFO("drawinglayer", "EMF+\tpath length: " << pathLength);
 
                     sal_uInt64 const pos = s.Tell();
 
@@ -177,8 +177,8 @@ namespace emfplushelper
                     sal_Int32 pathPoints, pathFlags;
                     s.ReadUInt32(pathHeader).ReadInt32(pathPoints).ReadInt32(pathFlags);
 
-                    SAL_INFO("cppcanvas.emf", "EMF+\tpath (brush path gradient)");
-                    SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec);
+                    SAL_INFO("drawinglayer", "EMF+\tpath (brush path gradient)");
+                    SAL_INFO("drawinglayer", "EMF+\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec);
 
                     path = new EMFPPath(pathPoints);
                     path->Read(s, pathFlags, rR);
@@ -188,7 +188,7 @@ namespace emfplushelper
                     const ::basegfx::B2DRectangle aBounds(::basegfx::utils::getRange(path->GetPolygon(rR, false)));
                     areaWidth = aBounds.getWidth();
                     areaHeight = aBounds.getHeight();
-                    SAL_INFO("cppcanvas.emf", "EMF+\t polygon bounding box: " << aBounds.getMinX() << "," << aBounds.getMinY() << " " << aBounds.getWidth() << "x" << aBounds.getHeight());
+                    SAL_INFO("drawinglayer", "EMF+\t polygon bounding box: " << aBounds.getMinX() << "," << aBounds.getMinY() << " " << aBounds.getWidth() << "x" << aBounds.getHeight());
                 }
                 else
                 {
@@ -196,7 +196,7 @@ namespace emfplushelper
                     s.ReadInt32(boundaryPointCount);
 
                     sal_uInt64 const pos = s.Tell();
-                    SAL_INFO("cppcanvas.emf", "EMF+\t use boundary, points: " << boundaryPointCount);
+                    SAL_INFO("drawinglayer", "EMF+\t use boundary, points: " << boundaryPointCount);
                     path = new EMFPPath(boundaryPointCount);
                     path->Read(s, 0x0, rR);
 
@@ -205,15 +205,15 @@ namespace emfplushelper
                     const ::basegfx::B2DRectangle aBounds(::basegfx::utils::getRange(path->GetPolygon(rR, false)));
                     areaWidth = aBounds.getWidth();
                     areaHeight = aBounds.getHeight();
-                    SAL_INFO("cppcanvas.emf", "EMF+\t polygon bounding box: " << aBounds.getMinX() << "," << aBounds.getMinY() << " " << aBounds.getWidth() << "x" << aBounds.getHeight());
+                    SAL_INFO("drawinglayer", "EMF+\t polygon bounding box: " << aBounds.getMinX() << "," << aBounds.getMinY() << " " << aBounds.getWidth() << "x" << aBounds.getHeight());
                 }
 
                 if (additionalFlags & 0x02)
                 {
-                    SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation");
+                    SAL_INFO("drawinglayer", "EMF+\tuse transformation");
                     EmfPlusHelperData::readXForm(s, brush_transformation);
                     hasTransformation = true;
-                    SAL_INFO("cppcanvas.emf",
+                    SAL_INFO("drawinglayer",
                                 "EMF+\tm11: " << brush_transformation.get(0,0) << " m12: " << brush_transformation.get(1,0) <<
                                 "\nEMF+\tm21: " << brush_transformation.get(0,1) << " m22: " << brush_transformation.get(1,1) <<
                                 "\nEMF+\tdx: " << brush_transformation.get(0,2) << " dy: " << brush_transformation.get(1,2));
@@ -223,7 +223,7 @@ namespace emfplushelper
                 if (additionalFlags & 0x08)
                 {
                     s.ReadInt32(blendPoints);
-                    SAL_INFO("cppcanvas.emf", "EMF+\tuse blend, points: " << blendPoints);
+                    SAL_INFO("drawinglayer", "EMF+\tuse blend, points: " << blendPoints);
                     if (blendPoints<0 || sal_uInt32(blendPoints)>SAL_MAX_INT32 / (2 * sizeof(float)))
                         blendPoints = SAL_MAX_INT32 / (2 * sizeof(float));
                     blendPositions = new float[2 * blendPoints];
@@ -232,20 +232,20 @@ namespace emfplushelper
                     for (int i = 0; i < blendPoints; i++)
                     {
                         s.ReadFloat(blendPositions[i]);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tposition[" << i << "]: " << blendPositions[i]);
+                        SAL_INFO("drawinglayer", "EMF+\tposition[" << i << "]: " << blendPositions[i]);
                     }
 
                     for (int i = 0; i < blendPoints; i++)
                     {
                         s.ReadFloat(blendFactors[i]);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tfactor[" << i << "]: " << blendFactors[i]);
+                        SAL_INFO("drawinglayer", "EMF+\tfactor[" << i << "]: " << blendFactors[i]);
                     }
                 }
 
                 if (additionalFlags & 0x04)
                 {
                     s.ReadInt32(colorblendPoints);
-                    SAL_INFO("cppcanvas.emf", "EMF+\tuse color blend, points: " << colorblendPoints);
+                    SAL_INFO("drawinglayer", "EMF+\tuse color blend, points: " << colorblendPoints);
 
                     if (colorblendPoints<0 || sal_uInt32(colorblendPoints)>SAL_MAX_INT32 / sizeof(float))
                     {
@@ -263,14 +263,14 @@ namespace emfplushelper
                     for (int i = 0; i < colorblendPoints; i++)
                     {
                         s.ReadFloat(colorblendPositions[i]);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tposition[" << i << "]: " << colorblendPositions[i]);
+                        SAL_INFO("drawinglayer", "EMF+\tposition[" << i << "]: " << colorblendPositions[i]);
                     }
 
                     for (int i = 0; i < colorblendPoints; i++)
                     {
                         s.ReadUInt32(color);
                         colorblendColors[i] = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tcolor[" << i << "]: 0x" << std::hex << color << std::dec);
+                        SAL_INFO("drawinglayer", "EMF+\tcolor[" << i << "]: 0x" << std::hex << color << std::dec);
                     }
                 }
 
@@ -279,16 +279,16 @@ namespace emfplushelper
             case BrushTypeLinearGradient:
             {
                 s.ReadUInt32(additionalFlags).ReadInt32(wrapMode);
-                SAL_INFO("cppcanvas.emf", "EMF+\tlinear gradient, additional flags: 0x" << std::hex << additionalFlags << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tlinear gradient, additional flags: 0x" << std::hex << additionalFlags << std::dec);
                 s.ReadFloat(areaX).ReadFloat(areaY).ReadFloat(areaWidth).ReadFloat(areaHeight);
-                SAL_INFO("cppcanvas.emf", "EMF+\tarea: " << areaX << "," << areaY << " - " << areaWidth << "x" << areaHeight);
+                SAL_INFO("drawinglayer", "EMF+\tarea: " << areaX << "," << areaY << " - " << areaWidth << "x" << areaHeight);
                 sal_uInt32 color;
                 s.ReadUInt32(color);
                 solidColor = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
-                SAL_INFO("cppcanvas.emf", "EMF+\tfirst color: 0x" << std::hex << color << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tfirst color: 0x" << std::hex << color << std::dec);
                 s.ReadUInt32(color);
                 secondColor = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
-                SAL_INFO("cppcanvas.emf", "EMF+\tsecond color: 0x" << std::hex << color << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tsecond color: 0x" << std::hex << color << std::dec);
 
                 // repeated colors, unknown meaning, see http://www.aces.uiuc.edu/~jhtodd/Metafile/MetafileRecords/ObjectBrush.html
                 s.ReadUInt32(color);
@@ -296,10 +296,10 @@ namespace emfplushelper
 
                 if (additionalFlags & 0x02)
                 {
-                    SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation");
+                    SAL_INFO("drawinglayer", "EMF+\tuse transformation");
                     EmfPlusHelperData::readXForm(s, brush_transformation);
                     hasTransformation = true;
-                    SAL_INFO("cppcanvas.emf",
+                    SAL_INFO("drawinglayer",
                         "EMF+\tm11: " << brush_transformation.get(0,0) << " m12: " << brush_transformation.get(1,0) <<
                         "\nEMF+\tm21: " << brush_transformation.get(0,1) << " m22: " << brush_transformation.get(1,1) <<
                         "\nEMF+\tdx: " << brush_transformation.get(0,2) << " dy: " << brush_transformation.get(1,2));
@@ -308,7 +308,7 @@ namespace emfplushelper
                 if (additionalFlags & 0x08)
                 {
                     s.ReadInt32(blendPoints);
-                    SAL_INFO("cppcanvas.emf", "EMF+\tuse blend, points: " << blendPoints);
+                    SAL_INFO("drawinglayer", "EMF+\tuse blend, points: " << blendPoints);
                     if (blendPoints<0 || sal_uInt32(blendPoints)>SAL_MAX_INT32 / (2 * sizeof(float)))
                         blendPoints = SAL_MAX_INT32 / (2 * sizeof(float));
                     blendPositions = new float[2 * blendPoints];
@@ -317,20 +317,20 @@ namespace emfplushelper
                     for (int i = 0; i < blendPoints; i++)
                     {
                         s.ReadFloat(blendPositions[i]);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tposition[" << i << "]: " << blendPositions[i]);
+                        SAL_INFO("drawinglayer", "EMF+\tposition[" << i << "]: " << blendPositions[i]);
                     }
 
                     for (int i = 0; i < blendPoints; i++)
                     {
                         s.ReadFloat(blendFactors[i]);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tfactor[" << i << "]: " << blendFactors[i]);
+                        SAL_INFO("drawinglayer", "EMF+\tfactor[" << i << "]: " << blendFactors[i]);
                     }
                 }
 
                 if (additionalFlags & 0x04)
                 {
                     s.ReadInt32(colorblendPoints);
-                    SAL_INFO("cppcanvas.emf", "EMF+\tuse color blend, points: " << colorblendPoints);
+                    SAL_INFO("drawinglayer", "EMF+\tuse color blend, points: " << colorblendPoints);
 
                     if (colorblendPoints<0 || sal_uInt32(colorblendPoints)>SAL_MAX_INT32 / sizeof(float))
                     {
@@ -348,14 +348,14 @@ namespace emfplushelper
                     for (int i = 0; i < colorblendPoints; i++)
                     {
                         s.ReadFloat(colorblendPositions[i]);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tposition[" << i << "]: " << colorblendPositions[i]);
+                        SAL_INFO("drawinglayer", "EMF+\tposition[" << i << "]: " << colorblendPositions[i]);
                     }
 
                     for (int i = 0; i < colorblendPoints; i++)
                     {
                         s.ReadUInt32(color);
                         colorblendColors[i] = ::Color(0xff - (color >> 24), (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
-                        SAL_INFO("cppcanvas.emf", "EMF+\tcolor[" << i << "]: 0x" << std::hex << color << std::dec);
+                        SAL_INFO("drawinglayer", "EMF+\tcolor[" << i << "]: 0x" << std::hex << color << std::dec);
                     }
                 }
 
@@ -363,7 +363,7 @@ namespace emfplushelper
             }
             default:
             {
-                SAL_INFO("cppcanvas.emf", "EMF+\tunhandled brush type: " << std::hex << type << std::dec);
+                SAL_INFO("drawinglayer", "EMF+\tunhandled brush type: " << std::hex << type << std::dec);
             }
         }
     }