ooo-build r14231 - in branches/ooo-build-3-0: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Tue Oct  7 07:02:15 2008
New Revision: 14231
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14231&view=rev

Log:
Fix loading the KDE4 VCL plugin


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/kde4-salnativewidgets-kde.diff

Modified: branches/ooo-build-3-0/patches/dev300/kde4-salnativewidgets-kde.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/kde4-salnativewidgets-kde.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/kde4-salnativewidgets-kde.diff	Tue Oct  7 07:02:15 2008
@@ -2166,3 +2166,22 @@
  }
  
  // -----------------------------------------------------------------------
+--- vcl/unx/kde/kdedata.cxx.ark	2008-10-06 16:19:14.114200454 +0200
++++ vcl/unx/kde/kdedata.cxx	2008-10-06 16:22:26.500076020 +0200
+@@ -238,6 +238,8 @@ void KDEData::Init()
+ extern "C" {
+     VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule )
+     {
++#if QT_VERSION < 0x040000
++	// Qt 3.x support needs >= 3.2.2 - any 4.x should be ok
+         rtl::OString aVersion( qVersion() );
+ #if OSL_DEBUG_LEVEL > 1
+         fprintf( stderr, "qt version string is \"%s\"\n", aVersion.getStr() );
+@@ -255,6 +257,7 @@ extern "C" {
+ #endif
+             return NULL;
+         }
++#endif
+         
+         KDESalInstance* pInstance = new KDESalInstance( new SalYieldMutex() );
+ #if OSL_DEBUG_LEVEL > 1