[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-4-2-g399932b
The following commit has been merged in the master branch:
commit 399932bf2132a73524d49f38c3740c3037c36713
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 14 22:02:07 2013 +0100
backport fix to fix --view from libreoffice-3-6
diff --git a/changelog b/changelog
index 6a950c6..bd4b861 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
libreoffice (1:3.5.4+dfsg-5) UNRELEASED; urgency=low
+ * debian/patches/fix-view-option.diff: backport fix to fix --view
+ from libreoffice-3-6 (closes: #697723)
+
* debian/rules:
- make -help-en-us break "the others" to work around 682838
(closes: #682838)
diff --git a/patches/fix-view-option.diff b/patches/fix-view-option.diff
new file mode 100644
index 0000000..7806be3
--- /dev/null
+++ b/patches/fix-view-option.diff
@@ -0,0 +1,33 @@
+From 4fc8af89257436b9cad70de574a166aa11ec42f1 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Mon, 09 Jul 2012 11:51:16 +0000
+Subject: Resolves: rhbz#838368 --view ignored while -view accepted
+
+and our ooviewdoc script uses --view
+
+Change-Id: Ice708f1c72c8d29d411ba21e93cb19876af13881
+---
+diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
+index af7ee26..c67db8c 100644
+--- a/desktop/source/app/cmdlineargs.cxx
++++ b/desktop/source/app/cmdlineargs.cxx
+@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" )))
++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" )))
+ {
+ // open in viewmode
+ bOpenEvent = false;
+@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" )))
++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" )))
+ {
+ // open in viewmode
+ bOpenEvent = false;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 0ce7ee4..fb2aa8d 100644
--- a/patches/series
+++ b/patches/series
@@ -49,3 +49,4 @@ CVE-2012-4233.diff
soffice-bashisms.diff
he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
+fix-view-option.diff
--
LibreOffice packaging repository
Reply to: