diff --git a/0001-resolved-rhbz-838248-init-filter-criteria-string.patch b/0001-resolved-rhbz-838248-init-filter-criteria-string.patch new file mode 100644 index 0000000..46ba87b --- /dev/null +++ b/0001-resolved-rhbz-838248-init-filter-criteria-string.patch @@ -0,0 +1,72 @@ +From 22ccbeef9c88b01ac841de37dfcb5985dc05a530 Mon Sep 17 00:00:00 2001 +Message-Id: <22ccbeef9c88b01ac841de37dfcb5985dc05a530.1341913622.git.erack@redhat.com> +From: Eike Rathke +Date: Mon, 9 Jul 2012 18:31:30 +0200 +Subject: [PATCH] resolved rhbz#838248 init filter criteria string +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 + + +In ScFilterDlg::Init() the string displayed as criteria was empty if +query is ByValue or ByDate. From earlier times the dialog assumed that +the query string was always set corresponding to the value, but internal +handling was changed. + +Change-Id: I4f10654f4015b38f7ddba9d6727e06806f1d6b77 +Signed-off-by: Kohei Yoshida +--- + sc/source/ui/dbgui/filtdlg.cxx | 26 +++++++++++++++++++++++++- + 1 files changed, 25 insertions(+), 1 deletions(-) + + +--------------erAck-patch-parts +Content-Type: text/x-patch; name="0001-resolved-rhbz-838248-init-filter-criteria-string.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="0001-resolved-rhbz-838248-init-filter-criteria-string.patch" + +diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx +index 93ad302..c744d85 100644 +--- a/sc/source/ui/dbgui/filtdlg.cxx ++++ b/sc/source/ui/dbgui/filtdlg.cxx +@@ -318,7 +318,31 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) + maCondLbArr[i]->Disable(); + } + else +- aValStr = rItem.maString; ++ { ++ if (rItem.maString.isEmpty()) ++ { ++ if (rItem.meType == ScQueryEntry::ByValue) ++ pDoc->GetFormatTable()->GetInputLineString( rItem.mfVal, 0, aValStr); ++ else if (rItem.meType == ScQueryEntry::ByDate) ++ { ++ SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); ++ pFormatter->GetInputLineString( rItem.mfVal, ++ pFormatter->GetStandardFormat( NUMBERFORMAT_DATE), aValStr); ++ } ++ else ++ { ++ SAL_WARN( "sc", "ScFilterDlg::Init: empty query string, really?"); ++ aValStr = rItem.maString; ++ } ++ } ++ else ++ { ++ // XXX NOTE: if not ByString we just assume this has been ++ // set to a proper string corresponding to the numeric ++ // value earlier! ++ aValStr = rItem.maString; ++ } ++ } + } + else if ( i == 0 ) + { + +--------------erAck-patch-parts-- + + diff --git a/libreoffice.spec b/libreoffice.spec index 3b973c5..b3a2365 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.3 -Release: 2%{?dist} +Release: 3%{?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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -145,6 +145,7 @@ Patch30: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch Patch31: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch Patch32: 0001-use-ure-instead-of-ure-link.patch Patch33: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch +Patch34: 0001-resolved-rhbz-838248-init-filter-criteria-string.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1008,6 +1009,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %endif %patch32 -p1 -b .use-ure-instead-of-ure-link.patch %patch33 -p1 -b .rhbz-838368-view-ignored-while-view-accepte.patch +%patch34 -p1 -b .rhbz-838248-init-filter-criteria-string.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2290,6 +2292,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Tue Jul 10 2012 Eike Rathke - 3.5.5.3-3 +- Resolves: rhbz#838248 calc standard filter doesn't show criteria after file re-open + * Mon Jul 09 2012 Caolán McNamara - 3.5.5.3-2 - Resolves: rhbz#838368 --view ignored while -view accepted