[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                     |    9 -----
 patches/dev300/sfx2-remove-check-update-on-fileload.diff |   27 ---------------
 2 files changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 04c1c8ce5eebd61fc6528b527a7bc08a18189d56
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 29 14:27:19 2010 -0400

    Removed sfx2-remove-check-update-on-fileload.diff; moved to libreoffice.
    
    Also removed [ PopupRemoval ] section along with it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index afddb95..0d54e13 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -16,7 +16,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
 	 Layout, VBABits, VBAObjects, CalcErrors, GCJ, Lwp, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
-	 PopupRemoval, FedoraCommonFixes, LayoutDialogs, Fuzz, \
+	 FedoraCommonFixes, LayoutDialogs, Fuzz, \
 	 CalcRowLimit, BuildFix, WriterDocComparison, \
 	 MySQL, BorderTypes, WriterNavigation
 
@@ -558,13 +558,6 @@ min-password-length-helpcontent2.diff, i#112772, timar
 # allow users to change current document password.
 document-password-change-sfx2.diff, kohei
 
-[ PopupRemoval ]
-# 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
-
-
 [ EasterEgg ]
 # go-oo.org people active in this release
 go-oo-team.diff, michael
diff --git a/patches/dev300/sfx2-remove-check-update-on-fileload.diff b/patches/dev300/sfx2-remove-check-update-on-fileload.diff
deleted file mode 100644
index 430de8b..0000000
--- a/patches/dev300/sfx2-remove-check-update-on-fileload.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- sfx2/source/doc/objstor.cxx |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index 902793a..a2c1047 100644
---- sfx2/source/doc/objstor.cxx
-+++ sfx2/source/doc/objstor.cxx
-@@ -789,6 +789,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
-             }
-         }
- 
-+#if 0
-         if ( pMedium->HasStorage_Impl() )
-         {
-             uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
-@@ -842,6 +843,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
-                 }
-             }
-         }
-+#endif
-     }
-     else
-         GetpApp()->HideStatusText();
--- 
-1.7.0.1
-