[libreoffice/f16] fix patch to apply
Caolán McNamara
caolanm at fedoraproject.org
Tue Mar 6 16:14:16 UTC 2012
commit 8881323911046f7e609000c779309d5abbf66132
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 6 16:14:12 2012 +0000
fix patch to apply
...bz-800272-complain-about-unknown-command-.patch | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch b/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
index bff16d0..b68b076 100644
--- a/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
+++ b/0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
@@ -77,7 +77,7 @@ diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officei
index b2c6566..4306a67 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
-@@ -709,6 +709,12 @@ void OfficeIPCThread::execute()
+@@ -710,6 +710,12 @@
#endif
continue;
}
@@ -87,14 +87,14 @@ index b2c6566..4306a67 100644
+ continue;
+#endif
+
- const CommandLineArgs &rCurrentCmdLineArgs = Desktop::GetCommandLineArgs();
+ CommandLineArgs *pCurrentCmdLineArgs = Desktop::GetCommandLineArgs();
if ( aCmdLineArgs->IsQuickstart() )
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 76562a3..ed22834 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
-@@ -71,6 +71,10 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
+@@ -63,6 +63,10 @@
desktop::displayVersion();
return EXIT_SUCCESS;
}
@@ -104,7 +104,7 @@ index 76562a3..ed22834 100644
+ }
#endif
return SVMain();
- #ifdef ANDROID
+ }
--
1.7.7.6
More information about the scm-commits
mailing list