cppcanvas/source/inc/canvasgraphichelper.hxx | 8 ++---
cppcanvas/source/inc/implrenderer.hxx | 4 +-
cppcanvas/source/inc/outdevstate.hxx | 14 +++++-----
cppcanvas/source/inc/tools.hxx | 4 +-
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx | 8 ++---
cppcanvas/source/mtfrenderer/mtftools.hxx | 8 ++---
cppcanvas/source/mtfrenderer/pointaction.cxx | 2 -
cppcanvas/source/mtfrenderer/polypolyaction.hxx | 26 +++++++++----------
cppcanvas/source/wrapper/implbitmap.hxx | 4 +-
cppcanvas/source/wrapper/implcanvas.hxx | 10 +++----
cppcanvas/source/wrapper/implcolor.hxx | 2 -
cppcanvas/source/wrapper/implcustomsprite.hxx | 6 ++--
cppcanvas/source/wrapper/implpolypolygon.hxx | 12 ++++----
cppcanvas/source/wrapper/implsprite.hxx | 4 +-
cppcanvas/source/wrapper/implspritecanvas.hxx | 4 +-
15 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit 17ae2821835c3c60c89528a2a94986a18d5f0096
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Tue Jul 28 13:47:37 2015 +0200
Whitespace cleanup / re-alignment.
Get alignment back after various cleanups, including
a99520eb0a0ccb5a03e85c697d38eb6520ec403c
Change-Id: I8a9004a600a04318ab8c1514f9b48c8b73fa9d70
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx
b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 209f191..a8c075a 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -59,15 +59,15 @@ namespace cppcanvas
// for our clients
// ===============
CanvasSharedPtr
getCanvas() const { return mpCanvas; }
- css::uno::Reference< css::rendering::XGraphicDevice >
getGraphicDevice() const { return mxGraphicDevice; }
- const css::rendering::RenderState&
getRenderState() const;
+ css::uno::Reference< css::rendering::XGraphicDevice >
getGraphicDevice() const { return mxGraphicDevice; }
+ const css::rendering::RenderState&
getRenderState() const;
private:
- mutable css::rendering::RenderState
maRenderState;
+ mutable css::rendering::RenderState
maRenderState;
boost::optional<basegfx::B2DPolyPolygon>
maClipPolyPolygon;
CanvasSharedPtr
mpCanvas;
- css::uno::Reference< css::rendering::XGraphicDevice >
mxGraphicDevice;
+ css::uno::Reference< css::rendering::XGraphicDevice >
mxGraphicDevice;
};
}
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 118ae6d..2ccd4a6 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -241,8 +241,8 @@ static float GetSwapFloat( SvStream& rSt )
static css::uno::Reference<
css::rendering::XCanvasFont > createFont( double&
o_rFontRotation,
- const vcl::Font&
rFont,
- const
ActionFactoryParameters& rParms );
+ const vcl::Font&
rFont,
+ const
ActionFactoryParameters& rParms );
bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms,
bool
bSubsettableActions );
diff --git a/cppcanvas/source/inc/outdevstate.hxx
b/cppcanvas/source/inc/outdevstate.hxx
index e343570..63aa7fb 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -81,20 +81,20 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon
clip;
::Rectangle
clipRect;
- css::uno::Reference< css::rendering::XPolyPolygon2D >
xClipPoly;
+ css::uno::Reference< css::rendering::XPolyPolygon2D >
xClipPoly;
- css::uno::Sequence< double >
lineColor;
- css::uno::Sequence< double >
fillColor;
- css::uno::Sequence< double >
textColor;
- css::uno::Sequence< double >
textFillColor;
- css::uno::Sequence< double >
textLineColor;
+ css::uno::Sequence< double >
lineColor;
+ css::uno::Sequence< double >
fillColor;
+ css::uno::Sequence< double >
textColor;
+ css::uno::Sequence< double >
textFillColor;
+ css::uno::Sequence< double >
textLineColor;
/** Current font.
@attention Beware, this member can be NULL, and
nevertheless text output is generated.
*/
- css::uno::Reference< css::rendering::XCanvasFont >
xFont;
+ css::uno::Reference< css::rendering::XCanvasFont >
xFont;
::basegfx::B2DHomMatrix
transform;
::basegfx::B2DHomMatrix
mapModeTransform;
double
fontRotation;
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index 079f952..63ee1dc 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -38,8 +38,8 @@ namespace cppcanvas
intSRGBAToDoubleSequence( const css::uno::Reference<
css::rendering::XGraphicDevice >&,
Color::IntSRGBA );
- Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference<
css::rendering::XGraphicDevice >& rDevice,
- const css::uno::Sequence<
double >& rColor );
+ Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference<
css::rendering::XGraphicDevice >& rDevice,
+ const css::uno::Sequence<
double >& rColor );
}
}
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index a182f6e..2b9a364 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -74,10 +74,10 @@ namespace cppcanvas
virtual bool renderPrimitive( css::uno::Reference<
css::rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix&
rTransformation ) const = 0;
- CanvasSharedPtr
mpCanvas;
- mutable css::uno::Reference< css::rendering::XCachedPrimitive >
mxCachedPrimitive;
- mutable ::basegfx::B2DHomMatrix
maLastTransformation;
- const bool
mbOnlyRedrawWithSameTransform;
+ CanvasSharedPtr
mpCanvas;
+ mutable css::uno::Reference< css::rendering::XCachedPrimitive >
mxCachedPrimitive;
+ mutable ::basegfx::B2DHomMatrix
maLastTransformation;
+ const bool
mbOnlyRedrawWithSameTransform;
};
}
}
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx
b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 687ef42..2deeb88 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -53,8 +53,8 @@ namespace cppcanvas
sets up the transformation and the clip from the
OutDevState.
*/
- void initRenderState( css::rendering::RenderState& renderState,
- const ::cppcanvas::internal::OutDevState&
outdevState );
+ void initRenderState( css::rendering::RenderState&
renderState,
+ const ::cppcanvas::internal::OutDevState&
outdevState );
/** Calc output offset relative to baseline
@@ -130,7 +130,7 @@ namespace cppcanvas
@return true, if the clip has changed, false if not
*/
- bool modifyClip( css::rendering::RenderState&
o_rRenderState,
+ bool modifyClip( css::rendering::RenderState&
o_rRenderState,
const struct ::cppcanvas::internal::OutDevState&
rOutdevState,
const CanvasSharedPtr&
rCanvas,
const ::basegfx::B2DPoint&
rOffset,
@@ -170,7 +170,7 @@ namespace cppcanvas
/** Transform given bounds to device coordinate system.
*/
- ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange&
rBounds,
+ ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange&
rBounds,
const
css::rendering::ViewState& viewState,
const
css::rendering::RenderState& renderState );
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx
b/cppcanvas/source/mtfrenderer/pointaction.cxx
index e76b4ea..c73f730 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -68,7 +68,7 @@ namespace cppcanvas
private:
::basegfx::B2DPoint maPoint;
CanvasSharedPtr mpCanvas;
- css::rendering::RenderState maState;
+ css::rendering::RenderState maState;
};
PointAction::PointAction( const ::basegfx::B2DPoint& rPoint,
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index be27e8a..394dea2 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -53,31 +53,31 @@ namespace cppcanvas
{
/// Create polygon, fill/stroke according to state
ActionSharedPtr createPolyPolyAction( const
::basegfx::B2DPolyPolygon&,
- const
CanvasSharedPtr&,
- const OutDevState&
);
+ const CanvasSharedPtr&,
+ const OutDevState& );
/// Create texture-filled polygon
ActionSharedPtr createPolyPolyAction( const
::basegfx::B2DPolyPolygon&,
- const
CanvasSharedPtr&,
- const OutDevState&,
- const
css::rendering::Texture& );
+ const CanvasSharedPtr&,
+ const OutDevState&,
+ const
css::rendering::Texture& );
/// Create line polygon (always stroked, not filled)
ActionSharedPtr createLinePolyPolyAction( const
::basegfx::B2DPolyPolygon&,
- const
CanvasSharedPtr&,
- const
OutDevState& );
+ const CanvasSharedPtr&,
+ const OutDevState& );
/// Create stroked polygon
ActionSharedPtr createPolyPolyAction( const
::basegfx::B2DPolyPolygon&,
- const
CanvasSharedPtr&,
- const OutDevState&,
- const
css::rendering::StrokeAttributes& );
+ const CanvasSharedPtr&,
+ const OutDevState&,
+ const
css::rendering::StrokeAttributes& );
/// For transparent painting of the given polygon (normally, we
take the colors always opaque)
ActionSharedPtr createPolyPolyAction( const
::basegfx::B2DPolyPolygon&,
- const
CanvasSharedPtr&,
- const OutDevState&,
- int nTransparency );
+ const CanvasSharedPtr&,
+ const OutDevState&,
+ int nTransparency );
}
}
}
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx
b/cppcanvas/source/wrapper/implbitmap.hxx
index f0e1aae..2a21bbd 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -58,8 +58,8 @@ namespace cppcanvas
ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
- const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
- BitmapCanvasSharedPtr
mpBitmapCanvas;
+ const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
+ BitmapCanvasSharedPtr
mpBitmapCanvas;
};
}
}
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx
b/cppcanvas/source/wrapper/implcanvas.hxx
index 0099f02..c882ede 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -69,9 +69,9 @@ namespace cppcanvas
virtual void clear() const
SAL_OVERRIDE;
virtual css::uno::Reference<
- css::rendering::XCanvas > getUNOCanvas() const
SAL_OVERRIDE;
+ css::rendering::XCanvas > getUNOCanvas() const
SAL_OVERRIDE;
- virtual css::rendering::ViewState getViewState() const
SAL_OVERRIDE;
+ virtual css::rendering::ViewState getViewState() const
SAL_OVERRIDE;
// take compiler-provided default copy constructor
//ImplCanvas(const ImplCanvas&);
@@ -79,9 +79,9 @@ namespace cppcanvas
private:
ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
- mutable css::rendering::ViewState
maViewState;
- boost::optional<basegfx::B2DPolyPolygon>
maClipPolyPolygon;
- const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
+ mutable css::rendering::ViewState maViewState;
+ boost::optional<basegfx::B2DPolyPolygon>
maClipPolyPolygon;
+ const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
};
}
diff --git a/cppcanvas/source/wrapper/implcolor.hxx
b/cppcanvas/source/wrapper/implcolor.hxx
index 883080f..c61e374 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -41,7 +41,7 @@ namespace cppcanvas
css::rendering::XGraphicDevice >& rDevice );
virtual ~ImplColor();
- virtual IntSRGBA getIntSRGBA(
css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
+ virtual IntSRGBA getIntSRGBA(
css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA
aSRGBA ) const SAL_OVERRIDE;
private:
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx
b/cppcanvas/source/wrapper/implcustomsprite.hxx
index a698908..ba3acdb 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -42,7 +42,7 @@ namespace cppcanvas
css::rendering::XSpriteCanvas >&
rParentCanvas,
const css::uno::Reference<
css::rendering::XCustomSprite >&
rSprite,
- const
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
+ const
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplCustomSprite();
virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE;
@@ -51,8 +51,8 @@ namespace cppcanvas
ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
ImplCustomSprite& operator=( const ImplCustomSprite& )
SAL_DELETED_FUNCTION;
- mutable CanvasSharedPtr
mpLastCanvas;
- const css::uno::Reference< css::rendering::XCustomSprite >
mxCustomSprite;
+ mutable CanvasSharedPtr
mpLastCanvas;
+ const css::uno::Reference< css::rendering::XCustomSprite >
mxCustomSprite;
};
}
}
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx
b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 9558c4b..eba8f82 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -68,14 +68,14 @@ namespace cppcanvas
ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
ImplPolyPolygon& operator= ( const ImplPolyPolygon& )
SAL_DELETED_FUNCTION;
- const css::uno::Reference< css::rendering::XPolyPolygon2D >
mxPolyPoly;
+ const css::uno::Reference< css::rendering::XPolyPolygon2D >
mxPolyPoly;
- css::rendering::StrokeAttributes
maStrokeAttributes;
+ css::rendering::StrokeAttributes
maStrokeAttributes;
- css::uno::Sequence< double >
maFillColor;
- css::uno::Sequence< double >
maStrokeColor;
- bool
mbFillColorSet;
- bool
mbStrokeColorSet;
+ css::uno::Sequence< double >
maFillColor;
+ css::uno::Sequence< double >
maStrokeColor;
+ bool
mbFillColorSet;
+ bool
mbStrokeColorSet;
};
}
diff --git a/cppcanvas/source/wrapper/implsprite.hxx
b/cppcanvas/source/wrapper/implsprite.hxx
index 876f439..0947485 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -41,7 +41,7 @@ namespace cppcanvas
css::rendering::XSpriteCanvas >&
rParentCanvas,
const css::uno::Reference<
css::rendering::XSprite >&
rSprite,
- const
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
+ const
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplSprite();
virtual void setAlpha( const double& rAlpha ) SAL_OVERRIDE;
@@ -67,7 +67,7 @@ namespace cppcanvas
css::uno::Reference< css::rendering::XGraphicDevice >
mxGraphicDevice;
const css::uno::Reference< css::rendering::XSprite >
mxSprite;
const css::uno::Reference< css::rendering::XAnimatedSprite >
mxAnimatedSprite;
- ImplSpriteCanvas::TransformationArbiterSharedPtr
mpTransformArbiter;
+ ImplSpriteCanvas::TransformationArbiterSharedPtr
mpTransformArbiter;
};
}
}
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx
b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 69f63df..a18f904 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -82,8 +82,8 @@ namespace cppcanvas
private:
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& )
SAL_DELETED_FUNCTION;
- const css::uno::Reference< css::rendering::XSpriteCanvas >
mxSpriteCanvas;
- TransformationArbiterSharedPtr
mpTransformArbiter;
+ const css::uno::Reference< css::rendering::XSpriteCanvas >
mxSpriteCanvas;
+ TransformationArbiterSharedPtr
mpTransformArbiter;
};
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
