[Libreoffice-commits] .: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/ui/drawfunc/fuins2.cxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit c6fc453194e2b735ba4080237dc3103efa88309d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 7 21:42:47 2011 +0100

    fdo#42526 : need to parse the address convention for parsing references

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 066dd12..2a85eef 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -162,7 +162,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
 
             // use ScChartPositioner to auto-detect column/row headers (like ScChartArray in old version)
             ScRangeListRef aRangeListRef( new ScRangeList );
-            aRangeListRef->Parse( aRangeString, pScDoc );
+            aRangeListRef->Parse( aRangeString, pScDoc, SCA_VALID, pScDoc->GetAddressConvention() );
             if ( !aRangeListRef->empty() )
             {
                 pScDoc->LimitChartIfAll( aRangeListRef );               // limit whole columns/rows to used area
commit 69565a036d371f19f807339f4c1b70e1827994d9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 7 21:36:40 2011 +0100

    little refactoring in fuins2.cxx

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 610f16f..066dd12 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -101,6 +101,8 @@ extern SdrObject* pSkipPaintObj;            // output.cxx - dieses Objekt nicht
 #define IS_AVAILABLE(WhichId,ppItem) \
     (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
 
+namespace {
+
 void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData,
                     const rtl::OUString& rRangeParam )
 {
@@ -119,7 +121,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
 
         ScMarkData& rMark = pViewData->GetMarkData();
         if ( !rMark.IsMarked() )
-            pViewData->GetView()->MarkDataArea( sal_True );
+            pViewData->GetView()->MarkDataArea( true );
 
         if ( pViewData->GetSimpleArea( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 ) == SC_MARK_SIMPLE )
         {
@@ -130,10 +132,8 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
                 ScDocument* pDoc = pViewData->GetDocument();
                 pDoc->LimitChartArea( nTab1, nCol1,nRow1, nCol2,nRow2 );
 
-                String aStr;
                 ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
-                aRange.Format( aStr, SCR_ABS_3D, pScDoc );
-                aRangeString = aStr;
+                aRange.Format( aRangeString, SCR_ABS_3D, pScDoc );
             }
         }
     }
@@ -212,6 +212,8 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
     }
 }
 
+}
+
 /*************************************************************************
 |*
 |* FuInsertOLE::Konstruktor