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

[tml svn gnome org]

Author: tml
Date: Tue Apr 29 11:08:49 2008
New Revision: 12372
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12372&view=rev

Log:
2008-04-29  Tor Lillqvist  <tml novell com>

	* patches/dev300/novell-win32-odma.diff: Update for dev300-m10.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/novell-win32-odma.diff

Modified: trunk/patches/dev300/novell-win32-odma.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-odma.diff	(original)
+++ trunk/patches/dev300/novell-win32-odma.diff	Tue Apr 29 11:08:49 2008
@@ -234,13 +234,11 @@
 diff -p -u -r1.5 odma_datasupplier.cxx
 --- ucb/source/ucp/odma/odma_datasupplier.cxx	17 Sep 2006 13:57:42 -0000	1.5
 +++ ucb/source/ucp/odma/odma_datasupplier.cxx	6 Nov 2006 00:12:08 -0000
-@@ -63,9 +63,6 @@
- #ifndef ODMA_PROVIDER_HXX
+@@ -63,7 +63,6 @@
+ #include "odma_content.hxx"
+ #include "odma_contentprops.hxx"
  #include "odma_provider.hxx"
- #endif
--#ifndef ODMA_LIB_HXX
 -#include "odma_lib.hxx"
--#endif
  
  using namespace com::sun::star::beans;
  using namespace com::sun::star::lang;
@@ -261,14 +259,14 @@
 --- ucb/source/ucp/odma/odma_lib.cxx	17 Sep 2006 13:58:10 -0000	1.5
 +++ ucb/source/ucp/odma/odma_lib.cxx	6 Nov 2006 00:12:08 -0000
 @@ -44,6 +44,8 @@
- #ifndef _RTL_USTRING_HXX_ 
+ //#endif
+ #include <osl/module.h>
  #include <rtl/ustring.hxx>
- #endif
 +#include <tools/prewin.h>
 +#include <tools/postwin.h>
- #ifndef ODMA_LIB_HXX
  #include "odma_lib.hxx"
- #endif
+ 
+ 
 @@ -84,17 +86,18 @@ namespace odma
  
  	sal_Bool LoadFunctions(oslModule _pODMA);
@@ -323,7 +321,7 @@
 diff -p -u -r1.4 odma_lib.hxx
 --- ucb/source/ucp/odma/odma_lib.hxx	9 Sep 2005 15:52:48 -0000	1.4
 +++ ucb/source/ucp/odma/odma_lib.hxx	6 Nov 2006 00:12:08 -0000
-@@ -35,20 +35,8 @@
+@@ -35,19 +35,7 @@
  #ifndef ODMA_LIB_HXX
  #define ODMA_LIB_HXX
  
@@ -339,12 +337,11 @@
 -#define WINAPI				__stdcall
 -#define FAR
 -
- #ifndef ODMA_H
 -#include "odma.h"
 +#include <odma.h>
- #endif
  
  namespace odma
+ {
 @@ -215,37 +203,37 @@ namespace odma
  
  	// now we define some macros
@@ -450,14 +447,14 @@
 --- ucb/source/ucp/odma/odma_provider.hxx	9 Sep 2005 15:53:43 -0000	1.4
 +++ ucb/source/ucp/odma/odma_provider.hxx	6 Nov 2006 00:12:09 -0000
 @@ -40,6 +40,8 @@
- #ifndef _UCBHELPER_PROVIDERHELPER_HXX
+ #define ODMA_PROVIDER_HXX
+ 
  #include <ucbhelper/providerhelper.hxx>
- #endif
 +#include <tools/prewin.h>
 +#include <tools/postwin.h>
- #ifndef ODMA_LIB_HXX
  #include "odma_lib.hxx"
- #endif
+ 
+ #include "rtl/ref.hxx"
 @@ -60,7 +62,7 @@ namespace odma {
  // UNO service name for the provider. This name will be used by the UCB to
  // create instances of the provider.
@@ -498,15 +495,13 @@
 diff -p -u -r1.5 odma_services.cxx
 --- ucb/source/ucp/odma/odma_services.cxx	17 Sep 2006 13:59:05 -0000	1.5
 +++ ucb/source/ucp/odma/odma_services.cxx	6 Nov 2006 00:12:09 -0000
-@@ -52,23 +52,19 @@
- #ifndef ODMA_PROVIDER_HXX
+@@ -52,21 +52,20 @@
+ #include <com/sun/star/registry/XRegistryKey.hpp>
+ #include "odma_contentprops.hxx"
  #include "odma_provider.hxx"
- #endif
--#ifndef ODMA_LIB_HXX
 -#include "odma_lib.hxx"
--#endif
  
--using namespace rtl;
+ using namespace rtl;
  using namespace com::sun::star::uno;
  using namespace com::sun::star::lang;
  using namespace com::sun::star::registry;
@@ -576,10 +571,21 @@
 dummy line to avoid confusing diff-mode
 --- scp2/source/ooo/file_library_ooo.scp	17 Feb 2006 16:52:02 -0000	1.184.2.2
 +++ scp2/source/ooo/file_library_ooo.scp	13 Mar 2006 11:07:23 -0000
+@@ -850,6 +850,10 @@
+ #endif
+ #endif
+ 
++#ifdef WNT
++SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
++#endif
++
+ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
+ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
+ 
 @@ -2069,4 +2071,6 @@
- SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Ucpexpand1, ucpexpand1.uno)
+ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
  
-+SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Ucpodma1, ucpodma1)
++SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 +
  #ifndef SYSTEM_HUNSPELL
  
@@ -625,19 +631,20 @@
 dummy line to avoid confusing diff-mode
 --- fpicker/source/generic/fpicker.cxx
 +++ fpicker/source/generic/fpicker.cxx
-@@ -52,6 +52,12 @@
- #include "com/sun/star/lang/XMultiComponentFactory.hpp"
+@@ -52,6 +52,13 @@
+ #include "cppuhelper/implementationentry.hxx"
  #endif
- 
+ #include "com/sun/star/lang/XMultiComponentFactory.hpp"
++
 +#ifdef WNT
 +#include <tools/prewin.h>
 +#include <tools/postwin.h>
 +#include <odma_lib.hxx>
 +#endif
 +
- #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
  #include "svtools/miscopt.hxx"
- #endif
+ #include "svtools/pickerhistoryaccess.hxx"
+ 
 @@ -75,15 +75,22 @@
   */
  static OUString FilePicker_getSystemPickerServiceName()
@@ -2020,20 +2027,6 @@
 +
 +.INCLUDE :	target.mk
 dummy line to avoid confusing diff-mode
---- scp2/source/ooo/file_library_ooo.scp
-+++ scp2/source/ooo/file_library_ooo.scp
-@@ -850,6 +850,10 @@
- #endif
- #endif
- 
-+#ifdef WNT
-+SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Fps_ODMA, fps_odma.uno )
-+#endif
-+
- SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Fps_Office, fps_office.uno )
- SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Fpicker, fpicker.uno )
- 
-dummy line to avoid confusing diff-mode
 --- solenv/inc/libs.mk
 +++ solenv/inc/libs.mk
 @@ -35,6 +35,9 @@
@@ -2510,15 +2503,13 @@
 dummy line to avoid confusing diff-mode
 --- framework/source/uielement/recentfilesmenucontroller.cxx
 +++ framework/source/uielement/recentfilesmenucontroller.cxx
-@@ -105,6 +105,11 @@
- #ifndef _OSL_FILE_HXX_
+@@ -105,6 +105,9 @@
+ #include <svtools/historyoptions.hxx>
+ #include <cppuhelper/implbase1.hxx>
  #include <osl/file.hxx>
- #endif
-+#ifndef ODMA_LIB_HXX
 +#include <tools/prewin.h>
 +#include <tools/postwin.h>
 +#include <odma_lib.hxx>
-+#endif
  //#include <tools/solar.hrc>
  
  //_________________________________________________________________________________________________________________