You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
2.0 KiB
52 lines
2.0 KiB
From 3efb6e5c35bb1129a78726b163f8fbf9bd94734a Mon Sep 17 00:00:00 2001
|
|
Message-Id: <3efb6e5c35bb1129a78726b163f8fbf9bd94734a.1399366556.git.erack@redhat.com>
|
|
From: Eike Rathke <erack@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@kohei.us>
|
|
Tested-by: Kohei Yoshida <libreoffice@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--
|
|
|
|
|