[Libreoffice-commits] core.git: 2 commits - sc/source xmloff/source

[Markus Mohrhard]

 sc/source/filter/excel/xicontent.cxx          |    2 ++
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |   22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 732d560a2e679a05ceffa6670536877fb32d9f52
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Feb 26 22:36:47 2013 +0100

    small performance improvement for fdo#61484
    
    Change-Id: I5562f2c8669bee4a18f0411420ac31d2c5ed1947

diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 344cd85..55779cb 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -638,6 +638,8 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
     {
         sal_uLong nKey = 0;
         mxScCondFmt.reset( new ScConditionalFormat( nKey, GetDocPtr() ) );
+        if(maRanges.size() > 1)
+            maRanges.Join(*maRanges[0], true);
         mxScCondFmt->AddRange(maRanges);
     }
 
commit c91b8d3251e3a8ad14e1b143af182c937bf6e5cb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Feb 26 22:35:57 2013 +0100

    one more fix for error bar import, fdo#60083
    
    This makes it finally possible to import the original test document.
    
    Change-Id: I5941f2ce303a28674dcf04aeabbbbc2d178c0913

diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index d28392d..a587fde 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -980,8 +980,6 @@ static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocume
         else
             aRoleBuffer.append( sal_Unicode( 'x' ));
 
-        rtl::OUString aPlainRole = aRoleBuffer.makeStringAndClear();
-        aRoleBuffer.append( aPlainRole );
         aRoleBuffer.append( sal_Unicode( '-' ));
 
         if( bPositiveValue )
@@ -1040,7 +1038,7 @@ SchXMLStatisticsObjectContext::~SchXMLStatisticsObjectContext()
 namespace {
 
 void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Reference< beans::XPropertySet> xBarProp,
-                                            SchXMLImportHelper& rImportHelper)
+                                            SchXMLImportHelper& rImportHelper, OUString& aPosRange, OUString& aNegRange)
 {
     const SvXMLStylesContext* pStylesCtxt = rImportHelper.GetAutoStylesContext();
     const SvXMLStyleContext* pStyle = pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(),
@@ -1098,6 +1096,20 @@ void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName, uno::Refere
                 xBarProp->setPropertyValue("NegativeError", aAny);
         }
 
+        aAny = SchXMLTools::getPropertyFromContext("ErrorBarRangePositive",
+                pSeriesStyleContext, pStylesCtxt);
+        if( aAny.hasValue() )
+        {
+            aAny >>= aPosRange;
+        }
+
+        aAny = SchXMLTools::getPropertyFromContext("ErrorBarRangeNegative",
+                pSeriesStyleContext, pStylesCtxt);
+        if( aAny.hasValue() )
+        {
+            aAny >>= aNegRange;
+        }
+
         switch(aBarStyle)
         {
             case com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN:
@@ -1183,8 +1195,8 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
 
 
                     // first import defaults from parent style
-                    SetErrorBarPropertiesFromStyleName( maSeriesStyleName, xBarProp, mrImportHelper );
-                    SetErrorBarPropertiesFromStyleName( sAutoStyleName, xBarProp, mrImportHelper );
+                    SetErrorBarPropertiesFromStyleName( maSeriesStyleName, xBarProp, mrImportHelper, aPosRange, aNegRange );
+                    SetErrorBarPropertiesFromStyleName( sAutoStyleName, xBarProp, mrImportHelper, aPosRange, aNegRange );
 
                     uno::Reference< chart2::XChartDocument > xDoc(GetImport().GetModel(),uno::UNO_QUERY);