summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@collabora.com>2013-12-18 20:08:41 +0530
committerMuthu Subramanian <sumuthu@collabora.com>2013-12-18 20:08:41 +0530
commit4d4fb2a6f8afd525bffbc465779a6bf95e5debd9 (patch)
treeaf2a4992a6aed02e5b56a2f31170b38bb779d31a
parentc67cbc42ec5f0d37f70aeda4e11e3dd90edad892 (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;