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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Dec  3 19:35:30 2008
New Revision: 14725
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14725&view=rev

Log:
2008-12-03  Rene Engelhard  <rene debian org>

        * revert last three chhanges, that's supposed to go to
          ooo-build-3-0-1 which already is there and DOES support m


Removed:
   branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd-m11.diff
   branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload-m11.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff
   branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Dec  3 19:35:30 2008
@@ -860,14 +860,7 @@
 remove-sfx-notify-basic.diff, i#89805, kohei
 remove-sfx-notify-chart2.diff, i#89806, kohei
 remove-sfx-notify-sc.diff, i#89807, kohei
-
-[ Misc < ooo680-m12 ]
-remove-sfx-notify-sd-m11.diff, i#89809, kohei
-
-[ Misc >= ooo680-m12 ]
 remove-sfx-notify-sd.diff, i#89809, kohei
-
-[ Misc ]
 remove-sfx-notify-sfx2.diff, i#89810, kohei
 remove-sfx-notify-svx.diff, i#89811, kohei
 #sfx-broadcaster-hashset-svtools.diff
@@ -882,10 +875,6 @@
 # Remove unnecessary popups that might show up during startup.
 
 # remove updater code that is only relevant for the upstream version.
-[ PopupRemoval <= ooo680-m11 ]
-sfx2-remove-check-update-on-fileload-m11.diff, kohei
-
-[ PopupRemoval >= ooo680-m12 ]
 sfx2-remove-check-update-on-fileload.diff, kohei
 
 # prevent the registration dialog from showing up on startup.

Modified: branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/remove-sfx-notify-sd.diff	Wed Dec  3 19:35:30 2008
@@ -6,7 +6,7 @@
  	using  SfxStyleSheetPool::Create;
  	virtual ~SdStyleSheetPool();
  
--//	virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType );
+-	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 );

Modified: branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload.diff	Wed Dec  3 19:35:30 2008
@@ -1,18 +1,18 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj uui/source/newerverwarn.cxx uui/source/newerverwarn.cxx
---- uui/source/newerverwarn.cxx	2008-05-06 23:56:41.000000000 -0400
-+++ uui/source/newerverwarn.cxx	2008-05-07 00:00:36.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj sfx2.clean/source/dialog/newerverwarn.cxx sfx2/source/dialog/newerverwarn.cxx
+--- sfx2.clean/source/dialog/newerverwarn.cxx	2008-05-06 23:56:41.000000000 -0400
++++ sfx2/source/dialog/newerverwarn.cxx	2008-05-07 00:00:36.000000000 -0400
 @@ -58,6 +58,7 @@ namespace lang  = ::com::sun::star::lang
  
- #define DEFINE_CONST_UNICODE( CONSTASCII )  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONSTASCII ) )
+ using namespace com::sun::star::system;
  
 +#if 0
- namespace uui
+ namespace sfx2
  {
  
 @@ -160,4 +161,5 @@ void NewerVersionWarningDialog::InitButt
  }
  
- } // end of namespace uui
+ } // end of namespace sfx2
 +#endif
  
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj sfx2.clean/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
@@ -23,9 +23,9 @@
          }
  
 +#if 0
-         uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
-         if ( xHandler.is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
+         if ( pMedium->GetInteractionHandler().is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
          {
+             // scan the generator string (within meta.xml)
 @@ -1125,6 +1126,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
                  }
              }
@@ -34,22 +34,22 @@
      }
      else
          GetpApp()->HideStatusText();
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj uui/source/newerverwarn.hxx uui/source/newerverwarn.hxx
---- uui/source/newerverwarn.hxx	2008-05-06 23:56:41.000000000 -0400
-+++ uui/source/newerverwarn.hxx	2008-05-06 23:59:58.000000000 -0400
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj sfx2.clean/source/inc/newerverwarn.hxx sfx2/source/inc/newerverwarn.hxx
+--- sfx2.clean/source/inc/newerverwarn.hxx	2008-05-06 23:56:41.000000000 -0400
++++ sfx2/source/inc/newerverwarn.hxx	2008-05-06 23:59:58.000000000 -0400
 @@ -39,6 +39,7 @@
- 
- #define RET_ASK_LATER   short( 100 )
+ #include <vcl/fixed.hxx>
+ #include <sfx2/basedlgs.hxx>
  
 +#if 0
- namespace uui
+ namespace sfx2
  {
      class NewerVersionWarningDialog : public SfxModalDialog
 @@ -60,6 +61,7 @@ namespace sfx2
          ~NewerVersionWarningDialog();
      };
- } // namespace uui
+ } // namespace sfx2
 +#endif
  
- #endif // #ifndef _NEWERVERSIONWARNING_HXX
+ #endif // #ifndef _SFX2_NEWERVERSIONWARNING_HXX