diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-03-03 11:39:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-03-03 11:39:43 +0000 |
| commit | e0d7a9fda4d50353857dcd5ab041be4c26de8472 (patch) | |
| tree | a50b992e3f8874d172e91ed4ae72e08eaa89491d /xmloff/source/style/escphdl.cxx | |
| parent | 595af138a9819ed4711369d561c16c042a14a762 (diff) | |
CWS-TOOLING: integrate CWS chart35
2009-02-20 12:33:54 +0100 nn r268312 : correct line ends
2009-01-19 12:50:45 +0100 iha r266491 : #i91800# style:text-position='0' is wrongly imported
2009-01-19 11:59:09 +0100 iha r266486 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge
2009-01-16 16:45:50 +0100 iha r266435 : #i93802# clockwise does not work on solars sparc
2009-01-16 13:23:37 +0100 iha r266414 : #i91037# Position of Datalabels in 3D Bar-Charts are crossing the edge
2009-01-15 14:09:27 +0100 iha r266370 : #i98102# checkbox show equation should not be checked initially
2009-01-14 17:41:33 +0100 iha r266323 : #i97133# #i97318# chart type is not detected correctly in case of invisible series
2009-01-14 16:23:06 +0100 iha r266316 : #i97133# #i97318# chart type is not detected correctly in case of invisible series
2009-01-14 13:43:38 +0100 iha r266298 : #i84417# Unable to edit existing chart title with clipboard
2009-01-14 13:43:04 +0100 iha r266297 : #i84417# Unable to edit existing chart title with IME
2009-01-14 13:14:15 +0100 dr r266293 : do not set CharEscapement property if not needed
2009-01-14 00:48:46 +0100 er r266262 : #i81383# changed ASC and JIS to use transliteration provided by i18n transliteration; patch from <bluedwarf>
2009-01-14 00:28:06 +0100 er r266261 : #i97536# silence gcc's unbracketed && || warnings
2009-01-13 22:43:45 +0100 er r266259 : #i97905# corrected IndexKey order
2009-01-13 20:36:15 +0100 er r266254 : #i97905# add SKK/EUR conversion (plus MTL/EUR and CYP/EUR)
2009-01-13 20:31:17 +0100 er r266253 : #i97905# updated locale data; contributed by <brko>
2009-01-13 11:57:08 +0100 iha r266204 : #i84103# cannot set data in xy diagram in draw
2009-01-12 20:29:37 +0100 nn r266181 : #i97680# GetStylesContainer: handle non-available style family
2009-01-12 19:53:19 +0100 nn r266180 : #i98000# don't get initial zoom value via SfxViewFrame::Current
2009-01-12 16:11:19 +0100 iha r266166 : #i71686# XY charts without valid x values are not imported correctly from Excel
2009-01-09 17:10:20 +0100 iha r266102 : #i95051# truncated asian strings on scale tabpage
2009-01-09 15:58:46 +0100 iha r266094 : #i89430# truncated asian strings in smooth lines dialog
2009-01-09 13:09:14 +0100 iha r266076 : #i94813# importing pie chart with multiline categories crashes
Diffstat (limited to 'xmloff/source/style/escphdl.cxx')
| -rw-r--r-- | xmloff/source/style/escphdl.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index 999375d19cc5..2b14138691df 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -150,7 +150,11 @@ sal_Bool XMLEscapementHeightPropHdl::importXML( const OUString& rStrImpValue, un } else { - nProp = (sal_Int8) DFLT_ESC_PROP; + sal_Int32 nEscapementPosition=0; + if( SvXMLUnitConverter::convertPercent( nEscapementPosition, aToken ) && nEscapementPosition==0 ) + nProp = 100; //if escapement position is zero and no escapement height is given the default height should be 100percent and not something smaller (#i91800#) + else + nProp = (sal_Int8) DFLT_ESC_PROP; } rValue <<= nProp; |