diff options
| author | Hansgerd Schneider <hansgerd.schneider@yahoo.com> | 2013-04-02 21:44:15 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-03 07:51:35 +0000 |
| commit | 7838a7df5dcec03b04f89dcc2698856bd4963ed1 (patch) | |
| tree | d0f05ac1cbe3f98dcec231672460eae4a35f26e3 | |
| parent | e6f0b0b94ec6bdf5fece0c1844ac64fa36e3b1e5 (diff) | |
fdo#39468: Translated German comments in filter
Change-Id: Ife2865d787b32fb821d07a6c0e9173b6235dcd1b
Reviewed-on: https://gerrit.libreoffice.org/3178
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
36 files changed, 493 insertions, 515 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 6749dfe0d819..8cdf07c0d872 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -1115,12 +1115,11 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) void METWriter::WillWriteOrder(sal_uLong nNextOrderMaximumLength) { - // Die Parameter eines 'Graphics Data Fields' duerfen (laut OS2-Doku) - // hoechstens 32759 Bytes umfassen. Gemeint ist die Laenge des Feldes minus - // dem 'Structured Field Introducer' (groesse: 8). Also darf die Groesse - // des ganzen Fields hoechstens 8+32759=32767=0x7fff sein. - // Zur Sicherheit nehmen wir lieber 30000 als Grenze. - + // The parameters of a 'Graphics Data Fields' can be (according to OS2 + // documentation) at most 32759 bytes long. Meant by this is the size + // of the field minus the 'Structured Field Introducer' (size 8). + // So the size of the whole field can be at most 8+32759=32767=0x7fff. + // To be on the safe side whe use 30000 as the limit. if (pMET->Tell()-nActualFieldStartPos+nNextOrderMaximumLength>30000) { UpdateFieldSize(); @@ -2346,7 +2345,7 @@ void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF) *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x20; *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x97 << (sal_uInt8)0x01 << (sal_uInt8)0xb5; - //--- Die weiteren Felder 'Map Coded Font': + //--- The additional Fields 'Map Coded Font': CreateChrSets(pMTF); WriteChrSets(); diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 010eaed494ca..36de78d077ab 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -32,15 +32,15 @@ class PBMWriter { private: - SvStream& m_rOStm; // Die auszugebende PBM-Datei - sal_uInt16 mpOStmOldModus; + SvStream& m_rOStm; // the output PBM file + sal_uInt16 mpOStmOldModus; - sal_Bool mbStatus; + sal_Bool mbStatus; sal_Int32 mnMode; // 0 -> raw, 1-> ascii BitmapReadAccess* mpAcc; - sal_uLong mnWidth, mnHeight; // Bildausmass in Pixeln + sal_uLong mnWidth, mnHeight; // size in pixel - sal_Bool ImplWriteHeader(); + sal_Bool ImplWriteHeader(); void ImplWriteBody(); void ImplWriteNumber( sal_Int32 ); @@ -53,7 +53,7 @@ public: sal_Bool WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); }; -//=================== Methoden von PBMWriter ============================== +//=================== Methods of PBMWriter ============================== PBMWriter::PBMWriter(SvStream &rPBM) : m_rOStm(rPBM) @@ -175,7 +175,7 @@ void PBMWriter::ImplWriteBody() } // ------------------------------------------------------------------------ -// eine Dezimalzahl im ASCII format wird in den Stream geschrieben +// A decimal number in ascii format is written in the stream. void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) { diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index e611f9a49ae0..4dd2e42902b1 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -32,15 +32,15 @@ class PGMWriter { private: - SvStream& m_rOStm; // Die auszugebende PGM-Datei - sal_uInt16 mpOStmOldModus; + SvStream& m_rOStm; // the output PGM file + sal_uInt16 mpOStmOldModus; - sal_Bool mbStatus; - sal_uInt32 mnMode; + sal_Bool mbStatus; + sal_uInt32 mnMode; BitmapReadAccess* mpAcc; - sal_uLong mnWidth, mnHeight; // Bildausmass in Pixeln + sal_uLong mnWidth, mnHeight; // image size in pixeln - sal_Bool ImplWriteHeader(); + sal_Bool ImplWriteHeader(); void ImplWriteBody(); void ImplWriteNumber( sal_Int32 ); @@ -200,8 +200,7 @@ void PGMWriter::ImplWriteBody() } // ------------------------------------------------------------------------ -// eine Dezimalzahl im ASCII format wird in den Stream geschrieben - +// write a decimal number in ascii format into the stream void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) { const rtl::OString aNum(rtl::OString::valueOf(nNumber)); diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 4114cdbfdd6a..765b4f74544d 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -241,13 +241,11 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly) nSize2=aPoly2.GetSize(); // At first we look for a point in aPoly1 (referenced by nBestIdx1) and a - // point in aPoly2 (referenced by nBestid2), which - // Zunaechst werden ein Punkt in aPoly1 (referenziert durch nBestIdx1) und ein - // Punkt in aPoly2 (referenziert durch nBestIdx2) gesucht, die moeglichst dicht - // beieinander liegen. Da dies mit quadratischem Aufwand einher geht, und somit - // manche Bilder Ewigkeiten benoetigen, um exportiert zu werden, begrenzen wir - // die Anzahl der Tests auf 1000, und brechen die Suche ggf. schon vorher ab. - // Dadruch wird das Ergebnis nicht falsch, sondern eventuell nicht so schoen. + // point in aPoly2 (referenced by nBestid2), which are as close together as + // possible. Because this is following square complexity and therefore some + // pictures would need infinite time to export, we limit the the number of test + // by the number of 1000 and cancel the search if necessary preliminarily. + // The result of this will not be wrong but rather not so beautiful. nCountdownTests=1000; nBestDistSqr=0x7fffffff; nBestIdx1=0; @@ -907,18 +905,17 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, // If 24-Bit, then create the Opcode 'DirectBitsRect': if ( nBitsPerPixel == 24 ) { - // Anzahl Bytes einer (ungepackten) Zeile in Quelle und Ziel berechnen: + // Calculate the number of bytes of an (uncompressed) line of source and destination. nSrcRowBytes =( ( 3 * nWidth ) + 0x0003 ) & 0xfffc; nDstRowBytes = nWidth * 4; // writing Opcode and BaseAddr (?): *pPict << (sal_uInt16)0x009a << (sal_uInt32)0x000000ff; - // Normalerweise wollen wir den Packing-Type 4 (Run length encoding - // for 32-Bit Pixels) erzeugen. Wenn aber RowBytes<8 gilt, sind die Daten - // grundsaetzlich ungepackt, auch wenn der Packing-Type 4 angegeben ist, - // was etwas komisch erscheint. Daher wollen wir in so einem Fall lieber - // gleich den Packing-Type 1 (ungepackt) angeben: + // Normally we want to produce packing type 4 (run length encoding + // for 32-bit pixels). But if RowBytes<8 is true, generally all data is + // unpacked even if packing type 4 is specified, which seems a little bit + // strange. Hence we want to specify packing type 1 (no packing) in these cases: if ( nDstRowBytes < 8 ) nPackType = 1; @@ -975,14 +972,14 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, } else // packing ( PackType == 4 ) { - // Speicher fuer Zeilen-Zwischen-Datenstruktur allozieren: + // allocate memory for lines-intermediate-data-structure for ( nc = 0; nc < 4; nc++ ) pComp[ nc ] = new sal_uInt8[ nWidth ]; // loop trough rows: for ( ny = 0; ny < nHeight; ny++ ) { - // Zeil ny der Quelle in die Zwischen-Datenstrktur einlesen: + // read line ny of source into the intermediate data structure for ( nx = 0; nx < nWidth; nx++ ) { @@ -1025,7 +1022,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nEqu3++; } - // Die Daten von nx bis nEqu3 unkomprimiert schreiben (ggf. in mehreren Records): + // write the data from nx to nEqu3 uncompressed (into multiple records if necessarcy); while ( nEqu3 > nx ) { nCount = nEqu3 - nx; @@ -1041,8 +1038,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, while ( nCount > 0 ); } - // Jetzt einen Komprimierungs-Record erzeugen (falls oben mindestens 3 - // gleiche Bytes gefunden): + // now create a compression record (if at least 3 identical bytes were found above) if ( nx < nWidth ) { // Hint: Then one has nx==nEqu3 (hopefully) nCount=3; // Three bytes are equal, as we found out above @@ -1070,7 +1066,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, pPict->Seek( nPos ); // count percentages, Callback, check errors: - nActBitmapPercent = ( ny * 70 / nHeight ) + 30; // (30% machten schon das Schreiben der Win-BMP-Datei aus) + nActBitmapPercent = ( ny * 70 / nHeight ) + 30; // (30% already added up to the writing of the Win-BMP file) MayCallback(); } // clean up: @@ -1081,8 +1077,8 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, else { // don't generate 24-bit i.e. Opcode 'PackBitsRect': - // Bei 1-Bit-Bildern ignorieren manche Import-Filter die Palette und nehmen statt - // dessen die Vorder- und Hintergrundfarbe: + // Some input filters are ignoring the palette of 1-bit images and are using + // the foreground and the background color instead. if ( nBitsPerPixel == 1 ) { WriteOpcode_RGBBkCol( pAcc->GetPaletteColor( 0 ) ); @@ -1094,18 +1090,17 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, WriteOpcode_RGBFgCol( Color( COL_WHITE ) ); } - // Anzahl Bytes einer (ungepackten) Zeile in Ziel und Quelle berechnen: + // Calculate the number of bytes of an (unpacked) line of source an destination. nDstRowBytes = ( nWidth * nBitsPerPixel + 7 ) >> 3; nSrcRowBytes = ( nDstRowBytes + 3 ) & 0xfffffffc; // writing Opcode: *pPict << (sal_uInt16)0x0098; - // Normalerweise wollen wir den Packing-Type 0 (default Packing) erzeugen. - // Wenn aber RowBytes<8 gilt, sind die Daten grundsaetzlich ungepackt, - // auch wenn der Packing-Type 0 angegeben ist, was etwas komisch erscheint. - // Daher wollen wir in so einem Fall lieber gleich den Packing-Type 1 (ungepackt) - // angeben: + // Normally we want to produce packing type 0 (default packing). + // But if RowBytes<8 is true, generally all data is unpacked even if packing + // type 0 is specified, which seems a little bit strange. Hence we want to + // specify packing type 1 (no packing) in these cases. if ( nDstRowBytes < 8 ) nPackType = 1; else @@ -1162,8 +1157,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, for ( ny = 0; ny < nHeight; ny++ ) { - // Zeile ny der Quelle in den Zwischenspeicher einlesen: - + // read line ny of source into the buffer: switch ( nBitsPerPixel ) { case 1 : @@ -1194,7 +1188,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, // remember start of the row in the target: nDstRowPos = pPict->Tell(); - // ByteCount (das ist die Groesse der gepackten Zeile) zunaechst 0 (wird spaeter berichtigt): + // ByteCount (this is the size of the packed line) initialized with 0 (will be corrected later): if ( nDstRowBytes > 250 ) *pPict << (sal_uInt16)0; else @@ -1204,9 +1198,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nx=0; while ( nx < nDstRowBytes && bStatus ) { - // Die Position von 3 gleichen Bytes suchen und in nEqu3 merken. - // wenn nicht gefunden, dann nEqu3=nDstRowBytes setzten. - // Wenn doch gefunden, dann in nEquData den Wert der Bytes merken. + // Look for the position of three identical bytes and remember it in nEqu3. + // Set nEqu3=nDstRowBytes if not found. + // Else remember the value of these bytes in nEquData. nEqu3 = nx; for (;;) { @@ -1221,7 +1215,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nEqu3++; } - // Die Daten von nx bis nEqu3 unkomprimiert schreiben (ggf. in mehreren Records): + // Write the data unpacked from nx to nEqu3 (in multiple records if necessary): while ( nEqu3 > nx ) { nCount = nEqu3 - nx; @@ -1236,19 +1230,18 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, } while ( nCount > 0 ); } - // Jetzt einen Komprimierungs-Record erzeugen (falls oben mindestens 3 - // gleiche Bytes gefunden): + // Now create a compression record (if at least 3 identical bytes were found above): if ( nx < nDstRowBytes ) - { // Hinweis: es gilt nx==nEqu3 (hoffentlich) - nCount = 3; // Drei Bytes sind gleich, wie weiter oben herausgefunden. - // Pruefen, ob es weitere gleiche Bytes gibts (dabei Max.-Record-Groesse beachten): + { // Note: it is imperative nx==nEqu3 (hopefully) + nCount = 3; // three bytes are identically, as identified above + // Check if more identical bytes exist. (in doing so, consider max record size): while ( nx + nCount < nDstRowBytes && nCount < 128 ) { if ( nEquData != pPix[ nx + nCount ] ) break; nCount++; } - // nCount gleiche Bytes komprimiert schreiben: + // write nCount identical bytes unpacked: nFlagCounterByte = (sal_uInt8)( 1 - (long)nCount ); *pPict << nFlagCounterByte << nEquData; nx += nCount; @@ -1266,7 +1259,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, } // count percentages, Callback, check errors: - nActBitmapPercent =( ny * 70 / nHeight ) + 30; // (30% machten schon das Schreiben der Win-BMP-Datei aus) + nActBitmapPercent =( ny * 70 / nHeight ) + 30; // (30% already added up to the writing of the Win-BMP file) MayCallback(); if ( pPict->GetError() ) bStatus = sal_False; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 6f73da12db42..cbd9faa540cb 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -90,19 +90,19 @@ struct StackMember struct PSLZWCTreeNode { - PSLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat - PSLZWCTreeNode* pFirstChild; // erster Sohn - sal_uInt16 nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn - sal_uInt16 nValue; // Der Pixelwert + PSLZWCTreeNode* pBrother; // next node who has the same father + PSLZWCTreeNode* pFirstChild; // first son + sal_uInt16 nCode; // The code for the string of pixel values, which arises if... <missing comment> + sal_uInt16 nValue; // the pixel value }; class PSWriter { private: - sal_Bool mbStatus; - sal_uLong mnLevelWarning; // number of embedded eps files which was not exported - sal_uLong mnLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde. - sal_uInt32 mnLatestPush; // offset auf streamposition, an der zuletzt gepusht wurde + sal_Bool mbStatus; + sal_uLong mnLevelWarning; // number of embedded eps files which was not exported + sal_uLong mnLastPercent; // the number with which pCallback was called the last time + sal_uInt32 mnLatestPush; // offset to streamposition, where last push was done long mnLevel; // dialog options sal_Bool mbGrayScale; @@ -121,17 +121,17 @@ private: double nBoundingY2; // StackMember* pGDIStack; - sal_uLong mnCursorPos; // aktuelle Cursorposition im Output - Color aColor; // aktuelle Farbe die fuer den Output benutzt wird - sal_Bool bLineColor; - Color aLineColor; // aktuelle GDIMetafile Farbeinstellungen - sal_Bool bFillColor; // + sal_uLong mnCursorPos; // current cursor position in output + Color aColor; // current color which is used for output + sal_Bool bLineColor; + Color aLineColor; // current GDIMetafile color settings + sal_Bool bFillColor; // Color aFillColor; // Color aTextColor; // - sal_Bool bTextFillColor; // + sal_Bool bTextFillColor; // Color aTextFillColor; // Color aBackgroundColor; // - sal_Bool bRegionChanged; + sal_Bool bRegionChanged; TextAlign eTextAlign; // double fLineWidth; @@ -142,19 +142,19 @@ private: Font maFont; Font maLastFont; - sal_uInt8 nChrSet; - ChrSet* pChrSetList; // Liste der Character-Sets - sal_uInt8 nNextChrSetId; // die erste unbenutzte ChrSet-Id + sal_uInt8 nChrSet; + ChrSet* pChrSetList; // list of character sets + sal_uInt8 nNextChrSetId; // first unused ChrSet-Id PSLZWCTreeNode* pTable; // LZW compression data PSLZWCTreeNode* pPrefix; // the compression is as same as the TIFF compression - sal_uInt16 nDataSize; - sal_uInt16 nClearCode; - sal_uInt16 nEOICode; - sal_uInt16 nTableSize; - sal_uInt16 nCodeSize; - sal_uLong nOffset; - sal_uLong dwShift; + sal_uInt16 nDataSize; + sal_uInt16 nClearCode; + sal_uInt16 nEOICode; + sal_uInt16 nTableSize; + sal_uInt16 nCodeSize; + sal_uLong nOffset; + sal_uLong dwShift; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; @@ -225,8 +225,8 @@ private: double ImplGetScaling( const MapMode& ); void ImplGetMapMode( const MapMode& ); - sal_Bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ); - sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize ); + sal_Bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ); + sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize ); // LZW methods void StartCompression(); void Compress( sal_uInt8 nSrc ); @@ -234,7 +234,7 @@ private: inline void WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ); public: - sal_Bool WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* ); + sal_Bool WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* ); PSWriter(); ~PSWriter(); }; @@ -538,7 +538,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) ImplWriteLine( "0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath" ); ImplWriteLine( "/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if" ); - ImplWriteLine( "/bdef {bind def} bind def" ); // der neue operator bdef wird erzeugt + ImplWriteLine( "/bdef {bind def} bind def" ); // the new operator bdef is created if ( mbGrayScale ) ImplWriteLine( "/c {setgray} bdef" ); else @@ -2117,9 +2117,9 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) } if ( eTextAlign != ALIGN_BASELINE ) { // PostScript kennt kein FontAlignment - if ( eTextAlign == ALIGN_TOP ) // -> ich gehe daher davon aus, dass - aPoint.Y() += ( aSize.Height() * 4 / 5 ); // der Bereich unter der Baseline - else if ( eTextAlign == ALIGN_BOTTOM ) // in etwa 20% der Fontsize ausmacht + if ( eTextAlign == ALIGN_TOP ) // -> so I assume that + aPoint.Y() += ( aSize.Height() * 4 / 5 ); // the area under the baseline + else if ( eTextAlign == ALIGN_BOTTOM ) // is about 20% of the font size aPoint.Y() -= ( aSize.Height() / 5 ); } ImplMoveTo( aPoint ); @@ -2582,7 +2582,7 @@ void PSWriter::StartCompression() nTableSize = nEOICode + 1; nCodeSize = nDataSize + 1; - nOffset = 32; // anzahl freier bits in dwShift + nOffset = 32; // number of free unused in dwShift dwShift = 0; pTable = new PSLZWCTreeNode[ 4096 ]; diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 7d4e841c7b24..ba665bcaac74 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -49,10 +49,10 @@ struct TIFFLZWCTreeNode { - TIFFLZWCTreeNode* pBrother; // naechster Knoten, der den selben Vater hat - TIFFLZWCTreeNode* pFirstChild; // erster Sohn - sal_uInt16 nCode; // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn - sal_uInt16 nValue; // Der Pixelwert + TIFFLZWCTreeNode* pBrother; // next node with the same father + TIFFLZWCTreeNode* pFirstChild; // first son + sal_uInt16 nCode; // The code for the string of pixel values, which arises if... <missing comment> + sal_uInt16 nValue; // pixel value }; class TIFFWriter @@ -63,7 +63,7 @@ private: sal_uInt32 mnStreamOfs; sal_Bool mbStatus; - BitmapReadAccess* mpAcc; + BitmapReadAccess* mpAcc; sal_uInt32 mnWidth, mnHeight, mnColors; sal_uInt32 mnCurAllPictHeight; @@ -74,7 +74,7 @@ private: sal_uInt32 mnLatestIfdPos; sal_uInt16 mnTagCount; // number of tags already written sal_uInt32 mnCurrentTagCountPos; // offset to the position where the current - // tag count is to insert + // tag count is to insert sal_uInt32 mnXResPos; // if != 0 this DWORDs stores the sal_uInt32 mnYResPos; // actual streamposition of the @@ -82,8 +82,8 @@ private: sal_uInt32 mnBitmapPos; sal_uInt32 mnStripByteCountPos; - TIFFLZWCTreeNode* pTable; - TIFFLZWCTreeNode* pPrefix; + TIFFLZWCTreeNode* pTable; + TIFFLZWCTreeNode* pPrefix; sal_uInt16 nDataSize; sal_uInt16 nClearCode; sal_uInt16 nEOICode; @@ -95,9 +95,9 @@ private: com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; void ImplCallback( sal_uInt32 nPercent ); - sal_Bool ImplWriteHeader( sal_Bool bMultiPage ); + sal_Bool ImplWriteHeader( sal_Bool bMultiPage ); void ImplWritePalette(); - sal_Bool ImplWriteBody(); + sal_Bool ImplWriteBody(); void ImplWriteTag( sal_uInt16 TagID, sal_uInt16 DataType, sal_uInt32 NumberOfItems, sal_uInt32 Value); void ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit ); void StartCompression(); @@ -139,12 +139,10 @@ TIFFWriter::~TIFFWriter() sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { - sal_uLong* pDummy = new sal_uLong; delete pDummy; // damit unter OS/2 - // das richtige (Tools-)new - // verwendet wird, da es sonst - // in dieser DLL nur Vector-news - // gibt; - + sal_uLong* pDummy = new sal_uLong; delete pDummy; // So that under OS/2 + // the right (tools-)new + // is used. Otherwise only vector + // exist within this dll. if ( pFilterConfigItem ) { xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); @@ -512,7 +510,7 @@ void TIFFWriter::StartCompression() nTableSize = nEOICode + 1; nCodeSize = nDataSize + 1; - nOffset = 32; // anzahl freier bits in dwShift + nOffset = 32; // number of free bits in dwShift dwShift = 0; pTable = new TIFFLZWCTreeNode[ 4096 ]; diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index e60841146628..14ff2547c1d5 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -28,18 +28,18 @@ class XPMWriter { private: - SvStream& m_rOStm; // Die auszugebende XPM-Datei + SvStream& m_rOStm; // the output XPM file - sal_Bool mbStatus; - sal_Bool mbTrans; + sal_Bool mbStatus; + sal_Bool mbTrans; BitmapReadAccess* mpAcc; - sal_uLong mnWidth, mnHeight; // Bildausmass in Pixeln - sal_uInt16 mnColors; + sal_uLong mnWidth, mnHeight; // size in Pixel + sal_uInt16 mnColors; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; void ImplCallback( sal_uInt16 nPercent ); - sal_Bool ImplWriteHeader(); + sal_Bool ImplWriteHeader(); void ImplWritePalette(); void ImplWriteColor( sal_uInt16 ); void ImplWriteBody(); @@ -50,7 +50,7 @@ public: XPMWriter(SvStream& rOStm); ~XPMWriter(); - sal_Bool WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); + sal_Bool WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); }; //=================== Methoden von XPMWriter ============================== @@ -99,10 +99,10 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); aBmp = aBmpEx.GetBitmap(); - if ( rGraphic.IsTransparent() ) // event. transparente Farbe erzeugen + if ( rGraphic.IsTransparent() ) // possibly create transparent color { mbTrans = sal_True; - if ( aBmp.GetBitCount() >= 8 ) // wenn noetig Bild auf 8 bit konvertieren + if ( aBmp.GetBitCount() >= 8 ) // if necessary convert image to 8 bit aBmp.Convert( BMP_CONVERSION_8BIT_TRANS ); else aBmp.Convert( BMP_CONVERSION_4BIT_TRANS ); @@ -110,7 +110,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter } else { - if ( aBmp.GetBitCount() > 8 ) // wenn noetig Bild auf 8 bit konvertieren + if ( aBmp.GetBitCount() > 8 ) // if necessary convert image to 8 bit aBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); } mpAcc = aBmp.AcquireReadAccess(); @@ -203,7 +203,7 @@ void XPMWriter::ImplWriteBody() } // ------------------------------------------------------------------------ -// eine Dezimalzahl im ASCII format wird in den Stream geschrieben +// write a decimal number in ascii format into the stream void XPMWriter::ImplWriteNumber(sal_Int32 nNumber) { @@ -226,13 +226,13 @@ void XPMWriter::ImplWritePixel( sal_uLong nCol ) const } // ------------------------------------------------------------------------ -// ein Farbwert wird im Hexadezimalzahlformat in den Stream geschrieben +// write a color value in hex format into the stream void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) { sal_uLong nTmp; sal_uInt8 j; - m_rOStm << "c #"; // # zeigt einen folgenden Hexwert an + m_rOStm << "c #"; // # indicates a following hex value const BitmapColor& rColor = mpAcc->GetPaletteColor( nNumber ); nTmp = ( rColor.GetRed() << 16 ) | ( rColor.GetGreen() << 8 ) | rColor.GetBlue(); for ( signed char i = 20; i >= 0 ; i-=4 ) diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 6b1b225d7450..2e83c45af985 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -396,7 +396,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty void CGMImpressOutAct::InsertPage() { - if ( mnCurrentPage ) // eine seite ist immer vorhanden, deshalb wird die erste Seite ausgelassen + if ( mnCurrentPage ) // one side is always existing, therefore the first side will be left out { uno::Reference< drawing::XDrawPage > xPage( maXDrawPages->insertNewByIndex( 0xffff ), uno::UNO_QUERY ); maXDrawPage = xPage; @@ -487,7 +487,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub uno::Any aAny( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) ); maXPropSet->setPropertyValue( "CircleKind", aAny ); - long nXSize = (long)( rSize.X * 2.0 ); // Merkwuerdigkes Verhalten bei einer awt::Size von 0 + long nXSize = (long)( rSize.X * 2.0 ); // strange behaviour with a awt::Size of 0 long nYSize = (long)( rSize.Y * 2.0 ); if ( nXSize < 1 ) nXSize = 1; @@ -515,7 +515,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize drawing::CircleKind eCircleKind; - long nXSize = (long)( rSize.X * 2.0 ); // Merkwuerdigkes Verhalten bei einer awt::Size von 0 + long nXSize = (long)( rSize.X * 2.0 ); // strange behaviour with a awt::Size of 0 long nYSize = (long)( rSize.Y * 2.0 ); if ( nXSize < 1 ) nXSize = 1; @@ -628,16 +628,16 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly ) { drawing::PointSequenceSequence aRetval; - // Polygone innerhalb vrobereiten + // prepare inside polygons aRetval.realloc( 1 ); - // Zeiger auf aeussere Arrays holen + // get pointer to outside arrays drawing::PointSequence* pOuterSequence = aRetval.getArray(); - // Platz in Arrays schaffen + // make room in arrays pOuterSequence->realloc((sal_Int32)nPoints); - // Pointer auf arrays holen + // get pointer to arrays awt::Point* pInnerSequence = pOuterSequence->getArray(); for( sal_uInt16 n = 0; n < nPoints; n++ ) @@ -661,16 +661,16 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly ) { drawing::PointSequenceSequence aRetval; - // Polygone innerhalb vrobereiten + // prepare inside polygons aRetval.realloc( 1 ); - // Zeiger auf aeussere Arrays holen + // get pointer to outside arrays drawing::PointSequence* pOuterSequence = aRetval.getArray(); - // Platz in Arrays schaffen + // make room in arrays pOuterSequence->realloc((sal_Int32)nPoints); - // Pointer auf arrays holen + // get pointer to arrays awt::Point* pInnerSequence = pOuterSequence->getArray(); for( sal_uInt16 n = 0; n < nPoints; n++ ) @@ -695,11 +695,11 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon ) aRetval.Coordinates.realloc( 1 ); aRetval.Flags.realloc( 1 ); - // Zeiger auf aeussere Arrays holen + // get pointer to outside arrays drawing::PointSequence* pOuterSequence = aRetval.Coordinates.getArray(); drawing::FlagSequence* pOuterFlags = aRetval.Flags.getArray(); - // Platz in Arrays schaffen + // make room in arrays pOuterSequence->realloc( nPoints ); pOuterFlags->realloc( nPoints ); @@ -727,11 +727,11 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon ) { drawing::PolyPolygonBezierCoords aRetval; - // Polygone innerhalb vrobereiten + // prepare inside polygons aRetval.Coordinates.realloc((sal_Int32)nNumPolys); aRetval.Flags.realloc((sal_Int32)nNumPolys); - // Zeiger auf aeussere Arrays holen + // get pointer to outside arrays drawing::PointSequence* pOuterSequence = aRetval.Coordinates.getArray(); drawing::FlagSequence* pOuterFlags = aRetval.Flags.getArray(); @@ -740,11 +740,11 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon ) Polygon aPolygon( rPolyPolygon.GetObject( a ) ); sal_uInt32 nNumPoints = aPolygon.GetSize(); - // Platz in Arrays schaffen + // make room in arrays pOuterSequence->realloc((sal_Int32)nNumPoints); pOuterFlags->realloc((sal_Int32)nNumPoints); - // Pointer auf arrays holen + // get pointer to arrays awt::Point* pInnerSequence = pOuterSequence->getArray(); drawing::PolygonFlags* pInnerFlags = pOuterFlags->getArray(); diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index 311ad38377ba..eb636eb5981a 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -184,7 +184,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) if ( nY > 0 ) fAngle = 360 - fAngle; - if ( fAngle > 180 ) // wird das bild nach oben oder unten aufgebaut ? + if ( fAngle > 180 ) // is the picture build upwards or downwards ? { rDesc.mnOrigin = rDesc.mnP; } @@ -332,7 +332,7 @@ void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& r if ( ( rSource.mnR.Y == rDest.mnQ.Y ) && ( rSource.mnR.X == rDest.mnQ.X ) ) { // Insert on Bottom if ( mpCGM->mnVDCYmul == -1 ) - rDest.mnOrigin = rSource.mnOrigin; // neuer origin + rDest.mnOrigin = rSource.mnOrigin; // new origin rDest.mpBitmap->Expand( 0, rSource.mnY ); rDest.mpBitmap->CopyPixel( Rectangle( Point( 0, rDest.mnY ), Size( rSource.mnX, rSource.mnY ) ), Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) ), rSource.mpBitmap ); @@ -347,7 +347,7 @@ void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& r else { // Insert on Top if ( mpCGM->mnVDCYmul == 1 ) - rDest.mnOrigin = rSource.mnOrigin; // neuer origin + rDest.mnOrigin = rSource.mnOrigin; // new origin rDest.mpBitmap->Expand( 0, rSource.mnY ); rDest.mpBitmap->CopyPixel( Rectangle( Point( 0, rDest.mnY ), Size( rSource.mnX, rSource.mnY ) ), Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) ), rSource.mpBitmap ); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 971b0a1c297a..407dda8d6ebf 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -697,7 +697,7 @@ void CGM::ImplDefaultReplacement() if ( mnElementSize & 1 ) nCount++; nCount += mnElementSize; - if ( ( mnElementClass != 1 ) || ( mnElementID != 0xc ) ) // rekursion hier nicht moeglich!! + if ( ( mnElementClass != 1 ) || ( mnElementID != 0xc ) ) // recursion is not possible here!! ImplDoClass(); } } @@ -760,7 +760,7 @@ SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ ) -//================== GraphicImport - die exportierte Funktion ================ +//================== GraphicImport - the exported function ================ extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar ) diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index 8b8062a1791b..fa65008815f9 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -34,10 +34,10 @@ void CGM::ImplDoClass0() break; case 0x02 : /*End MetaFile*/ { - if ( mpBitmapInUse ) // vorhandene grafik verarbeiten, + if ( mpBitmapInUse ) // process existend graphic { CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap(); - // irgendetwas mit der Bitmap anfangen + // do anything with the bitmap mpOutAct->DrawBitmap( pBmpDesc ); delete mpBitmapInUse; mpBitmapInUse = NULL; @@ -71,16 +71,16 @@ void CGM::ImplDoClass0() { if ( mbPicture ) { - if ( mpBitmapInUse ) // vorhandene grafik verarbeiten, + if ( mpBitmapInUse ) // process existend graphic { CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap(); - // irgendetwas mit der Bitmap anfangen + // do anything with the bitmap mpOutAct->DrawBitmap( pBmpDesc ); delete mpBitmapInUse; mpBitmapInUse = NULL; } - mpOutAct->EndFigure(); // eventuelle figuren schliessen - mpOutAct->EndGrouping(); // eventuelle gruppierungen noch abschliessen + mpOutAct->EndFigure(); // close potential figures + mpOutAct->EndGrouping(); // finish potential groups *pElement = *pCopyOfE; mbFigure = mbFirstOutPut = mbPicture = mbPictureBody = sal_False; } diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index 313a0853069f..8899d73a8951 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -109,10 +109,10 @@ void CGM::ImplDoClass4() if ( mbFirstOutPut ) mpOutAct->FirstOutPut(); - if ( mpBitmapInUse && ( mnElementID != 9 ) ) // vorhandene grafik verarbeiten, - { // da jetzt nicht bitmap actions anstehen + if ( mpBitmapInUse && ( mnElementID != 9 ) ) // process existend graphic + { // because there are now no pending bitmap actions CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap(); - // irgendetwas mit der Bitmap anfangen + // do anything with the bitmap mpOutAct->DrawBitmap( pBmpDesc ); delete mpBitmapInUse; mpBitmapInUse = NULL; @@ -304,8 +304,8 @@ void CGM::ImplDoClass4() if ( mpBitmapInUse ) { CGMBitmap* pBmpDesc = mpBitmapInUse->GetNext(); - if ( pBmpDesc ) // eventuell bekommen wir eine bitmap zurück, die nicht - { // zur vorherigen paßt -> diese müssen wir dann auch löschen + if ( pBmpDesc ) // we possibly get a bitmap back which does not fit to + { // to the previous -> we need to delete this one too mpOutAct->DrawBitmap( pBmpDesc->GetBitmap() ); delete pBmpDesc; } diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index be2732c4a088..369736a61b6b 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -862,9 +862,8 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & if ( bStatus==sal_True ) { rMTF.SetPrefSize( aPrefSize ); - - // MapMode einfach, falls Grafik dann nicht zu klein wird (<0,5cm), - // auf 1/100-mm (1/10-mm) setzen + // simply set map mode to 1/100-mm (1/10-mm) if the graphic + // does not get not too small (<0.5cm) if( ( aPrefSize.Width() < 500 ) && ( aPrefSize.Height() < 500 ) ) rMTF.SetPrefMapMode( MapMode( MAP_10TH_MM ) ); else diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx index bb687dc75f22..cfd17dd90152 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx @@ -31,9 +31,9 @@ class DXFBlock : public DXFEntities { public: DXFBlock * pSucc; - // Zeiger auf naechsten Block in der Liste DXFBlocks::pFirst + // pointer to the nex block in the list DXFBlocks::pFirst - // Eigenschaften des Blocks, durch Gruppencodes kommentiert: + // properties of blocks; commented with group codes: char sName[DXF_MAX_STRING_LEN+1]; // 2 char sAlsoName[DXF_MAX_STRING_LEN+1]; // 3 long nFlags; // 70 @@ -44,8 +44,8 @@ public: ~DXFBlock(); void Read(DXFGroupReader & rDGR); - // Liest den Block (einschliesslich der Entities) per rGDR - // aus einer DXF-Datei bis zu einem ENDBLK, ENDSEC oder EOF. + // reads the block (including entities) from a dxf file + // by rGDR until a ENDBLK, ENDSEC oder EOF. }; @@ -58,19 +58,19 @@ class DXFBlocks { public: DXFBlock * pFirst; - // Liste der Bloecke, READ ONLY! + // list of blocks, READ ONLY! DXFBlocks(); ~DXFBlocks(); void Read(DXFGroupReader & rDGR); - // Liesst alle Bloecke per rDGR bis zu einem ENDSEC oder EOF. + // reads all block per rDGR until a ENDSEC oder EOF. DXFBlock * Search(const char * sName) const; - // Sucht einen Block mit dem Namen, liefert NULL bei Misserfolg. + // looks for a block with the name, return NULL if not successful void Clear(); - // Loescht alle Bloecke; + // deletes all blocks }; diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index f0c8a92ab60d..21f4d30c1679 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -28,7 +28,7 @@ typedef std::deque< Point > DXFPointArray; //------------------------------------------------------------------------------ -//------------------------- Art eines Entity ----------------------------------- +//----------------------------- entity kind ------------------------------------ //------------------------------------------------------------------------------ enum DXFEntityType { @@ -53,7 +53,7 @@ enum DXFEntityType { }; //------------------------------------------------------------------------------ -//---------------------- Basisklasse fuer ein Entity --------------------------- +//------------------------ base class of an entity ----------------------------- //------------------------------------------------------------------------------ class DXFBasicEntity { @@ -61,13 +61,13 @@ class DXFBasicEntity { public: DXFBasicEntity * pSucc; - // Zeiger auf naechstes Entity (in der Liste DXFEntities.pFirst) + // pointer to next entity (in the list of DXFEntities.pFirst) DXFEntityType eType; - // Art des Entitys (Linie oder Kreis oder was) + // entity kind (line or circle or what) - // Eigenschaftenm, die alle Entities besitzen, jeweils - // durch den Gruppencode kommentiert: + // properties that all entities have, each + // commented with group codes: char sLayer[DXF_MAX_STRING_LEN+1]; // 8 char sLineType[DXF_MAX_STRING_LEN+1]; // 6 double fElevation; // 38 @@ -79,26 +79,26 @@ public: protected: DXFBasicEntity(DXFEntityType eThisType); - // Konstruktoren der Entities initialiseren immer mit Defaultwerten. + // always initialize the constructors of entities with default values public: virtual ~DXFBasicEntity(); virtual void Read(DXFGroupReader & rDGR); - // Liest die Prameter ein, bis zur naechten 0-Gruppe + // Reads a parameter till the next 0-group protected: virtual void EvaluateGroup(DXFGroupReader & rDGR); - // Diese Methode wird durch Read() fuer jeden Parameter (bzw. fuer jede - // Gruppe) aufgerufen. - // Sofern der Gruppencode dem Entity bekannt ist, wird der entsprechende - // Parameter geholt. + // This method will be called by Read() for every parameter (respectively + // for every group). + // As far as the group code of the entity is known, the corresponding + // parameter is fetched. }; //------------------------------------------------------------------------------ -//---------------- die verschiedenen Arten von Entyties ------------------------ +//------------------- the different kinds of entities -------------------------- //------------------------------------------------------------------------------ //--------------------------Line------------------------------------------------ @@ -495,8 +495,8 @@ class DXFVertexEntity : public DXFBasicEntity { public: DXFVector aP0; // 10,20,30 - double fSWidth; // 40 (Wenn <0.0, dann gilt DXFPolyLine::fSWidth) - double fEWidth; // 41 (Wenn <0.0, dann gilt DXFPolyLine::fEWidth) + double fSWidth; // 40 (if <0.0, then one has DXFPolyLine::fSWidth) + double fEWidth; // 41 (if <0.0, then one has DXFPolyLine::fEWidth) double fBulge; // 42 long nFlags; // 70 double fCFTDir; // 50 @@ -552,7 +552,7 @@ protected: }; //------------------------------------------------------------------------------ -//----------- Eine Menge von Entities lesen und repraesentieren ---------------- +//----------------- read and represent the set of entities --------------------- //------------------------------------------------------------------------------ class DXFEntities { @@ -562,15 +562,15 @@ public: DXFEntities(); ~DXFEntities(); - DXFBasicEntity * pFirst; // Liste von Entities, READ ONLY! + DXFBasicEntity * pFirst; // list of entities, READ ONLY! void Read(DXFGroupReader & rDGR); - // Liest Entitis per rGDR aus einer DXF-Datei bis zu - // einem ENDBLK, ENDSEC oder EOF (der Gruppe 0). - // (Alle unbekannten Dinge werden uebersprungen) + // read entities per rGDR of a DXF file untill a + // ENDBLK, ENDSEC oder EOF (of group 0). + // (all unknown thing will be skipped) void Clear(); - // Loescht alle Entities + // deletes all entities }; //------------------------------------------------------------------------------ diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index e9e902458297..f6d21bfa0911 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -39,9 +39,8 @@ rtl::OString DXFReadLine(SvStream& rIStm) rtl::OStringBuffer aBuf; - while( !bEnd && !rIStm.GetError() ) // !!! nicht auf EOF testen, - // !!! weil wir blockweise - // !!! lesen + while( !bEnd && !rIStm.GetError() ) // !!! do not check for EOF + // !!! because we read blockwise { sal_uInt16 nLen = (sal_uInt16)rIStm.Read( buf, sizeof(buf)-1 ); if( !nLen ) @@ -75,9 +74,9 @@ rtl::OString DXFReadLine(SvStream& rIStm) nOldFilePos += aBuf.getLength(); if( rIStm.Tell() > nOldFilePos ) nOldFilePos++; - rIStm.Seek( nOldFilePos ); // seeken wg. obigem BlockRead! + rIStm.Seek( nOldFilePos ); // seek because of BlockRead above! - if( bEnd && (c=='\r' || c=='\n')) // Sonderbehandlung DOS-Dateien + if( bEnd && (c=='\r' || c=='\n')) // special treatment of DOS files { char cTemp(0); rIStm.Read(&cTemp, 1); diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx index 2e6612c117b7..e83d958df4f4 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx @@ -32,8 +32,8 @@ class DXFGroupReader public: - // Anmerkkung: - // sizeof(DXFGroupReader) ist gross, also nur dynamisch anlegen! + // note: + // sizeof(DXFGroupReader) is big, so only create dynamically DXFGroupReader( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent ); @@ -42,41 +42,42 @@ public: void SetError(); sal_uInt16 Read(); - // Liesst die naechste Gruppe ein und liefert den Gruppencode zurueck. - // Im Falle eines Fehlers liefert GetStatus() sal_False, Gruppencode wird 0 - // gesetzt, und es wird SetS(0,"EOF") ausgefuehrt. + // Reads next group and returns the group code. + // In case of an error GetStatus() returns sal_False, group code will be set + // to 0 and SetS(0,"EOF") will be executed. sal_uInt16 GetG() const; - // Liefert den letzten Gruppencode (also was Read() zuletzt lieferte) + // Return the last group code (the one the last Read() did return). long GetI() const; - // Liefert den Integer-Wert zur Gruppe, die vorher mit Read() gelesen wurde. - // Dabei muss es sich um einen Gruppencode fuer den Datentyp Integer - // gehandelt haben, wenn nicht, wird 0 gelieferet. + // Returns the integer value of the group which was read earlier with Read(). + // This read must have returned a group code for datatype Integer. + // If not 0 is returend double GetF() const; - // Liefert den Floatingpoint-Wert zur Gruppe, die vorher mit Read() gelesen wurde. - // Dabei muss es sich um einen Gruppencode fuer den Datentyp Floatingpoint - // gehandelt haben, wenn nicht, wird 0 geliefert. + // Returns the floating point value of the group which was read earlier with Read(). + // This read must have returned a group code for datatype Floatingpoint. + // If not 0 is returend const char * GetS() const; - // Liefert den String zur Gruppe, die vorher mit Read() gelesen wurde. - // Dabei muss es sich um einen Gruppencode fuer den Datentyp String - // gehandelt haben, wenn nicht, wird NULL geliefert. - - // Folgende drei Methoden arbeiten wie die obigen, nur kann auch ein anderer als der - // aktuelle Gruppencode angegeben werden. (DXFGroupReader speichert die Parameter - // zu allen Gruppencodes. Dadurch ist es moeglich, dass zunaechst mit Read() einige - // verschiedene Gruppen eingelesen werden, bevor sie ausgewertet werden.) + // Returns the string of the group which was read earlier with Read(). + // This read must have returned a group code for datatype String. + // If not NULL is returend + + // The following three methods work like the above execp that a different than the + // current group code can bet set. (DXFGroupReader stroes the parameters of all + // group codes. Therefore it is possible to first Read() some groups and then analyze + // them afterwards.) + long GetI(sal_uInt16 nG) const; double GetF(sal_uInt16 nG) const; const char * GetS(sal_uInt16 nG) const; - // Mit folgenden Methoden koennen die aktuell gespeicherten Werte zu den - // Gruppencodes veraendert werden. (z.B. um Defaultwerte zu setzen, bevor - // 'blind' eine Menge von Gruppen eingelesen wird.) + // The following methods can change the current values of group codes + // (e.g. to set default values, before 'blindly' reading lots of groups) + void SetF(sal_uInt16 nG, double fF); - void SetS(sal_uInt16 nG, const char * sS); // (wird kopiert) + void SetS(sal_uInt16 nG, const char * sS); // (will be copied) private: @@ -96,18 +97,18 @@ private: sal_uLong nLastPercent; sal_uLong nFileSize; - char S0_9 [10][DXF_MAX_STRING_LEN+1]; // Strings Gruppencodes 0..9 - double F10_59 [50]; // Floats Gruppencodes 10..59 - long I60_79 [20]; // Integers Gruppencodes 60..79 + char S0_9 [10][DXF_MAX_STRING_LEN+1]; // Strings group codes 0..9 + double F10_59 [50]; // Floats group codes 10..59 + long I60_79 [20]; // Integers group codes 60..79 long I90_99 [10]; char S100 [DXF_MAX_STRING_LEN+1]; char S102 [DXF_MAX_STRING_LEN+1]; - double F140_147 [ 8]; // Floats Gruppencodes 140..147 - long I170_175 [ 6]; // Integers Gruppencodes 170..175 - double F210_239 [30]; // Floats Gruppencodes 210..239 - char S999_1009 [11][DXF_MAX_STRING_LEN+1]; // Strings Gruppencodes 999..1009 - double F1010_1059[50]; // Floats Gruppencodes 1010..1059 - long I1060_1079[20]; // Integers Gruppencodes 1060..1079 + double F140_147 [ 8]; // Floats group codes 140..147 + long I170_175 [ 6]; // Integers group codes 170..175 + double F210_239 [30]; // Floats group codes 210..239 + char S999_1009 [11][DXF_MAX_STRING_LEN+1]; // Strings group codes 999..1009 + double F1010_1059[50]; // Floats group codes 1010..1059 + long I1060_1079[20]; // Integers group codes 1060..1079 }; diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx index 43eb2749bc69..c2c06eec3ec7 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx @@ -104,7 +104,7 @@ public: void setGlobalLineTypeScale(double fGlobalLineTypeScale); sal_Bool Read( SvStream & rIStream, sal_uInt16 nMinPercent, sal_uInt16 nMaxPercent); - // Liesst die komplette DXF-Datei ein. + // Reads complete DXF file. private: diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx index 359351455340..4d74ccc8465a 100644 --- a/filter/source/graphicfilter/idxf/dxftblrd.hxx +++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx @@ -25,7 +25,7 @@ //---------------------------------------------------------------------------- -//------------------ Linien-Typ ---------------------------------------------- +//------------------- Line Type ---------------------------------------------- //---------------------------------------------------------------------------- #define DXF_MAX_DASH_COUNT 32 @@ -149,21 +149,21 @@ class DXFTables { public: - DXFLType * pLTypes; // Liste der Linientypen - DXFLayer * pLayers; // Liste der Layers - DXFStyle * pStyles; // Liste der Styles - DXFVPort * pVPorts; // Liste der Viewports + DXFLType * pLTypes; // list of line types + DXFLayer * pLayers; // list of layers + DXFStyle * pStyles; // list of styles + DXFVPort * pVPorts; // list of viewports DXFTables(); ~DXFTables(); void Read(DXFGroupReader & rDGR); - // Liest die Tabellen ein bis zu einem ENDSEC oder EOF - // (unbekannte Dinge/Tabellen werden uebersprungen) + // Reads the table until a ENDSEC oder EOF + // (Unknown things/tables will be skipped) void Clear(); - // Suche nach Tabelleneintraegen: + // look for table entries: DXFLType * SearchLType(const char * pName) const; DXFLayer * SearchLayer(const char * pName) const; DXFVPort * SearchVPort(const char * pName) const; diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx index ac975b580426..3db285f7d628 100644 --- a/filter/source/graphicfilter/idxf/dxfvec.hxx +++ b/filter/source/graphicfilter/idxf/dxfvec.hxx @@ -59,7 +59,7 @@ public: //------------------------------------------------------------------------------ //---------------------------- DXFVector --------------------------------------- //------------------------------------------------------------------------------ -// Allgemeiner 3D-Vektor mit double +// common 3D vector with doubles class DXFVector { @@ -70,29 +70,29 @@ public: inline DXFVector(double fX=0.0, double fY=0.0, double fZ=0.0); inline DXFVector(const DXFVector & rV); - // Addition/Subtraktion: + // summation/subtraktion: DXFVector & operator += (const DXFVector & rV); DXFVector operator + (const DXFVector & rV) const; DXFVector & operator -= (const DXFVector & rV); DXFVector operator - (const DXFVector & rV) const; - // Vektorprodukt + // vector product DXFVector operator * (const DXFVector & rV) const; - // Skalarprodukt: + // skalar product: double SProd(const DXFVector & rV) const; - // Multiplikation mit Skalar: + // multiplication with scalar: DXFVector & operator *= (double fs); DXFVector operator * (double fs) const; // length: double Abs() const; - // Vektor gleicher Richtung und der Laenge 1: + // vector with same direction and a length of 1: DXFVector Unit() const; - // Aequivalenz oder nicht: + // equivalence or net: sal_Bool operator == (const DXFVector & rV) const; sal_Bool operator != (const DXFVector & rV) const; }; @@ -100,62 +100,62 @@ public: //------------------------------------------------------------------------------ //---------------------------- DXFTransform ------------------------------------ //------------------------------------------------------------------------------ -// Eine Transformationsmatrix, spezialisiert auf unser Problem +// a transformation matrice specialized for our problem class DXFTransform { public: DXFTransform(); - // Zielkoordinate = Quellkoordinate + // destination coordinate = source coordinate DXFTransform(double fScaleX, double fScaleY, double fScaleZ, const DXFVector & rShift); - // Zielkoordinate = Verschoben(Skaliert(Quellkoorinate)) + // dest coordinate = translate(scale(source coordinate)) DXFTransform(double fScaleX, double fScaleY, double fScaleZ, double fRotAngle, const DXFVector & rShift); - // Zielkoordinate = Verschoben(Gedreht(Skaliert(Quellkoorinate))) - // Drehung geshieht um die Z-Achse, fRotAngle in Grad. + // dest coordinate = translate(rotate(scale(source coordinate))) + // rotation around z-axis, fRotAngle in degrees. DXFTransform(const DXFVector & rExtrusion); - // Transformation "ECS->WCS" per "Entity Extrusion Direction" - // und dem "Arbitrary Axis Algorithm" - // (Siehe DXF-Docu von AutoDesk) + // Transformation "ECS->WCS" via "Entity Extrusion Direction" + // ant the "Arbitrary Axis Algorithm" + // (See DXF-Docu from AutoDesk) DXFTransform(const DXFVector & rViewDir, const DXFVector & rViewTarget); - // Transformation Objektraum->Bildraum anhand von Richtung und - // Zielpunkt eines ViewPort. - // (siehe DXF-Docu von AutoDesk: VPORT) + // Transformation object space->picture space on the basis of direction + // destination point of a viewport + // (See DXF-Docu from AutoDesk: VPORT) DXFTransform(const DXFTransform & rT1, const DXFTransform & rT2); - // Zielkoordinate = rT2(rT1(Quellkoorinate)) + // destination coordinate = rT2(rT1(source coordinate)) void Transform(const DXFVector & rSrc, DXFVector & rTgt) const; - // Transformation DXFVector nach DXFVector + // Transformation from DXFVector to DXFVector void Transform(const DXFVector & rSrc, Point & rTgt) const; - // Transformation DXFVector nach SvPoint + // Transformation from DXFVector to SvPoint void TransDir(const DXFVector & rSrc, DXFVector & rTgt) const; - // Transformation eines relativen Vektors (also kein Verschiebung) + // Transformation of a relative vector (so no translation) sal_Bool TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const; - // Versucht, einen Kreis (in der XY-Ebene) zu transformieren, so dass eine - // ausgerichtete Ellipse entsteht. Wenn das nicht geht, weil Ellipse - // in belibieger Lage entstehen wuerde, wird sal_False geliefert. - // (Der Mittelpunkt wird hiermit nicht transformiert, nehme Transform(..)) + // Attemp to transform a circle (in xy plane) so that it results + // in an aligned ellipse. If the does not work because a ellipse of + // arbitrary position would be created, sal_False is returned. + // (The center point will not be transformed, use Transform(..)) sal_uLong TransLineWidth(double fW) const; - // Transformiert die Liniendicke (so gut es geht) + // Transforms the thickness of a line (as good as possible) double CalcRotAngle() const; - // Ermittelt den Rotationswinkel um die Z-Achse (in Grad) + // Calculates the rotation angle around z-axis (in degrees) sal_Bool Mirror() const; - // Liefert sal_True, wenn die Matrix ein Linkssystem bildet + // Returns sal_True, if the matrice represents a left-handed coordinate system LineInfo Transform(const DXFLineInfo& aDXFLineInfo) const; // Transform to LineInfo diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index a8d01eafe134..6c6265c9e14f 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -43,11 +43,10 @@ class FilterConfigItem; |* |* ImpSearchEntry() |* -|* Beschreibung Prueft ob im Speicherbereich pSource der nComp Bytes -|* gross ist eine Zeichenkette(pDest) mit der l�nge nSize -|* liegt. Geprueft wird NON-CASE-SENSITIVE und der Rueck- -|* gabewert ist die Adresse an der die Zeichekette gefunden -|* wurde oder NULL +|* Description Checks if there is a string(pDest) of length nSize +|* inside the memory area pSource which is nComp bytes long. +|* Check is NON-CASE-SENSITIVE. The return value ist the +|* address where the string is found or NULL |* *************************************************************************/ @@ -474,7 +473,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, } -//================== GraphicImport - die exportierte Funktion ================ +//================== GraphicImport - the exported function ================ #ifdef DISABLE_DYNLOADING #define GraphicImport ipsGraphicImport diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 6f711d081349..4aced68f6a85 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -321,15 +321,15 @@ private: long ErrorCode; - SvStream * pOS2MET; // Die einzulesende OS2MET-Datei - VirtualDevice * pVirDev; // here the drawing methods are being called - // Dabei findet ein Recording in das GDIMetaFile - // statt. - sal_uLong nOrigPos; // Anfaengliche Position in pOS2MET - sal_uInt16 nOrigNumberFormat; // Anfaengliches Nummern-Format von pOS2MET - Rectangle aBoundingRect; // Boundingrectangle wie in Datei angegeben - Rectangle aCalcBndRect; // selbst ermitteltes Boundingrectangle - MapMode aGlobMapMode; // resolution of the picture + SvStream * pOS2MET; // the OS2MET file to be read + VirtualDevice * pVirDev; // here the drawing methods are being called + // While doing this a recording in the GDIMetaFile + // will take place. + sal_uLong nOrigPos; // initial position in pOS2MET + sal_uInt16 nOrigNumberFormat; // initial number format of pOS2MET + Rectangle aBoundingRect; // bounding rectangle as stored in the file + Rectangle aCalcBndRect; // bounding rectangle calculated on our own + MapMode aGlobMapMode; // resolution of the picture sal_Bool bCoord32; OSPalette * pPaletteStack; @@ -1013,17 +1013,17 @@ void OS2METReader::ReadArc(sal_Bool bGivenPos) aAttr.aCurPos=aP3; SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle ); SetRasterOp(aAttr.eLinMix); - // OK, gegeben sind 3 Punkte der Ellipse, und das Verhaeltnis - // Breite zu Hoehe (als p zu q): + // Ok, given are 3 point of the ellipse, and the relation + // of width and height (as p to q): x1=aP1.X(); y1=aP1.Y(); x2=aP2.X(); y2=aP2.Y(); x3=aP3.X(); y3=aP3.Y(); p=aAttr.nArcP;q=aAttr.nArcQ; - // Berechnet wird der Mittelpunkt cx,cy der Ellipse: + // Calculation of the center point cx, cy of the ellipse: ncy=2*p*p*((y3-y1)*(x2-x1)-(y1-y2)*(x1-x3)); ncx=2*q*q*(x2-x1); if ( (ncx<0.001 && ncx>-0.001) || (ncy<0.001 && ncy>-0.001) ) { - // Berechnung nicht moeglich, Punkte liegen auf einer Linie + // Calculation impossible, points are all on the same straight line pVirDev->DrawLine(aP1,aP2); pVirDev->DrawLine(aP2,aP3); return; @@ -1034,9 +1034,8 @@ void OS2METReader::ReadArc(sal_Bool bGivenPos) // now we still need the radius in x and y direction: r=sqrt(q*q*(x1-cx)*(x1-cx)+p*p*(y1-cy)*(y1-cy)); rx=r/q; ry=r/p; - // Jetzt stellt sich "nur noch" die Frage, wie Start- und Endpunkt - // gewaehlt werden muessen, damit Punkt Nr. 2 innerhalb des - // gezeichneten Bogens liegt: + // We now have to find out how the the starting and the end point + // have to be choosen so that point no. 2 lies inside the drawn arc: w1=fmod((atan2(x1-cx,y1-cy)-atan2(x2-cx,y2-cy)),6.28318530718); if (w1<0) w1+=6.28318530718; w3=fmod((atan2(x3-cx,y3-cy)-atan2(x2-cx,y2-cy)),6.28318530718); if (w3<0) w3+=6.28318530718; if (w3<w1) { @@ -2158,8 +2157,8 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) break; case 0xfe92: { // Image Data - // Spaetestens jetzt brauchen wir die temporaere BMP-Datei - // und darin mindestens den Header + Palette. + // At the latest we now need the temprary BMP file and + // inside this file we need the header and the palette. if (p->pBMP==NULL) { p->pBMP=new SvMemoryStream(); p->pBMP->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); @@ -2179,8 +2178,8 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) for (i=0; i<nColTabSize; i++) *(p->pBMP) << GetPalette0RGB(i); } } - // OK, nun werden die Map-Daten ruebergeschoben. Leider haben OS2 und - // BMP eine unterschiedliche Reihenfolge von RGB bei 24-Bit. + // OK, now the map data is beeing pushed. Unfortunatly OS2 and BMP + // do habe a different RGB ordering when using 24-bit sal_uInt8 * pBuf=new sal_uInt8[nDataLen]; pOS2MET->Read(pBuf,nDataLen); if (p->nBitsPerPixel==24) { @@ -2334,7 +2333,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) case MapColAtrMagic: break; case BegImgObjMagic: { - // neue Bitmap schonmal herstellen: (wird spaeter gefuellt) + // create new bitmap by now: (will be filled later) OSBitmap * pB=new OSBitmap; pB->pSucc=pBitmapList; pBitmapList=pB; pB->pBMP=NULL; pB->nWidth=0; pB->nHeight=0; pB->nBitsPerPixel=0; @@ -2347,14 +2346,14 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) nbyte=((nbyte-0x30)<<4)|(nbyte2-0x30); pB->nID=(pB->nID>>8)|(((sal_uLong)nbyte)<<24); } - // neue Palette auf den Paletten-Stack bringen: (wird spaeter gefuellt) + // put new palette on the palette stack: (will be filled later) OSPalette * pP=new OSPalette; pP->pSucc=pPaletteStack; pPaletteStack=pP; pP->p0RGB=NULL; pP->nSize=0; break; } case EndImgObjMagic: { - // Temporaere Windows-BMP-Datei auslesen: + // read temporary Windows BMP file: if (pBitmapList==NULL || pBitmapList->pBMP==NULL || pBitmapList->pBMP->GetError()!=0) { pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); @@ -2421,11 +2420,11 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) if (pOrdFile==NULL) break; - // in pOrdFile wurden alle "DatGrfObj"-Felder gesammelt, so - // dass die darin enthaltnen "Orders" zusammenhangend und nicht durch - // "Fields" segmentiert sind. Um sie aus dem MemoryStream auszulesen, - // ohne grosse Umstaende deswegen zu haben (frueher wurden die "Orders" - // direkt aus pOS2MET gelesen), hier ein kleiner Trick: + // In pOrdFile all "DatGrfObj" fields were collected so that the + // thererin contained "Orders" are continuous and not segmented by fields. + // To read them from the memory stream without having any trouble, + // we use a little trick: + pSave=pOS2MET; pOS2MET=pOrdFile; //(!) nMaxPos=pOS2MET->Tell(); @@ -2446,11 +2445,11 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) nOrderID=(nOrderID << 8) | (((sal_uInt16)nbyte) & 0x00ff); } if (nOrderID>0x00ff || nOrderID==GOrdPolygn) { - // ooo: Laut OS2-Doku sollte die Orderlaenge nun als Big-Endian-Word - // gegeben sein (Zitat: "Highorder byte precedes loworder byte"). - // Tatsaechlich gibt es aber Dateien, die die Laenge als - // Little-Endian-Word angeben (zu mindestens fuer nOrderID==GOrdPolygn). - // Also werfen wir eine Muenze oder was ? + // ooo: As written in OS2 documentation, the order length should now + // be written as big endian word. (Quote: "Highorder byte precedes loworder byte"). + // In reality there are files in which the length is stored as little endian word + // (at least for nOrderID==GOrdPolygn) + // So we throw a coin or what else can we do? *pOS2MET >> nbyte; nOrderLen=(sal_uInt16)nbyte&0x00ff; *pOS2MET >> nbyte; if (nbyte!=0) nOrderLen=nOrderLen<<8|(((sal_uInt16)nbyte)&0x00ff); } @@ -2703,7 +2702,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF } } -//================== GraphicImport - die exportierte Funktion ================ +//================== GraphicImport - the exported function ================ #ifdef DISABLE_DYNLOADING #define GraphicImport imeGraphicImport diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 7be589ea8f72..4d92b48504ae 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -29,20 +29,20 @@ class PBMReader { private: - SvStream& mrPBM; // Die einzulesende PBM-Datei + SvStream& mrPBM; // the PBM file to read - sal_Bool mbStatus; - sal_Bool mbRemark; // sal_False wenn sich stream in einem Kommentar befindet - sal_Bool mbRaw; // RAW/ASCII MODE - sal_uLong mnMode; // 0->PBM, 1->PGM, 2->PPM + sal_Bool mbStatus; + sal_Bool mbRemark; // sal_False if the stream is in a comment + sal_Bool mbRaw; // RAW/ASCII MODE + sal_uLong mnMode; // 0->PBM, 1->PGM, 2->PPM Bitmap maBmp; BitmapWriteAccess* mpAcc; - sal_uLong mnWidth, mnHeight; // Bildausmass in Pixeln - sal_uLong mnCol; - sal_uLong mnMaxVal; // maximaler wert in den - sal_Bool ImplCallback( sal_uInt16 nPercent ); - sal_Bool ImplReadBody(); - sal_Bool ImplReadHeader(); + sal_uLong mnWidth, mnHeight; // dimensions in pixel + sal_uLong mnCol; + sal_uLong mnMaxVal; // max value in the <missing comment> + sal_Bool ImplCallback( sal_uInt16 nPercent ); + sal_Bool ImplReadBody(); + sal_Bool ImplReadHeader(); public: PBMReader(SvStream & rPBM); @@ -50,7 +50,7 @@ public: sal_Bool ReadPBM(Graphic & rGraphic ); }; -//=================== Methoden von PBMReader ============================== +//=================== Methods of PBMReader ============================== PBMReader::PBMReader(SvStream & rPBM) : mrPBM( rPBM ) @@ -89,7 +89,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic ) mrPBM.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - // Kopf einlesen: + // read header: if ( ( mbStatus = ImplReadHeader() ) == sal_False ) return sal_False; @@ -137,7 +137,7 @@ sal_Bool PBMReader::ReadPBM(Graphic & rGraphic ) break; } - // Bitmap-Daten einlesen + // read bitmap data mbStatus = ImplReadBody(); if ( mpAcc ) @@ -518,7 +518,7 @@ sal_Bool PBMReader::ImplReadBody() return mbStatus; } -//================== GraphicImport - die exportierte Funktion ================ +//================== GraphicImport - the exported function ================ #ifdef DISABLE_DYNLOADING #define GraphicImport ipbGraphicImport diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index f4c3f497ab08..2dacdb4ea879 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -311,7 +311,7 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent) ( (long)pCrN[ nXPair ] ) + ( (long)pCrN[ nXPair + 1 ] ) ) >> 2; } } - // Umwandlung von nL,nCb,nCr in nRed,nGreen,nBlue: + // conversion of nL,nCb,nCr in nRed,nGreen,nBlue: nL *= 89024L; nCb -= 156; nCr -= 137; diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index d9a9e68fad8b..859a90250947 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -29,25 +29,25 @@ class PCXReader { private: - SvStream& m_rPCX; // Die einzulesende PCX-Datei + SvStream& m_rPCX; // the PCX file to read Bitmap aBmp; BitmapWriteAccess* pAcc; - sal_uInt8 nVersion; // PCX-Version - sal_uInt8 nEncoding; // Art der Komprimierung - sal_uLong nBitsPerPlanePix; // Bits Pro Ebene pro Pixel - sal_uLong nPlanes; // Anzahl Ebenen - sal_uLong nBytesPerPlaneLin; // Bytes in einer Ebenen pro Zeile - sal_uInt16 nPaletteInfo; + sal_uInt8 nVersion; // PCX-Version + sal_uInt8 nEncoding; // compression type + sal_uLong nBitsPerPlanePix; // bits per plane per pixel + sal_uLong nPlanes; // no of planes + sal_uLong nBytesPerPlaneLin; // bytes per plane line + sal_uInt16 nPaletteInfo; - sal_uLong nWidth, nHeight; // Bildausmass in Pixeln - sal_uInt16 nResX, nResY; // Aufloesung in Pixel pro Inch oder 0,0 - sal_uInt16 nDestBitsPerPixel; // Bits pro Pixel der Zielbitmap 1,4,8 oder 24 - sal_uInt8* pPalette; // - sal_Bool nStatus; // status nun nicht mehr am stream abfragen ( SJ ) + sal_uLong nWidth, nHeight; // dimension in pixel + sal_uInt16 nResX, nResY; // resolution in pixel per inch oder 0,0 + sal_uInt16 nDestBitsPerPixel; // bits per pixel in destination bitmap 1,4,8 or 24 + sal_uInt8* pPalette; // + sal_Bool nStatus; // from now on do not read status from stream ( SJ ) - sal_Bool Callback( sal_uInt16 nPercent ); + sal_Bool Callback( sal_uInt16 nPercent ); void ImplReadBody(); void ImplReadPalette( sal_uLong nCol ); void ImplReadHeader(); @@ -56,10 +56,10 @@ public: PCXReader(SvStream &rStream); ~PCXReader(); sal_Bool ReadPCX(Graphic & rGraphic ); - // Liesst aus dem Stream eine PCX-Datei und fuellt das GDIMetaFile + // Reads a PCX file from the stream and fills the GDIMetaFile }; -//=================== Methoden von PCXReader ============================== +//=================== methods of PCXReader ============================== PCXReader::PCXReader(SvStream &rStream) : m_rPCX(rStream) @@ -83,21 +83,20 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic) if ( m_rPCX.GetError() ) return sal_False; - sal_uLong* pDummy = new sal_uLong; delete pDummy; // damit unter OS/2 - // das richtige (Tools-)new - // verwendet wird, da es sonst - // in dieser DLL nur Vector-news - // gibt; + sal_uLong* pDummy = new sal_uLong; delete pDummy; // to achive that under OS/2 + // the right (Tools-) new is used + // otherwise there are only Vector-news + // in this DLL m_rPCX.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); - // Kopf einlesen: + // read header: nStatus = sal_True; ImplReadHeader(); - // BMP-Header und ggf. (eventuell zunaechst ungueltige) Farbpalette schreiben: + // Write BMP header and conditionally (maybe invalid for now) color palette: if ( nStatus ) { aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel ); @@ -114,11 +113,11 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic) pAcc->SetPaletteColor( i, BitmapColor ( pPal[ 0 ], pPal[ 1 ], pPal[ 2 ] ) ); } } - // Bitmap-Daten einlesen + // read bitmap data ImplReadBody(); - // Wenn erweiterte Farbpalette am Ende von PCX, dann diese einlesen, und nochmals - // in Palette schreiben: + // If an extended color palette exists at the end of the file, then read it and + // and write again in palette: if ( nDestBitsPerPixel == 8 && nStatus ) { sal_uInt8* pPal = pPalette; @@ -131,7 +130,7 @@ sal_Bool PCXReader::ReadPCX(Graphic & rGraphic) } } /* - // Aufloesung einstellen: + // set resolution: if (nResX!=0 && nResY!=0) { MapMode aMapMode(MAP_INCH,Point(0,0),Fraction(1,nResX),Fraction(1,nResY)); rBitmap.SetPrefMapMode(aMapMode); @@ -196,8 +195,8 @@ void PCXReader::ImplReadHeader() return; } - // Wenn das Bild nur 2 Farben hat, ist die Palette zumeist ungueltig, und es handelt sich - // immer (?) um ein schwarz-weiss-Bild: + // If the bitmap has only 2 colors, the palatte is most often invalid and it is always(?) + // a black and white image: if ( nPlanes == 1 && nBitsPerPlanePix == 1 ) { pPalette[ 0 ] = pPalette[ 1 ] = pPalette[ 2 ] = 0x00; @@ -398,7 +397,7 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) } } -//================== GraphicImport - die exportierte Funktion ================ +//================== GraphicImport - the exported function ================ #ifdef DISABLE_DYNLOADING #define GraphicImport ipxGraphicImport diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index f7b3af308f87..9a254a535ac3 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -86,7 +86,7 @@ namespace PictReaderInternal { sal_uLong nHiBytes, nLoBytes; isColor = false; - // Anzahl der Bits im Pattern zaehlen, die auf 1 gesetzt sind: + // count the no of bits in pattern which are set to 1: nBitCount=0; for (ny=0; ny<8; ny++) { stream >> ((char&)nbyte[ny]); @@ -95,7 +95,7 @@ namespace PictReaderInternal { } } - // Pattern in 2 Langworten unterbringen: + // store pattern in 2 long words: nHiBytes=(((((((sal_uLong)nbyte[0])<<8)| (sal_uLong)nbyte[1])<<8)| (sal_uLong)nbyte[2])<<8)| @@ -105,14 +105,14 @@ namespace PictReaderInternal { (sal_uLong)nbyte[6])<<8)| (sal_uLong)nbyte[7]; - // Einen PenStyle machen: + // create a PenStyle: if (nBitCount<=0) penStyle=PEN_NULL; else if (nBitCount<=16) penStyle=PEN_DOT; else if (nBitCount<=32) penStyle=PEN_DASHDOT; else if (nBitCount<=48) penStyle=PEN_DASH; else penStyle=PEN_SOLID; - // Einen BrushStyle machen: + // create a BrushStyle: if (nHiBytes==0xffffffff && nLoBytes==0xffffffff) brushStyle=BRUSH_SOLID; else if (nHiBytes==0xff000000 && nLoBytes==0x00000000) brushStyle=BRUSH_HORZ; else if (nHiBytes==0x80808080 && nLoBytes==0x80808080) brushStyle=BRUSH_VERT; @@ -142,14 +142,14 @@ class PictReader { typedef class PictReaderInternal::Pattern Pattern; private: - SvStream * pPict; // Die einzulesende Pict-Datei - VirtualDevice * pVirDev; // Hier werden die Drawing-Methoden aufgerufen. - // Dabei findet ein Recording in das GDIMetaFile - // statt. - sal_uLong nOrigPos; // Anfaengliche Position in pPict - sal_uInt16 nOrigNumberFormat; // Anfaengliches Nummern-Format von pPict - sal_Bool IsVersion2; // Ob es ein Version 2 Pictfile ist. - Rectangle aBoundingRect; // Min/Max-Rechteck fuer die ganze Zeichnung + SvStream * pPict; // The Pict file to read. + VirtualDevice * pVirDev; // Here the drawing methos will be called. + // A recording into the GDIMetaFile will take place. + + sal_uLong nOrigPos; // Initial position in pPict. + sal_uInt16 nOrigNumberFormat; // Initial number format von pPict. + sal_Bool IsVersion2; // If it is a version 2 Pictfile. + Rectangle aBoundingRect; // Min/Max-Rectangle for the whole drawing. Point aPenPosition; Point aTextPosition; @@ -228,12 +228,12 @@ private: sal_Bool bMode, sal_Bool bMaskRgn); void ReadHeader(); - // Liesst den Kopf der Pict-Datei, setzt IsVersion2 und aBoundingRect + // Reads the header of the Pict file, set IsVersion and aBoundingRect sal_uLong ReadData(sal_uInt16 nOpcode); - // Liesst die Daten eines Opcodes ein und fuehrt die Operation aus. - // Auf jeden Fall wird die Anzahl der Datenbytes zu dem Opcode - // zurueckgeliefert. + // Reads the date of anOopcode and executes the operation. + // The number of data bytes belonging to the opcode will be returned + // in any case. void SetLineColor( const Color& rColor ); void SetFillColor( const Color& rColor ); @@ -245,7 +245,7 @@ public: PictReader() { aActFont.SetCharSet(GetTextEncoding()); } void ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ); - // Liesst aus dem Stream eine Pict-Datei und fuellt das GDIMetaFile + // reads a pict file from the stream and fills the GDIMetaFile }; @@ -301,7 +301,7 @@ public: return 0xffffffff; \ } -//=================== Methoden von PictReader ============================== +//=================== methods of PictReader ============================== rtl_TextEncoding PictReader::GetTextEncoding (sal_uInt16 fId) { static bool first = true; static rtl_TextEncoding enc = RTL_TEXTENCODING_APPLE_ROMAN; @@ -466,10 +466,10 @@ sal_uLong PictReader::ReadPolygon(Polygon & rPoly) sal_uLong PictReader::ReadPixPattern(PictReader::Pattern &pattern) { - // Keine Ahnung, ob dies richtig ist, weil kein Bild gefunden, das - // PixPatterns enthaelt. Auch hier nur der Versuch, die Groesse der Daten zu - // ermitteln, und einfache StarView-Styles daraus zu machen. Gluecklicherweise - // enthaelt ein PixPattern immer auch ein normales Pattern. + // Don't know if this is correct because no picture which contains PixPatterns found. + // Here again the attempt to calculate the size of the date to create simple StarView-Styles + // from them. Luckily a PixPattern always contains a normal pattern. + sal_uLong nDataSize; sal_uInt16 nPatType; @@ -682,7 +682,7 @@ sal_uLong PictReader::ReadAndDrawText() if (IsInvisible(PDM_TEXT)) return nDataLen; DrawingMethod(PDM_TEXT); - // Stoerende Steuerzeuichen wegnehmen: + // remove annoying control characters: while ( nLen > 0 && ( (unsigned char)sText[ nLen - 1 ] ) < 32 ) nLen--; sText[ nLen ] = 0; @@ -704,17 +704,17 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, sal_Bool bBaseAddr, sal_Bo sal_uInt8 nDat, nRed, nGreen, nBlue, nDummy; sal_uLong i, nDataSize = 0; - // In nDataSize wird mitgerechnet, wie gross die gesammten Daten sind. + // The calculation of nDataSize is considering the size of the whole data. nDataSize = 0; - // ggf. BaseAddr ueberlesen + // condionally skip BaseAddr if ( bBaseAddr ) { pPict->SeekRel( 4 ); nDataSize += 4; } - // PixMap oder Bitmap-Struktur einlesen; + // Read PixMap or Bitmap structure; *pPict >> nRowBytes >> nBndY >> nBndX >> nHeight >> nWidth; nHeight = nHeight - nBndY; nWidth = nWidth - nBndX; @@ -774,7 +774,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, sal_Bool bBaseAddr, sal_Bo pAcc->SetPaletteColor( 1, BitmapColor( 0, 0, 0 ) ); } - // ggf. Quell-Rechteck einlesen: + // conditionally read source rectangle: if ( pSrcRect != 0) { sal_uInt16 nTop, nLeft, nBottom, nRight; @@ -783,7 +783,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, sal_Bool bBaseAddr, sal_Bo nDataSize += 8; } - // ggf. Ziel-Rechteck einlesen: + // conditionally read destination rectangle: if ( pDestRect != 0 ) { Point aTL, aBR; @@ -793,14 +793,14 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, sal_Bool bBaseAddr, sal_Bo nDataSize += 8; } - // ggf. Modus einlesen (bzw. ueberspringen): + // conditionally read mode (or skip it): if ( bMode ) { pPict->SeekRel(2); nDataSize += 2; } - // ggf. Region einlesen (bzw. ueberspringen): + // conditionally read region (or skip it): if ( bMaskRgn ) { sal_uInt16 nSize; @@ -811,7 +811,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, sal_Bool bBaseAddr, sal_Bo // aSMem << (nHRes/1665L) << (nVRes/1665L) << ((sal_uLong)0) << ((sal_uLong)0); - // Lese und Schreibe Bitmap-Bits: + // read and write Bitmap bits: if ( nPixelSize == 1 || nPixelSize == 2 || nPixelSize == 4 || nPixelSize == 8 ) { sal_uInt8 nByteCountAsByte, nFlagCounterByte; @@ -1115,7 +1115,7 @@ void PictReader::ReadHeader() // 2 bytes to store size ( version 1 ) ignored pPict->SeekRel( 2 ); - *pPict >> y1 >> x1 >> y2 >> x2; // Rahmen-Rechteck des Bildes + *pPict >> y1 >> x1 >> y2 >> x2; // frame rectangle of the picture if (x1 > x2 || y1 > y2) continue; // bad bdbox if (x1 < -2048 || x2 > 2048 || y1 < -2048 || y2 > 2048 || // origin|dest is very small|large (x1 == x2 && y1 == y2) ) // 1 pixel pict is dubious @@ -1743,7 +1743,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode) pPict->SeekRel(2); *pPict >> nUSHORT; nDataSize=4+nUSHORT; break; - default: // 0x00a2 bis 0xffff (zumeist Reserved) + default: // 0x00a2 bis 0xffff (most times reserved) if (nOpcode<=0x00af) { *pPict >> nUSHORT; nDataSize=2+nUSHORT; } else if (nOpcode<=0x00cf) { nDataSize=0; } else if (nOpcode<=0x00fe) { sal_uInt32 nTemp; *pPict >> nTemp ; nDataSize = nTemp; nDataSize+=4; } @@ -1862,7 +1862,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) if (pPict->GetError()) pPict->Seek(nOrigPos); } -//================== GraphicImport - die exportierte Funktion ================ +//================== GraphicImport - the exported function ================ #ifdef DISABLE_DYNLOADING #define GraphicImport iptGraphicImport diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index bfcb3f41aa10..ebabcecaea9c 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -633,9 +633,9 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa if ( bStatus == sal_False ) return sal_False; - // Wenn EOL-Codes vorhanden sind, steht der EOL-Code auch vor der ersten Zeile. - // (und ich dachte EOL heisst 'End Of Line'...) - // Daher lesen wir den EOL-Code immer vor jeder Zeile als erstes ein: + // If EOL-Codes exist, the EOL-Code also appeared in front of the first line. + // (and I thought it means 'End of Line'...) + // Therefore we read the EOL-Code always at the beginning of each line first: if ( nOptions & CCI_OPTION_EOL ) { if ( bFirstEOL ) @@ -677,7 +677,7 @@ sal_Bool CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_uLong nTa for ( i = 0; i < nLastLineSize; i++ ) *( pDst++ ) = 0x00; } } - // ggf. Zeilen-Anfang auf naechste Byte-Grenze runden: + // conditionally align start of line to next byte: if ( nOptions & CCI_OPTION_BYTEALIGNROW ) nInputBitsBufSize &= 0xfff8; @@ -760,12 +760,11 @@ sal_Bool CCIDecompressor::ReadEOL( sal_uInt32 /*nMaxFillBits*/ ) sal_uInt8 nByte; // if (nOptions&CCI_OPTION_BYTEALIGNEOL) nMaxFillBits=7; else nMaxFillBits=0; - // Buuuh: Entweder wird die Option in itiff.cxx nicht richtig gesetzt (-> Fehler in Doku) - // oder es gibt tatsaechlich gemeine Export-Filter, die immer ein Align machen. - // Ausserdem wurden Dateien gefunden, in denen mehr als die maximal 7 noetigen - // Fuellbits vor dem EOL-Code stehen. Daher akzeptieren wir nun grundsaetzlich - // bis zu 32-nonsense-Bits vor dem EOL-Code: - // und ich habe eine Datei gefunden in der bis zu ??? Bloedsinn Bits stehen, zudem ist dort die Bit Reihenfolge verdreht (SJ); + // D'oh: Either the option in itiff.cxx is not set correctly (-> error in documentation) + // or there exist some nasty export filter who always do align. + // In addition files were found in which more than the necessary maximum of 7 filling + // bits were found. Therefore we now generally accept up to 32 nonsense bits in front of the EOL-Code: + // And I found a file in which up to ??? nonsense bits are written. Furthemore the byte order is switched in it. (SJ) sal_uInt32 nMaxPos = pIStream->Tell(); nMaxPos += nWidth >> 3; @@ -927,8 +926,8 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget // loop through codes from the input stream: do { - // die naechsten 13 Bits nach nCode holen, aber noch nicht - // aus dem Eingabe-Buffer loeschen: + // fetch next 13 bits into nCodem but dont remove them from + // the input buffer: while (nInputBitsBufSize<13) { *pIStream >> nByte; if ( nOptions & CCI_OPTION_INVERSEBITORDER ) @@ -954,13 +953,13 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget } if ( nCodeBits == 0 ) { - return; // das koennen sich jetzt um FuellBits handeln + return; // could be filling bits now } nEOLCount = 0; // too much data? if (nDataBits>nTargetBits) { - // Ja, koennte ein Folge-Fehler durch ungueltigen Code sein, - // daher irdenwie weitermachen: + // Yes, could be a subsequent error cause by an invalid code + // Thefore continue anyhow: nDataBits=nTargetBits; } diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx index 1e8ec014f625..bdc12f542586 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.hxx +++ b/filter/source/graphicfilter/itiff/ccidecom.hxx @@ -23,22 +23,21 @@ #include <tools/stream.hxx> -#define CCI_OPTION_2D 1 // 2D-Komprimierung (statt 1D) -#define CCI_OPTION_EOL 2 // EOL-Codes am Ende jeder Zeile vorhanden -#define CCI_OPTION_BYTEALIGNEOL 4 // Fuellbits vor jedem EOL-Code, so dass - // Ende von EOL auf Bytes aligend -#define CCI_OPTION_BYTEALIGNROW 8 // Rows beginnen immer auf Byte-Grenze +#define CCI_OPTION_2D 1 // 2D compression (instead of 1D) +#define CCI_OPTION_EOL 2 // There are EOL-Codes at the end of each line. +#define CCI_OPTION_BYTEALIGNEOL 4 // Filling bits before each EOL-Code, so that + // the end of EOL is bytes aligend +#define CCI_OPTION_BYTEALIGNROW 8 // Rows always start byte aligned #define CCI_OPTION_INVERSEBITORDER 16 -// Eintrag in eine Huffman-Tabelle: +// Entry in the Huffman table: struct CCIHuffmanTableEntry { - sal_uInt16 nValue; // Der Daten-Wert. - sal_uInt16 nCode; // Der Code durch den der Daten-Wert repraesentiert wird. - sal_uInt16 nCodeBits; // Laenge des Codes in Bits. + sal_uInt16 nValue; // The data vlaue. + sal_uInt16 nCode; // The code through which the data value is represented. + sal_uInt16 nCodeBits; // Size of the code in bits. }; - -// Eintrag in eine Hash-Tabelle zur schnellen Dekodierung +// Entry in a hash table for daft decoding. struct CCILookUpTableEntry { sal_uInt16 nValue; sal_uInt16 nCodeBits; diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 1a4575095e6d..2f4403197461 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -46,22 +46,22 @@ class TIFFReader private: sal_Bool bStatus; // Whether until now no error occurred - Animation aAnimation; + Animation aAnimation; sal_uLong nLastPercent; - SvStream* pTIFF; // the TIFF file that should be read - Bitmap aBitmap; - BitmapWriteAccess* pAcc; + SvStream* pTIFF; // the TIFF file that should be read + Bitmap aBitmap; + BitmapWriteAccess* pAcc; sal_uInt16 nDstBitsPerPixel; - AlphaMask* pAlphaMask; - BitmapWriteAccess* pMaskAcc; + AlphaMask* pAlphaMask; + BitmapWriteAccess* pMaskAcc; sal_uLong nOrigPos; // start position in pTIFF sal_uInt16 nOrigNumberFormat; // number format of pTIFF at the beginning sal_uInt16 nDataType; - // Daten, die aus dem TIFF-Tags entnommen werden: + // Data taken from the TIFF tags: sal_Bool bByteSwap; // sal_True if bits 0..7 -> 7..0 should get converted ( FILLORDER = 2 ); sal_uInt8 nByte1; // 'I', if the format is LittleEndian @@ -76,7 +76,7 @@ private: sal_uLong nCellWidth; // sal_uLong nCellLength; // sal_uLong nFillOrder; // - sal_uLong* pStripOffsets; // Feld von Offsets zu den Bitmap-Daten-"Strips" + sal_uLong* pStripOffsets; // Fiels of offsets to the Bitmap-Data-"Strips" sal_uLong nNumStripOffsets; // size of the field above sal_uLong nOrientation; // sal_uLong nSamplesPerPixel; // number of layers @@ -85,8 +85,8 @@ private: sal_uLong nNumStripByteCounts; // number of entries in the field above sal_uLong nMinSampleValue; // sal_uLong nMaxSampleValue; // - double fXResolution; // X-resolution or 0.0 - double fYResolution; // Y-resolution or 0.0 + double fXResolution; // X-resolution or 0.0 + double fYResolution; // Y-resolution or 0.0 sal_uLong nPlanarConfiguration; // sal_uLong nGroup3Options; // sal_uLong nGroup4Options; // @@ -97,7 +97,7 @@ private: sal_uLong nPlanes; // number of layers within the Tiff file sal_uLong nStripsPerPlane; // number of Strips per layer - sal_uLong nBytesPerRow; // Bytes pro Zeile pro Ebene in der Tiff-Datei ( unkomprimiert ) + sal_uLong nBytesPerRow; // Bytes per line per Layer in the Tiff file ( uncompressed ) sal_uInt8* pMap[ 4 ]; // temporary Scanline @@ -111,14 +111,15 @@ private: void ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen ); sal_Bool ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent ); - // Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap + // reads/decompresses the bitmap data and fills pMap sal_uLong GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_uLong nBitsCount ); - // Holt nBitsCount Bits aus pSrc[..] an der Bit-Position nBitsPos + // fetches BitsCount bits from pSrc[..] at the position nBitsPos void MakePalCol( void ); - // Erzeugt die Bitmap aus der temporaeren Bitmap pMap - // und loescht dabei pMap teilweise + // Create the bitmap from the temporary bitmap pMap + // and partly deletes pMap while doing this. + sal_Bool ConvertScanline( sal_uLong nY ); // converts a Scanline to the Windows-BMP format @@ -376,7 +377,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) sal_uLong nOldNumSBC, i, * pOldSBC; pOldSBC = pStripByteCounts; if ( pOldSBC == NULL ) - nNumStripByteCounts = 0; // Sicherheitshalber + nNumStripByteCounts = 0; // to be on the safe side nOldNumSBC = nNumStripByteCounts; nDataLen += nOldNumSBC; if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) ) @@ -1363,7 +1364,7 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) } -//================== GraphicImport - the exported Function ================ +//================== GraphicImport - the exported function ================ #ifdef DISABLE_DYNLOADING #define GraphicImport itiGraphicImport diff --git a/filter/source/graphicfilter/itiff/lzwdecom.hxx b/filter/source/graphicfilter/itiff/lzwdecom.hxx index 4a95995ca545..9edfc575b54e 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.hxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.hxx @@ -38,9 +38,8 @@ public: void StartDecompression(SvStream & rIStream); sal_uLong Decompress(sal_uInt8 * pTarget, sal_uLong nMaxCount); - // Liefert die Anzahl der geschriebenen Bytes, wenn < nMaxCount, - // sind keine weiteren Daten zu entpacken, oder es ist ein - // Fehler aufgetreten. + // Returns the number of written bytes. If < nMaxCount there is + // no more data to be unpacked or an error occurred. private: diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 412fb59e42b1..92e2fe3ba8f4 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1588,7 +1588,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno = (::com::sun::star::drawing::PolyPolygonBezierCoords*)rAny.getValue(); sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->Coordinates.getLength(); - // Zeiger auf innere sequences holen + // get pointer of inner sequences ::com::sun::star::drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->Coordinates.getArray(); ::com::sun::star::drawing::FlagSequence* pOuterFlags = pSourcePolyPolygon->Flags.getArray(); @@ -1598,7 +1598,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno sal_uInt16 a, b, nInnerSequenceCount; ::com::sun::star::awt::Point* pArray; - // dies wird ein Polygon set + // this will be a polygon set for ( a = 0; a < nOuterSequenceCount; a++ ) { ::com::sun::star::drawing::PointSequence* pInnerSequence = pOuterSequence++; @@ -1607,7 +1607,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno bNoError = pInnerSequence && pInnerFlags; if ( bNoError ) { - // Zeiger auf Arrays holen + // get pointer to arrays pArray = pInnerSequence->getArray(); ::com::sun::star::drawing::PolygonFlags* pFlags = pInnerFlags->getArray(); @@ -1637,21 +1637,21 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno = (::com::sun::star::drawing::PointSequenceSequence*)rAny.getValue(); sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->getLength(); - // Zeiger auf innere sequences holen + // get pointer to inner sequences ::com::sun::star::drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->getArray(); bNoError = pOuterSequence != NULL; if ( bNoError ) { sal_uInt16 a, b, nInnerSequenceCount; - // dies wird ein Polygon set + // this will be a polygon set for( a = 0; a < nOuterSequenceCount; a++ ) { ::com::sun::star::drawing::PointSequence* pInnerSequence = pOuterSequence++; bNoError = pInnerSequence != NULL; if ( bNoError ) { - // Zeiger auf Arrays holen + // get pointer to arrays ::com::sun::star::awt::Point* pArray = pInnerSequence->getArray(); if ( pArray != NULL ) @@ -1679,7 +1679,7 @@ PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno { sal_uInt16 a, nInnerSequenceCount; - // Zeiger auf Arrays holen + // get pointer to arrays ::com::sun::star::awt::Point* pArray = pInnerSequence->getArray(); if ( pArray != NULL ) { @@ -4524,7 +4524,7 @@ void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom ) sal_uInt32 nSize, nType, nSource, nBufSize, nToCopy, nCurPos = mpOutStrm->Tell(); sal_uInt8* pBuf; - // Persist table anpassen + // adjust persist table for( size_t i = 0, n = maPersistTable.size(); i < n; ++i ) { EscherPersistEntry* pPtr = maPersistTable[ i ]; sal_uInt32 nOfs = pPtr->mnOffset; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index b99360a80cc0..cb5c64a001d8 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -114,7 +114,7 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty nAngle *= 655; nAngle += 0x8000; - nAngle &=~0xffff; // nAngle auf volle Gradzahl runden + nAngle &=~0xffff; // nAngle round to full degrees rPropOpt.AddOpt( ESCHER_Prop_Rotation, nAngle ); rObj.SetAngle( nAngle ); @@ -286,7 +286,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, nLenght = rObj.GetRect().GetHeight(); nLenght >>= 1; if ( nRadius >= nLenght ) - nRadius = 0x2a30; // 0x2a30 ist PPTs maximum radius + nRadius = 0x2a30; // 0x2a30 is PPTs maximum radius else nRadius = ( 0x2a30 * nRadius ) / nLenght; aPropOpt.AddOpt( ESCHER_Prop_adjustValue, nRadius ); @@ -731,7 +731,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj, nAngle *= 655; nAngle += 0x8000; - nAngle &=~0xffff; // nAngle auf volle Gradzahl runden + nAngle &=~0xffff; // nAngle round to full degrees aPropOpt.AddOpt( ESCHER_Prop_Rotation, nAngle ); mpEscherEx->SetGroupSnapRect( mpEscherEx->GetGroupLevel(), rObj.GetRect() ); @@ -782,9 +782,9 @@ sal_uInt32 ImplEESdrWriter::ImplEnterAdditionalTextGroup( const Reference< XShap sal_Bool ImplEESdrWriter::ImplInitPageValues() { mnIndices = 0; - mnOutlinerCount = 0; // die gliederungsobjekte muessen dem layout entsprechen, + mnOutlinerCount = 0; // die outline objects must be in accordance with the layout. mnEffectCount = 0; - mbIsTitlePossible = sal_True; // bei mehr als einem title geht powerpoint in die knie + mbIsTitlePossible = sal_True; // With more than one title PowerPoint will fail. return sal_True; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index bca32e2c782d..a4bb2661962b 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -165,8 +165,8 @@ void Impl_OlePres::Write( SvStream & rStm ) if( GetFormat() == FORMAT_GDIMETAFILE && pMtf ) { - // Immer auf 1/100 mm, bis Mtf-Loesung gefunden - // Annahme (keine Skalierung, keine Org-Verschiebung) + // Always to 1/100 mm, until Mtf-Solution found + // Assumption (no scaling, no origin translation) DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == Fraction( 1, 1 ), "X-Skalierung im Mtf" ); DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == Fraction( 1, 1 ), @@ -2591,7 +2591,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObj MSO_ShadowType eShadowType = static_cast< MSO_ShadowType >( GetPropertyValue( DFF_Prop_shadowType ) ); if( eShadowType != mso_shadowOffset ) { - rSet.Put( SdrShadowXDistItem( 35 ) ); // 0,35 mm Schattendistanz + rSet.Put( SdrShadowXDistItem( 35 ) ); // 0,35 mm shadow distance rSet.Put( SdrShadowYDistItem( 35 ) ); } } @@ -3030,8 +3030,8 @@ void SvxMSDffManager::SetModel(SdrModel* pModel, long nApplicationScale) pSdrModel = pModel; if( pModel && (0 < nApplicationScale) ) { - // PPT arbeitet nur mit Einheiten zu 576DPI - // WW hingegen verwendet twips, i.e. 1440DPI. + // PPT works in units of 576DPI + // WW on the other side uses twips, i.e. 1440DPI. MapUnit eMap = pSdrModel->GetScaleUnit(); Fraction aFact( GetMapFactor(MAP_INCH, eMap).X() ); long nMul=aFact.GetNumerator(); @@ -3155,7 +3155,7 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uLong nMaxFilePos, DffRecordHeader* pRecHd, sal_uLong nSkipCount ) const { bool bRet = sal_False; - sal_uLong nFPosMerk = rStCtrl.Tell(); // FilePos merken fuer ggf. spaetere Restauration + sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for conditionally later restauration DffRecordHeader aHd; do { @@ -3185,8 +3185,8 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uL bool SvxMSDffManager::GetColorFromPalette( sal_uInt16 /* nNum */, Color& rColor ) const { - // diese Methode ist in der zum Excel-Import - // abgeleiteten Klasse zu ueberschreiben... + // This method has to be overwritten in the class + // derived for the excel export rColor.SetColor( COL_WHITE ); return sal_True; } @@ -3435,7 +3435,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte { // case of nUpper == 4 powerpoint takes this as agrument for a colorschemecolor GetColorFromPalette( nUpper, aColor ); } - else // hart attributiert, eventuell mit Hinweis auf SYSTEMRGB + else // attributed hard, maybe with hint to SYSTEMRGB aColor = Color( (sal_uInt8)nColorCode, (sal_uInt8)( nColorCode >> 8 ), (sal_uInt8)( nColorCode >> 16 ) ); return aColor; } @@ -5632,12 +5632,12 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe if( !nLenBStoreCont ) return; - // Im BStore Container alle Header der Container und Atome auslesen und die - // relevanten Daten aller enthaltenen FBSEs in unserem Pointer Array ablegen. - // Dabei zaehlen wir die gefundenen FBSEs im Member nBLIPCount mit. + // Read all atoms of the containers from the BStore container and store all + // relevant data of all contained FBSEs in out pointer array. + // We also count all found FBSEs in member nBLIPCount. - const sal_uLong nSkipBLIPLen = 20; // bis zu nBLIPLen zu ueberspringende Bytes - const sal_uLong nSkipBLIPPos = 4; // dahinter bis zu nBLIPPos zu skippen + const sal_uLong nSkipBLIPLen = 20; // skip to get to the nBLIPLen + const sal_uLong nSkipBLIPPos = 4; // thereafter skip up to nBLIPPos sal_uInt32 nBLIPLen = 0, nBLIPPos = 0; @@ -5665,14 +5665,14 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe if( bOk ) { - // Besonderheit: - // Falls nBLIPLen kleiner ist als nLenFBSE UND nBLIPPos Null ist, - // nehmen wir an, dass das Bild IM FBSE drin steht! + // specialty: + // If nBLIPLen is less than nLenFBSE AND nBLIPPos is NULL, + // then we assume, that the image is in FBSE! if( (!nBLIPPos) && (nBLIPLen < nLenFBSE) ) nBLIPPos = rSt.Tell() + 4; // That worked great! - // Wir merken uns, dass wir einen FBSE mehr im Pointer Array haben. + // We store, that we do have one FBSE more in the pointer array. nBLIPPos = Calc_nBLIPPos(nBLIPPos, rSt.Tell()); if( USHRT_MAX == nBLIPCount ) @@ -5690,7 +5690,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe } -// ab hier: Drawing Container d.h. Seiten (Blatt, Dia) - weit gueltige Daten +// from now on: Drawing Container which means Pages (Sheet, Slide) - wide valid data // ================= ====== // void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, @@ -5700,19 +5700,18 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, sal_uLong nReadDg = 0; - // Wir stehen in einem Drawing Container (je einer pro Seite) - // und muessen nun - // alle enthaltenen Shape Group Container abklappern + // We are now in a drawing container (one per each page) and + // we now have to iterate through all contained shape group containers do { if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; nReadDg += DFF_COMMON_RECORD_HEADER_SIZE; - // Patriarch gefunden (der oberste Shape Group Container) ? + // Patriarch found (the upmost shape group container) ? if( DFF_msofbtSpgrContainer == nFbt ) { if(!this->GetShapeGroupContainerData( rSt, nLength, sal_True, nDrawingContainerId )) return; } - // blanker Shape Container ? (ausserhalb vom Shape Group Container) + // empty Shape Container ? (outside of shape group container) else if( DFF_msofbtSpContainer == nFbt ) { if(!this->GetShapeContainerData( rSt, nLength, ULONG_MAX, nDrawingContainerId )) return; @@ -5731,9 +5730,8 @@ sal_Bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, { sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength; long nStartShapeGroupCont = rSt.Tell(); - // Wir stehen in einem Shape Group Container (ggfs. mehrere pro Seite) - // und muessen nun - // alle enthaltenen Shape Container abklappern + // We are now in a shape group container (conditionally mulitple per page) + // an we now have to iterate through all contained shape containers sal_Bool bFirst = !bPatriarch; sal_uLong nReadSpGrCont = 0; do @@ -5749,7 +5747,7 @@ sal_Bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, return sal_False; bFirst = sal_False; } - // eingeschachtelter Shape Group Container ? + // nested shape group container ? else if( DFF_msofbtSpgrContainer == nFbt ) { if ( !this->GetShapeGroupContainerData( rSt, nLength, sal_False, nDrawingContainerId ) ) @@ -5760,7 +5758,7 @@ sal_Bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, nReadSpGrCont += nLength; } while( nReadSpGrCont < nLenShapeGroupCont ); - // den Stream wieder korrekt positionieren + // possition the steam correctly rSt.Seek( nStartShapeGroupCont + nLenShapeGroupCont ); return sal_True; } @@ -5772,22 +5770,20 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, { sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength; long nStartShapeCont = rSt.Tell(); - // Wir stehen in einem Shape Container (ggfs. mehrere pro Sh. Group) - // und muessen nun - // die Shape Id und File-Pos (fuer spaetere, erneute Zugriffe) - // und den ersten BStore Verweis (falls vorhanden) entnehmen + + // We are in a shape container (possibly more than one per shape group) and we now + // have to fetch the shape id and file position (to be able to access them again later) + // and the first BStore reference (if present). sal_uLong nLenShapePropTbl = 0; sal_uLong nReadSpCont = 0; - // File Offset des Shape-Containers bzw. der Gruppe(!) vermerken - // + // Store file offset of the shape containers or respectivly the group(!). sal_uLong nStartOffs = (ULONG_MAX > nPosGroup) ? nPosGroup : nStartShapeCont - DFF_COMMON_RECORD_HEADER_SIZE; SvxMSDffShapeInfo aInfo( nStartOffs ); - // duerfte das Shape durch einen Rahmen ersetzt werden ? - // (vorausgesetzt, es zeigt sich, dass es eine TextBox ist, - // und der Text nicht gedreht ist) + // Can the shape be replaced with a frame? + // (provided that it is a TextBox and the text is not rotated) sal_Bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? sal_False : sal_True; // we don't know yet whether it's a TextBox @@ -5888,9 +5884,8 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, else if( 0x8000 & nPropId ) { // complex Prop found: - // Laenge ist immer 6, nur die Laenge der nach der - // eigentlichen Prop-Table anhaengenden Extra-Daten - // ist unterschiedlich + // Length is always 6. The length of the appended extra data + // after the actual prop table is of different size. nPropVal = 6; } } @@ -5921,11 +5916,11 @@ sal_Bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, while( nReadSpCont < nLenShapeCont ); // - // Jetzt ggfs. die Infos fuer spaetere Zugriffe auf das Shape speichern + // Now possibly store the information for subsequent accesses to the shape // if( aInfo.nShapeId ) { - // fuer Textboxen ggfs. ersetzen durch Rahmen erlauben + // Possibly allow replacement of textboxes with frames if( bCanBeReplaced && aInfo.nTxBxComp && ( @@ -5965,13 +5960,13 @@ sal_Bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape, m_pShapeInfosById->find(pTmpRec); if (it != m_pShapeInfosById->end()) { - // eventuell altes Errorflag loeschen + // Possibly delete old error flag. if( rStCtrl.GetError() ) rStCtrl.ResetError(); - // FilePos des/der Stream(s) merken + // store FilePos of the stream(s) sal_uLong nOldPosCtrl = rStCtrl.Tell(); sal_uLong nOldPosData = pStData ? pStData->Tell() : nOldPosCtrl; - // das Shape im Steuer Stream anspringen + // jump to the shape in the control stream sal_uLong const nFilePos((*it)->nFilePos); bool bSeeked = (nFilePos == rStCtrl.Seek(nFilePos)); @@ -6022,7 +6017,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p sal_uInt16 nIdx = sal_uInt16( nIdx_ ); if( !nIdx || (pBLIPInfos->size() < nIdx) ) return sal_False; - // eventuell alte(s) Errorflag(s) loeschen + // possibly delete old error flag(s) if( rStCtrl.GetError() ) rStCtrl.ResetError(); if( ( &rStCtrl != pStData ) @@ -6033,25 +6028,25 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p sal_uLong nOldPosCtrl = rStCtrl.Tell(); sal_uLong nOldPosData = pStData ? pStData->Tell() : nOldPosCtrl; - // passende Info-Struct aus unserem Pointer Array nehmen + // fetch matching info struct out of the pointer array SvxMSDffBLIPInfo& rInfo = (*pBLIPInfos)[ nIdx-1 ]; - // das BLIP Atom im Daten Stream anspringen + // jump to the BLIP atom in the data stream pStData->Seek( rInfo.nFilePos ); - // ggfs. Fehlerstatus zuruecksetzen + // possibly reset error status if( pStData->GetError() ) pStData->ResetError(); else bOk = GetBLIPDirect( *pStData, rData, pVisArea ); if( pStData2 && !bOk ) { - // Fehler, aber zweite Chance: es gibt noch einen zweiten - // Datenstream, in dem die Grafik liegen koennte! + // Error, but the is a second chance: There is a second + // data stream in which the graphic could be stored! if( pStData2->GetError() ) pStData2->ResetError(); sal_uLong nOldPosData2 = pStData2->Tell(); - // das BLIP Atom im zweiten Daten Stream anspringen + // jump to the BLIP atom in the second data stream pStData2->Seek( rInfo.nFilePos ); - // ggfs. Fehlerstatus zuruecksetzen + // reset error status if necessary if( pStData2->GetError() ) pStData2->ResetError(); else @@ -6059,7 +6054,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p // restore olf FilePos of the second data stream pStData2->Seek( nOldPosData2 ); } - // alte FilePos des/der Stream(s) restaurieren + // restore old FilePos of the stream(s) rStCtrl.Seek( nOldPosCtrl ); if( &rStCtrl != pStData ) pStData->Seek( nOldPosData ); @@ -6242,14 +6237,14 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, } } } - // ggfs. Fehlerstatus zuruecksetzen + // reset error status if necessary if ( ERRCODE_IO_PENDING == pGrStream->GetError() ) pGrStream->ResetError(); delete pOut; } rBLIPStream.Seek( nOldPos ); // restore old FilePos of the strem - return ( GRFILTER_OK == nRes ); // Ergebniss melden + return ( GRFILTER_OK == nRes ); // return result } /* also static */ @@ -6294,7 +6289,7 @@ sal_Bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLe void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader& /* rHd */ , void* /* pData */, DffObjData& /* rObj */ ) { - return; // wird von SJ im Draw ueberladen + return; // will be overloaded by SJ in Draw } sal_uLong SvxMSDffManager::Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong /* nStreamPos */ ) const @@ -6342,9 +6337,9 @@ sal_Bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFi sal_uLong nAdviseModes = 2; Impl_OlePres aEle( FORMAT_GDIMETAFILE ); - // Die Groesse in 1/100 mm umrechnen - // Falls eine nicht anwendbare MapUnit (Device abhaengig) verwendet wird, - // versucht SV einen BestMatchden richtigen Wert zu raten. + // Convert the size in 1/100 mm + // If a not applicable MapUnit (device dependend) is used, + // SV tries to guess a best match for the right value Size aSize = rMtf.GetPrefSize(); MapMode aMMSrc = rMtf.GetPrefMapMode(); MapMode aMMDst( MAP_100TH_MM ); diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 18d08e4384e8..5706df0b8562 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -102,8 +102,8 @@ const uno::Reference< container::XIndexContainer >& uno::Reference< container::XNameContainer > xNameCont = xFormsSupplier->getForms(); - // Das Formular bekommt einen Namen wie "WW-Standard[n]" und - // wird in jedem Fall neu angelegt. + // The form gets a new name like "WW-Standard[n]" and will + // created new in any case. OUString sName( sWW8_form ); sal_uInt16 n = 0; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 6071eb6ec348..28892499e14e 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2479,8 +2479,8 @@ Size SdrPowerPointImport::GetPageSize() const { Size aRet( IsNoteOrHandout( nAktPageNum, eAktPageKind ) ? aDocAtom.GetNotesPageSize() : aDocAtom.GetSlidesPageSize() ); Scale( aRet ); - // PPT arbeitet nur mit Einheiten zu 576DPI. Um Ungenauigkeiten zu - // vermeiden runde ich die letzte Nachkommastelle metrisch weg. + // PPT works with units of 576 dpi in any case. To avoid inacurracies + // I do round the last decimal digit away. if ( nMapMul > 2 * nMapDiv ) { MapUnit eMap = pSdrModel->GetScaleUnit(); @@ -5647,7 +5647,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s } else { - if ( GetAttrib( PPT_CharAttr_FontColor, nVal, nDestinationInstance ) ) // Textfarbe (4Byte-Arg) + if ( GetAttrib( PPT_CharAttr_FontColor, nVal, nDestinationInstance ) ) // text color (4Byte-Arg) { Color aCol( rManager.MSO_TEXT_CLR_ToColor( nVal ) ); rSet.Put( SvxColorItem( aCol, EE_CHAR_COLOR ) ); @@ -5663,7 +5663,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s } } - if ( GetAttrib( PPT_CharAttr_Escapement, nVal, nDestinationInstance ) ) // Hoch/Tiefstellung in % + if ( GetAttrib( PPT_CharAttr_Escapement, nVal, nDestinationInstance ) ) // super-/subscript in % { sal_uInt16 nEsc = 0; sal_uInt8 nProp = 100; @@ -6099,7 +6099,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) ) { if ( nVal <= 3 ) - { // Absatzausrichtung + { // paragraph adjustment static SvxAdjust const aAdj[ 4 ] = { SVX_ADJUST_LEFT, SVX_ADJUST_CENTER, SVX_ADJUST_RIGHT, SVX_ADJUST_BLOCK }; rSet.Put( SvxAdjustItem( aAdj[ nVal ], EE_PARA_JUST ) ); } @@ -6273,7 +6273,7 @@ void PPTFieldEntry::GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateForm { eDateFormat = SVXDATEFORMAT_APPDEFAULT; eTimeFormat = SVXTIMEFORMAT_APPDEFAULT; - // ID auswerten + // evaluate ID switch( nVal ) { case 0: diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index a7d1e2d6077f..473123a1d073 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1013,7 +1013,7 @@ void XMLFilterSettingsDialog::onClose() long XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) { - // Zuerst Basisklasse rufen wegen TabSteuerung + // Because of of tab control first call the base class. long nRet = ModelessDialog::Notify( rNEvt ); if ( !nRet ) { |