summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2003-01-28 10:02:25 +0000
committerCaolán McNamara <cmc@openoffice.org>2003-01-28 10:02:25 +0000
commit80965be16be2edd8a1c717df9b27d9b3b22927a4 (patch)
tree62c8cc87c7b5b431e674e736a41aae5dc77a9a4e /svx
parent47d686e00d76e19bb690438ddd56da5e7766709a (diff)
#i7490# no value -> default align
Diffstat (limited to 'svx')
-rw-r--r--svx/source/msfilter/msocximex.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/svx/source/msfilter/msocximex.cxx b/svx/source/msfilter/msocximex.cxx
index ce5f094ffeab..f72805d16f9f 100644
--- a/svx/source/msfilter/msocximex.cxx
+++ b/svx/source/msfilter/msocximex.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: msocximex.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: cmc $ $Date: 2002-04-09 11:17:51 $
+ * last change: $Author: cmc $ $Date: 2003-01-28 11:02:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,8 @@
*
************************************************************************/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
+
#ifndef _COM_SUN_STAR_UNO_ANY_H_
#include <com/sun/star/uno/Any.h>
#endif
@@ -3106,8 +3108,9 @@ sal_Bool OCX_FontData::Export(SvStorageStreamRef &rContent,
aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("Align"));
nFlags |= 0x40;
- sal_Int16 nAlign;
- aTmp >>= nAlign;
+ sal_Int16 nAlign(0);
+ if (aTmp.hasValue())
+ aTmp >>= nAlign;
nJustification = ExportAlign(nAlign);
*rContent << nJustification;
}
@@ -3253,3 +3256,5 @@ sal_Bool OCX_Image::Export(SvStorageRef &rObj,
SvStorageStreamRef xContents( rObj->OpenStream( C2S("contents")));
return WriteContents(xContents, rPropSet, rSize);
}
+
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */