ooo-build r14616 - in branches/ooo-build-3-0-1: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Nov 26 23:24:15 2008
New Revision: 14616
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14616&view=rev

Log:
2008-11-27  Rene Engelhard  <rene debian org>

        * configure.in: default to ooo300-m12
        * patches/dev300/apply: OLDEST_SUPPORTED=ooo300-m12. Temporarily
          disable sfx2-remove-check-update-on-fileload.diff
        * patches/dev300/remove-sfx-notify-sd.diff,
          patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff,
          patches/dev300/sw-ww8-fieldandcharstyle.diff,
          patches/dev300/ui-desktop-integration.diff: update for ooo300-m12


Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/remove-sfx-notify-sd.diff
   branches/ooo-build-3-0-1/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
   branches/ooo-build-3-0-1/patches/dev300/sw-ww8-fieldandcharstyle.diff
   branches/ooo-build-3-0-1/patches/dev300/ui-desktop-integration.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Nov 26 23:24:15 2008
@@ -7,7 +7,7 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver
 
-OLDEST_SUPPORTED=dev300-m28 ooo300-m0
+OLDEST_SUPPORTED=ooo300-m12
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -871,7 +871,7 @@
 # Remove unnecessary popups that might show up during startup.
 
 # remove updater code that is only relevant for the upstream version.
-sfx2-remove-check-update-on-fileload.diff, kohei
+#FIXME#sfx2-remove-check-update-on-fileload.diff, kohei
 
 # prevent the registration dialog from showing up on startup.
 desktop-disable-startup-registration.diff, kohei

Modified: branches/ooo-build-3-0-1/patches/dev300/remove-sfx-notify-sd.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/remove-sfx-notify-sd.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/remove-sfx-notify-sd.diff	Wed Nov 26 23:24:15 2008
@@ -6,8 +6,8 @@
  	using  SfxStyleSheetPool::Create;
  	virtual ~SdStyleSheetPool();
  
--	virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType );
-+	virtual void 		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+-//	virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType );
++//	virtual void 		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
  
  	void AddStyleFamily( const SdPage* pPage );
  	void RemoveStyleFamily( const SdPage* pPage );

Modified: branches/ooo-build-3-0-1/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff	Wed Nov 26 23:24:15 2008
@@ -5,17 +5,17 @@
 diff -u -r1.181 objstor.cxx
 --- sfx2/source/doc/objstor.cxx	4 Aug 2006 14:23:30 -0000	1.181
 +++ sfx2/source/doc/objstor.cxx	12 Feb 2007 17:16:29 -0000
-@@ -200,6 +203,10 @@
+@@ -108,7 +108,10 @@
  #include <svtools/embedhlp.hxx>
  #include <rtl/logfile.hxx>
  #include <basic/modsizeexceeded.hxx>
 +#include <com/sun/star/util/XMacroExpander.hpp>
-+#include <osl/file.hxx>
+ #include <osl/file.hxx>
 +#include <osl/process.h>
 +#include <osl/thread.hxx>
  
- #include "app.hxx"
- #include "objsh.hxx"
+ #include <sfx2/signaturestate.hxx>
+ #include <sfx2/app.hxx>
 @@ -245,6 +252,126 @@
  
  namespace css = ::com::sun::star;

Modified: branches/ooo-build-3-0-1/patches/dev300/sw-ww8-fieldandcharstyle.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/sw-ww8-fieldandcharstyle.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/sw-ww8-fieldandcharstyle.diff	Wed Nov 26 23:24:15 2008
@@ -120,7 +120,7 @@
      switch (nTxtTyp)
      {
          case TXT_MAINTEXT:
-@@ -1751,8 +1758,15 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
+@@ -1765,8 +1765,15 @@
              break;
          default:
              ASSERT( !this, "was ist das fuer ein SubDoc-Type?" );
@@ -135,16 +135,16 @@
 +    bool bUnicode = IsUnicode();
 +    WW8_WrPlcFld* pFldP = CurrentFieldPlc();
  
-     if (WRITEFIELD_START & nMode)
-     {
+     // --> OD 2008-08-14 #158418#
+     const bool bIncludeEmptyPicLocation = ( eFldType == ww::ePAGE );
 @@ -1820,6 +1834,7 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
      {
          static const BYTE aFld14[2] = { 0x14, 0xff };
          pFldP->Append( Fc2Cp( Strm().Tell() ), aFld14 );
 +        pFldP->ResultAdded();
+         // --> OD 2008-08-14 #158418#
          InsertSpecialChar( *this, 0x14 );
      }
-     if (WRITEFIELD_END & nMode)
 @@ -1847,16 +1862,25 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
                      BYTE aArr[12];
                      BYTE *pArr = aArr;

Modified: branches/ooo-build-3-0-1/patches/dev300/ui-desktop-integration.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/ui-desktop-integration.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/ui-desktop-integration.diff	Wed Nov 26 23:24:15 2008
@@ -206,7 +206,7 @@
 @@ -155,6 +155,7 @@
  #include <svtools/menuoptions.hxx>
  #include <svtools/cmdoptions.hxx>
- #include <comphelper/uieventslogger.hxx>
+ #include <dispatch/uieventloghelper.hxx>
 +#include <svtools/miscopt.hxx>
  
  //_________________________________________________________________________________________________________________