rpms/openoffice.org/F-10 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch, NONE, 1.1 workspace.vcl98.patch, NONE, 1.1 openoffice.org.spec, 1.1705, 1.1706

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22492

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch 
	workspace.vcl98.patch 
Log Message:
Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch

openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch ---
diff -up OOO300_m9/config_office/configure.in.orig OOO300_m9.old3/config_office/configure.in
--- OOO300_m9/config_office/configure.in.orig	2008-12-18 10:51:57.000000000 +0100
+++ OOO300_m9/config_office/configure.in	2008-12-18 10:52:26.000000000 +0100
@@ -4320,7 +4320,11 @@ else
 fi
 AC_SUBST(XINC)
 if test "$x_libraries" = "default_x_libraries"; then
-   XLIB="/usr/lib"
+   if test "$build_cpu" != "x86_64" ; then
+      XLIB="/usr/lib"
+   else
+      XLIB="/usr/lib64"
+   fi
 else
    XLIB="$x_libraries"
 fi

workspace.vcl98.patch:

--- NEW FILE workspace.vcl98.patch ---
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.150.2.1
diff -u -r1.150.2.1 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Aug 2008 12:26:31 -0000	1.150.2.1
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	17 Dec 2008 15:06:40 -0000
@@ -1251,7 +1279,8 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    int nLoadFlags = mnLoadFlags;
+    int nLoadFlags = mnLoadFlags | FT_LOAD_IGNORE_TRANSFORM;
+;
 
 //  if( mbArtItalic )
 //      nLoadFlags |= FT_LOAD_NO_BITMAP;    
@@ -1339,7 +1368,7 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    FT_Int nLoadFlags = mnLoadFlags;
+    FT_Int nLoadFlags = mnLoadFlags | FT_LOAD_IGNORE_TRANSFORM;
     // #i70930# force mono-hinting for monochrome text
     if( nFTVERSION >= 2110 ) //#i71947# unless it looks worse
     {
@@ -1499,7 +1528,7 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    FT_Int nLoadFlags = mnLoadFlags;
+    FT_Int nLoadFlags = mnLoadFlags | FT_LOAD_IGNORE_TRANSFORM;
 
     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++ )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1705
retrieving revision 1.1706
diff -u -r1.1705 -r1.1706
--- openoffice.org.spec	18 Dec 2008 18:40:26 -0000	1.1705
+++ openoffice.org.spec	19 Dec 2008 11:49:45 -0000	1.1706
@@ -137,6 +137,7 @@
 Patch64: workspace.vcl97.patch
 Patch65: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 Patch66: workspace.vcl98.patch
+Patch67: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1398,6 +1399,7 @@
 %patch64 -p1 -b .workspace.vcl97.patch
 %patch65 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
 %patch66 -p1 -b .workspace.vcl98.patch
+%patch67 -p1 -b .ooo97428.config_office.xinerama-on-x86_64.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3764,7 +3766,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Dec 18 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Fri Dec 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
@@ -3784,6 +3786,7 @@
 - Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 - add workspace.vcl98.patch
 - Resolves: rhbz#477016 playing video under full-screen presentation went away
+- Resolves: rhbz#474719 openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
 
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred