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

2013-11-14 Thread Bjoern Michaelsen 
 dictionaries |2 +-
 helpcontent2 |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 75748b5c800cea2170e9bb26430ff6a9fc55c608
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 13 10:26:51 2013 +0100

Updated core
Project: dictionaries  96cb9a317f448f7c70afc3a81b532efacaabd456

tweak dicts for core Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863

Change-Id: Icab59f08e96c6c1f13e24d72676077b8ddad90e3
Reviewed-on: https://gerrit.libreoffice.org/6662
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/dictionaries b/dictionaries
index c6f4f79..96cb9a3 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c6f4f79b596756f5d45c5264a49232e491b9cd78
+Subproject commit 96cb9a317f448f7c70afc3a81b532efacaabd456
commit 8327616e083dd7fd8df2ff2797d4381cfc8d593f
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 13 10:31:01 2013 +0100

Updated core
Project: help  33bc6868c0b6ffaf2e9ee31b8e5448b11930634f

tweak help for core Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863

Change-Id: Iffb5f9facb234be10523af93f1e23607fb4fdd1c
Reviewed-on: https://gerrit.libreoffice.org/6663
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/helpcontent2 b/helpcontent2
index 39f6e24..33bc686 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 39f6e246dc6790f93511d3f7f7e08861f160d400
+Subproject commit 33bc6868c0b6ffaf2e9ee31b8e5448b11930634f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-03-26 Thread 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 liji...@apache.org
Date:   Tue Sep 25 04:53:47 2012 +

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 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
+Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad
diff --git a/helpcontent2 b/helpcontent2
index 341ef99..aab9e88 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b
+Subproject commit aab9e2b7e799b6246caa6c40ca3d46e6220d
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 a...@apache.org
Date:   Tue Jun 26 14:29:05 2012 +

#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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits