[Libreoffice-commits] core.git: 2 commits - filter/source include/sal qadevOOo/tests
Andras Timar
andras.timar at collabora.com
Mon Feb 3 01:48:55 PST 2014
filter/source/graphicfilter/idxf/dxf2mtf.hxx | 1
filter/source/graphicfilter/ios2met/ios2met.cxx | 60 +++++++++-------------
filter/source/graphicfilter/ipict/ipict.cxx | 1
filter/source/graphicfilter/itiff/itiff.cxx | 50 ++++++++----------
include/sal/log-areas.dox | 2
qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java | 2
6 files changed, 54 insertions(+), 62 deletions(-)
New commits:
commit ed69dd79ffbd51417caefda48cf5ef6c3e396eea
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Feb 3 10:47:18 2014 +0100
convert OOODEBUG to SAL_INFO
Change-Id: I63a990dca554c9defd4f168fa250ebc1685baafd
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index 518ed28..20222ad 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -24,7 +24,6 @@
#include <vcl/font.hxx>
#include <vcl/lineinfo.hxx>
-// MT: NOOLDSV, someone should change the code...
enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 43ffd67..d85eb5d 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -28,14 +28,9 @@
class FilterConfigItem;
-// MT: NOOLDSV, someone should change the code...
enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-//============================== defines ===================================
-
-#define OOODEBUG(str,Num) //InfoBox(NULL,String(str)+String(" ")+String(Num)).Execute();
-
// -----------------------------Feld-Typen-------------------------------
#define BegDocumnMagic 0xA8A8 /* Begin Document */
@@ -1424,13 +1419,13 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
case GOrdGivStx: ReadChrStr(sal_True , sal_False, sal_True , nOrderLen); break;
case GOrdCurStx: ReadChrStr(sal_False, sal_False, sal_True , nOrderLen); break;
- case GOrdGivImg: OOODEBUG("GOrdGivImg",0);
+ case GOrdGivImg: SAL_INFO("filter.os2met","GOrdGivImg");
break;
- case GOrdCurImg: OOODEBUG("GOrdCurImg",0);
+ case GOrdCurImg: SAL_INFO("filter.os2met","GOrdCurImg");
break;
- case GOrdImgDat: OOODEBUG("GOrdImgDat",0);
+ case GOrdImgDat: SAL_INFO("filter.os2met","GOrdImgDat");
break;
- case GOrdEndImg: OOODEBUG("GOrdEndImg",0);
+ case GOrdEndImg: SAL_INFO("filter.os2met","GOrdEndImg");
break;
case GOrdBegAra: {
@@ -1475,9 +1470,9 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
break;
- case GOrdBegElm:// OOODEBUG("GOrdBegElm",0);
+ case GOrdBegElm: SAL_INFO("filter.os2met","GOrdBegElm");
break;
- case GOrdEndElm:// OOODEBUG("GOrdEndElm",0);
+ case GOrdEndElm: SAL_INFO("filter.os2met","GOrdEndElm");
break;
case GOrdBegPth: {
@@ -1586,7 +1581,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
break;
}
- case GOrdSClPth: { OOODEBUG("GOrdSClPth",0);
+ case GOrdSClPth: { SAL_INFO("filter.os2met","GOrdSClPth");
sal_uInt32 nID;
OSPath * p=pPathList;
pOS2MET->SeekRel(2);
@@ -1599,29 +1594,29 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdNopNop:
break;
- case GOrdRemark: //OOODEBUG("GOrdRemark",0);
+ case GOrdRemark: SAL_INFO("filter.os2met","GOrdRemark");
break;
- case GOrdSegLab: OOODEBUG("GOrdSegLab",0);
+ case GOrdSegLab: SAL_INFO("filter.os2met","GOrdSegLab");
break;
case GOrdBitBlt: ReadBitBlt(); break;
- case GOrdCalSeg: OOODEBUG("GOrdCalSeg",0);
+ case GOrdCalSeg: SAL_INFO("filter.os2met","GOrdCalSeg");
break;
- case GOrdSSgBnd: OOODEBUG("GOrdSSgBnd",0);
+ case GOrdSSgBnd: SAL_INFO("filter.os2met","GOrdSSgBnd");
break;
- case GOrdSegChr: OOODEBUG("GOrdSegChr",0);
+ case GOrdSegChr: SAL_INFO("filter.os2met","GOrdSegChr");
break;
case GOrdCloFig:
CloseFigure();
break;
- case GOrdEndSym: OOODEBUG("GOrdEndSym",0);
+ case GOrdEndSym: SAL_INFO("filter.os2met","GOrdEndSym");
break;
- case GOrdEndPlg: OOODEBUG("GOrdEndPlg",0);
+ case GOrdEndPlg: SAL_INFO("filter.os2met","GOrdEndPlg");
break;
- case GOrdEscape: OOODEBUG("GOrdEscape",0);
+ case GOrdEscape: SAL_INFO("filter.os2met","GOrdEscape");
break;
- case GOrdExtEsc: OOODEBUG("GOrdExtEsc",0);
+ case GOrdExtEsc: SAL_INFO("filter.os2met","GOrdExtEsc");
break;
case GOrdPolygn: ReadPolygons(); break;
@@ -1841,7 +1836,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
}
case GOrdPPtSet: PushAttr(nOrderID);
- case GOrdSPtSet: OOODEBUG("GOrdSPtSet",0);
+ case GOrdSPtSet: SAL_INFO("filter.os2met","GOrdSPtSet");
break;
case GOrdPPtSym: PushAttr(nOrderID);
@@ -1853,7 +1848,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
case GOrdPPtRef: PushAttr(nOrderID);
- case GOrdSPtRef: OOODEBUG("GOrdSPtRef",0);
+ case GOrdSPtRef: SAL_INFO("filter.os2met","GOrdSPtRef");
break;
case GOrdPLnEnd: PushAttr(nOrderID);
@@ -1964,7 +1959,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
case GOrdPTxAlg: PushAttr(nOrderID);
- case GOrdSTxAlg: OOODEBUG("GOrdSTxAlg",0);
+ case GOrdSTxAlg: SAL_INFO("filter.os2met","GOrdSTxAlg");
break;
case GOrdPMkPrc: PushAttr(nOrderID);
@@ -2023,20 +2018,20 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
break;
case GOrdPMdTrn: PushAttr(nOrderID);
- case GOrdSMdTrn: OOODEBUG("GOrdSMdTrn",0);
+ case GOrdSMdTrn: SAL_INFO("filter.os2met","GOrdSMdTrn");
break;
case GOrdPPkIdn: PushAttr(nOrderID);
- case GOrdSPkIdn: OOODEBUG("GOrdSPkIdn",0);
+ case GOrdSPkIdn: SAL_INFO("filter.os2met","GOrdSPkIdn");
break;
- case GOrdSVwTrn: OOODEBUG("GOrdSVwTrn",0);
+ case GOrdSVwTrn: SAL_INFO("filter.os2met","GOrdSVwTrn");
break;
case GOrdPVwWin: PushAttr(nOrderID);
- case GOrdSVwWin: OOODEBUG("GOrdSVwWin",0);
+ case GOrdSVwWin: SAL_INFO("filter.os2met","GOrdSVwWin");
break;
- default: OOODEBUG("Order unbekannt:",nOrderID);
+ default: SAL_INFO("filter.os2met","Unknown order: " << nOrderID);
}
}
@@ -2461,11 +2456,10 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize)
nPos=pOS2MET->Tell();
ReadOrder(nOrderID, nOrderLen);
if (nPos+nOrderLen < pOS2MET->Tell()) {
- OOODEBUG("Order shorter than he assumes! OrderID:",nOrderID);
- OOODEBUG("...und zwar bei Position (Parameteranfang):",nPos);
+ SAL_INFO("filter.os2met","Order is shorter than expected. OrderID: " << nOrderID << " Position: " << nPos);
}
else if (nPos+nOrderLen != pOS2MET->Tell()) {
- OOODEBUG(String(nOrderID)+String(" Order nicht alles gelesen! bei:"),nPos);
+ SAL_INFO("filter.os2met","Order was not read completely. OrderID: " << nOrderID << " Position: " << nPos);
}
pOS2MET->Seek(nPos+nOrderLen);
}
@@ -2698,7 +2692,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
pOS2MET->SetNumberFormatInt(nOrigNumberFormat);
if (pOS2MET->GetError()) {
- OOODEBUG("Fehler Nr.:",ErrorCode);
+ SAL_INFO("filter.os2met","Error code: " << ErrorCode);
pOS2MET->Seek(nOrigPos);
}
}
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index f1903e9..d5aa1ef 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -62,7 +62,6 @@ namespace PictReaderInternal {
//! returns true if this is the default pattern
bool isDefault() const { return isRead == false; }
- // MT: NOOLDSV, someone should change the code...
enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 71bd7e0..f235a35 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -25,8 +25,6 @@
class FilterConfigItem;
-#define OOODEBUG(str,Num) //(InfoBox(NULL,String(str)+String(" ")+String(Num)).Execute();
-
namespace {
template< typename T > T BYTESWAP(T nByte) {
@@ -75,7 +73,7 @@ private:
sal_uLong nCellWidth; //
sal_uLong nCellLength; //
sal_uLong nFillOrder; //
- sal_uLong* pStripOffsets; // Fiels of offsets to the Bitmap-Data-"Strips"
+ sal_uLong* pStripOffsets; // field of offsets to the Bitmap-Data-"Strips"
sal_uLong nNumStripOffsets; // size of the field above
sal_uLong nOrientation; //
sal_uLong nSamplesPerPixel; // number of layers
@@ -148,7 +146,7 @@ sal_uLong TIFFReader::DataTypeSize()
switch ( nDataType )
{
case 1 : // BYTE
- case 2 : // ACSII
+ case 2 : // ASCII
case 6 : // SIGNED Byte
case 7 : // UNDEFINED
nSize = 1;
@@ -163,7 +161,7 @@ sal_uLong TIFFReader::DataTypeSize()
nSize = 4;
break;
case 5 : // RATIONAL
- case 10 : // SIGNED RATINAL
+ case 10 : // SIGNED RATIONAL
case 12 : // DOUBLE
nSize = 8;
break;
@@ -268,44 +266,44 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
{
case 0x00fe: // New Sub File
nNewSubFile = ReadIntData();
- OOODEBUG("NewSubFile",nNewSubFile);
+ SAL_INFO("filter.tiff","NewSubFile: " << nNewSubFile);
break;
case 0x00ff: // Sub File
nSubFile = ReadIntData();
- OOODEBUG("SubFile",nSubFile);
+ SAL_INFO("filter.tiff","SubFile: " << nSubFile);
break;
case 0x0100: // Image Width
nImageWidth = ReadIntData();
- OOODEBUG("ImageWidth",nImageWidth);
+ SAL_INFO("filter.tiff","ImageWidth: " << nImageWidth);
break;
case 0x0101: // Image Length
nImageLength = ReadIntData();
- OOODEBUG("ImageLength",nImageLength);
+ SAL_INFO("filter.tiff","ImageLength: " << nImageLength);
break;
case 0x0102: // Bits Per Sample
nBitsPerSample = ReadIntData();
- OOODEBUG("BitsPerSample",nBitsPerSample);
+ SAL_INFO("filter.tiff","BitsPerSample: " << nBitsPerSample);
if ( nBitsPerSample >= 32 ) // 32 bit and larger samples are not supported
bStatus = sal_False;
break;
case 0x0103: // Compression
nCompression = ReadIntData();
- OOODEBUG("Compression",nCompression);
+ SAL_INFO("filter.tiff","Compression: " << nCompression);
break;
case 0x0106: // Photometric Interpreation
nPhotometricInterpretation = ReadIntData();
- OOODEBUG("PhotometricInterpretation",nPhotometricInterpretation);
+ SAL_INFO("filter.tiff","PhotometricInterpretation: " << nPhotometricInterpretation);
break;
case 0x0107: // Thresholding
nThresholding = ReadIntData();
- OOODEBUG("Thresholding",nThresholding);
+ SAL_INFO("filter.tiff","Thresholding: " << nThresholding);
break;
case 0x0108: // Cell Width
@@ -318,7 +316,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
case 0x010a: // Fill Order
nFillOrder = ReadIntData();
- OOODEBUG("FillOrder",nFillOrder);
+ SAL_INFO("filter.tiff","FillOrder: " << nFillOrder);
break;
case 0x0111: { // Strip Offset(s)
@@ -349,22 +347,22 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
}
delete[] pOldSO;
}
- OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
+ SAL_INFO("filter.tiff","StripOffsets (Number:) " << nDataLen);
break;
}
case 0x0112: // Orientation
nOrientation = ReadIntData();
- OOODEBUG("Orientation",nOrientation);
+ SAL_INFO("filter.tiff","Orientation: " << nOrientation);
break;
case 0x0115: // Samples Per Pixel
nSamplesPerPixel = ReadIntData();
- OOODEBUG("SamplesPerPixel",nSamplesPerPixel);
+ SAL_INFO("filter.tiff","SamplesPerPixel: " << nSamplesPerPixel);
break;
case 0x0116: // Rows Per Strip
nRowsPerStrip = ReadIntData();
- OOODEBUG("RowsPerStrip",nRowsPerStrip);
+ SAL_INFO("filter.tiff","RowsPerStrip: " << nRowsPerStrip);
break;
case 0x0117: { // Strip Byte Counts
@@ -395,17 +393,17 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
}
delete[] pOldSBC;
}
- OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
+ SAL_INFO("filter.tiff","StripByteCounts (Number:) " << nDataLen);
break;
}
case 0x0118: // Min Sample Value
nMinSampleValue = ReadIntData();
- OOODEBUG("MinSampleValue",nMinSampleValue);
+ SAL_INFO("filter.tiff","MinSampleValue: " << nMinSampleValue);
break;
case 0x0119: // Max Sample Value
nMaxSampleValue = ReadIntData();
- OOODEBUG("MaxSampleValue",nMaxSampleValue);
+ SAL_INFO("filter.tiff","MaxSampleValue: " << nMaxSampleValue);
break;
case 0x011a: // X Resolution
@@ -418,17 +416,17 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
case 0x011c: // Planar Configuration
nPlanarConfiguration = ReadIntData();
- OOODEBUG("PlanarConfiguration",nPlanarConfiguration);
+ SAL_INFO("filter.tiff","PlanarConfiguration: " << nPlanarConfiguration);
break;
case 0x0124: // Group 3 Options
nGroup3Options = ReadIntData();
- OOODEBUG("Group3Options",nGroup3Options);
+ SAL_INFO("filter.tiff","Group3Options: " << nGroup3Options);
break;
case 0x0125: // Group 4 Options
nGroup4Options = ReadIntData();
- OOODEBUG("Group4Options",nGroup4Options);
+ SAL_INFO("filter.tiff","Group4Options: " << nGroup4Options);
break;
case 0x0128: // Resolution Unit
@@ -437,7 +435,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
case 0x013d: // Predictor
nPredictor = ReadIntData();
- OOODEBUG("Predictor",nPredictor);
+ SAL_INFO("filter.tiff","Predictor: " << nPredictor);
break;
case 0x0140: { // Color Map
@@ -467,7 +465,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
}
else
bStatus = sal_False;
- OOODEBUG("ColorMap (Anzahl Farben:)", nNumColors);
+ SAL_INFO("filter.tiff","ColorMap (number of colors): " << nNumColors);
break;
}
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 0bd0199..fa8cd45 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -157,6 +157,8 @@ certain functionality.
@li @c filter.config
@li @c filter.ms - escher import/export
@li @c filter.odfflatxml
+ at li @c filter.os2met
+ at li @c filter.tiff
@li @c filter.xslt - xslt import/export
@li @c oox.cscode - see oox/source/drawingml/customshapes/README
@li @c oox.drawingml - DrawingML
commit 69adcefccef578f6694e37891ecb07ec3c6d51e4
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Feb 3 10:43:14 2014 +0100
typo: ACSII -> ASCII
Change-Id: I5c12ad690df99718dc1e5d1f25a3b62af3c6b355
diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
index b73fa75..eb0b72c 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java
@@ -517,7 +517,7 @@ public class _XBreakIterator extends MultiMethodTest {
/**
* Tries to determine script type (of all four types). <p>
* Has <b>OK</b> status if <code>LATIN</code> type returned
- * for ACSII character, <code>ASIAN</code> for Katakana Unicode
+ * for ASCII character, <code>ASIAN</code> for Katakana Unicode
* codepoints, <code>COMPLEX</code> for Arabic Unicode
* codepoints and <code>WEAK</code> for codepoints from Arrows
* Unicode block.
More information about the Libreoffice-commits
mailing list