GNOME.org
 

ooo-build r11487 - in trunk: . patches/src680

Author: noelpwer
Date: Fri Feb  1 09:23:29 2008
New Revision: 11487
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11487&view=rev

Log:
2008-02-01  Noel Power  <noel power novell com>

        * patches/src680/cws-npower9.diff: fix windows build issue



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

Modified: trunk/patches/src680/cws-npower9.diff
==============================================================================
--- trunk/patches/src680/cws-npower9.diff	(original)
+++ trunk/patches/src680/cws-npower9.diff	Fri Feb  1 09:23:29 2008
@@ -1,80 +1,9 @@
-cvs diff: Diffing scripting
-cvs diff: Diffing scripting/examples
-cvs diff: Diffing scripting/examples/basic
-cvs diff: Diffing scripting/examples/beanshell
-cvs diff: Diffing scripting/examples/beanshell/Capitalise
-cvs diff: Diffing scripting/examples/beanshell/HelloWorld
-cvs diff: Diffing scripting/examples/beanshell/Highlight
-cvs diff: Diffing scripting/examples/beanshell/InteractiveBeanShell
-cvs diff: Diffing scripting/examples/beanshell/MemoryUsage
-cvs diff: Diffing scripting/examples/beanshell/WordCount
-cvs diff: Diffing scripting/examples/java
-cvs diff: Diffing scripting/examples/java/HelloWorld
-cvs diff: Diffing scripting/examples/java/Highlight
-cvs diff: Diffing scripting/examples/java/MemoryUsage
-cvs diff: Diffing scripting/examples/java/Newsgroup
-cvs diff: Diffing scripting/examples/java/debugger
-cvs diff: Diffing scripting/examples/java/selector
-cvs diff: Diffing scripting/examples/javascript
-cvs diff: Diffing scripting/examples/javascript/ExportSheetsToHTML
-cvs diff: Diffing scripting/examples/javascript/HelloWorld
-cvs diff: Diffing scripting/examples/javascript/Highlight
-cvs diff: Diffing scripting/examples/python
-cvs diff: Diffing scripting/examples/python/pythonSamples
-cvs diff: Diffing scripting/inc
-cvs diff: Diffing scripting/inc/pch
-cvs diff: Diffing scripting/java
-cvs diff: Diffing scripting/java/Framework
-cvs diff: Diffing scripting/java/Framework/com
-cvs diff: Diffing scripting/java/Framework/com/sun
-cvs diff: Diffing scripting/java/Framework/com/sun/star
-cvs diff: Diffing scripting/java/Framework/com/sun/star/script
-cvs diff: Diffing scripting/java/Framework/com/sun/star/script/framework
-cvs diff: Diffing scripting/java/Framework/com/sun/star/script/framework/security
-cvs diff: Diffing scripting/java/com
-cvs diff: Diffing scripting/java/com/sun
-cvs diff: Diffing scripting/java/com/sun/star
-cvs diff: Diffing scripting/java/com/sun/star/script
-cvs diff: Diffing scripting/java/com/sun/star/script/framework
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/browse
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/container
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/io
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/log
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/provider
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/provider/beanshell
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/provider/java
-cvs diff: Diffing scripting/java/com/sun/star/script/framework/provider/javascript
-cvs diff: Diffing scripting/java/org
-cvs diff: Diffing scripting/java/org/openoffice
-cvs diff: Diffing scripting/java/org/openoffice/idesupport
-cvs diff: Diffing scripting/java/org/openoffice/idesupport/filter
-cvs diff: Diffing scripting/java/org/openoffice/idesupport/localoffice
-cvs diff: Diffing scripting/java/org/openoffice/idesupport/ui
-cvs diff: Diffing scripting/java/org/openoffice/idesupport/xml
-cvs diff: Diffing scripting/java/org/openoffice/idesupport/zip
-cvs diff: Diffing scripting/java/org/openoffice/netbeans
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/editor
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/actions
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/filesystem
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/loader
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/nodes
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/options
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/resources
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/resources/templates
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/utils
-cvs diff: Diffing scripting/java/org/openoffice/netbeans/modules/office/wizard
-cvs diff: Diffing scripting/prj
-cvs diff: Diffing scripting/source
-cvs diff: Diffing scripting/source/basprov
-cvs diff: Diffing scripting/source/dlgprov
 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 -b -w -B -r1.13 -r1.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,9 @@
@@ -459,10 +388,10 @@
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgevtatt.hxx,v
 retrieving revision 1.6
-retrieving revision 1.6.22.2
-diff -u -p -b -w -B -r1.6 -r1.6.22.2
+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	15 Jan 2008 17:08:46 -0000	1.6.22.2
++++ scripting/source/dlgprov/dlgevtatt.hxx	30 Jan 2008 16:27:06 -0000	1.6.22.3
 @@ -65,7 +65,9 @@
  #include <cppuhelper/implbase1.hxx>
  #endif
@@ -496,7 +425,7 @@
 +#ifdef FAKE_VBA_EVENT_SUPPORT
 +        ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl );
 +#endif
-+        void  attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
++        void  SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
      public:
 -        DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 +        DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, 
@@ -548,10 +477,10 @@
 ===================================================================
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgprov.cxx,v
 retrieving revision 1.12
-retrieving revision 1.12.8.2
-diff -u -p -b -w -B -r1.12 -r1.12.8.2
+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	15 Jan 2008 12:57:32 -0000	1.12.8.2
++++ scripting/source/dlgprov/dlgprov.cxx	30 Jan 2008 16:27:48 -0000	1.12.8.3
 @@ -113,6 +113,7 @@ namespace dlgprov
  {
  //.........................................................................
@@ -706,7 +635,13 @@
          {
              throw RuntimeException(
                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogProviderImpl::initialize: invalid number of arguments!" ) ),
-@@ -699,7 +719,12 @@ namespace dlgprov
+@@ -693,13 +713,20 @@ namespace dlgprov
+ 
+         ::osl::MutexGuard aGuard( getMutex() );
+ 
+-        OSL_ENSURE( URL.getLength(), "DialogProviderImpl::getDialog: no URL!" );
+ 
+ 		// m_xHandler = xHandler;
  
          //Reference< XDialog > xDialog;
  		Reference< XControl > xCtrl;
@@ -716,7 +651,10 @@
 +        if ( m_BasicInfo.get() )
 +            xCtrlMod = createDialogModelForBasic();
 +        else
++        {
++            OSL_ENSURE( URL.getLength(), "DialogProviderImpl::getDialog: no URL!" );
 +            xCtrlMod = createDialogModel( URL );
++        }
          if ( xCtrlMod.is() )
          {
              xCtrl = Reference< XControl >( createDialogControl( xCtrlMod, xParent ) );
@@ -725,7 +663,7 @@
 RCS file: /cvs/framework/scripting/source/dlgprov/dlgprov.hxx,v
 retrieving revision 1.6
 retrieving revision 1.6.22.2
-diff -u -p -b -w -B -r1.6 -r1.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,6 +66,9 @@
@@ -772,40 +710,12 @@
  
          // XDialogProvider / XDialogProvider2 impl method
  	    virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XControl > SAL_CALL createDialogImpl(
-cvs diff: Diffing scripting/source/inc
-cvs diff: Diffing scripting/source/inc/util
-cvs diff: Diffing scripting/source/protocolhandler
-cvs diff: Diffing scripting/source/provider
-cvs diff: Diffing scripting/source/pyprov
-cvs diff: Diffing scripting/source/runtimemgr
-cvs diff: Diffing scripting/source/storage
-cvs diff: Diffing scripting/source/stringresource
-cvs diff: Diffing scripting/util
-cvs diff: Diffing scripting/workben
-cvs diff: Diffing scripting/workben/bindings
-cvs diff: Diffing scripting/workben/data
-cvs diff: Diffing scripting/workben/data/objdsc
-cvs diff: Diffing scripting/workben/data/testdata
-cvs diff: Diffing scripting/workben/ifc
-cvs diff: Diffing scripting/workben/ifc/scripting
-cvs diff: Diffing scripting/workben/installer
-cvs diff: Diffing scripting/workben/mod
-cvs diff: Diffing scripting/workben/mod/_scripting
-cvs diff: Diffing basic
-cvs diff: Diffing basic/inc
-cvs diff: Diffing basic/inc/basic
-cvs diff: Diffing basic/inc/pch
-cvs diff: Diffing basic/prj
-cvs diff: Diffing basic/source
-cvs diff: Diffing basic/source/app
-cvs diff: Diffing basic/source/basmgr
-cvs diff: Diffing basic/source/classes
 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 -b -w -B -r1.30 -r1.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
 @@ -96,6 +96,7 @@
@@ -1180,14 +1090,3 @@
  	SbxVariableRef refVar = rPar.Get(0);
  	unoToSbxValue( (SbxVariable*)refVar, aRetVal );
  }
-cvs diff: Diffing basic/source/comp
-cvs diff: Diffing basic/source/inc
-cvs diff: Diffing basic/source/runtime
-cvs diff: Diffing basic/source/sample
-cvs diff: Diffing basic/source/sbx
-cvs diff: Diffing basic/source/uno
-cvs diff: Diffing basic/util
-cvs diff: Diffing basic/util/defs
-cvs diff: Diffing basic/win
-cvs diff: Diffing basic/win/res
-cvs diff: Diffing basic/workben
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]