ooo-build r13237 - in trunk: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Wed Jul 16 04:05:53 2008
New Revision: 13237
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13237&view=rev

Log:
2008-07-16  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/scp2_build_extensions.diff
	* patches/dev300/always_default_iconset.diff
	* patches/dev300/scp2_build_accessories.diff
	DEV300-m24 related fixes for OxygenOffice Professional.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/always_default_iconset.diff
   trunk/patches/dev300/scp2_build_accessories.diff
   trunk/patches/dev300/scp2_build_extensions.diff

Modified: trunk/patches/dev300/always_default_iconset.diff
==============================================================================
--- trunk/patches/dev300/always_default_iconset.diff	(original)
+++ trunk/patches/dev300/always_default_iconset.diff	Wed Jul 16 04:05:53 2008
@@ -1,14 +1,14 @@
 --- vcl/source/app/settings.cxx.original	2008-04-08 07:18:13.000000000 +0200
 +++ vcl/source/app/settings.cxx	2008-04-11 07:11:08.000000000 +0200
 @@ -795,9 +795,9 @@
- 				const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
- 
- 				if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
--					snFallbackDesktopStyle = STYLE_SYMBOLS_TANGO;
-+					snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
- 				else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
--					snFallbackDesktopStyle = STYLE_SYMBOLS_CRYSTAL;
-+					snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
- 
- 				sbFallbackDesktopChecked = true;
- 			}
+    if( bCont )
+    {
+        if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
+-            nRet = STYLE_SYMBOLS_TANGO;
++            nRet = STYLE_SYMBOLS_DEFAULT;
+        else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+-            nRet = STYLE_SYMBOLS_CRYSTAL;
++            nRet = STYLE_SYMBOLS_DEFAULT;
+    }
+
+    return nRet;

Modified: trunk/patches/dev300/scp2_build_accessories.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_accessories.diff	(original)
+++ trunk/patches/dev300/scp2_build_accessories.diff	Wed Jul 16 04:05:53 2008
@@ -4,7 +4,7 @@
  cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
  cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
 +cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
 

Modified: trunk/patches/dev300/scp2_build_extensions.diff
==============================================================================
--- trunk/patches/dev300/scp2_build_extensions.diff	(original)
+++ trunk/patches/dev300/scp2_build_extensions.diff	Wed Jul 16 04:05:53 2008
@@ -12,6 +12,6 @@
  cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
  cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL