rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.24.2.1, 1.24.2.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17279

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
adjust patch

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	7 Mar 2008 14:32:37 -0000	1.24.2.1
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	8 Mar 2008 17:21:43 -0000	1.24.2.2
@@ -791,7 +791,16 @@
 diff -u -r1.17 substitutepathvars.cxx
 --- openoffice.org.orig/framework/source/services/substitutepathvars.cxx	16 Sep 2006 14:12:15 -0000	1.17
 +++ openoffice.org/framework/source/services/substitutepathvars.cxx	28 Jun 2007 13:59:22 -0000
-@@ -1264,7 +1264,10 @@
+@@ -84,6 +84,8 @@
+ #include <unotools/bootstrap.hxx>
+ #endif
+ 
++#include <unotools/localedatawrapper.hxx>
++
+ #ifndef _OSL_MUTEX_HXX_
+ #include <osl/mutex.hxx>
+ #endif
+@@ -1266,7 +1268,10 @@
  	Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
  	rtl::OUString aLocaleStr;
  	if ( aLocale >>= aLocaleStr )