diff options
| author | Muthu Subramanian <sumuthu@collabora.com> | 2013-12-18 19:56:28 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-03-16 15:28:58 +0100 |
| commit | 3f16ae0233442bd2b8f2f0ebde9a2741a41ef6c4 (patch) | |
| tree | 26f0592522e71be799c8bdda483b11fedbf47506 | |
| parent | ca1e73d7e91f35cede3d3e6220f9b86dcd55e427 (diff) | |
fdo#73627 n#828390: Explictly export font properties.
Seems like the status is returned as default,
but the font properties needs to be still exported.
(cherry picked from commit 33b796eb1484b9a3fc11a189faddb7fc36509856)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I65619d10f44ad54ab79874c718e47677049a2ff8
| -rw-r--r-- | oox/source/export/drawingml.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 752674188822..75bfc5601a94 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -699,14 +699,14 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs sal_Int32 nSize = 1800; sal_Int32 nCharEscapement = 0; - if( GETAD( CharHeight ) ) + if( GETA( CharHeight ) ) nSize = (sal_Int32) (100*(*((float*) mAny.getValue()))); - if ( ( bComplex && GETAD( CharWeightComplex ) ) || GETAD( CharWeight ) ) + if ( ( bComplex && GETA( CharWeightComplex ) ) || GETA( CharWeight ) ) if ( *((float*) mAny.getValue()) >= awt::FontWeight::SEMIBOLD ) bold = "1"; - if ( ( bComplex && GETAD( CharPostureComplex ) ) || GETAD( CharPosture ) ) + if ( ( bComplex && GETA( CharPostureComplex ) ) || GETA( CharPosture ) ) switch ( *((awt::FontSlant*) mAny.getValue()) ) { case awt::FontSlant_OBLIQUE : @@ -815,7 +815,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs WriteSolidFill( color ); } - if( GETAD( CharFontName ) ) { + if( GETA( CharFontName ) ) { const char* pitch = NULL; const char* charset = NULL; OUString usTypeface; |