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

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12397 - in trunk: . patches/dev300
Date: Wed, 30 Apr 2008 14:17:38 +0100 (BST)
Author: noelpwer
Date: Wed Apr 30 13:17:38 2008
New Revision: 12397
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12397&view=rev

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

        * patches/dev300/cws-npower9.diff: fix for #n361061 & #i85804




Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-npower9.diff

Modified: trunk/patches/dev300/cws-npower9.diff
==============================================================================
--- trunk/patches/dev300/cws-npower9.diff	(original)
+++ trunk/patches/dev300/cws-npower9.diff	Wed Apr 30 13:17:38 2008
@@ -1,25 +1,23 @@
-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
-retrieving revision 1.13
-retrieving revision 1.13.22.2
-diff -u -p -u -p -b -w -B -r1.13 -r1.13.22.2
---- scripting/source/dlgprov/dlgevtatt.cxx	20 Jun 2007 10:27:38 -0000	1.13
-+++ scripting/source/dlgprov/dlgevtatt.cxx	15 Jan 2008 17:08:46 -0000	1.13.22.2
-@@ -92,7 +92,7 @@
+retrieving revision 1.14
+retrieving revision 1.13.22.4
+diff -u -p -u -p -b -w -B -r1.14 -r1.13.22.4
+--- scripting/source/dlgprov/dlgevtatt.cxx	11 Apr 2008 10:26:35 -0000	1.14
++++ scripting/source/dlgprov/dlgevtatt.cxx	30 Apr 2008 12:45:32 -0000	1.13.22.4
+@@ -53,7 +53,9 @@
  #include <com/sun/star/reflection/XIdlMethod.hpp>
  #include <com/sun/star/beans/MethodConcept.hpp>
  #include <com/sun/star/beans/XMaterialHolder.hpp>
 -
++#ifdef FAKE_VBA_EVENT_SUPPORT
 +#include <org/openoffice/vba/XVBAToOOEventDescGen.hpp>
++#endif
  
  using namespace ::com::sun::star;
  using namespace ::com::sun::star::awt;
-@@ -107,15 +109,111 @@ using namespace ::com::sun::star::reflec
+@@ -68,15 +70,111 @@ using namespace ::com::sun::star::reflec
  //.........................................................................
  namespace dlgprov
  {
@@ -132,7 +130,7 @@
      }
  
      // -----------------------------------------------------------------------------
-@@ -125,55 +223,38 @@ namespace dlgprov
+@@ -86,55 +184,38 @@ namespace dlgprov
      }
  
      // -----------------------------------------------------------------------------
@@ -207,12 +205,12 @@
                  if ( xEventCont.is() )
                  {
                      Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames();
-@@ -186,8 +267,14 @@ namespace dlgprov
+@@ -147,8 +228,14 @@ namespace dlgprov
  
                          Any aElement = xEventCont->getByName( pNames[ j ] );
                          aElement >>= aDesc;
 +                    rtl::OUString sKey = aDesc.ScriptType;
-+                    if ( aDesc.ScriptType.equals( rtl::OUString::createFromAscii("Script" )	) )
++                    if ( aDesc.ScriptType.equals( rtl::OUString::createFromAscii("Script" ) ) || aDesc.ScriptType.equals( rtl::OUString::createFromAscii("UNO" ) ) )
 +                    {
 +                        sal_Int32 nIndex = aDesc.ScriptCode.indexOf( ':' );
 +                        sKey = aDesc.ScriptCode.copy( 0, nIndex );	
@@ -223,7 +221,7 @@
  
                          // try first to attach event to the ControlModel
                          bool bSuccess = false;
-@@ -239,6 +326,61 @@ namespace dlgprov
+@@ -200,6 +287,61 @@ namespace dlgprov
                  }
              }
          }
@@ -285,7 +283,7 @@
      }
  
  
-@@ -318,14 +460,13 @@ namespace dlgprov
+@@ -279,14 +421,13 @@ namespace dlgprov
      // DialogScriptListenerImpl
      // =============================================================================
  
@@ -302,7 +300,7 @@
          ,m_xControl( rxControl )
          ,m_xHandler( rxHandler )
          ,m_xIntrospectionAccess( rxIntrospectionAccess )
-@@ -340,42 +481,8 @@ namespace dlgprov
+@@ -301,42 +442,8 @@ namespace dlgprov
      }
  
      // -----------------------------------------------------------------------------
@@ -346,7 +344,7 @@
          try
          {
              Reference< provider::XScriptProvider > xScriptProvider;
-@@ -409,7 +516,7 @@ namespace dlgprov
+@@ -370,7 +477,7 @@ namespace dlgprov
  
              if ( xScriptProvider.is() )
              {                    
@@ -355,7 +353,7 @@
                  OSL_ENSURE( xScript.is(), "DialogScriptListenerImpl::firing_impl: failed to get script" );
  
                  if ( xScript.is() )
-@@ -439,7 +546,29 @@ namespace dlgprov
+@@ -400,7 +507,29 @@ namespace dlgprov
          }
      }
  
@@ -389,14 +387,14 @@
 Index: scripting/source/dlgprov/dlgevtatt.hxx
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgevtatt.hxx,v
-retrieving revision 1.6
-retrieving revision 1.6.22.3
-diff -u -p -u -p -b -w -B -r1.6 -r1.6.22.3
---- scripting/source/dlgprov/dlgevtatt.hxx	20 Jun 2007 10:28:01 -0000	1.6
-+++ scripting/source/dlgprov/dlgevtatt.hxx	30 Jan 2008 16:27:06 -0000	1.6.22.3
-@@ -65,7 +65,9 @@
- #include <cppuhelper/implbase1.hxx>
+retrieving revision 1.7
+retrieving revision 1.6.22.4
+diff -u -p -u -p -b -w -B -r1.7 -r1.6.22.4
+--- scripting/source/dlgprov/dlgevtatt.hxx	11 Apr 2008 10:26:53 -0000	1.7
++++ scripting/source/dlgprov/dlgevtatt.hxx	22 Apr 2008 09:17:07 -0000	1.6.22.4
+@@ -43,7 +43,9 @@
  #endif
+ #include <cppuhelper/implbase1.hxx>
  
 +#include <com/sun/star/script/XScriptEventsSupplier.hpp>
  
@@ -404,7 +402,7 @@
  //.........................................................................
  namespace dlgprov
  {
-@@ -74,6 +76,10 @@ namespace dlgprov
+@@ -52,6 +54,10 @@ namespace dlgprov
      // =============================================================================
      // class DialogEventsAttacherImpl
      // =============================================================================
@@ -415,7 +413,7 @@
  
      typedef ::cppu::WeakImplHelper1<
          ::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE;
-@@ -82,17 +88,28 @@ namespace dlgprov
+@@ -60,17 +66,28 @@ namespace dlgprov
      class DialogEventsAttacherImpl : public DialogEventsAttacherImpl_BASE
      {
      private:
@@ -447,7 +445,7 @@
              const ::com::sun::star::uno::Any& Helper ) 
              throw (::com::sun::star::lang::IllegalArgumentException, 
                     ::com::sun::star::beans::IntrospectionException, 
-@@ -146,24 +163,11 @@ namespace dlgprov
+@@ -124,24 +141,11 @@ namespace dlgprov
  
      class DialogScriptListenerImpl : public DialogScriptListenerImpl_BASE
      {
@@ -478,12 +476,12 @@
 Index: scripting/source/dlgprov/dlgprov.cxx
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgprov.cxx,v
-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
+retrieving revision 1.15
+retrieving revision 1.12.8.5
+diff -u -p -u -p -b -w -B -r1.15 -r1.12.8.5
+--- scripting/source/dlgprov/dlgprov.cxx	11 Apr 2008 10:27:11 -0000	1.15
++++ scripting/source/dlgprov/dlgprov.cxx	22 Apr 2008 09:17:04 -0000	1.12.8.5
+@@ -80,6 +80,7 @@ namespace dlgprov
  {
  //.........................................................................
  
@@ -491,7 +489,7 @@
      // =============================================================================
      // component operations
      // =============================================================================
-@@ -210,9 +211,41 @@ namespace dlgprov
+@@ -177,9 +178,41 @@ namespace dlgprov
  		return xStringResourceManager;
  	}
  
@@ -534,7 +532,7 @@
  
  		::rtl::OUString aURL( sURL );
  
-@@ -408,24 +441,6 @@ namespace dlgprov
+@@ -371,24 +404,6 @@ namespace dlgprov
          Reference< XControlModel > xCtrlModel;
          if ( xInput.is() && m_xContext.is() )
          {
@@ -559,7 +557,7 @@
  					Reference< resource::XStringResourceManager > xStringResourceManager;
  					if( bSingleDialog )
  					{
-@@ -446,7 +461,7 @@ namespace dlgprov
+@@ -409,7 +424,7 @@ namespace dlgprov
  
  						Reference< task::XInteractionHandler > xDummyHandler;
  						aArgs[5] <<= xDummyHandler;
@@ -568,7 +566,7 @@
  						// TODO: Ctor
  						xStringResourceManager = Reference< resource::XStringResourceManager >( xSMgr_->createInstanceWithContext
  							( ::rtl::OUString::createFromAscii( "com.sun.star.resource.StringResourceWithLocation" ), 
-@@ -463,16 +478,15 @@ namespace dlgprov
+@@ -426,16 +441,15 @@ namespace dlgprov
  						xStringResourceManager = getStringResourceFromDialogLibrary( xDialogLib );
  					}
  
@@ -594,7 +592,7 @@
          }
          return xCtrlModel;
      }
-@@ -563,19 +577,13 @@ namespace dlgprov
+@@ -526,19 +540,13 @@ namespace dlgprov
                  // also add the dialog control itself to the sequence
                  pObjects[nControlCount] = Reference< XInterface >( rxControl, UNO_QUERY );
  
@@ -616,7 +614,7 @@
                  }
              }
          }
-@@ -672,7 +680,19 @@ namespace dlgprov
+@@ -635,7 +643,19 @@ namespace dlgprov
                      Reference< XInterface >() );
              }
          }
@@ -637,7 +635,7 @@
          {
              throw RuntimeException(
                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogProviderImpl::initialize: invalid number of arguments!" ) ),
-@@ -698,13 +718,20 @@ namespace dlgprov
+@@ -661,13 +681,20 @@ namespace dlgprov
  
          ::osl::MutexGuard aGuard( getMutex() );
  
@@ -663,12 +661,12 @@
 Index: scripting/source/dlgprov/dlgprov.hxx
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgprov.hxx,v
-retrieving revision 1.6
-retrieving revision 1.6.22.2
-diff -u -p -u -p -b -w -B -r1.6 -r1.6.22.2
---- scripting/source/dlgprov/dlgprov.hxx	20 Jun 2007 10:28:40 -0000	1.6
-+++ scripting/source/dlgprov/dlgprov.hxx	15 Jan 2008 12:57:32 -0000	1.6.22.2
-@@ -66,15 +66,15 @@
+retrieving revision 1.7
+retrieving revision 1.6.22.3
+diff -u -p -u -p -b -w -B -r1.7 -r1.6.22.3
+--- scripting/source/dlgprov/dlgprov.hxx	11 Apr 2008 10:27:29 -0000	1.7
++++ scripting/source/dlgprov/dlgprov.hxx	22 Apr 2008 09:17:11 -0000	1.6.22.3
+@@ -40,15 +40,14 @@
  #include <com/sun/star/lang/XInitialization.hpp>
  #include <com/sun/star/script/XScriptEventsAttacher.hpp>
  #include <com/sun/star/uno/XComponentContext.hpp>
@@ -682,14 +680,13 @@
 -#ifndef _CPPUHELPER_IMPLBASE3_HXX_
  #include <cppuhelper/implbase4.hxx>
 -#endif
-+
  #include <osl/mutex.hxx>
 -
 +#include <memory>
  
  //.........................................................................
  namespace dlgprov
-@@ -101,6 +103,13 @@ namespace dlgprov
+@@ -76,6 +74,13 @@ namespace dlgprov
      class DialogProviderImpl : public DialogProviderImpl_BASE
      {
      private:
@@ -703,7 +700,7 @@
          ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
          ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 m_xModel;
          ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsAttacher > m_xScriptEventsAttacher;
-@@ -118,6 +127,10 @@ namespace dlgprov
+@@ -93,6 +98,10 @@ namespace dlgprov
  			bool bDialogProviderMode );
  		::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler( 
  			const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler );
@@ -717,12 +714,12 @@
 Index: basic/source/classes/eventatt.cxx
 ===================================================================
 RCS file: /cvs/script/basic/source/classes/eventatt.cxx,v
-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 @@
+retrieving revision 1.32
+retrieving revision 1.30.30.4
+diff -u -p -u -p -b -w -B -r1.32 -r1.30.30.4
+--- basic/source/classes/eventatt.cxx	11 Apr 2008 11:44:51 -0000	1.32
++++ basic/source/classes/eventatt.cxx	22 Apr 2008 09:17:46 -0000	1.30.30.4
+@@ -54,6 +54,7 @@
  
  #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
  #include <com/sun/star/script/provider/XScriptProvider.hpp>
@@ -730,7 +727,7 @@
  
  #include <com/sun/star/frame/XModel.hpp>
  
-@@ -115,36 +116,6 @@ using namespace ::com::sun::star::uno;
+@@ -73,36 +74,6 @@ using namespace ::com::sun::star::uno;
  using namespace ::com::sun::star::script;
  using namespace ::com::sun::star::resource;
  
@@ -767,7 +764,7 @@
  using namespace ::com::sun::star::uno;
  using namespace ::com::sun::star::lang;
  using namespace ::com::sun::star::beans;
-@@ -477,264 +448,6 @@ void BasicScriptListener_Impl::firing_im
+@@ -435,264 +406,6 @@ void BasicScriptListener_Impl::firing_im
          }
  }
  
@@ -1032,7 +1029,7 @@
  Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
  {
  	Any aRetDlgLibAny;
-@@ -842,7 +555,6 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
+@@ -800,7 +513,6 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
  
  	// Import the DialogModel
  	Reference< XInputStream > xInput( xISP->createInputStream() );
@@ -1040,7 +1037,7 @@
  
  	// i83963 Force decoration
  	uno::Reference< beans::XPropertySet > xDlgModPropSet( xDialogModel, uno::UNO_QUERY );
-@@ -889,39 +601,38 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
+@@ -847,39 +559,38 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
  			aDlgLibAny = implFindDialogLibForDialog( aAnyISP, pSearchBasic2 );
  	}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]