Skip to content

C
core
Kaydet (Commit) 17ae2821 authored tarafından Thorsten Behrens's avatar Thorsten Behrens
Dosyalara gözat
Seçenekler

Whitespace cleanup / re-alignment. 

Get alignment back after various cleanups, including
a99520eb

Change-Id: I8a9004a600a04318ab8c1514f9b48c8b73fa9d70
üst a99520eb
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
cppcanvas/source/inc/canvasgraphichelper.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -59,15 +59,15 @@ namespace cppcanvas ...@@ -59,15 +59,15 @@ namespace cppcanvas
// for our clients // for our clients
// =============== // ===============
CanvasSharedPtr getCanvas() const { return mpCanvas; } CanvasSharedPtr getCanvas() const { return mpCanvas; }
css::uno::Reference< css::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; } css::uno::Reference< css::rendering::XGraphicDevice > getGraphicDevice() const { return mxGraphicDevice; }
const css::rendering::RenderState& getRenderState() const; const css::rendering::RenderState& getRenderState() const;
private: private:
mutable css::rendering::RenderState maRenderState; mutable css::rendering::RenderState maRenderState;
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice; css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
}; };
} }
......
cppcanvas/source/inc/implrenderer.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -241,8 +241,8 @@ static float GetSwapFloat( SvStream& rSt ) ...@@ -241,8 +241,8 @@ static float GetSwapFloat( SvStream& rSt )
static css::uno::Reference< static css::uno::Reference<
css::rendering::XCanvasFont > createFont( double& o_rFontRotation, css::rendering::XCanvasFont > createFont( double& o_rFontRotation,
const vcl::Font& rFont, const vcl::Font& rFont,
const ActionFactoryParameters& rParms ); const ActionFactoryParameters& rParms );
bool createActions( GDIMetaFile& rMtf, bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms, const ActionFactoryParameters& rParms,
bool bSubsettableActions ); bool bSubsettableActions );
......
cppcanvas/source/inc/outdevstate.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -81,20 +81,20 @@ namespace cppcanvas ...@@ -81,20 +81,20 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon clip; ::basegfx::B2DPolyPolygon clip;
::Rectangle clipRect; ::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 > lineColor;
css::uno::Sequence< double > fillColor; css::uno::Sequence< double > fillColor;
css::uno::Sequence< double > textColor; css::uno::Sequence< double > textColor;
css::uno::Sequence< double > textFillColor; css::uno::Sequence< double > textFillColor;
css::uno::Sequence< double > textLineColor; css::uno::Sequence< double > textLineColor;
/** Current font. /** Current font.
@attention Beware, this member can be NULL, and @attention Beware, this member can be NULL, and
nevertheless text output is generated. nevertheless text output is generated.
*/ */
css::uno::Reference< css::rendering::XCanvasFont > xFont; css::uno::Reference< css::rendering::XCanvasFont > xFont;
::basegfx::B2DHomMatrix transform; ::basegfx::B2DHomMatrix transform;
::basegfx::B2DHomMatrix mapModeTransform; ::basegfx::B2DHomMatrix mapModeTransform;
double fontRotation; double fontRotation;
......
cppcanvas/source/inc/tools.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -38,8 +38,8 @@ namespace cppcanvas ...@@ -38,8 +38,8 @@ namespace cppcanvas
intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&, intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&,
Color::IntSRGBA ); Color::IntSRGBA );
Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice, Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice,
const css::uno::Sequence< double >& rColor ); const css::uno::Sequence< double >& rColor );
} }
} }
......
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -74,10 +74,10 @@ namespace cppcanvas ...@@ -74,10 +74,10 @@ namespace cppcanvas
virtual bool renderPrimitive( css::uno::Reference< css::rendering::XCachedPrimitive >& rCachedPrimitive, virtual bool renderPrimitive( css::uno::Reference< css::rendering::XCachedPrimitive >& rCachedPrimitive,
const ::basegfx::B2DHomMatrix& rTransformation ) const = 0; const ::basegfx::B2DHomMatrix& rTransformation ) const = 0;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
mutable css::uno::Reference< css::rendering::XCachedPrimitive > mxCachedPrimitive; mutable css::uno::Reference< css::rendering::XCachedPrimitive > mxCachedPrimitive;
mutable ::basegfx::B2DHomMatrix maLastTransformation; mutable ::basegfx::B2DHomMatrix maLastTransformation;
const bool mbOnlyRedrawWithSameTransform; const bool mbOnlyRedrawWithSameTransform;
}; };
} }
} }
......
cppcanvas/source/mtfrenderer/mtftools.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -53,8 +53,8 @@ namespace cppcanvas ...@@ -53,8 +53,8 @@ namespace cppcanvas
sets up the transformation and the clip from the sets up the transformation and the clip from the
OutDevState. OutDevState.
*/ */
void initRenderState( css::rendering::RenderState& renderState, void initRenderState( css::rendering::RenderState& renderState,
const ::cppcanvas::internal::OutDevState& outdevState ); const ::cppcanvas::internal::OutDevState& outdevState );
/** Calc output offset relative to baseline /** Calc output offset relative to baseline
...@@ -130,7 +130,7 @@ namespace cppcanvas ...@@ -130,7 +130,7 @@ namespace cppcanvas
@return true, if the clip has changed, false if not @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 struct ::cppcanvas::internal::OutDevState& rOutdevState,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const ::basegfx::B2DPoint& rOffset, const ::basegfx::B2DPoint& rOffset,
...@@ -170,7 +170,7 @@ namespace cppcanvas ...@@ -170,7 +170,7 @@ namespace cppcanvas
/** Transform given bounds to device coordinate system. /** 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::ViewState& viewState,
const css::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
......
cppcanvas/source/mtfrenderer/pointaction.cxx
Dosyayı görüntüle @ 17ae2821
...@@ -68,7 +68,7 @@ namespace cppcanvas ...@@ -68,7 +68,7 @@ namespace cppcanvas
private: private:
::basegfx::B2DPoint maPoint; ::basegfx::B2DPoint maPoint;
CanvasSharedPtr mpCanvas; CanvasSharedPtr mpCanvas;
css::rendering::RenderState maState; css::rendering::RenderState maState;
}; };
PointAction::PointAction( const ::basegfx::B2DPoint& rPoint, PointAction::PointAction( const ::basegfx::B2DPoint& rPoint,
......
cppcanvas/source/mtfrenderer/polypolyaction.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -53,31 +53,31 @@ namespace cppcanvas ...@@ -53,31 +53,31 @@ namespace cppcanvas
{ {
/// Create polygon, fill/stroke according to state /// Create polygon, fill/stroke according to state
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Create texture-filled polygon /// Create texture-filled polygon
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const css::rendering::Texture& ); const css::rendering::Texture& );
/// Create line polygon (always stroked, not filled) /// Create line polygon (always stroked, not filled)
ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Create stroked polygon /// Create stroked polygon
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const css::rendering::StrokeAttributes& ); const css::rendering::StrokeAttributes& );
/// For transparent painting of the given polygon (normally, we take the colors always opaque) /// For transparent painting of the given polygon (normally, we take the colors always opaque)
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
int nTransparency ); int nTransparency );
} }
} }
} }
......
cppcanvas/source/wrapper/implbitmap.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -58,8 +58,8 @@ namespace cppcanvas ...@@ -58,8 +58,8 @@ namespace cppcanvas
ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION; ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION; ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
const css::uno::Reference< css::rendering::XBitmap > mxBitmap; const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
BitmapCanvasSharedPtr mpBitmapCanvas; BitmapCanvasSharedPtr mpBitmapCanvas;
}; };
} }
} }
......
cppcanvas/source/wrapper/implcanvas.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -69,9 +69,9 @@ namespace cppcanvas ...@@ -69,9 +69,9 @@ namespace cppcanvas
virtual void clear() const SAL_OVERRIDE; virtual void clear() const SAL_OVERRIDE;
virtual css::uno::Reference< 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 // take compiler-provided default copy constructor
//ImplCanvas(const ImplCanvas&); //ImplCanvas(const ImplCanvas&);
...@@ -79,9 +79,9 @@ namespace cppcanvas ...@@ -79,9 +79,9 @@ namespace cppcanvas
private: private:
ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION; ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
mutable css::rendering::ViewState maViewState; mutable css::rendering::ViewState maViewState;
boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon; boost::optional<basegfx::B2DPolyPolygon> maClipPolyPolygon;
const css::uno::Reference< css::rendering::XCanvas > mxCanvas; const css::uno::Reference< css::rendering::XCanvas > mxCanvas;
}; };
} }
......
cppcanvas/source/wrapper/implcolor.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -41,7 +41,7 @@ namespace cppcanvas ...@@ -41,7 +41,7 @@ namespace cppcanvas
css::rendering::XGraphicDevice >& rDevice ); css::rendering::XGraphicDevice >& rDevice );
virtual ~ImplColor(); 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; virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
private: private:
......
cppcanvas/source/wrapper/implcustomsprite.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -42,7 +42,7 @@ namespace cppcanvas ...@@ -42,7 +42,7 @@ namespace cppcanvas
css::rendering::XSpriteCanvas >& rParentCanvas, css::rendering::XSpriteCanvas >& rParentCanvas,
const css::uno::Reference< const css::uno::Reference<
css::rendering::XCustomSprite >& rSprite, css::rendering::XCustomSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplCustomSprite(); virtual ~ImplCustomSprite();
virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE; virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE;
...@@ -51,8 +51,8 @@ namespace cppcanvas ...@@ -51,8 +51,8 @@ namespace cppcanvas
ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION; ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION; ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
mutable CanvasSharedPtr mpLastCanvas; mutable CanvasSharedPtr mpLastCanvas;
const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite; const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
}; };
} }
} }
......
cppcanvas/source/wrapper/implpolypolygon.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -68,14 +68,14 @@ namespace cppcanvas ...@@ -68,14 +68,14 @@ namespace cppcanvas
ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION; ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
ImplPolyPolygon& operator= ( 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 > maFillColor;
css::uno::Sequence< double > maStrokeColor; css::uno::Sequence< double > maStrokeColor;
bool mbFillColorSet; bool mbFillColorSet;
bool mbStrokeColorSet; bool mbStrokeColorSet;
}; };
} }
......
cppcanvas/source/wrapper/implsprite.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -41,7 +41,7 @@ namespace cppcanvas ...@@ -41,7 +41,7 @@ namespace cppcanvas
css::rendering::XSpriteCanvas >& rParentCanvas, css::rendering::XSpriteCanvas >& rParentCanvas,
const css::uno::Reference< const css::uno::Reference<
css::rendering::XSprite >& rSprite, css::rendering::XSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
virtual ~ImplSprite(); virtual ~ImplSprite();
virtual void setAlpha( const double& rAlpha ) SAL_OVERRIDE; virtual void setAlpha( const double& rAlpha ) SAL_OVERRIDE;
...@@ -67,7 +67,7 @@ namespace cppcanvas ...@@ -67,7 +67,7 @@ namespace cppcanvas
css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice; css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice;
const css::uno::Reference< css::rendering::XSprite > mxSprite; const css::uno::Reference< css::rendering::XSprite > mxSprite;
const css::uno::Reference< css::rendering::XAnimatedSprite > mxAnimatedSprite; const css::uno::Reference< css::rendering::XAnimatedSprite > mxAnimatedSprite;
ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter;
}; };
} }
} }
......
cppcanvas/source/wrapper/implspritecanvas.hxx
Dosyayı görüntüle @ 17ae2821
...@@ -82,8 +82,8 @@ namespace cppcanvas ...@@ -82,8 +82,8 @@ namespace cppcanvas
private: private:
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION; ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas; const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
TransformationArbiterSharedPtr mpTransformArbiter; TransformationArbiterSharedPtr mpTransformArbiter;
}; };
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment