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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15173 - in trunk: . patches/dev300
Date: Tue, 27 Jan 2009 20:09:16 +0000 (UTC)
Author: kyoshida
Date: Tue Jan 27 20:09:15 2009
New Revision: 15173
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15173&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/unxsplash-rework-m39.diff:
	* patches/dev300/unxsplash-rework.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/unxsplash-rework-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/unxsplash-rework.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/unxsplash-rework.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 20:09:15 2009
@@ -697,9 +697,12 @@
 
 
 [ QuickStarter <= dev300-m36 ]
-unxsplash-rework.diff, i#60696, michael/jholesov
+unxsplash-rework-m36.diff, i#60696, michael/jholesov
+
+[ QuickStarter > dev300-m36 <= dev300-m39 ]
+unxsplash-rework-m39.diff, i#60696, michael/jholesov
 
-[ QuickStarter > dev300-m36 ]
+[ QuickStarter > dev300-m39 ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
 [ QuickStarter ]

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Tue Jan 27 20:09:15 2009
@@ -1,8 +1,8 @@
-diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
-index 1672175..9e931db 100644
+diff --git desktop/inc/app.hxx desktop/inc/app.hxx
+index aae085b..d686e56 100644
 --- desktop/inc/app.hxx
 +++ desktop/inc/app.hxx
-@@ -114,6 +114,7 @@ class Desktop : public Application
+@@ -90,6 +90,7 @@ class Desktop : public Application
  								~Desktop();
  		virtual void			Main( );
  		virtual void			Init();
@@ -10,11 +10,11 @@
  		virtual void			DeInit();
  		virtual BOOL			QueryExit();
  		virtual USHORT			Exception(USHORT nError);
-diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
-index 3b3f0c8..012a82c 100644
+diff --git desktop/prj/build.lst desktop/prj/build.lst
+index 89c2d8c..0b010ef 100644
 --- desktop/prj/build.lst
 +++ desktop/prj/build.lst
-@@ -14,6 +14,8 @@ dt	desktop\win32\source\setup				nmake	-	w	dt_setup dt_inc NULL
+@@ -18,6 +18,8 @@ dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
  dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
  dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
  dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
@@ -23,7 +23,7 @@
  dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
  dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
  dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc NULL
-@@ -32,5 +34,5 @@ dt	desktop\source\deployment\registry\component		nmake	-	all	dt_dp_registry_comp
+@@ -35,5 +37,5 @@ dt	desktop\source\deployment\registry\configuration	nmake	-	all	dt_dp_registry_c
  dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
  dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
  dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
@@ -31,22 +31,22 @@
 +dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
  dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
 diff --git desktop/prj/d.lst desktop/prj/d.lst
-index 9fed318..7698153 100644
+index 1f401d8..78e9977 100644
 --- desktop/prj/d.lst
 +++ desktop/prj/d.lst
 @@ -13,6 +13,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
  ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
  ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
- ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice
+ ..\%__SRC%\bin\soffice_mac %_DEST%\bin%_EXT%\soffice
 +..\%__SRC%\bin\oosplash %_DEST%\bin%_EXT%\oosplash.bin
  ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
  ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe
  ..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index 7fd1393..20936bd 100644
+diff --git desktop/scripts/soffice.sh desktop/scripts/soffice.sh
+index b469f35..9ebd74c 100644
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh
-@@ -147,6 +147,16 @@ else
+@@ -128,6 +128,16 @@ sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} } pagein-common"
  PATH=$sd_prog${PATH+:$PATH}
  export PATH
  
@@ -63,11 +63,11 @@
  # execute soffice binary
  "$sd_prog/$sd_binary" "$@" &
  trap 'kill -9 $!' TERM
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index faeafe5..681b6c6 100644
+diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx
+index deac5f2..b1645eb 100644
 --- desktop/source/app/app.cxx
 +++ desktop/source/app/app.cxx
-@@ -660,6 +660,13 @@ void Desktop::Init()
+@@ -506,6 +506,13 @@ void Desktop::Init()
      }
  }
  
@@ -81,7 +81,7 @@
  void Desktop::DeInit()
  {
      RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::DeInit" );
-@@ -1337,6 +1344,7 @@ void Desktop::Main()
+@@ -1232,6 +1239,7 @@ void Desktop::Main()
      OpenSplashScreen();
      RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main } OpenSplashScreen" );
  
@@ -89,7 +89,7 @@
      {
          UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
          if ( instErr_fin != UserInstall::E_None)
-@@ -1352,7 +1360,7 @@ void Desktop::Main()
+@@ -1247,7 +1255,7 @@ void Desktop::Main()
          }
          // refresh path information
          utl::Bootstrap::reloadData();
@@ -98,7 +98,7 @@
      }
  
      Reference< XMultiServiceFactory > xSMgr =
-@@ -1365,7 +1373,7 @@ void Desktop::Main()
+@@ -1260,7 +1268,7 @@ void Desktop::Main()
      {
          RegisterServices( xSMgr );
  
@@ -107,7 +107,7 @@
  
  #ifndef UNX
          if ( pCmdLineArgs->IsHelp() ) {
-@@ -1403,7 +1411,7 @@ void Desktop::Main()
+@@ -1298,7 +1306,7 @@ void Desktop::Main()
          //  Read the common configuration items for optimization purpose
          if ( !InitializeConfiguration() ) return;
  
@@ -116,7 +116,7 @@
  
          // set static variable to enabled/disable crash reporter
          retrieveCrashReporterState();
-@@ -1464,10 +1472,10 @@ void Desktop::Main()
+@@ -1357,10 +1365,10 @@ void Desktop::Main()
  #endif
  
          SetDisplayName( aTitle );
@@ -129,7 +129,7 @@
  //        pLanguageOptions = new SvtLanguageOptions(sal_True);
  //        SetSplashScreenProgress(45);
          RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
-@@ -1548,7 +1556,7 @@ void Desktop::Main()
+@@ -1452,7 +1460,7 @@ void Desktop::Main()
                  OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
              if (xDesktopFrame.is())
              {
@@ -138,7 +138,7 @@
                  Reference< XFrame > xBackingFrame;
                  Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
  
-@@ -1564,7 +1572,7 @@ void Desktop::Main()
+@@ -1468,7 +1476,7 @@ void Desktop::Main()
                      Reference< XController > xBackingComp(
                          xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs),
                          UNO_QUERY);
@@ -147,7 +147,7 @@
                      if (xBackingComp.is())
                      {
                          Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY);
-@@ -1607,7 +1615,7 @@ void Desktop::Main()
+@@ -1507,7 +1515,7 @@ void Desktop::Main()
          return;
      }
      */
@@ -156,7 +156,7 @@
  
      SvtFontSubstConfig().Apply();
  
-@@ -1616,7 +1624,7 @@ void Desktop::Main()
+@@ -1516,7 +1524,7 @@ void Desktop::Main()
  	aAppearanceCfg.SetApplicationDefaults( this );
  	SvtAccessibilityOptions aOptions;
  	aOptions.SetVCLSettings();
@@ -165,7 +165,7 @@
  
  	Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
  
-@@ -1639,7 +1647,7 @@ void Desktop::Main()
+@@ -1539,7 +1547,7 @@ void Desktop::Main()
      // use system window dialogs
      Application::SetSystemWindowMode( SYSTEMWINDOW_MODE_DIALOG );
  
@@ -174,7 +174,7 @@
  
      if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() )
          InitializeQuickstartMode( xSMgr );
-@@ -2908,14 +2916,18 @@ void Desktop::OpenSplashScreen()
+@@ -2832,14 +2840,18 @@ void Desktop::OpenSplashScreen()
          else if ( pCmdLine->IsWeb() )
              aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "web" ));
  
@@ -195,11 +195,11 @@
  
          if(m_rSplashScreen.is())
                  m_rSplashScreen->start(OUString::createFromAscii("SplashScreen"), 100);
-diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
-index ab02af5..5658050 100644
+diff --git desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.cxx
+index b14baab..6b8ca2a 100644
 --- desktop/source/app/cmdlineargs.cxx
 +++ desktop/source/app/cmdlineargs.cxx
-@@ -420,6 +420,11 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
+@@ -457,6 +457,11 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
  		SetBoolParam_Impl( CMD_BOOLPARAM_HELPMATH, sal_True );
  		return sal_True;
  	}
@@ -210,22 +210,22 @@
 +    }
      #ifdef MACOSX
      /* #i84053# ignore -psn on Mac
-       Platform dependent #ifdef here is ugly, however this is currently
-@@ -929,7 +929,8 @@
+        Platform dependent #ifdef here is ugly, however this is currently
+@@ -858,7 +863,8 @@ sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const
  {
      osl::MutexGuard  aMutexGuard( m_aMutex );
-
--    return m_eArgumentCount == NONE ||
+ 
+-    return m_eArgumentCount == NONE || 
 +    return m_eArgumentCount == NONE ||
 +           ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_SPLASHPIPE ].getLength() )) ||
             ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() )) ||
-            ( ( m_eArgumentCount == ONE ) && ( m_aBoolParams[ CMD_BOOLPARAM_PSN ] ));
+            ( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] );
  }
-diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
-index 877a909..83f1c67 100644
+diff --git desktop/source/app/cmdlineargs.hxx desktop/source/app/cmdlineargs.hxx
+index 6411398..c42bb99 100644
 --- desktop/source/app/cmdlineargs.hxx
 +++ desktop/source/app/cmdlineargs.hxx
-@@ -90,6 +90,7 @@ class CommandLineArgs
+@@ -79,6 +79,7 @@ class CommandLineArgs
  		enum StringParam // must be zero based!
  		{
  			CMD_STRINGPARAM_PORTAL,
@@ -233,9 +233,9 @@
  			CMD_STRINGPARAM_ACCEPT,
  			CMD_STRINGPARAM_UNACCEPT,
  			CMD_STRINGPARAM_USERDIR,
-diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
+diff --git desktop/unx/source/makefile.mk desktop/unx/source/makefile.mk
 new file mode 100644
-index 0000000..e609303
+index 0000000..110d081
 --- /dev/null
 +++ desktop/unx/source/makefile.mk
 @@ -0,0 +1,38 @@
@@ -277,7 +277,7 @@
 +$(INCCOM)$/introbmpnames.hxx $(DO_PHONY):
 +	echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
 +	echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk
-diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
+diff --git desktop/unx/source/splashx.c desktop/unx/source/splashx.c
 new file mode 100644
 index 0000000..b3b6da0
 --- /dev/null
@@ -853,7 +853,7 @@
 +    free( bitmap );
 +    bitmap = NULL;
 +}
-diff --git a/desktop/unx/source/splashx.h b/desktop/unx/source/splashx.h
+diff --git desktop/unx/source/splashx.h desktop/unx/source/splashx.h
 new file mode 100644
 index 0000000..6d84d4b
 --- /dev/null
@@ -930,9 +930,9 @@
 +#endif
 +
 +#endif // _SPLASHX_H
-diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
+diff --git desktop/unx/source/start.c desktop/unx/source/start.c
 new file mode 100644
-index 0000000..2317efe
+index 0000000..a42a286
 --- /dev/null
 +++ desktop/unx/source/start.c
 @@ -0,0 +1,719 @@
@@ -1655,9 +1655,9 @@
 +
 +    return 0;
 +}
-diff --git a/desktop/unx/splash/exports.map b/desktop/unx/splash/exports.map
+diff --git desktop/unx/splash/exports.map desktop/unx/splash/exports.map
 new file mode 100644
-index 0000000..c235082
+index 0000000..ba501f9
 --- /dev/null
 +++ desktop/unx/splash/exports.map
 @@ -0,0 +1,10 @@
@@ -1671,9 +1671,9 @@
 +    local:
 +        *;
 +};
-diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk
+diff --git desktop/unx/splash/makefile.mk desktop/unx/splash/makefile.mk
 new file mode 100644
-index 0000000..4bbe6dd
+index 0000000..874b81b
 --- /dev/null
 +++ desktop/unx/splash/makefile.mk
 @@ -0,0 +1,73 @@
@@ -1750,9 +1750,9 @@
 +
 +.INCLUDE :  target.mk
 +
-diff --git a/desktop/unx/splash/services_unxsplash.cxx b/desktop/unx/splash/services_unxsplash.cxx
+diff --git desktop/unx/splash/services_unxsplash.cxx desktop/unx/splash/services_unxsplash.cxx
 new file mode 100644
-index 0000000..c1ee124
+index 0000000..b762fa5
 --- /dev/null
 +++ desktop/unx/splash/services_unxsplash.cxx
 @@ -0,0 +1,177 @@
@@ -1933,7 +1933,7 @@
 +    return NULL;
 +}
 +} // extern "C"
-diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
+diff --git desktop/unx/splash/unxsplash.cxx desktop/unx/splash/unxsplash.cxx
 new file mode 100644
 index 0000000..ca20334
 --- /dev/null
@@ -2131,7 +2131,7 @@
 +}
 +
 +}
-diff --git a/desktop/unx/splash/unxsplash.hxx b/desktop/unx/splash/unxsplash.hxx
+diff --git desktop/unx/splash/unxsplash.hxx desktop/unx/splash/unxsplash.hxx
 new file mode 100644
 index 0000000..5419324
 --- /dev/null
@@ -2254,25 +2254,11 @@
 +};
 +
 +}
-diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
-index 1fc287e..3d3460d 100644
---- scp2/source/ooo/file_library_ooo.scp
-+++ scp2/source/ooo/file_library_ooo.scp
-@@ -2116,6 +2116,9 @@ File gid_File_Lib_Spell
- End
- 
- STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
-+#ifdef UNX
-+STD_UNO_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
-+#endif
- 
- SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
- 
-diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
-index 8e113d3..2f49288 100644
+diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
+index 6bccbd8..161de3d 100644
 --- scp2/source/ooo/common_brand.scp
 +++ scp2/source/ooo/common_brand.scp
-@@ -399,6 +399,15 @@ File gid_File_Bin_Soffice_Bin
+@@ -415,6 +415,15 @@ File gid_Brand_File_Bin_Soffice_Bin
      Name = "soffice.bin";
  End
  
@@ -2286,13 +2272,53 @@
 +#endif
 +
  // use this for high detail file open dialog >= 5.1 windows
- // #ifdef WNT
+ #ifdef WNT
  File gid_Brand_File_Bin_Soffice_Bin_Manifest
-diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
-index 1576807..9492703 100644
+diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+index 1a6661a..dbbe327 100644
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -1346,6 +1346,9 @@ File gid_File_Lib_Spell
+ End
+ 
+ STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
++#ifdef UNX
++STD_UNO_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
++#endif
+ 
+ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
+ 
+diff --git smoketestoo_native/smoketest.pl smoketestoo_native/smoketest.pl
+index 6785977..c0a2e6c 100755
+--- smoketestoo_native/smoketest.pl
++++ smoketestoo_native/smoketest.pl
+@@ -502,7 +502,7 @@ sub doTest {
+     if ($ENV{OS} eq "MACOSX") {
+ 		delete $ENV{DYLD_LIBRARY_PATH};
+ 	}
+-	$Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
++	$Command = "\"$programpath" . "$SOFFICEBIN\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
+ 	if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) {
+ 		$Command = "cd \"$programpath\"; " . $Command;
+ 	}
+diff --git solenv/bin/cwscheckapi solenv/bin/cwscheckapi
+index fe5ecc1..e43ba12 100755
+--- solenv/bin/cwscheckapi
++++ solenv/bin/cwscheckapi
+@@ -225,7 +225,7 @@ if [ -n "$WORK_STAMP" ]; then
+ 	fi
+ fi
+ 
+-PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
++PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -no-oosplash -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
+ PARAM="$PARAM -cs pipe,name=$USER"
+ PARAM="$PARAM -NoOffice true"
+ PARAM="$PARAM -SRC_ROOT $SRC_ROOT"
+diff --git vcl/inc/vcl/svapp.hxx vcl/inc/vcl/svapp.hxx
+index d900862..a324664 100644
 --- vcl/inc/vcl/svapp.hxx
 +++ vcl/inc/vcl/svapp.hxx
-@@ -292,6 +292,7 @@ public:
+@@ -267,6 +267,7 @@ public:
      virtual void                DataChanged( const DataChangedEvent& rDCEvt );
  
      virtual void                Init();
@@ -2300,11 +2326,11 @@
      virtual void                DeInit();
  
      static void                 InitAppRes( const ResId& rResId );
-diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
-index 76bb447..8aefaf8 100644
+diff --git vcl/source/app/svapp.cxx vcl/source/app/svapp.cxx
+index 0c8b1d8..08c9ebd 100644
 --- vcl/source/app/svapp.cxx
 +++ vcl/source/app/svapp.cxx
-@@ -381,6 +381,11 @@ void Application::Init()
+@@ -326,6 +326,11 @@ void Application::Init()
  }
  
  // -----------------------------------------------------------------------
@@ -2316,11 +2342,11 @@
  
  void Application::DeInit()
  {
-diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
-index 6a1a0c0..db4c9f0 100644
+diff --git vcl/source/window/window.cxx vcl/source/window/window.cxx
+index d7cc722..8882c23 100644
 --- vcl/source/window/window.cxx
 +++ vcl/source/window/window.cxx
-@@ -6518,10 +6518,19 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
+@@ -6539,10 +6539,19 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
              mpWindowImpl->mpBorderWindow->Show( TRUE, nFlags );
          else if ( mpWindowImpl->mbFrame )
          {
@@ -2342,32 +2368,3 @@
  
              //DBG_ASSERT( !mpWindowImpl->mbSuppressAccessibilityEvents, "Window::Show() - Frame reactivated");
              mpWindowImpl->mbSuppressAccessibilityEvents = FALSE;
-Index: smoketest.pl
-===================================================================
-RCS file: /cvs/installation/smoketestoo_native/smoketest.pl,v
-retrieving revision 1.34.6.1
-diff -u -r1.34.6.1 smoketest.pl
---- smoketestoo_native/smoketest.pl    30 Jul 2008 13:31:30 -0000      1.34.6.1
-+++ smoketextoo_native/smoketest.pl    7 Oct 2008 13:30:32 -0000
-@@ -502,7 +502,7 @@
-     if ($ENV{OS} eq "MACOSX") {
-               delete $ENV{DYLD_LIBRARY_PATH};
-       }
--      $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
-+      $Command = "\"$programpath" . "$SOFFICEBIN\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
-       if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) {
-               $Command = "cd \"$programpath\"; " . $Command;
-       }
-diff --git solenv/bin/cwscheckapi solenv/bin/cwscheckapi
-index fe5ecc1..e43ba12 100755
---- solenv/bin/cwscheckapi
-+++ solenv/bin/cwscheckapi
-@@ -225,7 +225,7 @@ if [ -n "$WORK_STAMP" ]; then
- 	fi
- fi
- 
--PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
-+PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -no-oosplash -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
- PARAM="$PARAM -cs pipe,name=$USER"
- PARAM="$PARAM -NoOffice true"
- PARAM="$PARAM -SRC_ROOT $SRC_ROOT"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]