[PATCH] Translate German comments, fix some ws
Philipp Weissenbacher (via Code Review)
gerrit at gerrit.libreoffice.org
Tue Mar 26 11:11:56 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3063
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/3063/1
Translate German comments, fix some ws
Change-Id: Ic7cf80655e6520f09a0b63b7839e46ad50de8fb1
---
M vcl/source/gdi/gdimtf.cxx
M vcl/source/gdi/gfxlink.cxx
M vcl/source/gdi/gradient.cxx
M vcl/source/gdi/graph.cxx
M vcl/source/gdi/graphictools.cxx
M vcl/source/gdi/hatch.cxx
M vcl/source/gdi/image.cxx
M vcl/source/gdi/impanmvw.cxx
M vcl/source/gdi/impanmvw.hxx
M vcl/source/gdi/jobset.cxx
M vcl/source/gdi/mapmod.cxx
11 files changed, 49 insertions(+), 522 deletions(-)
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 798d4d8..da87d31 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -132,7 +132,7 @@
bRecord ( sal_False ),
bUseCanvas ( rMtf.bUseCanvas )
{
- // RefCount der MetaActions erhoehen
+ // Increment RefCount of MetaActions
for( size_t i = 0, n = rMtf.GetActionSize(); i < n; ++i )
{
rMtf.GetAction( i )->Duplicate();
@@ -195,7 +195,7 @@
{
Clear();
- // RefCount der MetaActions erhoehen
+ // Increment RefCount of MetaActions
for( size_t i = 0, n = rMtf.GetActionSize(); i < n; ++i )
{
rMtf.GetAction( i )->Duplicate();
@@ -690,7 +690,6 @@
aList.push_back( pAction );
}
-// @since #110496#
void GDIMetaFile::RemoveAction( size_t nPos )
{
if ( nPos < aList.size() )
@@ -908,8 +907,7 @@
const PolyPolygon& rPolyPoly,
const Gradient& rGrad )
{
- // #105055# Generate comment, GradientEx and Gradient actions
- // (within DrawGradient)
+ // Generate comment, GradientEx and Gradient actions (within DrawGradient)
VirtualDevice aVDev( rMapDev, 0 );
aVDev.EnableOutput( sal_False );
GDIMetaFile aGradMtf;
@@ -1162,7 +1160,7 @@
}
break;
- // #105055# Handle gradientex comment block correctly
+ // Handle gradientex comment block correctly
case( META_COMMENT_ACTION ):
{
MetaCommentAction* pCommentAct = (MetaCommentAction*) pAction;
@@ -2888,8 +2886,6 @@
const BitmapEx* pOverlay,
const Rectangle* pOverlayRect ) const
{
- // the implementation is provided by KA
-
// initialization seems to be complicated but is used to avoid rounding errors
VirtualDevice aVDev;
const Point aNullPt;
@@ -3011,7 +3007,7 @@
{
const sal_uInt8* pData=(sal_uInt8*)_pData;
- // data gets copied twice, unfortunately
+ // FIXME: Data gets copied twice, unfortunately
rtl::OString aRendererServiceName(
rRendererServiceName.getStr(),
rRendererServiceName.getLength(),
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 27dacf74..effa86c 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -29,10 +29,6 @@
#include <vcl/cvtgrf.hxx>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-// -----------
-// - GfxLink -
-// -----------
-
GfxLink::GfxLink() :
meType ( GFX_LINK_TYPE_NONE ),
mpBuf ( NULL ),
@@ -43,15 +39,11 @@
{
}
-// ------------------------------------------------------------------------
-
GfxLink::GfxLink( const GfxLink& rGfxLink ) :
mpImpData( new ImpGfxLink )
{
ImplCopy( rGfxLink );
}
-
-// ------------------------------------------------------------------------
GfxLink::GfxLink( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, sal_Bool bOwns ) :
mpImpData( new ImpGfxLink )
@@ -75,8 +67,6 @@
mpBuf = NULL;
}
-// ------------------------------------------------------------------------
-
GfxLink::~GfxLink()
{
if( mpBuf && !( --mpBuf->mnRefCount ) )
@@ -87,8 +77,6 @@
delete mpImpData;
}
-
-// ------------------------------------------------------------------------
GfxLink& GfxLink::operator=( const GfxLink& rGfxLink )
{
@@ -105,8 +93,6 @@
return *this;
}
-
-// ------------------------------------------------------------------------
sal_Bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const
{
@@ -128,8 +114,6 @@
return bIsEqual;
}
-// ------------------------------------------------------------------------
-
void GfxLink::ImplCopy( const GfxLink& rGfxLink )
{
mnBufSize = rGfxLink.mnBufSize;
@@ -146,28 +130,20 @@
mpSwap->mnRefCount++;
}
-// ------------------------------------------------------------------------
-
GfxLinkType GfxLink::GetType() const
{
return meType;
}
-
-// ------------------------------------------------------------------------
sal_Bool GfxLink::IsNative() const
{
return( meType >= GFX_LINK_FIRST_NATIVE_ID && meType <= GFX_LINK_LAST_NATIVE_ID );
}
-// ------------------------------------------------------------------------
-
sal_uInt32 GfxLink::GetDataSize() const
{
return mnBufSize;
}
-
-// ------------------------------------------------------------------------
const sal_uInt8* GfxLink::GetData() const
{
@@ -177,14 +153,10 @@
return( mpBuf ? mpBuf->mpBuffer : NULL );
}
-// ------------------------------------------------------------------------
-
const Size& GfxLink::GetPrefSize() const
{
return mpImpData->maPrefSize;
}
-
-// ------------------------------------------------------------------------
void GfxLink::SetPrefSize( const Size& rPrefSize )
{
@@ -192,21 +164,15 @@
mpImpData->mbPrefSizeValid = true;
}
-// ------------------------------------------------------------------------
-
bool GfxLink::IsPrefSizeValid()
{
return mpImpData->mbPrefSizeValid;
}
-// ------------------------------------------------------------------------
-
const MapMode& GfxLink::GetPrefMapMode() const
{
return mpImpData->maPrefMapMode;
}
-
-// ------------------------------------------------------------------------
void GfxLink::SetPrefMapMode( const MapMode& rPrefMapMode )
{
@@ -214,14 +180,10 @@
mpImpData->mbPrefMapModeValid = true;
}
-// ------------------------------------------------------------------------
-
bool GfxLink::IsPrefMapModeValid()
{
return mpImpData->mbPrefMapModeValid;
}
-
-// ------------------------------------------------------------------------
sal_Bool GfxLink::LoadNative( Graphic& rGraphic )
{
@@ -260,8 +222,6 @@
return bRet;
}
-// ------------------------------------------------------------------------
-
void GfxLink::SwapOut()
{
if( !IsSwappedOut() && mpBuf )
@@ -283,8 +243,6 @@
}
}
-// ------------------------------------------------------------------------
-
void GfxLink::SwapIn()
{
if( IsSwappedOut() )
@@ -298,8 +256,6 @@
}
}
-// ------------------------------------------------------------------------
-
sal_Bool GfxLink::ExportNative( SvStream& rOStream ) const
{
if( GetDataSize() )
@@ -312,8 +268,6 @@
return ( rOStream.GetError() == ERRCODE_NONE );
}
-
-// ------------------------------------------------------------------------
SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink )
{
@@ -337,8 +291,6 @@
return rOStream;
}
-
-// ------------------------------------------------------------------------
SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink)
{
@@ -377,10 +329,6 @@
return rIStream;
}
-// -----------
-// - ImpSwap -
-// -----------
-
ImpSwap::ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ) :
mnDataSize( nDataSize ),
mnRefCount( 1UL )
@@ -409,15 +357,11 @@
}
}
-// ------------------------------------------------------------------------
-
ImpSwap::~ImpSwap()
{
if( IsSwapped() )
osl_removeFile( maURL.pData );
}
-
-// ------------------------------------------------------------------------
sal_uInt8* ImpSwap::GetData() const
{
@@ -444,8 +388,6 @@
return pData;
}
-
-// ------------------------------------------------------------------------
void ImpSwap::WriteTo( SvStream& rOStm ) const
{
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 72d5ffc..b4099b5 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -23,11 +23,7 @@
#include <tools/gen.hxx>
#include <vcl/gradient.hxx>
-// =======================================================================
-
DBG_NAME( Gradient )
-
-// -----------------------------------------------------------------------
Impl_Gradient::Impl_Gradient() :
maStartColor( COL_BLACK ),
@@ -44,8 +40,6 @@
mnStepCount = 0;
}
-// -----------------------------------------------------------------------
-
Impl_Gradient::Impl_Gradient( const Impl_Gradient& rImplGradient ) :
maStartColor( rImplGradient.maStartColor ),
maEndColor( rImplGradient.maEndColor )
@@ -61,11 +55,9 @@
mnStepCount = rImplGradient.mnStepCount;
}
-// -----------------------------------------------------------------------
-
void Gradient::MakeUnique()
{
- // Falls noch andere Referenzen bestehen, dann kopieren
+ // If there are still other references, copy
if ( mpImplGradient->mnRefCount != 1 )
{
if( mpImplGradient->mnRefCount )
@@ -75,8 +67,6 @@
}
}
-// -----------------------------------------------------------------------
-
Gradient::Gradient()
{
DBG_CTOR( Gradient, NULL );
@@ -84,19 +74,15 @@
mpImplGradient = new Impl_Gradient;
}
-// -----------------------------------------------------------------------
-
Gradient::Gradient( const Gradient& rGradient )
{
DBG_CTOR( Gradient, NULL );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
- // Instance Daten uebernehmen und Referenzcounter erhoehen
+ // Take over instance data and increment refcount
mpImplGradient = rGradient.mpImplGradient;
mpImplGradient->mnRefCount++;
}
-
-// -----------------------------------------------------------------------
Gradient::Gradient( GradientStyle eStyle,
const Color& rStartColor, const Color& rEndColor )
@@ -109,21 +95,17 @@
mpImplGradient->maEndColor = rEndColor;
}
-// -----------------------------------------------------------------------
-
Gradient::~Gradient()
{
DBG_DTOR( Gradient, NULL );
- // Wenn es die letzte Referenz ist, loeschen,
- // sonst Referenzcounter decrementieren
+ // If it's the last reference, delete it, otherwise
+ // decrement refcount
if ( mpImplGradient->mnRefCount == 1 )
delete mpImplGradient;
else
mpImplGradient->mnRefCount--;
}
-
-// -----------------------------------------------------------------------
void Gradient::SetStyle( GradientStyle eStyle )
{
@@ -133,8 +115,6 @@
mpImplGradient->meStyle = eStyle;
}
-// -----------------------------------------------------------------------
-
void Gradient::SetStartColor( const Color& rColor )
{
DBG_CHKTHIS( Gradient, NULL );
@@ -142,8 +122,6 @@
MakeUnique();
mpImplGradient->maStartColor = rColor;
}
-
-// -----------------------------------------------------------------------
void Gradient::SetEndColor( const Color& rColor )
{
@@ -153,8 +131,6 @@
mpImplGradient->maEndColor = rColor;
}
-// -----------------------------------------------------------------------
-
void Gradient::SetAngle( sal_uInt16 nAngle )
{
DBG_CHKTHIS( Gradient, NULL );
@@ -162,8 +138,6 @@
MakeUnique();
mpImplGradient->mnAngle = nAngle;
}
-
-// -----------------------------------------------------------------------
void Gradient::SetBorder( sal_uInt16 nBorder )
{
@@ -173,8 +147,6 @@
mpImplGradient->mnBorder = nBorder;
}
-// -----------------------------------------------------------------------
-
void Gradient::SetOfsX( sal_uInt16 nOfsX )
{
DBG_CHKTHIS( Gradient, NULL );
@@ -182,8 +154,6 @@
MakeUnique();
mpImplGradient->mnOfsX = nOfsX;
}
-
-// -----------------------------------------------------------------------
void Gradient::SetOfsY( sal_uInt16 nOfsY )
{
@@ -193,8 +163,6 @@
mpImplGradient->mnOfsY = nOfsY;
}
-// -----------------------------------------------------------------------
-
void Gradient::SetStartIntensity( sal_uInt16 nIntens )
{
DBG_CHKTHIS( Gradient, NULL );
@@ -202,8 +170,6 @@
MakeUnique();
mpImplGradient->mnIntensityStart = nIntens;
}
-
-// -----------------------------------------------------------------------
void Gradient::SetEndIntensity( sal_uInt16 nIntens )
{
@@ -213,8 +179,6 @@
mpImplGradient->mnIntensityEnd = nIntens;
}
-// -----------------------------------------------------------------------
-
void Gradient::SetSteps( sal_uInt16 nSteps )
{
DBG_CHKTHIS( Gradient, NULL );
@@ -222,8 +186,6 @@
MakeUnique();
mpImplGradient->mnStepCount = nSteps;
}
-
-// -----------------------------------------------------------------------
void Gradient::GetBoundRect( const Rectangle& rRect, Rectangle& rBoundRect, Point& rCenter ) const
{
@@ -277,29 +239,29 @@
if( GetStyle() == GradientStyle_RADIAL )
{
- // Radien-Berechnung fuer Kreis
+ // Calculation of radii for circle
aSize.Width() = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() + (double)aSize.Height()*(double)aSize.Height()));
aSize.Height() = aSize.Width();
}
else if( GetStyle() == GradientStyle_ELLIPTICAL )
{
- // Radien-Berechnung fuer Ellipse
+ // Calculation of radii for ellipse
aSize.Width() = (long)( 0.5 + (double) aSize.Width() * 1.4142 );
aSize.Height() = (long)( 0.5 + (double) aSize.Height() * 1.4142 );
}
- // neue Mittelpunkte berechnen
+ // Calculate new centers
long nZWidth = aRect.GetWidth() * (long) GetOfsX() / 100;
long nZHeight = aRect.GetHeight() * (long) GetOfsY() / 100;
long nBorderX = (long) GetBorder() * aSize.Width() / 100;
long nBorderY = (long) GetBorder() * aSize.Height() / 100;
rCenter = Point( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
- // Rand beruecksichtigen
+ // Respect borders
aSize.Width() -= nBorderX;
aSize.Height() -= nBorderY;
- // Ausgaberechteck neu setzen
+ // Recalculate output rectangle
aRect.Left() = rCenter.X() - ( aSize.Width() >> 1 );
aRect.Top() = rCenter.Y() - ( aSize.Height() >> 1 );
@@ -308,18 +270,15 @@
}
}
-// -----------------------------------------------------------------------
-
Gradient& Gradient::operator=( const Gradient& rGradient )
{
DBG_CHKTHIS( Gradient, NULL );
DBG_CHKOBJ( &rGradient, Gradient, NULL );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+ // Increment refcount first so that we can reference ourselves
rGradient.mpImplGradient->mnRefCount++;
- // Wenn es die letzte Referenz ist, loeschen,
- // sonst Referenzcounter decrementieren
+ // If it's the last reference, delete it, otherwise decrement
if ( mpImplGradient->mnRefCount == 1 )
delete mpImplGradient;
else
@@ -328,8 +287,6 @@
return *this;
}
-
-// -----------------------------------------------------------------------
sal_Bool Gradient::operator==( const Gradient& rGradient ) const
{
@@ -374,8 +331,6 @@
return rIStm;
}
-// -----------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImpl_Gradient )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
@@ -394,15 +349,11 @@
return rOStm;
}
-// -----------------------------------------------------------------------
-
SvStream& operator>>( SvStream& rIStm, Gradient& rGradient )
{
rGradient.MakeUnique();
return( rIStm >> *rGradient.mpImplGradient );
}
-
-// -----------------------------------------------------------------------
SvStream& operator<<( SvStream& rOStm, const Gradient& rGradient )
{
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index fcfaf61..464cb62 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -32,10 +32,6 @@
using namespace ::com::sun::star;
-// -----------------------
-// - Default-Drawmethode -
-// -----------------------
-
static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
Font* pFont, const Bitmap* pBitmap, const BitmapEx* pBitmapEx,
const Point& rDestPt, const Size& rDestSize )
@@ -51,7 +47,7 @@
pOutDev->SetFillColor();
- // Auf dem Drucker ein schwarzes Rechteck und auf dem Bildschirm eins mit 3D-Effekt
+ // On the printer a black rectangle and on the screen one with 3D effect
if ( pOutDev->GetOutDevType() == OUTDEV_PRINTER )
pOutDev->SetLineColor( COL_BLACK );
else
@@ -112,10 +108,10 @@
long nTextWidth = pOutDev->GetTextWidth( *pText );
if ( nTextHeight )
{
- // Die N"aherung ber"ucksichtigt keine Ungenauigkeiten durch
- // Wortumbr"uche
+ // The approximation does not respect imprecisions caused
+ // by word wraps
long nLines = aSize.Height() / nTextHeight;
- long nWidth = aSize.Width() * nLines; // N"aherung!!!
+ long nWidth = aSize.Width() * nLines; // Approximation!!!
if ( nTextWidth <= nWidth || aSz.Height() <= nThreshold )
{
@@ -165,8 +161,7 @@
}
}
- // Falls die Default-Graphik keinen Inhalt hat,
- // malen wir ein rotes Kreuz
+ // If the default graphic does not have content, we draw a red rectangle
if( !bFilled )
{
aBorderRect.Left()++;
@@ -182,20 +177,12 @@
pOutDev->Pop();
}
-// -----------
-// - Graphic -
-// -----------
-
TYPEINIT1_AUTOFACTORY( Graphic, SvDataCopyStream );
-
-// ------------------------------------------------------------------------
Graphic::Graphic()
{
mpImpGraphic = new ImpGraphic;
}
-
-// ------------------------------------------------------------------------
Graphic::Graphic( const Graphic& rGraphic ) :
SvDataCopyStream()
@@ -209,42 +196,30 @@
}
}
-// ------------------------------------------------------------------------
-
Graphic::Graphic( const Bitmap& rBmp )
{
mpImpGraphic = new ImpGraphic( rBmp );
}
-
-// ------------------------------------------------------------------------
Graphic::Graphic( const BitmapEx& rBmpEx )
{
mpImpGraphic = new ImpGraphic( rBmpEx );
}
-// ------------------------------------------------------------------------
-
Graphic::Graphic(const SvgDataPtr& rSvgDataPtr)
{
mpImpGraphic = new ImpGraphic(rSvgDataPtr);
}
-
-// ------------------------------------------------------------------------
Graphic::Graphic( const Animation& rAnimation )
{
mpImpGraphic = new ImpGraphic( rAnimation );
}
-// ------------------------------------------------------------------------
-
Graphic::Graphic( const GDIMetaFile& rMtf )
{
mpImpGraphic = new ImpGraphic( rMtf );
}
-
-// ------------------------------------------------------------------------
Graphic::Graphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic )
{
@@ -268,8 +243,6 @@
mpImpGraphic = new ImpGraphic;
}
-// ------------------------------------------------------------------------
-
Graphic::~Graphic()
{
if( mpImpGraphic->mnRefCount == 1UL )
@@ -277,8 +250,6 @@
else
mpImpGraphic->mnRefCount--;
}
-
-// ------------------------------------------------------------------------
void Graphic::ImplTestRefCount()
{
@@ -288,8 +259,6 @@
mpImpGraphic = new ImpGraphic( *mpImpGraphic );
}
}
-
-// ------------------------------------------------------------------------
Graphic& Graphic::operator=( const Graphic& rGraphic )
{
@@ -320,49 +289,35 @@
return *this;
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::operator==( const Graphic& rGraphic ) const
{
return( *mpImpGraphic == *rGraphic.mpImpGraphic );
}
-
-// ------------------------------------------------------------------------
sal_Bool Graphic::operator!=( const Graphic& rGraphic ) const
{
return( *mpImpGraphic != *rGraphic.mpImpGraphic );
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::operator!() const
{
return( GRAPHIC_NONE == mpImpGraphic->ImplGetType() );
}
-
-// ------------------------------------------------------------------------
void Graphic::Load( SvStream& rIStm )
{
rIStm >> *this;
}
-// ------------------------------------------------------------------------
-
void Graphic::Save( SvStream& rOStm )
{
rOStm << *this;
}
-// ------------------------------------------------------------------------
-
void Graphic::Assign( const SvDataCopyStream& rCopyStream )
{
*this = (const Graphic& ) rCopyStream;
}
-
-// ------------------------------------------------------------------------
void Graphic::Clear()
{
@@ -370,14 +325,10 @@
mpImpGraphic->ImplClear();
}
-// ------------------------------------------------------------------------
-
GraphicType Graphic::GetType() const
{
return mpImpGraphic->ImplGetType();
}
-
-// ------------------------------------------------------------------------
void Graphic::SetDefaultType()
{
@@ -385,70 +336,50 @@
mpImpGraphic->ImplSetDefaultType();
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::IsSupportedGraphic() const
{
return mpImpGraphic->ImplIsSupportedGraphic();
}
-
-// ------------------------------------------------------------------------
sal_Bool Graphic::IsTransparent() const
{
return mpImpGraphic->ImplIsTransparent();
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::IsAlpha() const
{
return mpImpGraphic->ImplIsAlpha();
}
-
-// ------------------------------------------------------------------------
sal_Bool Graphic::IsAnimated() const
{
return mpImpGraphic->ImplIsAnimated();
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::IsEPS() const
{
return mpImpGraphic->ImplIsEPS();
}
-
-// ------------------------------------------------------------------------
Bitmap Graphic::GetBitmap(const GraphicConversionParameters& rParameters) const
{
return mpImpGraphic->ImplGetBitmap(rParameters);
}
-// ------------------------------------------------------------------------
-
BitmapEx Graphic::GetBitmapEx(const GraphicConversionParameters& rParameters) const
{
return mpImpGraphic->ImplGetBitmapEx(rParameters);
}
-
-// ------------------------------------------------------------------------
Animation Graphic::GetAnimation() const
{
return mpImpGraphic->ImplGetAnimation();
}
-// ------------------------------------------------------------------------
-
const GDIMetaFile& Graphic::GetGDIMetaFile() const
{
return mpImpGraphic->ImplGetGDIMetaFile();
}
-
-// ------------------------------------------------------------------------
uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
{
@@ -471,14 +402,10 @@
return xRet;
}
-// ------------------------------------------------------------------------
-
Size Graphic::GetPrefSize() const
{
return mpImpGraphic->ImplGetPrefSize();
}
-
-// ------------------------------------------------------------------------
void Graphic::SetPrefSize( const Size& rPrefSize )
{
@@ -486,22 +413,16 @@
mpImpGraphic->ImplSetPrefSize( rPrefSize );
}
-// ------------------------------------------------------------------------
-
MapMode Graphic::GetPrefMapMode() const
{
return mpImpGraphic->ImplGetPrefMapMode();
}
-
-// ------------------------------------------------------------------------
void Graphic::SetPrefMapMode( const MapMode& rPrefMapMode )
{
ImplTestRefCount();
mpImpGraphic->ImplSetPrefMapMode( rPrefMapMode );
}
-
-// ------------------------------------------------------------------
Size Graphic::GetSizePixel( const OutputDevice* pRefDevice ) const
{
@@ -515,21 +436,15 @@
return aRet;
}
-// ------------------------------------------------------------------
-
sal_uLong Graphic::GetSizeBytes() const
{
return mpImpGraphic->ImplGetSizeBytes();
}
-// ------------------------------------------------------------------------
-
void Graphic::Draw( OutputDevice* pOutDev, const Point& rDestPt ) const
{
mpImpGraphic->ImplDraw( pOutDev, rDestPt );
}
-
-// ------------------------------------------------------------------------
void Graphic::Draw( OutputDevice* pOutDev,
const Point& rDestPt, const Size& rDestSz ) const
@@ -540,16 +455,12 @@
mpImpGraphic->ImplDraw( pOutDev, rDestPt, rDestSz );
}
-// ------------------------------------------------------------------------
-
void Graphic::DrawEx( OutputDevice* pOutDev, const OUString& rText,
Font& rFont, const BitmapEx& rBitmap,
const Point& rDestPt, const Size& rDestSz )
{
ImplDrawDefault( pOutDev, &rText, &rFont, NULL, &rBitmap, rDestPt, rDestSz );
}
-
-// ------------------------------------------------------------------------
void Graphic::StartAnimation( OutputDevice* pOutDev, const Point& rDestPt,
const Size& rDestSz, long nExtraData,
@@ -559,71 +470,51 @@
mpImpGraphic->ImplStartAnimation( pOutDev, rDestPt, rDestSz, nExtraData, pFirstFrameOutDev );
}
-// ------------------------------------------------------------------------
-
void Graphic::StopAnimation( OutputDevice* pOutDev, long nExtraData )
{
ImplTestRefCount();
mpImpGraphic->ImplStopAnimation( pOutDev, nExtraData );
}
-// ------------------------------------------------------------------------
-
void Graphic::SetAnimationNotifyHdl( const Link& rLink )
{
mpImpGraphic->ImplSetAnimationNotifyHdl( rLink );
}
-
-// ------------------------------------------------------------------------
Link Graphic::GetAnimationNotifyHdl() const
{
return mpImpGraphic->ImplGetAnimationNotifyHdl();
}
-// ------------------------------------------------------------------------
-
sal_uLong Graphic::GetAnimationLoopCount() const
{
return mpImpGraphic->ImplGetAnimationLoopCount();
}
-
-// ------------------------------------------------------------------------
GraphicReader* Graphic::GetContext()
{
return mpImpGraphic->ImplGetContext();
}
-// ------------------------------------------------------------------------
-
void Graphic::SetContext( GraphicReader* pReader )
{
mpImpGraphic->ImplSetContext( pReader );
}
-
-// ------------------------------------------------------------------------
void Graphic::SetDocFileName( const String& rName, sal_uLong nFilePos )
{
mpImpGraphic->ImplSetDocFileName( rName, nFilePos );
}
-// ------------------------------------------------------------------------
-
const String& Graphic::GetDocFileName() const
{
return mpImpGraphic->ImplGetDocFileName();
}
-// ------------------------------------------------------------------------
-
sal_uLong Graphic::GetDocFilePos() const
{
return mpImpGraphic->ImplGetDocFilePos();
}
-
-// ------------------------------------------------------------------------
sal_Bool Graphic::SwapOut()
{
@@ -631,15 +522,11 @@
return mpImpGraphic->ImplSwapOut();
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::SwapOut( SvStream* pOStream )
{
ImplTestRefCount();
return mpImpGraphic->ImplSwapOut( pOStream );
}
-
-// ------------------------------------------------------------------------
sal_Bool Graphic::SwapIn()
{
@@ -647,22 +534,16 @@
return mpImpGraphic->ImplSwapIn();
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::SwapIn( SvStream* pStrm )
{
ImplTestRefCount();
return mpImpGraphic->ImplSwapIn( pStrm );
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::IsSwapOut() const
{
return mpImpGraphic->ImplIsSwapOut();
}
-
-// ------------------------------------------------------------------------
void Graphic::SetLink( const GfxLink& rGfxLink )
{
@@ -670,35 +551,25 @@
mpImpGraphic->ImplSetLink( rGfxLink );
}
-// ------------------------------------------------------------------------
-
GfxLink Graphic::GetLink() const
{
return mpImpGraphic->ImplGetLink();
}
-
-// ------------------------------------------------------------------------
sal_Bool Graphic::IsLink() const
{
return mpImpGraphic->ImplIsLink();
}
-// ------------------------------------------------------------------------
-
sal_uLong Graphic::GetChecksum() const
{
return mpImpGraphic->ImplGetChecksum();
}
-// ------------------------------------------------------------------------
-
sal_Bool Graphic::ExportNative( SvStream& rOStream ) const
{
return mpImpGraphic->ImplExportNative( rOStream );
}
-
-// ------------------------------------------------------------------------
SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic )
{
@@ -706,14 +577,10 @@
return rIStream >> *rGraphic.mpImpGraphic;
}
-// ------------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOStream, const Graphic& rGraphic )
{
return rOStream << *rGraphic.mpImpGraphic;
}
-
-// ------------------------------------------------------------------------
const SvgDataPtr& Graphic::getSvgData() const
{
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 0c25eda..26cb977 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -21,15 +21,11 @@
#include <vcl/graphictools.hxx>
-////////////////////////////////////////////////////////////////////////////
-
SvtGraphicFill::Transform::Transform()
{
matrix[0] = 1.0; matrix[1] = 0.0; matrix[2] = 0.0;
matrix[3] = 0.0; matrix[4] = 1.0; matrix[5] = 0.0;
}
-
-////////////////////////////////////////////////////////////////////////////
SvtGraphicStroke::SvtGraphicStroke() :
maPath(),
@@ -176,9 +172,6 @@
return rIStm;
}
-
-
-/////////////////////////////////////////////////////////////////////////////
SvtGraphicFill::SvtGraphicFill() :
maPath(),
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index 8b5cf17..037a194 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -24,10 +24,6 @@
DBG_NAME( Hatch )
-// --------------
-// - ImplHatch -
-// --------------
-
ImplHatch::ImplHatch() :
mnRefCount ( 1 ),
maColor ( COL_BLACK ),
@@ -36,8 +32,6 @@
mnAngle ( 0 )
{
}
-
-// -----------------------------------------------------------------------
ImplHatch::ImplHatch( const ImplHatch& rImplHatch ) :
mnRefCount ( 1 ),
@@ -48,17 +42,11 @@
{
}
-// ---------
-// - Hatch -
-// ---------
-
Hatch::Hatch()
{
DBG_CTOR( Hatch, NULL );
mpImplHatch = new ImplHatch;
}
-
-// -----------------------------------------------------------------------
Hatch::Hatch( const Hatch& rHatch )
{
@@ -67,8 +55,6 @@
mpImplHatch = rHatch.mpImplHatch;
mpImplHatch->mnRefCount++;
}
-
-// -----------------------------------------------------------------------
Hatch::Hatch( HatchStyle eStyle, const Color& rColor,
long nDistance, sal_uInt16 nAngle10 )
@@ -81,16 +67,12 @@
mpImplHatch->mnAngle = nAngle10;
}
-// -----------------------------------------------------------------------
-
Hatch::~Hatch()
{
DBG_DTOR( Hatch, NULL );
if( !( --mpImplHatch->mnRefCount ) )
delete mpImplHatch;
}
-
-// -----------------------------------------------------------------------
Hatch& Hatch::operator=( const Hatch& rHatch )
{
@@ -106,8 +88,6 @@
return *this;
}
-// -----------------------------------------------------------------------
-
sal_Bool Hatch::operator==( const Hatch& rHatch ) const
{
DBG_CHKTHIS( Hatch, NULL );
@@ -120,8 +100,6 @@
mpImplHatch->mnAngle == rHatch.mpImplHatch->mnAngle ) );
}
-// -----------------------------------------------------------------------
-
void Hatch::ImplMakeUnique()
{
if( mpImplHatch->mnRefCount != 1 )
@@ -133,16 +111,12 @@
}
}
-// -----------------------------------------------------------------------
-
void Hatch::SetColor( const Color& rColor )
{
DBG_CHKTHIS( Hatch, NULL );
ImplMakeUnique();
mpImplHatch->maColor = rColor;
}
-
-// -----------------------------------------------------------------------
void Hatch::SetDistance( long nDistance )
{
@@ -151,16 +125,12 @@
mpImplHatch->mnDistance = nDistance;
}
-// -----------------------------------------------------------------------
-
void Hatch::SetAngle( sal_uInt16 nAngle10 )
{
DBG_CHKTHIS( Hatch, NULL );
ImplMakeUnique();
mpImplHatch->mnAngle = nAngle10;
}
-
-// -----------------------------------------------------------------------
SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch )
{
@@ -176,8 +146,6 @@
return rIStm;
}
-// -----------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
@@ -189,15 +157,11 @@
return rOStm;
}
-// -----------------------------------------------------------------------
-
SvStream& operator>>( SvStream& rIStm, Hatch& rHatch )
{
rHatch.ImplMakeUnique();
return( rIStm >> *rHatch.mpImplHatch );
}
-
-// -----------------------------------------------------------------------
SvStream& operator<<( SvStream& rOStm, const Hatch& rHatch )
{
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 9c6bbef..415ae14 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -45,17 +45,11 @@
using namespace ::com::sun::star;
-// ---------
-// - Image -
-// ---------
-
Image::Image() :
mpImplData( NULL )
{
DBG_CTOR( Image, NULL );
}
-
-// -----------------------------------------------------------------------
Image::Image( const ResId& rResId ) :
mpImplData( NULL )
@@ -104,8 +98,6 @@
}
}
-// -----------------------------------------------------------------------
-
Image::Image( const Image& rImage ) :
mpImplData( rImage.mpImplData )
{
@@ -115,8 +107,6 @@
++mpImplData->mnRefCount;
}
-// -----------------------------------------------------------------------
-
Image::Image( const BitmapEx& rBitmapEx ) :
mpImplData( NULL )
{
@@ -125,8 +115,6 @@
ImplInit( rBitmapEx );
}
-// -----------------------------------------------------------------------
-
Image::Image( const Bitmap& rBitmap ) :
mpImplData( NULL )
{
@@ -134,8 +122,6 @@
ImplInit( rBitmap );
}
-
-// -----------------------------------------------------------------------
Image::Image( const Bitmap& rBitmap, const Bitmap& rMaskBitmap ) :
mpImplData( NULL )
@@ -147,8 +133,6 @@
ImplInit( aBmpEx );
}
-// -----------------------------------------------------------------------
-
Image::Image( const Bitmap& rBitmap, const Color& rColor ) :
mpImplData( NULL )
{
@@ -159,8 +143,6 @@
ImplInit( aBmpEx );
}
-// -----------------------------------------------------------------------
-
Image::Image( const uno::Reference< graphic::XGraphic >& rxGraphic ) :
mpImplData( NULL )
{
@@ -170,8 +152,6 @@
ImplInit( aGraphic.GetBitmapEx() );
}
-// -----------------------------------------------------------------------
-
Image::~Image()
{
DBG_DTOR( Image, NULL );
@@ -179,8 +159,6 @@
if( mpImplData && ( 0 == --mpImplData->mnRefCount ) )
delete mpImplData;
}
-
-// -----------------------------------------------------------------------
void Image::ImplInit( const BitmapEx& rBmpEx )
{
@@ -201,8 +179,6 @@
}
}
}
-
-// -----------------------------------------------------------------------
Size Image::GetSizePixel() const
{
@@ -227,8 +203,6 @@
return aRet;
}
-// -----------------------------------------------------------------------
-
BitmapEx Image::GetBitmapEx() const
{
DBG_CHKTHIS( Image, NULL );
@@ -252,16 +226,12 @@
return aRet;
}
-// -----------------------------------------------------------------------
-
uno::Reference< graphic::XGraphic > Image::GetXGraphic() const
{
const Graphic aGraphic( GetBitmapEx() );
return aGraphic.GetXGraphic();
}
-
-// -----------------------------------------------------------------------
Image& Image::operator=( const Image& rImage )
{
@@ -278,8 +248,6 @@
return *this;
}
-
-// -----------------------------------------------------------------------
sal_Bool Image::operator==( const Image& rImage ) const
{
@@ -315,10 +283,6 @@
return bRet;
}
-// -------------
-// - ImageList -
-// -------------
-
ImageList::ImageList( sal_uInt16 nInit, sal_uInt16 nGrow ) :
mpImplData( NULL ),
mnInitSize( nInit ),
@@ -326,8 +290,6 @@
{
DBG_CTOR( ImageList, NULL );
}
-
-// -----------------------------------------------------------------------
ImageList::ImageList( const ResId& rResId ) :
mpImplData( NULL ),
@@ -377,8 +339,6 @@
}
}
-// -----------------------------------------------------------------------
-
ImageList::ImageList( const ::std::vector< ::rtl::OUString >& rNameVector,
const ::rtl::OUString& rPrefix,
const Color* ) :
@@ -399,8 +359,6 @@
}
}
-// -----------------------------------------------------------------------
-
ImageList::ImageList( const ImageList& rImageList ) :
mpImplData( rImageList.mpImplData ),
mnInitSize( rImageList.mnInitSize ),
@@ -411,8 +369,6 @@
if( mpImplData )
++mpImplData->mnRefCount;
}
-
-// -----------------------------------------------------------------------
ImageList::~ImageList()
{
@@ -429,8 +385,6 @@
mpImplData->maImages.reserve( nItems );
mpImplData->maImageSize = rSize;
}
-
-// -----------------------------------------------------------------------
void ImageAryData::Load(const rtl::OUString &rPrefix)
{
@@ -458,8 +412,7 @@
#endif
}
-// -----------------------------------------------------------------------
-// Rather a performance hazard:
+// FIXME: Rather a performance hazard
BitmapEx ImageList::GetAsHorizontalStrip() const
{
Size aSize( mpImplData->maImageSize );
@@ -498,8 +451,6 @@
return aResult;
}
-// -----------------------------------------------------------------------
-
void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
const std::vector< rtl::OUString > &rNameVector )
{
@@ -520,8 +471,6 @@
mpImplData->AddImage( rNameVector[ nIdx ], nIdx + 1, aBitmap );
}
}
-
-// -----------------------------------------------------------------------
void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
sal_uInt16 nCount,
@@ -545,8 +494,6 @@
InsertFromHorizontalStrip( aBmpEx, aNames );
}
-// -----------------------------------------------------------------------
-
sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const
{
DBG_CHKTHIS( ImageList, NULL );
@@ -558,8 +505,6 @@
return 0;
}
-// -----------------------------------------------------------------------
-
void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage )
{
DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" );
@@ -570,8 +515,6 @@
mpImplData->AddImage( rImageName, GetImageCount() + 1,
rImage.GetBitmapEx() );
}
-
-// -----------------------------------------------------------------------
void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage )
{
@@ -587,8 +530,6 @@
}
}
-// -----------------------------------------------------------------------
-
void ImageList::RemoveImage( sal_uInt16 nId )
{
DBG_CHKTHIS( ImageList, NULL );
@@ -602,8 +543,6 @@
}
}
}
-
-// -----------------------------------------------------------------------
Image ImageList::GetImage( sal_uInt16 nId ) const
{
@@ -638,8 +577,6 @@
return aRet;
}
-// -----------------------------------------------------------------------
-
Image ImageList::GetImage( const ::rtl::OUString& rImageName ) const
{
if( mpImplData )
@@ -657,16 +594,12 @@
return Image();
}
-// -----------------------------------------------------------------------
-
sal_uInt16 ImageList::GetImageCount() const
{
DBG_CHKTHIS( ImageList, NULL );
return mpImplData ? static_cast< sal_uInt16 >( mpImplData->maImages.size() ) : 0;
}
-
-// -----------------------------------------------------------------------
sal_uInt16 ImageList::GetImagePos( sal_uInt16 nId ) const
{
@@ -689,8 +622,6 @@
return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND;
}
-// -----------------------------------------------------------------------
-
sal_uInt16 ImageList::GetImagePos( const ::rtl::OUString& rImageName ) const
{
DBG_CHKTHIS( ImageList, NULL );
@@ -707,8 +638,6 @@
return IMAGELIST_IMAGE_NOTFOUND;
}
-// -----------------------------------------------------------------------
-
sal_uInt16 ImageList::GetImageId( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( ImageList, NULL );
@@ -719,8 +648,6 @@
return 0;
}
-// -----------------------------------------------------------------------
-
::rtl::OUString ImageList::GetImageName( sal_uInt16 nPos ) const
{
DBG_CHKTHIS( ImageList, NULL );
@@ -730,8 +657,6 @@
return ::rtl::OUString();
}
-
-// -----------------------------------------------------------------------
void ImageList::GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const
{
@@ -751,8 +676,6 @@
}
}
}
-
-// -----------------------------------------------------------------------
Size ImageList::GetImageSize() const
{
@@ -775,8 +698,6 @@
return aRet;
}
-// -----------------------------------------------------------------------
-
ImageList& ImageList::operator=( const ImageList& rImageList )
{
DBG_CHKTHIS( ImageList, NULL );
@@ -792,8 +713,6 @@
return *this;
}
-
-// -----------------------------------------------------------------------
sal_Bool ImageList::operator==( const ImageList& rImageList ) const
{
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 7be51d2..5ee810a 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -23,10 +23,6 @@
#include <vcl/window.hxx>
#include <tools/helpers.hxx>
-// ----------------
-// - ImplAnimView -
-// ----------------
-
ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut,
const Point& rPt, const Size& rSz,
sal_uLong nExtraData,
@@ -48,7 +44,7 @@
{
mpParent->ImplIncAnimCount();
- // mirrored horizontically?
+ // Mirrored horizontally?
if( mbHMirr )
{
maDispPt.X() = maPt.X() + maSz.Width() + 1L;
@@ -61,7 +57,7 @@
maDispSz.Width() = maSz.Width();
}
- // mirrored vertically?
+ // Mirrored vertically?
if( mbVMirr )
{
maDispPt.Y() = maPt.Y() + maSz.Height() + 1L;
@@ -88,15 +84,13 @@
else
mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz, *mpOut );
- // initial drawing to actual position
+ // Initialize drawing to actual position
ImplDrawToPos( mpParent->ImplGetCurPos() );
- // if first frame OutputDevice is set, update variables now for real OutputDevice
+ // If first frame OutputDevice is set, update variables now for real OutputDevice
if( pFirstFrameOutDev )
maClip = ( mpOut = pOut )->GetClipRegion();
}
-
-// ------------------------------------------------------------------------
ImplAnimView::~ImplAnimView()
{
@@ -105,8 +99,6 @@
mpParent->ImplDecAnimCount();
}
-
-// ------------------------------------------------------------------------
sal_Bool ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const
{
@@ -122,8 +114,6 @@
return bRet;
}
-
-// ------------------------------------------------------------------------
void ImplAnimView::ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size& rSizePix )
{
@@ -153,16 +143,14 @@
rSizePix.Width() = aPt2.X() - rPosPix.X() + 1L;
rSizePix.Height() = aPt2.Y() - rPosPix.Y() + 1L;
- // mirrored horizontically?
+ // Mirrored horizontally?
if( mbHMirr )
rPosPix.X() = maSzPix.Width() - 1L - aPt2.X();
- // mirrored vertically?
+ // Mirrored vertically?
if( mbVMirr )
rPosPix.Y() = maSzPix.Height() - 1L - aPt2.Y();
}
-
-// ------------------------------------------------------------------------
void ImplAnimView::ImplDrawToPos( sal_uLong nPos )
{
@@ -187,14 +175,10 @@
}
}
-// ------------------------------------------------------------------------
-
void ImplAnimView::ImplDraw( sal_uLong nPos )
{
ImplDraw( nPos, NULL );
}
-
-// ------------------------------------------------------------------------
void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev )
{
@@ -215,7 +199,7 @@
ImplGetPosSize( rAnm, aPosPix, aSizePix );
- // mirrored horizontically?
+ // Mirrored horizontally?
if( mbHMirr )
{
aBmpPosPix.X() = aPosPix.X() + aSizePix.Width() - 1L;
@@ -227,7 +211,7 @@
aBmpSizePix.Width() = aSizePix.Width();
}
- // mirrored vertically?
+ // Mirrored vertically?
if( mbVMirr )
{
aBmpPosPix.Y() = aPosPix.Y() + aSizePix.Height() - 1L;
@@ -270,9 +254,9 @@
maRestPt = aPosPix;
maRestSz = aSizePix;
- // Was muessen wir beim naechsten Mal restaurieren ?
- // ==> ggf. in eine Bitmap stecken, ansonsten SaveBitmap
- // aus Speichergruenden loeschen
+ // What do we need to restore the next time?
+ // Put it into a bitmap if needed, else delete
+ // SaveBitmap to conserve memory
if( ( meLastDisposal == DISPOSE_BACK ) || ( meLastDisposal == DISPOSE_NOT ) )
mpRestore->SetOutputSizePixel( Size( 1, 1 ), sal_False );
else
@@ -306,8 +290,6 @@
}
}
-// ------------------------------------------------------------------------
-
void ImplAnimView::ImplRepaint()
{
const sal_Bool bOldPause = mbPause;
@@ -327,8 +309,6 @@
ImplDrawToPos( mnActPos );
mbPause = bOldPause;
}
-
-// ------------------------------------------------------------------------
AInfo* ImplAnimView::ImplCreateAInfo() const
{
diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index fe728a5..4e20f1d 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.hxx
@@ -22,10 +22,6 @@
#include <vcl/animate.hxx>
-// ----------------
-// - ImplAnimView -
-// ----------------
-
class Animation;
class OutputDevice;
class VirtualDevice;
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index fdd4f5a..f018e0c 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -25,8 +25,6 @@
#include <jobset.h>
-// =======================================================================
-
DBG_NAME( JobSetup )
#define JOBSET_FILEFORMAT2 3780
@@ -53,8 +51,6 @@
SVBT32 nPaperHeight;
};
-// =======================================================================
-
ImplJobSetup::ImplJobSetup()
{
mnRefCount = 1;
@@ -68,8 +64,6 @@
mnDriverDataLen = 0;
mpDriverData = NULL;
}
-
-// -----------------------------------------------------------------------
ImplJobSetup::ImplJobSetup( const ImplJobSetup& rJobSetup ) :
maPrinterName( rJobSetup.maPrinterName ),
@@ -94,14 +88,10 @@
maValueMap = rJobSetup.maValueMap;
}
-// -----------------------------------------------------------------------
-
ImplJobSetup::~ImplJobSetup()
{
rtl_freeMemory( mpDriverData );
}
-
-// =======================================================================
ImplJobSetup* JobSetup::ImplGetData()
{
@@ -116,16 +106,12 @@
return mpData;
}
-// -----------------------------------------------------------------------
-
ImplJobSetup* JobSetup::ImplGetConstData()
{
if ( !mpData )
mpData = new ImplJobSetup;
return mpData;
}
-
-// -----------------------------------------------------------------------
const ImplJobSetup* JobSetup::ImplGetConstData() const
{
@@ -134,16 +120,12 @@
return mpData;
}
-// =======================================================================
-
JobSetup::JobSetup()
{
DBG_CTOR( JobSetup, NULL );
mpData = NULL;
}
-
-// -----------------------------------------------------------------------
JobSetup::JobSetup( const JobSetup& rJobSetup )
{
@@ -155,8 +137,6 @@
if ( mpData )
mpData->mnRefCount++;
}
-
-// -----------------------------------------------------------------------
JobSetup::~JobSetup()
{
@@ -171,8 +151,6 @@
}
}
-// -----------------------------------------------------------------------
-
rtl::OUString JobSetup::GetPrinterName() const
{
if ( mpData )
@@ -180,8 +158,6 @@
else
return rtl::OUString();
}
-
-// -----------------------------------------------------------------------
rtl::OUString JobSetup::GetDriverName() const
{
@@ -191,8 +167,6 @@
return rtl::OUString();
}
-// -----------------------------------------------------------------------
-
void JobSetup::SetValue( const rtl::OUString& rKey, const rtl::OUString& rValue )
{
if( ! mpData )
@@ -201,20 +175,18 @@
mpData->maValueMap[ rKey ] = rValue;
}
-// -----------------------------------------------------------------------
-
JobSetup& JobSetup::operator=( const JobSetup& rJobSetup )
{
DBG_CHKTHIS( JobSetup, NULL );
DBG_CHKOBJ( &rJobSetup, JobSetup, NULL );
DBG_ASSERT( !rJobSetup.mpData || (rJobSetup.mpData->mnRefCount) < 0xFFFE, "JobSetup: RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
+ // Increment recount first, so that we can assign to ourselves
if ( rJobSetup.mpData )
rJobSetup.mpData->mnRefCount++;
- // Wenn es keine statischen ImpDaten sind, dann loeschen, wenn es
- // die letzte Referenz ist, sonst Referenzcounter decrementieren
+ // If it's not static ImpData and the last reference, delete it, else
+ // decrement recount
if ( mpData )
{
if ( mpData->mnRefCount == 1 )
@@ -227,8 +199,6 @@
return *this;
}
-
-// -----------------------------------------------------------------------
sal_Bool JobSetup::operator==( const JobSetup& rJobSetup ) const
{
@@ -260,8 +230,6 @@
return sal_False;
}
-
-// -----------------------------------------------------------------------
SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
{
@@ -300,7 +268,7 @@
pJobData->maPrinterName = OStringToOUString(pData->cPrinterName, aStreamEncoding);
pJobData->maDriver = OStringToOUString(pData->cDriverName, aStreamEncoding);
- // Sind es unsere neuen JobSetup-Daten?
+ // Are these our new JobSetup files?
if ( nSystem == JOBSET_FILE364_SYSTEM ||
nSystem == JOBSET_FILE605_SYSTEM )
{
@@ -353,14 +321,12 @@
return rIStream;
}
-// -----------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
{
DBG_ASSERTWARNING( rOStream.GetVersion(), "JobSetup::<< - Solar-Version not set on rOStream" );
- // Zur Zeit haben wir noch kein neues FileFormat
-// if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 )
+ // We do not have a new FileFormat at this point in time
+ // if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 )
{
sal_uInt16 nLen = 0;
if ( !rJobSetup.mpData )
@@ -371,7 +337,7 @@
const ImplJobSetup* pJobData = rJobSetup.ImplGetConstData();
Impl364JobSetupData aOldJobData;
- sal_uInt16 nOldJobDataSize = sizeof( aOldJobData );
+ sal_uInt16 nOldJobDataSize = sizeof( aOldJobData );
ShortToSVBT16( nOldJobDataSize, aOldJobData.nSize );
ShortToSVBT16( pJobData->mnSystem, aOldJobData.nSystem );
UInt32ToSVBT32( pJobData->mnDriverDataLen, aOldJobData.nDriverDataLen );
@@ -422,11 +388,6 @@
rOStream.Seek( nPos + nLen );
}
}
-/*
- else
- {
- }
-*/
return rOStream;
}
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index fd3861d..768e979 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -22,11 +22,7 @@
#include <tools/debug.hxx>
#include <vcl/mapmod.hxx>
-// =======================================================================
-
DBG_NAME( MapMode )
-
-// -----------------------------------------------------------------------
ImplMapMode::ImplMapMode() :
maOrigin( 0, 0 ),
@@ -38,8 +34,6 @@
mbSimple = sal_False;
}
-// -----------------------------------------------------------------------
-
ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
maOrigin( rImplMapMode.maOrigin ),
maScaleX( rImplMapMode.maScaleX ),
@@ -49,8 +43,6 @@
meUnit = rImplMapMode.meUnit;
mbSimple = sal_False;
}
-
-// -----------------------------------------------------------------------
SvStream& operator>>( SvStream& rIStm, ImplMapMode& rImplMapMode )
{
@@ -64,8 +56,6 @@
return rIStm;
}
-// -----------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rImplMapMode )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
@@ -78,8 +68,6 @@
return rOStm;
}
-
-// -----------------------------------------------------------------------
ImplMapMode* ImplMapMode::ImplGetStaticMapMode( MapUnit eUnit )
{
@@ -102,11 +90,9 @@
return pImplMapMode;
}
-// -----------------------------------------------------------------------
-
inline void MapMode::ImplMakeUnique()
{
- // Falls noch andere Referenzen bestehen, dann kopieren
+ // If there are other references, copy
if ( mpImplMapMode->mnRefCount != 1 )
{
if ( mpImplMapMode->mnRefCount )
@@ -115,8 +101,6 @@
}
}
-// -----------------------------------------------------------------------
-
MapMode::MapMode()
{
DBG_CTOR( MapMode, NULL );
@@ -124,22 +108,18 @@
mpImplMapMode = ImplMapMode::ImplGetStaticMapMode( MAP_PIXEL );
}
-// -----------------------------------------------------------------------
-
MapMode::MapMode( const MapMode& rMapMode )
{
DBG_CTOR( MapMode, NULL );
DBG_CHKOBJ( &rMapMode, MapMode, NULL );
DBG_ASSERT( rMapMode.mpImplMapMode->mnRefCount < 0xFFFFFFFE, "MapMode: RefCount overflow" );
- // shared Instance Daten uebernehmen und Referenzcounter erhoehen
+ // Take over Shared Instance Data and increment refcount
mpImplMapMode = rMapMode.mpImplMapMode;
- // RefCount == 0 fuer statische Objekte
+ // RefCount == 0 for static objects
if ( mpImplMapMode->mnRefCount )
mpImplMapMode->mnRefCount++;
}
-
-// -----------------------------------------------------------------------
MapMode::MapMode( MapUnit eUnit )
{
@@ -147,8 +127,6 @@
mpImplMapMode = ImplMapMode::ImplGetStaticMapMode( eUnit );
}
-
-// -----------------------------------------------------------------------
MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg,
const Fraction& rScaleX, const Fraction& rScaleY )
@@ -162,14 +140,12 @@
mpImplMapMode->maScaleY = rScaleY;
}
-// -----------------------------------------------------------------------
-
MapMode::~MapMode()
{
DBG_DTOR( MapMode, NULL );
- // Wenn es keine statischen ImpDaten sind, dann loeschen, wenn es
- // die letzte Referenz ist, sonst Referenzcounter decrementieren
+ // If it's not static ImpData and it's the last reference, delete it,
+ // else decrement refcounter
if ( mpImplMapMode->mnRefCount )
{
if ( mpImplMapMode->mnRefCount == 1 )
@@ -179,8 +155,6 @@
}
}
-// -----------------------------------------------------------------------
-
void MapMode::SetMapUnit( MapUnit eUnit )
{
DBG_CHKTHIS( MapMode, NULL );
@@ -188,8 +162,6 @@
ImplMakeUnique();
mpImplMapMode->meUnit = eUnit;
}
-
-// -----------------------------------------------------------------------
void MapMode::SetOrigin( const Point& rLogicOrg )
{
@@ -199,8 +171,6 @@
mpImplMapMode->maOrigin = rLogicOrg;
}
-// -----------------------------------------------------------------------
-
void MapMode::SetScaleX( const Fraction& rScaleX )
{
DBG_CHKTHIS( MapMode, NULL );
@@ -208,8 +178,6 @@
ImplMakeUnique();
mpImplMapMode->maScaleX = rScaleX;
}
-
-// -----------------------------------------------------------------------
void MapMode::SetScaleY( const Fraction& rScaleY )
{
@@ -219,21 +187,19 @@
mpImplMapMode->maScaleY = rScaleY;
}
-// -----------------------------------------------------------------------
-
MapMode& MapMode::operator=( const MapMode& rMapMode )
{
DBG_CHKTHIS( MapMode, NULL );
DBG_CHKOBJ( &rMapMode, MapMode, NULL );
DBG_ASSERT( rMapMode.mpImplMapMode->mnRefCount < 0xFFFFFFFE, "MapMode: RefCount overflow" );
- // Zuerst Referenzcounter erhoehen, damit man sich selbst zuweisen kann
- // RefCount == 0 fuer statische Objekte
+ // First increment refcount so that we can reference ourselves
+ // RefCount == 0 for static objects
if ( rMapMode.mpImplMapMode->mnRefCount )
rMapMode.mpImplMapMode->mnRefCount++;
- // Wenn es keine statischen ImpDaten sind, dann loeschen, wenn es
- // die letzte Referenz ist, sonst Referenzcounter decrementieren
+ // If it's not static ImpData and it's the last reference, delete it,
+ // else decrement refcounter
if ( mpImplMapMode->mnRefCount )
{
if ( mpImplMapMode->mnRefCount == 1 )
@@ -246,8 +212,6 @@
return *this;
}
-
-// -----------------------------------------------------------------------
sal_Bool MapMode::operator==( const MapMode& rMapMode ) const
{
@@ -266,8 +230,6 @@
return sal_False;
}
-// -----------------------------------------------------------------------
-
sal_Bool MapMode::IsDefault() const
{
DBG_CHKTHIS( MapMode, NULL );
@@ -285,15 +247,11 @@
return sal_False;
}
-// -----------------------------------------------------------------------
-
SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode )
{
rMapMode.ImplMakeUnique();
return (rIStm >> *rMapMode.mpImplMapMode);
}
-
-// -----------------------------------------------------------------------
SvStream& operator<<( SvStream& rOStm, const MapMode& rMapMode )
{
--
To view, visit https://gerrit.libreoffice.org/3063
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7cf80655e6520f09a0b63b7839e46ad50de8fb1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Weissenbacher <p.weissenbacher at gmail.com>
More information about the LibreOffice
mailing list