[libreoffice] Resolves: fdo#78294 default null-date for document import is 1899-12-30
Eike Rathke
erack at fedoraproject.org
Tue May 6 11:16:32 UTC 2014
commit 0ddcb19f6235e0ef695bfe3964b7c09f2dd4500a
Author: Eike Rathke <erack at redhat.com>
Date: Tue May 6 12:02:25 2014 +0100
Resolves: fdo#78294 default null-date for document import is 1899-12-30
...o-78294-default-null-date-for-document-im.patch | 51 ++++++++++++++++++++
libreoffice.spec | 6 ++-
2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/0001-resolved-fdo-78294-default-null-date-for-document-im.patch b/0001-resolved-fdo-78294-default-null-date-for-document-im.patch
new file mode 100644
index 0000000..c687816
--- /dev/null
+++ b/0001-resolved-fdo-78294-default-null-date-for-document-im.patch
@@ -0,0 +1,51 @@
+From 3efb6e5c35bb1129a78726b163f8fbf9bd94734a Mon Sep 17 00:00:00 2001
+Message-Id: <3efb6e5c35bb1129a78726b163f8fbf9bd94734a.1399366556.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Mon, 5 May 2014 18:18:57 +0100
+Subject: [PATCH] resolved fdo#78294 default null-date for document import is
+ 1899-12-30
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+Change-Id: I9dfe76d422ad732a081442b95a995d8d395a098e
+(cherry picked from commit 571cefca474e6b77d68f9fa31f805dcf692927fd)
+Reviewed-on: https://gerrit.libreoffice.org/9253
+Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
+Tested-by: Kohei Yoshida <libreoffice at kohei.us>
+---
+ sc/source/ui/docshell/docsh3.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-resolved-fdo-78294-default-null-date-for-document-im.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-resolved-fdo-78294-default-null-date-for-document-im.patch"
+
+diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
+index fcb2760f..42817ee 100644
+--- a/sc/source/ui/docshell/docsh3.cxx
++++ b/sc/source/ui/docshell/docsh3.cxx
+@@ -428,6 +428,12 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L
+ // so it must not be taken from the global options.
+ // Calculation settings are handled separately in ScXMLBodyContext::EndElement.
+ aDocOpt.SetStdPrecision( SvNumberFormatter::UNLIMITED_PRECISION );
++
++ // fdo#78294 The default null-date if
++ // <table:null-date table:date-value='...' />
++ // is absent is 1899-12-30 regardless what the configuration is set to.
++ // Import filters may override this value.
++ aDocOpt.SetDate( 30, 12, 1899);
+ }
+
+ aDocument.SetDocOptions( aDocOpt );
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 04c9428..14ed684 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -37,7 +37,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity
URL: http://www.libreoffice.org/default/
@@ -296,6 +296,7 @@ Patch35: 0001-Related-fdo-36815-center-scaled-comment-page-vertica.patch
Patch36: 0001-Resolves-fdo-78128-go-back-to-using-an-interim-metaf.patch
Patch37: 0001-Related-rhbz-1032774-slide-restarter-should-disable-.patch
Patch38: 0001-add-X-TryExec-entries-to-desktop-files.patch
+Patch39: 0001-resolved-fdo-78294-default-null-date-for-document-im.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -2259,6 +2260,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Thu May 01 2014 Eike Rathke <erack at redhat.com> - 1:4.2.4.2-3
+- Resolves: fdo#78294 default null-date for document import is 1899-12-30
+
* Thu May 01 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.2-2
- better scaling of notes-using pages
More information about the scm-commits
mailing list