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

[Jianyuan Li]

 dictionaries                       |    2 +-
 helpcontent2                       |    2 +-
 sc/source/filter/excel/xlpivot.cxx |   14 ++++++++++++--
 sc/source/ui/view/viewdata.cxx     |    3 +++
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 2d3f9fb97857fd8cfc732d3f5aa8f20b01e1cb35
Author: Jianyuan Li <lijiany at apache.org>
Date:   Tue Sep 25 04:53:47 2012 +0000

    Fix #119514#:Item lists are incorrectly imported
    
    Reported by: Terry Yang
    Reviewed by: sunying
    Patched by: Jianyuan Li
    Conflicts:
    	sc/source/filter/excel/xlpivot.cxx
    
    Change-Id: I1e1c69004ed0764442298ae52c3bea87e6096bcd

diff --git a/dictionaries b/dictionaries
index 36776c3..350dc59 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad
diff --git a/helpcontent2 b/helpcontent2
index 341ef99..aab9e88 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b
+Subproject commit aab9e88882b7e799b6246caa6c40ca3d46e6220d
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 84a6042..8a902e0 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -86,9 +86,19 @@ void XclPCItem::SetInteger( sal_Int16 nValue )
 void XclPCItem::SetError( sal_uInt16 nError )
 {
     meType = EXC_PCITEM_ERROR;
-    //! TODO convert error to string
     maText = rtl::OUString();
     mnError = nError;
+    switch( nError )
+    {
+    case 0x00: maText = "#NULL!"; break;
+    case 0x07: maText = "#DIV/0!"; break;
+    case 0x0F: maText = "#VALUE!"; break;
+    case 0x17: maText = "#REF!"; break;
+    case 0x1D: maText = "#NAME?"; break;
+    case 0x24: maText = "#NUM!"; break;
+    case 0x2A: maText = "#N/A"; break;
+    default: break;
+    }
 }
 
 void XclPCItem::SetBool( bool bValue )
@@ -125,7 +135,7 @@ bool XclPCItem::IsEmpty() const
 
 const rtl::OUString* XclPCItem::GetText() const
 {
-    return (meType == EXC_PCITEM_TEXT) ? &maText : 0;
+    return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL;
 }
 
 const double* XclPCItem::GetDouble() const
commit 79a6b5191961c5dcc91f6e0b0b63f2e61a933823
Author: Andre Fischer <af at apache.org>
Date:   Tue Jun 26 14:29:05 2012 +0000

    #i119557# Ignore redundant "split" property.
    
    Patch by: Jianyuan Li
    Found by: binguo
    Review by: Andre Fischer

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 746b233..2f50245 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2520,6 +2520,9 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
                     double nFactor = pDocShell->GetOutputFactor();
                     aPixel.X() = (long)( aPixel.X() * nFactor + 0.5 );
                 }
+
+                bHSplit = bHSplit && aPixel.X() > 0;
+                bVSplit = bVSplit && aPixel.Y() > 0;
                 if( bHSplit )
                 {
                     rViewTab.eHSplitMode = SC_SPLIT_NORMAL;