summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@collabora.com>2013-12-18 20:08:41 +0530
committerAndras Timar <andras.timar@collabora.com>2014-01-03 11:23:44 +0100
commit3ab5537b23061e2e42b3afb56c403a72ae8524b8 (patch)
treed31bac02278196232c73bbc3808098045a6cda54
parente16a2d929613610526a4101e1750a14b49a68104 (diff)
n#828390: Explictly export font properties.
Seems like the status is returned as default, but the font properties needs to be still exported.
-rw-r--r--oox/source/export/drawingml.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index bfe3ed94d718..ff3f62a53313 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -667,14 +667,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 :
@@ -789,7 +789,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs
WriteSolidFill( color );
}
- if( GETAD( CharFontName ) ) {
+ if( GETA( CharFontName ) ) {
const char* typeface = NULL;
const char* pitch = NULL;
const char* charset = NULL;