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

[brosenk svn gnome org]

Author: brosenk
Date: Wed Dec  3 19:28:48 2008
New Revision: 14723
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14723&view=rev

Log:
More -m12 bits


Added:
   branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload-m11.diff   (props changed)
      - copied unchanged from r14720, /branches/ooo-build-3-0/patches/dev300/sfx2-remove-check-update-on-fileload.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   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:28:48 2008
@@ -882,6 +882,10 @@
 # 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/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:28:48 2008
@@ -1,18 +1,18 @@
-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
+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
 @@ -58,6 +58,7 @@ namespace lang  = ::com::sun::star::lang
  
- using namespace com::sun::star::system;
+ #define DEFINE_CONST_UNICODE( CONSTASCII )  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONSTASCII ) )
  
 +#if 0
- namespace sfx2
+ namespace uui
  {
  
 @@ -160,4 +161,5 @@ void NewerVersionWarningDialog::InitButt
  }
  
- } // end of namespace sfx2
+ } // end of namespace uui
 +#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
-         if ( pMedium->GetInteractionHandler().is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
+         uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
+         if ( xHandler.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 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
+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
 @@ -39,6 +39,7 @@
- #include <vcl/fixed.hxx>
- #include <sfx2/basedlgs.hxx>
+ 
+ #define RET_ASK_LATER   short( 100 )
  
 +#if 0
- namespace sfx2
+ namespace uui
  {
      class NewerVersionWarningDialog : public SfxModalDialog
 @@ -60,6 +61,7 @@ namespace sfx2
          ~NewerVersionWarningDialog();
      };
- } // namespace sfx2
+ } // namespace uui
 +#endif
  
- #endif // #ifndef _SFX2_NEWERVERSIONWARNING_HXX
+ #endif // #ifndef _NEWERVERSIONWARNING_HXX