oox/source/export/drawingml.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3f16ae0233442bd2b8f2f0ebde9a2741a41ef6c4
Author: Muthu Subramanian <sumu...@collabora.com>
Date: Wed Dec 18 19:56:28 2013 +0530
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.ti...@collabora.com>
Change-Id: I65619d10f44ad54ab79874c718e47677049a2ff8
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7526741..75bfc56 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
