rpms/openoffice.org/devel openoffice.org.spec, 1.1726, 1.1727 workspace.vcl98.patch, 1.1, 1.2 openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11306

Modified Files:
	openoffice.org.spec workspace.vcl98.patch 
Removed Files:
	openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch 
Log Message:
merge workspace.vcl98.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -r1.1726 -r1.1727
--- openoffice.org.spec	17 Dec 2008 16:59:06 -0000	1.1726
+++ openoffice.org.spec	17 Dec 2008 19:13:45 -0000	1.1727
@@ -129,11 +129,10 @@
 Patch56: workspace.tkr16.patch
 Patch57: workspace.swffixes02.patch
 Patch58: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch59: openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
-Patch60: workspace.transogl03.patch
-Patch61: workspace.vcl97.patch
-Patch62: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
-Patch63: workspace.vcl98.patch
+Patch59: workspace.transogl03.patch
+Patch60: workspace.vcl97.patch
+Patch61: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
+Patch62: workspace.vcl98.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1401,11 +1400,10 @@
 %patch56 -p1 -b .workspace.tkr16.patch
 %patch57 -p1 -b .workspace.swffixes02.patch
 %patch58 -p1
-%patch59 -p1 -b .ooo97064.fpicker.honour-uilang-override.patch
-%patch60 -p0 -b .workspace.transogl03.patch
-%patch61 -p1 -b .workspace.vcl97.patch
-%patch62 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
-%patch63 -p1 -b .workspace.vcl98.patch
+%patch59 -p0 -b .workspace.transogl03.patch
+%patch60 -p1 -b .workspace.vcl97.patch
+%patch61 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
+%patch62 -p1 -b .workspace.vcl98.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3805,7 +3803,9 @@
 * Wed Dec 17 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.3
 - Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 - add ga thesaurus
-- add workspace.vcl98.patch
+- add workspace.vcl98.patch, and merge 
+  openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
+  into it
 
 * Thu Dec 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.2
 - Resolves: rhbz#466680 package OGLTrans 3D OpenGL slide transitions

workspace.vcl98.patch:

Index: workspace.vcl98.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl98.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl98.patch	17 Dec 2008 16:59:06 -0000	1.1
+++ workspace.vcl98.patch	17 Dec 2008 19:13:45 -0000	1.2
@@ -33,3 +33,70 @@
  
      if( mbArtItalic )
          nLoadFlags |= FT_LOAD_NO_BITMAP;    
+Index: source/unx/gnome/SalGtkFilePicker.cxx
+===================================================================
+RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
+retrieving revision 1.28
+diff -u -r1.28 SalGtkFilePicker.cxx
+--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	11 Apr 2008 09:28:01 -0000	1.28
++++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx	10 Dec 2008 13:49:09 -0000
+@@ -36,6 +36,7 @@
+ //------------------------------------------------------------------------
+ #include <com/sun/star/lang/DisposedException.hpp>
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
++#include <com/sun/star/container/XNameAccess.hpp>
+ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
+ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
+@@ -124,6 +125,40 @@
+     gtk_widget_set_size_request (m_pPreview, -1, -1);
+ }
+ 
++static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr)
++{
++    static bool bSet = false;
++    if (bSet)
++        return;
++    
++    OUString sUILocale;
++    try
++    {
++        uno::Reference<lang::XMultiServiceFactory> xConfigMgr = 
++          uno::Reference<lang::XMultiServiceFactory>(xServiceMgr->createInstance(
++            OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), 
++              UNO_QUERY_THROW );
++
++        Sequence< Any > theArgs(1);
++        theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
++
++        uno::Reference< container::XNameAccess > xNameAccess =
++          uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
++            OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
++              UNO_QUERY_THROW );
++
++        if (xNameAccess.is())
++            xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
++	} catch (...) {}
++  
++    if (sUILocale.getLength()) 
++    {
++        sUILocale = rtl::OUString::createFromAscii("LANGUAGE=") + sUILocale.replace('-', '_');
++        putenv(strdup(rtl::OUStringToOString(sUILocale, osl_getThreadTextEncoding()).getStr()));
++    }
++    bSet = true;
++}
++
+ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) : 
+ 	cppu::WeakComponentImplHelper10<
+ 		XFilterManager,
+@@ -147,7 +182,9 @@
+ 	m_pPreview( NULL ),
+ 	m_PreviewImageWidth( 256 ),
+     m_PreviewImageHeight( 256 )
+-{   
++{
++    lcl_setGTKLanguage(xServiceMgr);
++
+ 	int i;
+ 
+ 	for( i = 0; i < TOGGLE_LAST; i++ )


--- openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch DELETED ---