|
|
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv527
Modified Files:
openoffice.org-1.9.87.rh151357.patch
Log Message:
tweak patch
openoffice.org-1.9.87.rh151357.patch:
desktop/source/app/langselect.cxx | 39 +++-----
desktop/source/app/langselect.hxx | 2
desktop/source/app/userinstall.cxx | 15 ---
desktop/source/migration/wizard.cxx | 19 ----
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4
registry/schema/org/openoffice/Office/Common.xcs | 0
sfx2/source/appl/sfxhelp.cxx | 59 +++++++++++--
source/app/langselect.cxx | 0
source/app/langselect.hxx | 0
source/app/userinstall.cxx | 0
source/appl/sfxhelp.cxx | 0
source/migration/wizard.cxx | 0
12 files changed, 75 insertions(+), 63 deletions(-)
Index: openoffice.org-1.9.87.rh151357.patch
===================================================================
RCS file:
/cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.87.rh151357.patch 9 Jun 2005 08:31:26 -0000
1.6
+++ openoffice.org-1.9.87.rh151357.patch 10 Jun 2005 17:00:38 -0000
1.7
@@ -103,10 +103,10 @@
Index: source/appl/sfxhelp.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v
-retrieving revision 1.62
-diff -u -p -r1.62 sfxhelp.cxx
---- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 15 Mar 2005 13:05:26
-0000 1.62
-+++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 13 Apr 2005 10:16:42
-0000
+retrieving revision 1.64
+diff -u -p -u -r1.64 sfxhelp.cxx
+--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 9 Jun 2005 13:54:45
-0000 1.64
++++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 10 Jun 2005 17:02:29
-0000
@@ -125,6 +125,9 @@
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
@@ -117,25 +117,19 @@
#ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
#endif
-@@ -135,12 +138,17 @@
+@@ -135,6 +138,11 @@
#include <svtools/pathoptions.hxx>
#include <rtl/ustring.hxx>
#include <osl/process.h>
+#include <osl/file.hxx>
- #include <rtl/uri.hxx>
-
- #define _SVSTDARR_STRINGSDTOR
- #define _SVSTDARR_ULONGSSORT
- #include <svtools/svstdarr.hxx>
-
+#ifndef _UTL_BOOTSTRAP_HXX
+#include <unotools/bootstrap.hxx>
+#endif
+
- #include "sfxsids.hrc"
- #include "app.hxx"
- #include "viewfrm.hxx"
-@@ -166,16 +174,50 @@ using namespace ::com::sun::star::lang;
+ #include <rtl/uri.hxx>
+ #include <vcl/msgbox.hxx>
+ #include <svtools/ehdl.hxx>
+@@ -191,16 +199,50 @@ void NoHelpErrorBox::RequestHelp( const
#define STARTERLIST 0
@@ -194,7 +188,7 @@
// query part exists?
if ( bQuestionMark )
-@@ -190,6 +232,7 @@ void AppendConfigToken_Impl( String& rUR
+@@ -215,6 +257,7 @@ void AppendConfigToken_Impl( String& rUR
rURL += String( aLocaleStr );
rURL += DEFINE_CONST_UNICODE("&System=");
rURL += SvtHelpOptions().GetSystem();
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|