[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                              |    3 ++
 patches/dev300/chart-highlight-selection-fix.diff |   29 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

New commits:
commit 132c0fe825b490d7c398019d151bf9f61c71b8c6
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Jan 7 15:52:07 2010 -0500

    Correctly highlight dis-joint ranges while in chart mode.
    
    * patches/dev300/apply:
    * patches/dev300/chart-highlight-selection-fix.diff: dis-joint
      ranges in chart were highlighted correctly only when the separator
      was ';'.  This patch fixes it. (n#568016)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7d4cdf0..9cde6e0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -845,6 +845,9 @@ calc-formula-range-separator-fix.diff, n#556268, kohei
 # import xlsx's Normal cell style into Calc's 'Default' style.
 calc-xlsx-import-default-cellstyle.diff, n#558577, kohei
 
+# correctly highlight disjoint ranges in chart mode.
+chart-highlight-selection-fix.diff, n#568016, kohei
+
 # Support PHONETIC function to display asian phonetic guide.
 # LATER: I'll take care of this later.  --kohei
 # calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
diff --git a/patches/dev300/chart-highlight-selection-fix.diff b/patches/dev300/chart-highlight-selection-fix.diff
new file mode 100644
index 0000000..540cd1a
--- /dev/null
+++ b/patches/dev300/chart-highlight-selection-fix.diff
@@ -0,0 +1,29 @@
+diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
+index 80e0fd7..651723f 100644
+--- sc/source/ui/view/tabview3.cxx
++++ sc/source/ui/view/tabview3.cxx
+@@ -80,6 +80,7 @@
+ #include "rangeutl.hxx"
+ #include "client.hxx"
+ #include "tabprotection.hxx"
++#include "formula/FormulaCompiler.hxx"
+ 
+ #include <com/sun/star/chart2/data/HighlightedRange.hpp>
+ #include <com/sun/star/document/XVbaEventsHelper.hpp>
+@@ -2178,6 +2179,7 @@ void ScTabView::DoChartSelection(
+     const uno::Sequence< chart2::data::HighlightedRange > & rHilightRanges )
+ {
+     ClearHighlightRanges();
++    const sal_Unicode sep = ::formula::FormulaCompiler::GetNativeSymbol(ocSep).GetChar(0);
+ 
+     for( sal_Int32 i=0; i<rHilightRanges.getLength(); ++i )
+     {
+@@ -2185,7 +2187,7 @@ void ScTabView::DoChartSelection(
+         ScRangeList aRangeList;
+         ScDocument* pDoc = aViewData.GetDocShell()->GetDocument();
+         if( ScRangeStringConverter::GetRangeListFromString(
+-                aRangeList, rHilightRanges[i].RangeRepresentation, pDoc, pDoc->GetAddressConvention(), ';' ))
++                aRangeList, rHilightRanges[i].RangeRepresentation, pDoc, pDoc->GetAddressConvention(), sep ))
+         {
+             for ( ScRangePtr p = aRangeList.First(); p; p = aRangeList.Next())
+             {