ooo-build r12172 - in branches/sled-10-sp2-ooo-build-2-4: . patches/src680

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Apr 15 18:11:18 2008
New Revision: 12172
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12172&view=rev

Log:
2008-04-15  Noel Power  <noel power novell com>

        * patches/src680/cws-npower9.diff: update to latest cws version
        includes code to fix n#379844



Modified:
   branches/sled-10-sp2-ooo-build-2-4/ChangeLog
   branches/sled-10-sp2-ooo-build-2-4/patches/src680/cws-npower9.diff

Modified: branches/sled-10-sp2-ooo-build-2-4/patches/src680/cws-npower9.diff
==============================================================================
--- branches/sled-10-sp2-ooo-build-2-4/patches/src680/cws-npower9.diff	(original)
+++ branches/sled-10-sp2-ooo-build-2-4/patches/src680/cws-npower9.diff	Tue Apr 15 18:11:18 2008
@@ -1,3 +1,7 @@
+cvs diff: cannot open CVS/Entries for reading: No such file or directory
+cvs [diff aborted]: no repository
+cvs diff: cannot open CVS/Entries for reading: No such file or directory
+cvs [diff aborted]: no repository
 Index: scripting/source/dlgprov/dlgevtatt.cxx
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgevtatt.cxx,v
@@ -476,11 +480,11 @@
 Index: scripting/source/dlgprov/dlgprov.cxx
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgprov.cxx,v
-retrieving revision 1.12
-retrieving revision 1.12.8.3
-diff -u -p -u -p -b -w -B -r1.12 -r1.12.8.3
---- scripting/source/dlgprov/dlgprov.cxx	26 Nov 2007 16:28:43 -0000	1.12
-+++ scripting/source/dlgprov/dlgprov.cxx	30 Jan 2008 16:27:48 -0000	1.12.8.3
+retrieving revision 1.13
+retrieving revision 1.12.8.4
+diff -u -p -u -p -b -w -B -r1.13 -r1.12.8.4
+--- scripting/source/dlgprov/dlgprov.cxx	28 Jan 2008 13:57:53 -0000	1.13
++++ scripting/source/dlgprov/dlgprov.cxx	25 Feb 2008 11:12:21 -0000	1.12.8.4
 @@ -113,6 +113,7 @@ namespace dlgprov
  {
  //.........................................................................
@@ -635,7 +639,7 @@
          {
              throw RuntimeException(
                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogProviderImpl::initialize: invalid number of arguments!" ) ),
-@@ -693,13 +713,20 @@ namespace dlgprov
+@@ -698,13 +718,20 @@ namespace dlgprov
  
          ::osl::MutexGuard aGuard( getMutex() );
  
@@ -657,7 +661,7 @@
 +        }
          if ( xCtrlMod.is() )
          {
-             xCtrl = Reference< XControl >( createDialogControl( xCtrlMod, xParent ) );
+ 			// i83963 Force decoration
 Index: scripting/source/dlgprov/dlgprov.hxx
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgprov.hxx,v
@@ -713,11 +717,11 @@
 Index: basic/source/classes/eventatt.cxx
 ===================================================================
 RCS file: /cvs/script/basic/source/classes/eventatt.cxx,v
-retrieving revision 1.30
-retrieving revision 1.30.30.1
-diff -u -p -u -p -b -w -B -r1.30 -r1.30.30.1
---- basic/source/classes/eventatt.cxx	15 Oct 2007 13:03:12 -0000	1.30
-+++ basic/source/classes/eventatt.cxx	20 Dec 2007 21:19:27 -0000	1.30.30.1
+retrieving revision 1.31
+retrieving revision 1.30.30.3
+diff -u -p -u -p -b -w -B -r1.31 -r1.30.30.3
+--- basic/source/classes/eventatt.cxx	28 Jan 2008 13:59:47 -0000	1.31
++++ basic/source/classes/eventatt.cxx	15 Apr 2008 15:21:04 -0000	1.30.30.3
 @@ -96,6 +96,7 @@
  
  #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
@@ -1028,15 +1032,15 @@
  Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
  {
  	Any aRetDlgLibAny;
-@@ -837,7 +550,6 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
+@@ -842,7 +555,6 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
  
  	// Import the DialogModel
  	Reference< XInputStream > xInput( xISP->createInputStream() );
 -    xmlscript::importDialogModel( xInput, xDialogModel, xContext );
  
- 	// Find dialog library for dialog, direct access is not possible here
-     StarBASIC* pStartedBasic = pINST->GetBasic();
-@@ -865,39 +577,27 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
+ 	// i83963 Force decoration
+ 	uno::Reference< beans::XPropertySet > xDlgModPropSet( xDialogModel, uno::UNO_QUERY );
+@@ -889,39 +601,38 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
  			aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
  	}
  
@@ -1072,17 +1076,28 @@
 -	Reference< XToolkit > xToolkit( xMSF->createInstance( 
 -	OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.ExtToolkit" ) ) ), UNO_QUERY );
 -	xDlg->createPeer( xToolkit, NULL );
-+	Reference< XDialogProvider > xDlgProv( xMSF->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.scripting.DialogProvider" ) ), aArgs ), UNO_QUERY );
-+	Reference< XControl > xCntrl( xDlgProv->createDialog( rtl::OUString() ), UNO_QUERY_THROW );
-+    // Add dialog model to dispose vector
-+	Reference< XComponent > xDlgComponent( xCntrl->getModel(), UNO_QUERY );
-+    pINST->getComponentVector().push_back( xDlgComponent );
++        Reference< XControl > xCntrl;
++        try
++        {
++	    Reference< XDialogProvider >  xDlgProv( xMSF->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.scripting.DialogProvider" ) ), aArgs ), UNO_QUERY );
++            xCntrl.set( xDlgProv->createDialog( rtl::OUString() ), UNO_QUERY_THROW );
++           // Add dialog model to dispose vector
++           Reference< XComponent > xDlgComponent( xCntrl->getModel(), UNO_QUERY );
++           pINST->getComponentVector().push_back( xDlgComponent );
      // need ThisCompoent from calling script
- 
+-
 -    OSL_TRACE("About to try get a hold of ThisComponent");
 -    Reference< frame::XModel > xModel = getModelFromBasic( pStartedBasic ) ;            
 -	attachDialogEvents( pStartedBasic, xModel, xDlg );
--    
++        }
++        // preserve existing bad behaviour, it's possible... but probably
++        // illegal to open 2 dialogs ( they ARE modal ) when this happens, sometimes 
++        // create dialog fails.  So, in this case let's not throw, just leave basic 
++        // detect the unset object.
++        catch( uno::Exception& )
++        {
++        }
+     
  	// Return dialog
  	Any aRetVal;
 -	aRetVal <<= xDlg;