[Libreoffice-commits] core.git: filter/source
Jens Carl
j.carl43 at gmx.de
Thu Mar 30 10:26:49 UTC 2017
filter/source/config/cache/querytokenizer.hxx | 2 +-
filter/source/graphicfilter/egif/egif.cxx | 1 -
filter/source/graphicfilter/icgm/cgm.hxx | 4 ++--
filter/source/graphicfilter/idxf/dxfblkrd.hxx | 6 +++---
filter/source/graphicfilter/idxf/dxfentrd.hxx | 4 ++--
filter/source/graphicfilter/idxf/dxftblrd.hxx | 2 +-
filter/source/graphicfilter/ios2met/ios2met.cxx | 2 +-
filter/source/graphicfilter/ipcx/ipcx.cxx | 2 +-
filter/source/graphicfilter/iras/iras.cxx | 2 +-
filter/source/graphicfilter/itiff/itiff.cxx | 1 -
filter/source/msfilter/dffpropset.cxx | 1 -
filter/source/msfilter/escherex.cxx | 4 ++--
filter/source/msfilter/msdffimp.cxx | 6 +++---
filter/source/msfilter/svdfppt.cxx | 16 ++++++++--------
filter/source/msfilter/util.cxx | 4 ++--
filter/source/msfilter/viscache.hxx | 4 ++--
16 files changed, 29 insertions(+), 32 deletions(-)
New commits:
commit 63e36cdd9d7acc71fb8a8bb9a1e9aef54f240b9d
Author: Jens Carl <j.carl43 at gmx.de>
Date: Thu Mar 30 06:06:23 2017 +0000
tdf#39468 Translate German comments
Translate German comments and terms in filter/
Change-Id: I37a5c87952b2664ea3171373c8bb9020c0fa73d0
Reviewed-on: https://gerrit.libreoffice.org/35887
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx
index 28e3286d820a..b6147ac00e1c 100644
--- a/filter/source/config/cache/querytokenizer.hxx
+++ b/filter/source/config/cache/querytokenizer.hxx
@@ -43,7 +43,7 @@ namespace filter{
uses this schema.
@attention This class is not threadsafe implemented. Because it's not necessary.
- But you have to make sure, that ist not used as such :-)
+ But you have to make sure that it's not used as such :-)
*/
class QueryTokenizer : public std::unordered_map< OUString ,
OUString ,
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 887935f8e293..ee4e824b9930 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -420,7 +420,6 @@ void GIFWriter::WriteLocalHeader()
// set Flag for the local color palette
cFlags |= 0x80;
- // alles rausschreiben
m_rGIF.WriteUChar( 0x2c );
m_rGIF.WriteUInt16( nPosX );
m_rGIF.WriteUInt16( nPosY );
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 0f3d68620f8b..777e53913e24 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -46,8 +46,8 @@ class CGM
friend class CGMElements;
friend class CGMImpressOutAct;
- double mnOutdx; // Ausgabe Groesse in 1/100TH mm
- double mnOutdy; // auf das gemappt wird
+ double mnOutdx; // Output size in 1/100TH mm
+ double mnOutdy; // on which is mapped
double mnVDCXadd;
double mnVDCYadd;
double mnVDCXmul;
diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx
index 572ce27575ca..c35149d65428 100644
--- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx
@@ -31,7 +31,7 @@ class DXFBlock : public DXFEntities {
public:
DXFBlock * pSucc;
- // pointer to the nex block in the list DXFBlocks::pFirst
+ // pointer to the next block in the list DXFBlocks::pFirst
// properties of blocks; commented with group codes:
OString m_sName; // 2
@@ -45,7 +45,7 @@ public:
void Read(DXFGroupReader & rDGR);
// reads the block (including entities) from a dxf file
- // by rGDR until a ENDBLK, ENDSEC oder EOF.
+ // by rGDR until a ENDBLK, ENDSEC or EOF.
};
@@ -63,7 +63,7 @@ public:
~DXFBlocks();
void Read(DXFGroupReader & rDGR);
- // reads all block per rDGR until a ENDSEC oder EOF.
+ // reads all block per rDGR until a ENDSEC or EOF.
DXFBlock * Search(OString const& rName) const;
// looks for a block with the name, return NULL if not successful
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index 61bd59cb0ee2..85dbd32b2c5e 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -524,8 +524,8 @@ public:
mutable bool mbBeingDrawn; // guard for loop in entity parsing
void Read(DXFGroupReader & rDGR);
- // read entities per rGDR of a DXF file until a
- // ENDBLK, ENDSEC oder EOF (of group 0).
+ // read entities by rGDR of a DXF file until a
+ // ENDBLK, ENDSEC or EOF (of group 0).
// (all unknown thing will be skipped)
void Clear();
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx
index 588e7c8f059d..824b03bf2993 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx
@@ -153,7 +153,7 @@ public:
~DXFTables();
void Read(DXFGroupReader & rDGR);
- // Reads the table until a ENDSEC oder EOF
+ // Reads the table until a ENDSEC or EOF
// (Unknown things/tables will be skipped)
void Clear();
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 2bc052f57bd0..9ba110cd8ec7 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -426,7 +426,7 @@ public:
~OS2METReader();
void ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaFile );
- // Reads from the stream a OS2MET file und and fills up the GDIMetaFile
+ // Reads from the stream a OS2MET file and fills up the GDIMetaFile
};
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 8ded909962c7..67b2f7c3ded0 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -40,7 +40,7 @@ private:
sal_uInt16 nPaletteInfo;
sal_uLong nWidth, nHeight; // dimension in pixel
- sal_uInt16 nResX, nResY; // resolution in pixel per inch oder 0,0
+ sal_uInt16 nResX, nResY; // resolution in pixel per inch or 0,0
sal_uInt16 nDestBitsPerPixel; // bits per pixel in destination bitmap 1,4,8 or 24
std::unique_ptr<sal_uInt8[]>
pPalette;
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 9cc98ad45bf1..343a90cb812c 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -141,7 +141,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
return false;
}
- else if ( mnColorMapType != RAS_COLOR_NO_MAP ) // alles andere ist kein standard
+ else if ( mnColorMapType != RAS_COLOR_NO_MAP ) // everything else is not standard
return false;
if (!bPalette)
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index e4afeb0c3d63..560056c6fa85 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1305,7 +1305,6 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
nNumTags = nMaxRecords;
}
- // Schleife ueber Tags:
for( i = 0; i < nNumTags; i++ )
{
pTIFF->ReadUInt16( nTagType ).ReadUInt16( nDataType ).ReadUInt32( nDataLen );
diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx
index 5490fee57366..72dd1cb5df45 100644
--- a/filter/source/msfilter/dffpropset.cxx
+++ b/filter/source/msfilter/dffpropset.cxx
@@ -1107,7 +1107,6 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool bSetUninitializedOnly )
sal_uInt32 nPropCount = aHd.nRecInstance;
- // FilePos der ComplexData merken
sal_uInt32 nComplexDataFilePos = rIn.Tell() + ( nPropCount * 6 );
for( sal_uInt32 nPropNum = 0; nPropNum < nPropCount; nPropNum++ )
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 4c8cc125978c..00efa154aa86 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4482,7 +4482,7 @@ sal_uInt32 EscherConnectorListEntry::GetClosestPoint( const tools::Polygon& rPol
// for rectangles for ellipses for polygons
//
-// nRule = 0 ->Top 0 ->Top nRule = Index auf ein (Poly)Polygon Punkt
+// nRule = 0 ->Top 0 ->Top nRule = index to a (Poly)Polygon point
// 1 ->Left 2 ->Left
// 2 ->Bottom 4 ->Bottom
// 3 ->Right 6 ->Right
@@ -4558,7 +4558,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst )
o3tl::doAccess<css::drawing::PolyPolygonBezierCoords>(aAny);
sal_Int32 nOuterSequenceCount = pSourcePolyPolygon->Coordinates.getLength();
- // Zeiger auf innere sequences holen
+ // get pointer of inner sequences
css::drawing::PointSequence const * pOuterSequence =
pSourcePolyPolygon->Coordinates.getConstArray();
css::drawing::FlagSequence const * pOuterFlags =
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index cd6dcf439f48..545d6a0be1fd 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5796,7 +5796,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
Reading the Shape-Infos in the Ctor:
---------------------------------
- remembering the Shape-Ids and the associated Blip-Numbers und TextBox-Infos
+ remembering the Shape-Ids and the associated Blip-Numbers and TextBox-Infos
========= ============ =============
and remembering the File-Offsets for each Blip
============
@@ -6045,7 +6045,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
// FSP ?
if( ( DFF_msofbtSp == nFbt ) && ( 4 <= nLength ) )
{
- // we've found the FSP gefunden: note Shape Type and Id!
+ // we've found the FSP: note Shape Type and Id!
eShapeType = (MSO_SPT)nInst;
rSt.ReadUInt32( aInfo.nShapeId );
rSt.SeekRel( nLength - 4 );
@@ -6224,7 +6224,7 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape,
else
rpShape = ImportObj( rStCtrl, &rData, rData.aParentRect, rData.aParentRect );
- // restore old alte FilePos of the stream(s)
+ // restore old FilePos of the stream(s)
rStCtrl.Seek( nOldPosCtrl );
if( &rStCtrl != pStData && pStData )
pStData->Seek( nOldPosData );
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index e819b6bc6593..d7c9a007694a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1397,7 +1397,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
if ( pPersistPtr[ nOfs ] > nStreamLen )
{
bOk = false;
- OSL_FAIL("SdrPowerPointImport::Ctor(): Ungueltiger Eintrag im Persist-Directory!");
+ OSL_FAIL("SdrPowerPointImport::Ctor(): Invalid Entry in Persist-Directory!");
}
}
nAnz--;
@@ -1405,7 +1405,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
}
if ( bOk && nAnz > 0 )
{
- OSL_FAIL("SdrPowerPointImport::Ctor(): Nicht alle Persist-Directory Entraege gelesen!");
+ OSL_FAIL("SdrPowerPointImport::Ctor(): Not all entries of Persist-Directory read!");
bOk = false;
}
}
@@ -1427,7 +1427,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
nDocStreamPos = aUserEditAtom.nDocumentRef;
if ( nDocStreamPos > nPersistPtrAnz )
{
- OSL_FAIL("SdrPowerPointImport::Ctor(): aUserEditAtom.nDocumentRef ungueltig!");
+ OSL_FAIL("SdrPowerPointImport::Ctor(): aUserEditAtom.nDocumentRef invalid!");
bOk = false;
}
}
@@ -4214,7 +4214,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
mpCharSheet[ nInstance ]->maCharLevel[ nLev ] = mpCharSheet[ nInstance ]->maCharLevel[ nLev - 1 ];
}
- // Exception: Template 5, 6 (MasterTitle Title und SubTitle)
+ // Exception: Template 5, 6 (MasterTitle Title and SubTitle)
if ( nInstance >= TSS_Type::Subtitle )
{
bFirst = false;
@@ -4251,7 +4251,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
}
}
if ( rIn.Tell() != aTxMasterStyleHd.GetRecEndFilePos() )
- SAL_WARN( "filter.ms", "SJ: Falsche Anzahl von Bytes gelesen beim Import der PPT-Formatvorlagen");
+ SAL_WARN( "filter.ms", "SJ: Wrong number of bytes read during import of PPT style");
}
#endif
}
@@ -7388,9 +7388,9 @@ void CreateTableColumns( const Reference< XTableColumns >& xTableColumns, const
void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan )
{
DBG_ASSERT( (nColSpan > 1) || (nRowSpan > 1), "nonsense parameter!!" );
- DBG_ASSERT( (nCol >= 0) && (nCol < xTable->getColumnCount()) && (nRow >= 0) && (nRow < xTable->getRowCount()), "die celle gibts nicht!!" );
- DBG_ASSERT( (nColSpan >= 1) && ((nCol + nColSpan - 1) < xTable->getColumnCount()), "nColSpan murks!" );
- DBG_ASSERT( (nRowSpan >= 1) && ((nRow + nRowSpan - 1) < xTable->getRowCount()), "nRowSpan murks!" );
+ DBG_ASSERT( (nCol >= 0) && (nCol < xTable->getColumnCount()) && (nRow >= 0) && (nRow < xTable->getRowCount()), "the cell does not exists!!" );
+ DBG_ASSERT( (nColSpan >= 1) && ((nCol + nColSpan - 1) < xTable->getColumnCount()), "nColSpan botch!" );
+ DBG_ASSERT( (nRowSpan >= 1) && ((nRow + nRowSpan - 1) < xTable->getRowCount()), "nRowSpan botch!" );
if( xTable.is() ) try
{
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index b105029a244f..91b5f4dc6bbf 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -372,10 +372,10 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken()
// until the next blank or "\" or closing quotation mark
// or the end of the string of pStr.
//
-// Output ppNext (if ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
+// Output ppNext (if ppNext != 0) search begin of next parameter resp. 0
//
// Return value: 0 if end of string reached,
-// ansonsten Anfang des Paramters bzw. der Zeichenkette
+// otherwise beginning of the parameter resp. string
//
sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart)
{
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 81b60d6216fe..0a73ee75dbf6 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -33,13 +33,13 @@ class Impl_OlePres
pMtf;
sal_uInt32 nAdvFlags;
- Size aSize; // Groesse in 100TH_MM
+ Size aSize; // size in 100TH_MM
public:
explicit Impl_OlePres( SotClipboardFormatId nF )
: nFormat( nF )
, nAspect( ASPECT_CONTENT )
, pMtf( nullptr )
- , nAdvFlags( 0x2 ) // in Dokument gefunden
+ , nAdvFlags( 0x2 ) // found in document
{}
void SetMtf( const GDIMetaFile & rMtf )
{
More information about the Libreoffice-commits
mailing list