[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.4-1-10-gc94baae
The following commit has been merged in the debian-experimental-3.6 branch:
commit c94baae8a64dda593639dfd20e7468eaf106f0d4
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 14 23:25:03 2013 +0100
remove upstreamed fix-view-option.diff
diff --git a/patches/fix-view-option.diff b/patches/fix-view-option.diff
deleted file mode 100644
index 7806be3..0000000
--- a/patches/fix-view-option.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-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 c9ee017..733856d 100644
--- a/patches/series
+++ b/patches/series
@@ -28,4 +28,3 @@ build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
ure-no-etc-opt-ure.diff
poppler_0_21_x.diff
-fix-view-option.diff
--
LibreOffice packaging repository
Reply to: