Skip to content

C
core
Kaydet (Commit) 08a690cf authored tarafından Bartosz Kosiorek's avatar Bartosz Kosiorek
Dosyalara gözat
Seçenekler

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

Change-Id: If235956228d7f807817d9ffff3da652bd6485ffa
Reviewed-on: https://gerrit.libreoffice.org/43834Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBartosz Kosiorek <gang65@poczta.onet.pl>
üst 9ae1e094
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 59 deletions
drawinglayer/source/tools/emfpcustomlinecap.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -73,12 +73,12 @@ namespace emfplushelper ...@@ -73,12 +73,12 @@ namespace emfplushelper
{ {
sal_Int32 pathLength; sal_Int32 pathLength;
s.ReadInt32(pathLength); s.ReadInt32(pathLength);
SAL_INFO("cppcanvas.emf", "EMF+\t\tpath length: " << pathLength); SAL_INFO("drawinglayer", "EMF+\t\tpath length: " << pathLength);
sal_uInt32 pathHeader; sal_uInt32 pathHeader;
sal_Int32 pathPoints, pathFlags; sal_Int32 pathPoints, pathFlags;
s.ReadUInt32(pathHeader).ReadInt32(pathPoints).ReadInt32(pathFlags); s.ReadUInt32(pathHeader).ReadInt32(pathPoints).ReadInt32(pathFlags);
SAL_INFO("cppcanvas.emf", "EMF+\t\tpath (custom cap line path)"); SAL_INFO("drawinglayer", "EMF+\t\tpath (custom cap line path)");
SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec); SAL_INFO("drawinglayer", "EMF+\t\theader: 0x" << std::hex << pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << std::hex << pathFlags << std::dec);
EMFPPath path(pathPoints); EMFPPath path(pathPoints);
path.Read(s, pathFlags, rR); path.Read(s, pathFlags, rR);
...@@ -96,8 +96,8 @@ namespace emfplushelper ...@@ -96,8 +96,8 @@ namespace emfplushelper
{ {
sal_uInt32 header; sal_uInt32 header;
s.ReadUInt32(header).ReadUInt32(type); s.ReadUInt32(header).ReadUInt32(type);
SAL_INFO("cppcanvas.emf", "EMF+\t\tcustom cap"); SAL_INFO("drawinglayer", "EMF+\t\tcustom cap");
SAL_INFO("cppcanvas.emf", "EMF+\t\theader: 0x" << std::hex << header << " type: " << type << std::dec); SAL_INFO("drawinglayer", "EMF+\t\theader: 0x" << std::hex << header << " type: " << type << std::dec);
if (type == EmfPlusCustomLineCapDataTypeDefault) if (type == EmfPlusCustomLineCapDataTypeDefault)
{ {
...@@ -111,14 +111,14 @@ namespace emfplushelper ...@@ -111,14 +111,14 @@ namespace emfplushelper
.ReadFloat(miterLimit).ReadFloat(widthScale) .ReadFloat(miterLimit).ReadFloat(widthScale)
.ReadFloat(fillHotSpotX).ReadFloat(fillHotSpotY).ReadFloat(strokeHotSpotX).ReadFloat(strokeHotSpotY); .ReadFloat(fillHotSpotX).ReadFloat(fillHotSpotY).ReadFloat(strokeHotSpotX).ReadFloat(strokeHotSpotY);
SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomLineCapDataFlags: 0x" << std::hex << customLineCapDataFlags); SAL_INFO("drawinglayer", "EMF+\t\tcustomLineCapDataFlags: 0x" << std::hex << customLineCapDataFlags);
SAL_INFO("cppcanvas.emf", "EMF+\t\tbaseCap: 0x" << std::hex << baseCap); SAL_INFO("drawinglayer", "EMF+\t\tbaseCap: 0x" << std::hex << baseCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tbaseInset: " << baseInset); SAL_INFO("drawinglayer", "EMF+\t\tbaseInset: " << baseInset);
SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeStartCap: 0x" << std::hex << strokeStartCap); SAL_INFO("drawinglayer", "EMF+\t\tstrokeStartCap: 0x" << std::hex << strokeStartCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeEndCap: 0x" << std::hex << strokeEndCap); SAL_INFO("drawinglayer", "EMF+\t\tstrokeEndCap: 0x" << std::hex << strokeEndCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeJoin: 0x" << std::hex << strokeJoin); SAL_INFO("drawinglayer", "EMF+\t\tstrokeJoin: 0x" << std::hex << strokeJoin);
SAL_INFO("cppcanvas.emf", "EMF+\t\tmiterLimit: " << miterLimit); SAL_INFO("drawinglayer", "EMF+\t\tmiterLimit: " << miterLimit);
SAL_INFO("cppcanvas.emf", "EMF+\t\twidthScale: " << widthScale); SAL_INFO("drawinglayer", "EMF+\t\twidthScale: " << widthScale);
if (customLineCapDataFlags & EmfPlusCustomLineCapDataFillPath) if (customLineCapDataFlags & EmfPlusCustomLineCapDataFillPath)
{ {
...@@ -143,7 +143,7 @@ namespace emfplushelper ...@@ -143,7 +143,7 @@ namespace emfplushelper
.ReadInt32(lineEndCap).ReadInt32(lineJoin).ReadFloat(miterLimit).ReadInt32(widthScale) .ReadInt32(lineEndCap).ReadInt32(lineJoin).ReadFloat(miterLimit).ReadInt32(widthScale)
.ReadFloat(fillHotSpotX).ReadFloat(fillHotSpotY).ReadFloat(lineHotSpotX).ReadFloat(lineHotSpotY); .ReadFloat(fillHotSpotX).ReadFloat(fillHotSpotY).ReadFloat(lineHotSpotX).ReadFloat(lineHotSpotY);
SAL_INFO("cppcanvas.emf", "EMF+\t\tTODO - actually read EmfPlusCustomLineCapArrowData object (section 2.2.2.12)"); SAL_INFO("drawinglayer", "EMF+\t\tTODO - actually read EmfPlusCustomLineCapArrowData object (section 2.2.2.12)");
} }
} }
} }
......
drawinglayer/source/tools/emfpfont.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -45,9 +45,9 @@ namespace emfplushelper ...@@ -45,9 +45,9 @@ namespace emfplushelper
sal_uInt32 reserved; sal_uInt32 reserved;
sal_uInt32 length; sal_uInt32 length;
s.ReadUInt32(header).ReadFloat(emSize).ReadUInt32(sizeUnit).ReadInt32(fontFlags).ReadUInt32(reserved).ReadUInt32(length); s.ReadUInt32(header).ReadFloat(emSize).ReadUInt32(sizeUnit).ReadInt32(fontFlags).ReadUInt32(reserved).ReadUInt32(length);
SAL_WARN_IF((header >> 12) != 0xdbc01, "cppcanvas.emf", "Invalid header - not 0xdbc01"); SAL_WARN_IF((header >> 12) != 0xdbc01, "drawinglayer", "Invalid header - not 0xdbc01");
SAL_INFO("cppcanvas.emf", "EMF+\tfont\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec); SAL_INFO("drawinglayer", "EMF+\tfont\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec);
SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << " reserved: 0x" << reserved << " length: 0x" << std::hex << length << std::dec); SAL_INFO("drawinglayer", "EMF+\tflags: 0x" << std::hex << fontFlags << " reserved: 0x" << reserved << " length: 0x" << std::hex << length << std::dec);
if (length > 0 && length < 0x4000) if (length > 0 && length < 0x4000)
{ {
...@@ -60,7 +60,7 @@ namespace emfplushelper ...@@ -60,7 +60,7 @@ namespace emfplushelper
} }
family = OUString(pStr, SAL_NO_ACQUIRE); family = OUString(pStr, SAL_NO_ACQUIRE);
SAL_INFO("cppcanvas.emf", "EMF+\tfamily: " << family); SAL_INFO("drawinglayer", "EMF+\tfamily: " << family);
} }
} }
} }
......
drawinglayer/source/tools/emfpimage.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -44,20 +44,20 @@ namespace emfplushelper ...@@ -44,20 +44,20 @@ namespace emfplushelper
{ {
sal_uInt32 header, bitmapType; sal_uInt32 header, bitmapType;
s.ReadUInt32(header).ReadUInt32(type); s.ReadUInt32(header).ReadUInt32(type);
SAL_INFO("cppcanvas.emf", "EMF+\timage\nEMF+\theader: 0x" << std::hex << header << " type: " << type << std::dec); SAL_INFO("drawinglayer", "EMF+\timage\nEMF+\theader: 0x" << std::hex << header << " type: " << type << std::dec);
if (1 == type) if (1 == type)
{ {
// bitmap // bitmap
s.ReadInt32(width).ReadInt32(height).ReadInt32(stride).ReadInt32(pixelFormat).ReadUInt32(bitmapType); s.ReadInt32(width).ReadInt32(height).ReadInt32(stride).ReadInt32(pixelFormat).ReadUInt32(bitmapType);
SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: " << width << " height: " << height << " stride: " << stride << " pixelFormat: 0x" << std::hex << pixelFormat << std::dec); SAL_INFO("drawinglayer", "EMF+\tbitmap width: " << width << " height: " << height << " stride: " << stride << " pixelFormat: 0x" << std::hex << pixelFormat << std::dec);
if ((bitmapType != 0) || (width == 0)) if ((bitmapType != 0) || (width == 0))
{ {
// non native formats // non native formats
GraphicFilter filter; GraphicFilter filter;
filter.ImportGraphic(graphic, OUString(), s); filter.ImportGraphic(graphic, OUString(), s);
SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: " << graphic.GetBitmap().GetSizePixel().Width() << " height: " << graphic.GetBitmap().GetSizePixel().Height()); SAL_INFO("drawinglayer", "EMF+\tbitmap width: " << graphic.GetBitmap().GetSizePixel().Width() << " height: " << graphic.GetBitmap().GetSizePixel().Height());
} }
} }
else if (2 == type) else if (2 == type)
...@@ -71,7 +71,7 @@ namespace emfplushelper ...@@ -71,7 +71,7 @@ namespace emfplushelper
else else
dataSize -= 16; dataSize -= 16;
SAL_INFO("cppcanvas.emf", "EMF+\tmetafile type: " << mfType << " dataSize: " << mfSize << " real size calculated from record dataSize: " << dataSize); SAL_INFO("drawinglayer", "EMF+\tmetafile type: " << mfType << " dataSize: " << mfSize << " real size calculated from record dataSize: " << dataSize);
GraphicFilter filter; GraphicFilter filter;
// workaround buggy metafiles, which have wrong mfSize set (n#705956 for example) // workaround buggy metafiles, which have wrong mfSize set (n#705956 for example)
......
drawinglayer/source/tools/emfppath.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -70,7 +70,7 @@ namespace emfplushelper ...@@ -70,7 +70,7 @@ namespace emfplushelper
// EMFPlusPointR: points are stored in EMFPlusInteger7 or // EMFPlusPointR: points are stored in EMFPlusInteger7 or
// EMFPlusInteger15 objects, see section 2.2.2.21/22 // EMFPlusInteger15 objects, see section 2.2.2.21/22
// If 0x800 bit is set, the 0x4000 bit is undefined and must be ignored // If 0x800 bit is set, the 0x4000 bit is undefined and must be ignored
SAL_WARN("cppcanvas.emf", "EMF+\t\t TODO - parse EMFPlusPointR object (section 2.2.1.6)"); SAL_WARN("drawinglayer", "EMF+\t\t TODO - parse EMFPlusPointR object (section 2.2.1.6)");
} }
else if (pathFlags & 0x4000) else if (pathFlags & 0x4000)
{ {
...@@ -78,7 +78,7 @@ namespace emfplushelper ...@@ -78,7 +78,7 @@ namespace emfplushelper
sal_Int16 x, y; sal_Int16 x, y;
s.ReadInt16( x ).ReadInt16( y ); s.ReadInt16( x ).ReadInt16( y );
SAL_INFO ("cppcanvas.emf", "EMF+\t EMFPlusPoint [x,y]: " << x << "," << y); SAL_INFO ("drawinglayer", "EMF+\t EMFPlusPoint [x,y]: " << x << "," << y);
pPoints [i*2] = x; pPoints [i*2] = x;
pPoints [i*2 + 1] = y; pPoints [i*2 + 1] = y;
} }
...@@ -86,7 +86,7 @@ namespace emfplushelper ...@@ -86,7 +86,7 @@ namespace emfplushelper
{ {
// EMFPlusPointF: stored in Single (float) format // EMFPlusPointF: stored in Single (float) format
s.ReadFloat( pPoints [i*2] ).ReadFloat( pPoints [i*2 + 1] ); s.ReadFloat( pPoints [i*2] ).ReadFloat( pPoints [i*2 + 1] );
SAL_INFO ("cppcanvas.emf", "EMF+\t EMFPlusPointF [x,y]: " << pPoints [i*2] << "," << pPoints [i*2 + 1]); SAL_INFO ("drawinglayer", "EMF+\t EMFPlusPointF [x,y]: " << pPoints [i*2] << "," << pPoints [i*2 + 1]);
} }
} }
...@@ -95,7 +95,7 @@ namespace emfplushelper ...@@ -95,7 +95,7 @@ namespace emfplushelper
for (int i = 0; i < nPoints; i++) for (int i = 0; i < nPoints; i++)
{ {
s.ReadUChar(pPointTypes[i]); s.ReadUChar(pPointTypes[i]);
SAL_INFO("cppcanvas.emf", "EMF+\tpoint type: " << (int)pPointTypes[i]); SAL_INFO("drawinglayer", "EMF+\tpoint type: " << (int)pPointTypes[i]);
} }
} }
...@@ -104,7 +104,7 @@ namespace emfplushelper ...@@ -104,7 +104,7 @@ namespace emfplushelper
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
const ::basegfx::B2DRectangle aBounds (::basegfx::utils::getRange (GetPolygon (rR))); const ::basegfx::B2DRectangle aBounds (::basegfx::utils::getRange (GetPolygon (rR)));
SAL_INFO ("cppcanvas.emf", SAL_INFO ("drawinglayer",
"EMF+\tpolygon bounding box: " << aBounds.getMinX () << "," << aBounds.getMinY () << aBounds.getWidth () << "x" << aBounds.getHeight () << " (mapped)"); "EMF+\tpolygon bounding box: " << aBounds.getMinX () << "," << aBounds.getMinY () << aBounds.getWidth () << "x" << aBounds.getHeight () << " (mapped)");
#else #else
(void) rR; // avoid warnings (void) rR; // avoid warnings
...@@ -141,7 +141,7 @@ namespace emfplushelper ...@@ -141,7 +141,7 @@ namespace emfplushelper
if (((i - last_normal )% 3) == 1) if (((i - last_normal )% 3) == 1)
{ {
polygon.setNextControlPoint (p - 1, mapped); polygon.setNextControlPoint (p - 1, mapped);
SAL_INFO ("cppcanvas.emf", "polygon append next: " << p - 1 << " mapped: " << mapped.getX () << "," << mapped.getY ()); SAL_INFO ("drawinglayer", "polygon append next: " << p - 1 << " mapped: " << mapped.getX () << "," << mapped.getY ());
continue; continue;
} }
else if (((i - last_normal) % 3) == 2) else if (((i - last_normal) % 3) == 2)
...@@ -158,12 +158,12 @@ namespace emfplushelper ...@@ -158,12 +158,12 @@ namespace emfplushelper
} }
polygon.append (mapped); polygon.append (mapped);
SAL_INFO ("cppcanvas.emf", "polygon append point: " << pPoints [i*2] << "," << pPoints [i*2 + 1] << " mapped: " << mapped.getX () << ":" << mapped.getY ()); SAL_INFO ("drawinglayer", "polygon append point: " << pPoints [i*2] << "," << pPoints [i*2 + 1] << " mapped: " << mapped.getX () << ":" << mapped.getY ());
if (hasPrev) if (hasPrev)
{ {
polygon.setPrevControlPoint (p, prev); polygon.setPrevControlPoint (p, prev);
SAL_INFO ("cppcanvas.emf", "polygon append prev: " << p << " mapped: " << prev.getX () << "," << prev.getY ()); SAL_INFO ("drawinglayer", "polygon append prev: " << p << " mapped: " << prev.getX () << "," << prev.getY ());
hasPrev = false; hasPrev = false;
} }
...@@ -174,7 +174,7 @@ namespace emfplushelper ...@@ -174,7 +174,7 @@ namespace emfplushelper
// closed polygon // closed polygon
polygon.setClosed (true); polygon.setClosed (true);
aPolygon.append (polygon); aPolygon.append (polygon);
SAL_INFO ("cppcanvas.emf", "close polygon"); SAL_INFO ("drawinglayer", "close polygon");
last_normal = i + 1; last_normal = i + 1;
p = 0; p = 0;
polygon.clear (); polygon.clear ();
...@@ -197,17 +197,17 @@ namespace emfplushelper ...@@ -197,17 +197,17 @@ namespace emfplushelper
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
for (unsigned int i=0; i<aPolygon.count(); i++) { for (unsigned int i=0; i<aPolygon.count(); i++) {
polygon = aPolygon.getB2DPolygon(i); polygon = aPolygon.getB2DPolygon(i);
SAL_INFO ("cppcanvas.emf", "polygon: " << i); SAL_INFO ("drawinglayer", "polygon: " << i);
for (unsigned int j=0; j<polygon.count(); j++) { for (unsigned int j=0; j<polygon.count(); j++) {
::basegfx::B2DPoint point = polygon.getB2DPoint(j); ::basegfx::B2DPoint point = polygon.getB2DPoint(j);
SAL_INFO ("cppcanvas.emf", "point: " << point.getX() << "," << point.getY()); SAL_INFO ("drawinglayer", "point: " << point.getX() << "," << point.getY());
if (polygon.isPrevControlPointUsed(j)) { if (polygon.isPrevControlPointUsed(j)) {
point = polygon.getPrevControlPoint(j); point = polygon.getPrevControlPoint(j);
SAL_INFO ("cppcanvas.emf", "prev: " << point.getX() << "," << point.getY()); SAL_INFO ("drawinglayer", "prev: " << point.getX() << "," << point.getY());
} }
if (polygon.isNextControlPointUsed(j)) { if (polygon.isNextControlPointUsed(j)) {
point = polygon.getNextControlPoint(j); point = polygon.getNextControlPoint(j);
SAL_INFO ("cppcanvas.emf", "next: " << point.getX() << "," << point.getY()); SAL_INFO ("drawinglayer", "next: " << point.getX() << "," << point.getY());
} }
} }
} }
......
drawinglayer/source/tools/emfppen.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -167,8 +167,8 @@ namespace emfplushelper ...@@ -167,8 +167,8 @@ namespace emfplushelper
sal_uInt32 graphicsVersion, penType; sal_uInt32 graphicsVersion, penType;
int i; int i;
s.ReadUInt32(graphicsVersion).ReadUInt32(penType).ReadUInt32(penDataFlags).ReadUInt32(penUnit).ReadFloat(penWidth); s.ReadUInt32(graphicsVersion).ReadUInt32(penType).ReadUInt32(penDataFlags).ReadUInt32(penUnit).ReadFloat(penWidth);
SAL_INFO("cppcanvas.emf", "EMF+\tpen"); SAL_INFO("drawinglayer", "EMF+\tpen");
SAL_INFO("cppcanvas.emf", "EMF+\t graphics version: 0x" << std::hex << graphicsVersion << " type (must be set to zero): " << penType << SAL_INFO("drawinglayer", "EMF+\t graphics version: 0x" << std::hex << graphicsVersion << " type (must be set to zero): " << penType <<
" pen data flags: 0x" << penDataFlags << " unit: " << penUnit << " width: " << std::dec << penWidth); " pen data flags: 0x" << penDataFlags << " unit: " << penUnit << " width: " << std::dec << penWidth);
if (penDataFlags & PenDataTransform) if (penDataFlags & PenDataTransform)
...@@ -179,7 +179,7 @@ namespace emfplushelper ...@@ -179,7 +179,7 @@ namespace emfplushelper
if (penDataFlags & PenDataStartCap) if (penDataFlags & PenDataStartCap)
{ {
s.ReadInt32(startCap); s.ReadInt32(startCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tstartCap: 0x" << std::hex << startCap); SAL_INFO("drawinglayer", "EMF+\t\tstartCap: 0x" << std::hex << startCap);
} }
else else
{ {
...@@ -189,7 +189,7 @@ namespace emfplushelper ...@@ -189,7 +189,7 @@ namespace emfplushelper
if (penDataFlags & PenDataEndCap) if (penDataFlags & PenDataEndCap)
{ {
s.ReadInt32(endCap); s.ReadInt32(endCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tendCap: 0x" << std::hex << endCap); SAL_INFO("drawinglayer", "EMF+\t\tendCap: 0x" << std::hex << endCap);
} }
else else
{ {
...@@ -217,7 +217,7 @@ namespace emfplushelper ...@@ -217,7 +217,7 @@ namespace emfplushelper
if (penDataFlags & PenDataLineStyle) if (penDataFlags & PenDataLineStyle)
{ {
s.ReadInt32(dashStyle); s.ReadInt32(dashStyle);
SAL_INFO("cppcanvas.emf", "EMF+\t\tdashStyle: 0x" << std::hex << dashStyle); SAL_INFO("drawinglayer", "EMF+\t\tdashStyle: 0x" << std::hex << dashStyle);
} }
else else
{ {
...@@ -248,7 +248,7 @@ namespace emfplushelper ...@@ -248,7 +248,7 @@ namespace emfplushelper
sal_Int32 dashPatternLen; sal_Int32 dashPatternLen;
s.ReadInt32(dashPatternLen); s.ReadInt32(dashPatternLen);
SAL_INFO("cppcanvas.emf", "EMF+\t\tdashPatternLen: " << dashPatternLen); SAL_INFO("drawinglayer", "EMF+\t\tdashPatternLen: " << dashPatternLen);
if (dashPatternLen<0 || sal_uInt32(dashPatternLen)>SAL_MAX_INT32 / sizeof(float)) if (dashPatternLen<0 || sal_uInt32(dashPatternLen)>SAL_MAX_INT32 / sizeof(float))
{ {
...@@ -260,7 +260,7 @@ namespace emfplushelper ...@@ -260,7 +260,7 @@ namespace emfplushelper
for (i = 0; i < dashPatternLen; i++) for (i = 0; i < dashPatternLen; i++)
{ {
s.ReadFloat(dashPattern[i]); s.ReadFloat(dashPattern[i]);
SAL_INFO("cppcanvas.emf", "EMF+\t\t\tdashPattern[" << i << "]: " << dashPattern[i]); SAL_INFO("drawinglayer", "EMF+\t\t\tdashPattern[" << i << "]: " << dashPattern[i]);
} }
} }
...@@ -294,7 +294,7 @@ namespace emfplushelper ...@@ -294,7 +294,7 @@ namespace emfplushelper
if (penDataFlags & PenDataCustomStartCap) if (penDataFlags & PenDataCustomStartCap)
{ {
s.ReadInt32(customStartCapLen); s.ReadInt32(customStartCapLen);
SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomStartCapLen: " << customStartCapLen); SAL_INFO("drawinglayer", "EMF+\t\tcustomStartCapLen: " << customStartCapLen);
sal_uInt64 const pos = s.Tell(); sal_uInt64 const pos = s.Tell();
customStartCap = new EMFPCustomLineCap(); customStartCap = new EMFPCustomLineCap();
...@@ -311,7 +311,7 @@ namespace emfplushelper ...@@ -311,7 +311,7 @@ namespace emfplushelper
if (penDataFlags & PenDataCustomEndCap) if (penDataFlags & PenDataCustomEndCap)
{ {
s.ReadInt32(customEndCapLen); s.ReadInt32(customEndCapLen);
SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomEndCapLen: " << customEndCapLen); SAL_INFO("drawinglayer", "EMF+\t\tcustomEndCapLen: " << customEndCapLen);
sal_uInt64 const pos = s.Tell(); sal_uInt64 const pos = s.Tell();
customEndCap = new EMFPCustomLineCap(); customEndCap = new EMFPCustomLineCap();
......
drawinglayer/source/tools/emfpregion.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -66,8 +66,8 @@ namespace emfplushelper ...@@ -66,8 +66,8 @@ namespace emfplushelper
{ {
sal_uInt32 header; sal_uInt32 header;
s.ReadUInt32(header).ReadInt32(parts); s.ReadUInt32(header).ReadInt32(parts);
SAL_INFO("cppcanvas.emf", "EMF+\tregion"); SAL_INFO("drawinglayer", "EMF+\tregion");
SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << " parts: " << parts << std::dec); SAL_INFO("drawinglayer", "EMF+\theader: 0x" << std::hex << header << " parts: " << parts << std::dec);
if (parts) if (parts)
{ {
...@@ -81,12 +81,12 @@ namespace emfplushelper ...@@ -81,12 +81,12 @@ namespace emfplushelper
for (int i = 0; i < parts; i++) for (int i = 0; i < parts; i++)
{ {
s.ReadInt32(combineMode[i]); s.ReadInt32(combineMode[i]);
SAL_INFO("cppcanvas.emf", "EMF+\tcombine mode [" << i << "]: 0x" << std::hex << combineMode[i] << std::dec); SAL_INFO("drawinglayer", "EMF+\tcombine mode [" << i << "]: 0x" << std::hex << combineMode[i] << std::dec);
} }
} }
s.ReadInt32(initialState); s.ReadInt32(initialState);
SAL_INFO("cppcanvas.emf", "EMF+\tinitial state: 0x" << std::hex << initialState << std::dec); SAL_INFO("drawinglayer", "EMF+\tinitial state: 0x" << std::hex << initialState << std::dec);
} }
} }
......
drawinglayer/source/tools/emfpstringformat.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -51,11 +51,11 @@ namespace emfplushelper ...@@ -51,11 +51,11 @@ namespace emfplushelper
// keep only the last 16 bits of language // keep only the last 16 bits of language
language >>= 16; language >>= 16;
digitLanguage >>= 16; digitLanguage >>= 16;
SAL_WARN_IF((header >> 12) != 0xdbc01, "cppcanvas.emf", "Invalid header - not 0xdbc01"); SAL_WARN_IF((header >> 12) != 0xdbc01, "drawinglayer", "Invalid header - not 0xdbc01");
SAL_INFO("cppcanvas.emf", "EMF+\t string format\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " StringFormatFlags: " << std::dec << stringFormatFlags << " Language: " << language); SAL_INFO("drawinglayer", "EMF+\t string format\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " StringFormatFlags: " << std::dec << stringFormatFlags << " Language: " << language);
SAL_INFO("cppcanvas.emf", "EMF+\t StringAlignment: " << stringAlignment << " LineAlign: " << lineAlign << " DigitSubstitution: " << digitSubstitution << " DigitLanguage: " << digitLanguage); SAL_INFO("drawinglayer", "EMF+\t StringAlignment: " << stringAlignment << " LineAlign: " << lineAlign << " DigitSubstitution: " << digitSubstitution << " DigitLanguage: " << digitLanguage);
SAL_INFO("cppcanvas.emf", "EMF+\t FirstTabOffset: " << firstTabOffset << " HotkeyPrefix: " << hotkeyPrefix << " LeadingMargin: " << leadingMargin << " TrailingMargin: " << trailingMargin << " Tracking: " << tracking); SAL_INFO("drawinglayer", "EMF+\t FirstTabOffset: " << firstTabOffset << " HotkeyPrefix: " << hotkeyPrefix << " LeadingMargin: " << leadingMargin << " TrailingMargin: " << trailingMargin << " Tracking: " << tracking);
SAL_INFO("cppcanvas.emf", "EMF+\t Trimming: " << trimming << " TabStopCount: " << tabStopCount << " RangeCount: " << rangeCount); SAL_INFO("drawinglayer", "EMF+\t Trimming: " << trimming << " TabStopCount: " << tabStopCount << " RangeCount: " << rangeCount);
} }
} }
......
drawinglayer/source/tools/wmfemfhelper.cxx
Dosyayı görüntüle @ 08a690cf
...@@ -3003,11 +3003,11 @@ namespace wmfemfhelper ...@@ -3003,11 +3003,11 @@ namespace wmfemfhelper
if (aEMFPlus.get()) if (aEMFPlus.get())
{ {
// error: should not yet exist // error: should not yet exist
SAL_INFO("cppcanvas.emf", "Error: multiple EMF_PLUS_HEADER_INFO"); SAL_INFO("drawinglayer", "Error: multiple EMF_PLUS_HEADER_INFO");
} }
else else
{ {
SAL_INFO("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pA->GetDataSize()); SAL_INFO("drawinglayer", "EMF+ passed to canvas mtf renderer - header info, size: " << pA->GetDataSize());
SvMemoryStream aMemoryStream(const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(), StreamMode::READ); SvMemoryStream aMemoryStream(const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(), StreamMode::READ);
aEMFPlus.reset( aEMFPlus.reset(
...@@ -3022,7 +3022,7 @@ namespace wmfemfhelper ...@@ -3022,7 +3022,7 @@ namespace wmfemfhelper
if (!aEMFPlus.get()) if (!aEMFPlus.get())
{ {
// error: should exist // error: should exist
SAL_INFO("cppcanvas.emf", "Error: EMF_PLUS before EMF_PLUS_HEADER_INFO"); SAL_INFO("drawinglayer", "Error: EMF_PLUS before EMF_PLUS_HEADER_INFO");
} }
else else
{ {
...@@ -3035,11 +3035,11 @@ namespace wmfemfhelper ...@@ -3035,11 +3035,11 @@ namespace wmfemfhelper
if (char *env = getenv("EMF_PLUS_LIMIT")) if (char *env = getenv("EMF_PLUS_LIMIT"))
{ {
limit = atoi(env); limit = atoi(env);
SAL_INFO("cppcanvas.emf", "EMF+ records limit: " << limit); SAL_INFO("drawinglayer", "EMF+ records limit: " << limit);
} }
} }
SAL_INFO("cppcanvas.emf", "EMF+ passed to canvas mtf renderer, size: " << pA->GetDataSize()); SAL_INFO("drawinglayer", "EMF+ passed to canvas mtf renderer, size: " << pA->GetDataSize());
if (count < limit) if (count < limit)
{ {
......
include/sal/log-areas.dox
Dosyayı görüntüle @ 08a690cf
...@@ -123,6 +123,10 @@ certain functionality. ...@@ -123,6 +123,10 @@ certain functionality.
@li @c cui.options @li @c cui.options
@li @c cui.tabpages @li @c cui.tabpages
@section drawinglayer
@li @c drawinglayer
@section Calc @section Calc
@li @c sc @li @c sc
...@@ -577,7 +581,6 @@ certain functionality. ...@@ -577,7 +581,6 @@ certain functionality.
@li @c configmgr.dconf @li @c configmgr.dconf
@li @c cppcanvas @li @c cppcanvas
@li @c cppcanvas.emf @li @c cppcanvas.emf
@li @c drawinglayer
@li @c dtrans @li @c dtrans
@li @c helpcompiler @li @c helpcompiler
@li @c idl @li @c idl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment