diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-17 09:55:28 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-17 09:55:28 +0000 |
| commit | 7151f3fae03157040120644c870d7c833c09ef9d (patch) | |
| tree | 1ebd5659d8ebe2b2395403660ad92ce70bcb0a22 /sdext/source/pdfimport/inc | |
| parent | e03fcb7ad74e6f216529ad1109ac72acf155d004 (diff) | |
CWS-TOOLING: integrate CWS pdfextfix
2009-01-30 15:01:16 +0100 pl r267198 : remove an extra character produced by gperf, fix a warning
2009-01-26 12:55:07 +0100 pl r266917 : #i92912# add: outline text
2009-01-14 17:03:30 +0100 pl r266319 : #i94952# replace fonts in test files by DejaVu family
2009-01-14 14:29:05 +0100 pl r266303 : #i91980# add standard style dependency for graphic styles
Diffstat (limited to 'sdext/source/pdfimport/inc')
| -rwxr-xr-x | sdext/source/pdfimport/inc/contentsink.hxx | 6 | ||||
| -rwxr-xr-x | sdext/source/pdfimport/inc/pdfihelper.hxx | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index e570e3ad4b5f..fee855435409 100755 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -64,11 +64,13 @@ namespace pdfi bool isBold_, bool isItalic_, bool isUnderline_, + bool isOutline_, double size_ ) : familyName(familyName_), isBold(isBold_), isItalic(isItalic_), isUnderline(isUnderline_), + isOutline(isOutline_), size(size_) {} @@ -77,6 +79,7 @@ namespace pdfi isBold(false), isItalic(false), isUnderline(false), + isOutline(false), size(0.0) {} @@ -84,6 +87,7 @@ namespace pdfi bool isBold; bool isItalic; bool isUnderline; + bool isOutline; double size; // device pixel bool operator==(const FontAttributes& rFont) const @@ -92,6 +96,7 @@ namespace pdfi !isBold == !rFont.isBold && !isItalic == !rFont.isItalic && !isUnderline == !rFont.isUnderline && + !isOutline == !rFont.isOutline && size == rFont.size; } }; @@ -128,6 +133,7 @@ namespace pdfi virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) = 0; virtual void setBlendMode( sal_Int8 blendMode ) = 0; virtual void setFont( const FontAttributes& rFont ) = 0; + virtual void setTextRenderMode( sal_Int32 ) = 0; virtual void strokePath( const ::com::sun::star::uno::Reference< diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index cc1bce96f6b3..2614ff8b334c 100755 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -91,6 +91,7 @@ namespace pdfi ^ size_t(rFont.isBold ? 0xd47be593 : 0) ^ size_t(rFont.isItalic ? 0x1efd51a1 : 0) ^ size_t(rFont.isUnderline ? 0xf6bd325a : 0) + ^ size_t(rFont.isOutline ? 0x12345678 : 0) ^ size_t(rFont.size) ; } @@ -108,6 +109,7 @@ namespace pdfi double MiterLimit; std::vector<double> DashArray; sal_Int32 FontId; + sal_Int32 TextRenderMode; basegfx::B2DHomMatrix Transformation; basegfx::B2DPolyPolygon Clip; @@ -122,6 +124,7 @@ namespace pdfi MiterLimit(10.0), DashArray(), FontId(0), + TextRenderMode(0), Transformation(), Clip() {} @@ -144,6 +147,7 @@ namespace pdfi MiterLimit == rRight.MiterLimit && DashArray == rRight.DashArray && FontId == rRight.FontId && + TextRenderMode == rRight.TextRenderMode && Transformation == rRight.Transformation && Clip == rRight.Clip; } @@ -173,6 +177,7 @@ namespace pdfi ^ size_t(rGC.MiterLimit) ^ rGC.DashArray.size() ^ size_t(rGC.FontId) + ^ size_t(rGC.TextRenderMode) ^ size_t(rGC.Transformation.get( 0, 0 )) ^ size_t(rGC.Transformation.get( 1, 0 )) ^ size_t(rGC.Transformation.get( 0, 1 )) |