strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pct import: Add logging.

Browse source 
Change-Id: Ia3fe1ff0075434d0b6903bf978c16499e07d699d
This commit is contained in:
Jan Holesovsky 2014-06-10 15:54:40 +02:00
parent a5a17ccdbc
commit e7944dabfb
2 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
filter/source/graphicfilter/ipict/ipict.cxx
View file

@ -371,8 +371,11 @@ Point PictReader::ReadPoint()
pPict->ReadInt16( ny ).ReadInt16( nx );
return Point( (long)nx - aBoundingRect.Left(),
Point aPoint( (long)nx - aBoundingRect.Left(),
(long)ny - aBoundingRect.Top() );
SAL_INFO("filter.pict", "ReadPoint: " << aPoint);
return aPoint;
}
Point PictReader::ReadDeltaH(Point aBase)
@ -458,6 +461,8 @@ void PictReader::ReadRectangle(Rectangle & rRect)
aTopLeft=ReadPoint();
aBottomRight=ReadPoint();
rRect=Rectangle(aTopLeft,aBottomRight);
SAL_INFO("filter.pict", "ReadRectangle: " << rRect);
}
@ -1198,6 +1203,38 @@ void PictReader::ReadHeader()
pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
}
#if OSL_DEBUG_LEVEL > 0
static const char* operationName(sal_uInt16 nOpcode)
{
// add here whatever makes the debugging easier for you, otherwise you'll
// see only the operation's opcode
switch (nOpcode)
{
case 0x0001: return "Clip";
case 0x0003: return "TxFont";
case 0x0004: return "TxFace";
case 0x0008: return "PnMode";
case 0x0009: return "PnPat";
case 0x000d: return "TxSize";
case 0x001a: return "RGBFgCol";
case 0x001d: return "HiliteColor";
case 0x0020: return "Line";
case 0x0022: return "ShortLine";
case 0x0028: return "LongText";
case 0x0029: return "DHText";
case 0x002a: return "DVText";
case 0x002c: return "fontName";
case 0x002e: return "glyphState";
case 0x0031: return "paintRect";
case 0x0038: return "frameSameRect";
case 0x0070: return "framePoly";
case 0x0071: return "paintPoly";
case 0x00a1: return "LongComment";
default: return "";
}
}
#endif
sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
{
sal_uInt16 nUSHORT;
@ -1213,6 +1250,10 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
default: break;
}
#if OSL_DEBUG_LEVEL > 0
SAL_INFO("filter.pict", "Operation: 0x" << OUString::number(nOpcode, 16) << " [" << operationName(nOpcode) << "]");
#endif
switch(nOpcode) {
case 0x0000: // NOP
@ -1228,16 +1269,16 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
// I do that because the clipping is often used to clean a region,
// before drawing some text and also to draw this text.
// So using a too small region can lead to clip the end of the text ;
// but this can be discutable...
aRect.setWidth(aRect.getWidth()+1);
// but this can be discutable...
aRect.setWidth(aRect.getWidth()+1);
aRect.setHeight(aRect.getHeight()+1);
pVirDev->SetClipRegion( Region( aRect ) );
break;
}
case 0x0002: // BkPat
nDataSize=eActBackPattern.read(*pPict);
eActMethod=PDM_UNDEFINED;
break;
nDataSize = eActBackPattern.read(*pPict);
eActMethod = PDM_UNDEFINED;
break;
case 0x0003: // TxFont
pPict->ReadUInt16( nUSHORT );
@ -1305,12 +1346,12 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
break;
case 0x0009: // PnPat
nDataSize=eActPenPattern.read(*pPict);
nDataSize=eActPenPattern.read(*pPict);
eActMethod=PDM_UNDEFINED;
break;
case 0x000a: // FillPat
nDataSize=eActFillPattern.read(*pPict);
nDataSize=eActFillPattern.read(*pPict);
eActMethod=PDM_UNDEFINED;
break;

1
include/sal/log-areas.dox
View file

@ -172,6 +172,7 @@ certain functionality.
@li @c filter.ms - escher import/export
@li @c filter.odfflatxml
@li @c filter.os2met
@li @c filter.pict
@li @c filter.tiff
@li @c filter.xslt - xslt import/export
@li @c oox.cscode - see oox/source/drawingml/customshapes/README