The following commit has been merged in the master branch:
commit 1c315e1adfeb10cf4689e90dfc62a84da2baf872
Author: Rene Engelhard <r...@debian.org>
Date: Thu Jun 7 13:05:44 2012 +0200
add patch to fix (legacy) report opening
diff --git a/changelog b/changelog
index 13c35ff..d4da62b 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:3.5.4-4) UNRELEASED; urgency=low
* debian/patches/make-shortcuts-in-menus-localized-again.diff:
backport from libreoffice-3-5; as name says, regression from 3.5.3
+ * debian/patches/fix-legacy-report-opening.diff: backport fix from
+ libreoffice-3-5; as name says
* debian/rules:
- reenable Base on armel; apparently also fixed by
diff --git a/patches/fix-legacy-report-opening.diff
b/patches/fix-legacy-report-opening.diff
new file mode 100644
index 0000000..4c970c2
--- /dev/null
+++ b/patches/fix-legacy-report-opening.diff
@@ -0,0 +1,26 @@
+diff -u b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+--- b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
++++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+@@ -279,7 +279,6 @@
+ {
+ getRecordParser().Command = (String)
oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
+
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
+-
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+ getRecordParser().Command =
getRecordParser().getSQLQueryComposer().getQuery();
+ }
+ else
+@@ -292,7 +291,14 @@
+ bexecute =
getRecordParser().executeCommand(nCommandType); //sMsgQueryCreationImpossible +
(char) 13 + sMsgEndAutopilot, sFieldNameList, true);
+ if (bexecute)
+ {
++ DBMetaData.CommandObject oCommand =
getRecordParser().getQueryByName(sQueryName);
+ bexecute =
getRecordParser().getFields(sFieldNameList, true);
++ if (bexecute &&
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
++ {
++
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
++ getRecordParser().Command =
getRecordParser().getSQLQueryComposer().getQuery();
++ bexecute =
getRecordParser().executeCommand(nCommandType);
++ }
+ }
+ return bexecute;
+ }
diff --git a/patches/series b/patches/series
index 1f59dd7..56b4e6d 100644
--- a/patches/series
+++ b/patches/series
@@ -39,3 +39,4 @@ fix-Test-BigPtrArray-on-64bit-bigendian.diff
yyinput-fix-for-unsigned-char.diff
s390-remove-fsigned-char.diff
make-shortcuts-in-menus-localized-again.diff
+fix-legacy-report-opening.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1scfo7-0006bu...@vasks.debian.org
