diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 16:59:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 16:59:20 +0000 |
| commit | 222c7995132191a12ec36c3ce49d362e016f4e0c (patch) | |
| tree | 3668bfcf7d79095e9ee553328f7f7f19776e7f6b /sc/source/filter/xml/xmlstyli.cxx | |
| parent | 8a647714a66c29b32246d27cfc5301b810cf29cf (diff) | |
INTEGRATION: CWS calc24 (1.50.42); FILE MERGED
2004/10/22 15:32:52 nn 1.50.42.2: #b4974740# parse base-cell-address of conditional formats after all sheets are loaded
2004/10/19 10:42:11 sab 1.50.42.1: #i27594#; don't insert AllBorderWidth
Diffstat (limited to 'sc/source/filter/xml/xmlstyli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 8b822f4b6c60..3a58dd8fd09c 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyli.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: rt $ $Date: 2004-09-08 15:32:37 $ + * last change: $Author: hr $ $Date: 2004-11-09 17:59:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -205,6 +205,11 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >& } } } + + // #i27594#; copy Value, but don't insert + if (pAllBorderWidthProperty) + pAllBorderWidthProperty->mnIndex = -1; + for ( i = 0; i < 4; i++) { if (pAllPaddingProperty && !pPadding[i]) @@ -390,16 +395,13 @@ void XMLTableStyleContext::SetBaseCellAddress(com::sun::star::uno::Sequence<bean { aProps.realloc(aProps.getLength() + 1); beans::PropertyValue aProp; - table::CellAddress aBaseAddress; - sal_Int32 nOffset(0); - if ( ScXMLConverter::GetAddressFromString( aBaseAddress, sBaseCell, GetScImport().GetDocument(), nOffset )) - { - uno::Any aAnyBase; - aAnyBase <<= aBaseAddress; - aProp.Value = aAnyBase; - aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SOURCEPOS)); - aProps[aProps.getLength() - 1] = aProp; - } + + // #b4974740# source position must be set as string, because it may + // refer to a sheet that hasn't been loaded yet. + + aProp.Value <<= sBaseCell; + aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SOURCESTR)); + aProps[aProps.getLength() - 1] = aProp; } void XMLTableStyleContext::SetStyle(com::sun::star::uno::Sequence<beans::PropertyValue>& aProps, |