[Libreoffice-commits] core.git: filter/source
Marco Cecchetti
marco.cecchetti at collabora.com
Fri Jul 1 09:41:55 UTC 2016
filter/source/svg/svgwriter.hxx | 43 ++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 23 deletions(-)
New commits:
commit 1085035078ac1546238be5de2ec47f70a8caffb1
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date: Thu Jun 16 13:36:51 2016 +0200
svgfilter - polish code formatting
Change-Id: Ic63cfeb352326f3375ba664a775e58c566901320
Reviewed-on: https://gerrit.libreoffice.org/26830
Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
Tested-by: Marco Cecchetti <mrcekets at gmail.com>
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 38eedc0..76c2df0 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -84,13 +84,13 @@ class SVGAttributeWriter
{
private:
- vcl::Font maCurFont;
- SVGExport& mrExport;
- SVGFontExport& mrFontExport;
- SvXMLElementExport* mpElemFont;
-
+ vcl::Font maCurFont;
+ SVGExport& mrExport;
+ SVGFontExport& mrFontExport;
+ SvXMLElementExport* mpElemFont;
static double ImplRound( double fVal );
+
public:
SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFontExport );
@@ -111,14 +111,13 @@ public:
struct SVGShapeDescriptor
{
- tools::PolyPolygon maShapePolyPoly;
- Color maShapeFillColor;
- Color maShapeLineColor;
- sal_Int32 mnStrokeWidth;
- SvtGraphicStroke::DashArray maDashArray;
- ::std::unique_ptr< Gradient > mapShapeGradient;
- OUString maId;
-
+ tools::PolyPolygon maShapePolyPoly;
+ Color maShapeFillColor;
+ Color maShapeLineColor;
+ sal_Int32 mnStrokeWidth;
+ SvtGraphicStroke::DashArray maDashArray;
+ ::std::unique_ptr< Gradient > mapShapeGradient;
+ OUString maId;
basegfx::B2DLineJoin maLineJoin;
css::drawing::LineCap maLineCap;
@@ -157,9 +156,9 @@ class SVGTextWriter
SVGExport& mrExport;
SVGAttributeWriter* mpContext;
VclPtr<VirtualDevice> mpVDev;
- bool mbIsTextShapeStarted;
+ bool mbIsTextShapeStarted;
Reference<XText> mrTextShape;
- OUString msShapeId;
+ OUString msShapeId;
Reference<XEnumeration> mrParagraphEnumeration;
Reference<XTextContent> mrCurrentTextParagraph;
Reference<XEnumeration> mrTextPortionEnumeration;
@@ -248,8 +247,6 @@ class SVGTextWriter
void implRegisterInterface( const Reference< XInterface >& rxIf );
const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf );
-
-
};
@@ -268,8 +265,8 @@ private:
SVGTextWriter maTextWriter;
VclPtr<VirtualDevice> mpVDev;
MapMode maTargetMapMode;
- bool mbClipAttrChanged;
- bool mbIsPlaceholderShape;
+ bool mbClipAttrChanged;
+ bool mbIsPlaceholderShape;
void ImplAcquireContext()
@@ -323,11 +320,10 @@ private:
public:
- static OUString GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine );
- static BitmapChecksum GetChecksum( const MetaAction* pAction );
+ static OUString GetPathString( const tools::PolyPolygon& rPolyPoly, bool bLine );
+ static BitmapChecksum GetChecksum( const MetaAction* pAction );
public:
-
SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport );
virtual ~SVGActionWriter();
@@ -354,7 +350,8 @@ public:
// XSVGWriter
virtual void SAL_CALL write( const Reference<XDocumentHandler>& rxDocHandler,
- const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ) override;
+ const Sequence<sal_Int8>& rMtfSeq )
+ throw( RuntimeException, std::exception ) override;
};
#endif // INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
More information about the Libreoffice-commits
mailing list