[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                     |    3 
 patches/dev300/sfx2-add-to-recently-used-after-save.diff |   67 ---------------
 2 files changed, 70 deletions(-)

New commits:
commit f811f8c1193664679050e8ca832640cc53357246
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 18:29:56 2011 +0200

    pushed sfx2-add-to-recently-used-after-save.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0889cfd..d793a3c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1450,9 +1450,6 @@ SectionOwner => thorsten
 #slideshow-sound.diff, n#515553, rodo
 
 [ Fixes ]
-sfx2-add-to-recently-used-after-save.diff, rodo
-
-[ Fixes ]
 # In some cases when exporting a PDF from a presentation, we are asked
 # to export an empty "link annotation", which gets turned into a
 # rather bogus file: link to the directory the presentadion document
diff --git a/patches/dev300/sfx2-add-to-recently-used-after-save.diff b/patches/dev300/sfx2-add-to-recently-used-after-save.diff
deleted file mode 100644
index cee1ed6..0000000
--- a/patches/dev300/sfx2-add-to-recently-used-after-save.diff
+++ /dev/null
@@ -1,67 +0,0 @@
----
- sfx2/inc/sfx2/objsh.hxx     |    3 +++
- sfx2/source/doc/objstor.cxx |   24 +++++++++++++++---------
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx
-index 26135a4..bdb1fdb 100644
---- sfx2/inc/sfx2/objsh.hxx
-+++ sfx2/inc/sfx2/objsh.hxx
-@@ -245,6 +245,9 @@ protected:
-     /// template method, called by FlushDocInfo; this implementation is empty
-     virtual void                DoFlushDocInfo();
- 
-+    // helper method
-+    void AddToRecentlyUsedList();
-+
- public:
-                                 TYPEINFO();
-                                 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index 6128852..24ca99a 100644
---- sfx2/source/doc/objstor.cxx
-+++ sfx2/source/doc/objstor.cxx
-@@ -962,15 +962,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
-             && !( pPreviewItem && pPreviewItem->GetValue() )
-             && !( pHiddenItem && pHiddenItem->GetValue() ) )
-             {
--                INetURLObject aUrl( pMedium->GetOrigURL() );
--
--                if ( aUrl.GetProtocol() == INET_PROT_FILE )
--                {
--                    const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
--                    Application::AddToRecentDocumentList(
--                        aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
--                        (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
--                }
-+            AddToRecentlyUsedList();
-             }
-         }
- 
-@@ -2365,9 +2357,23 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
-     pMedium->ClearBackup_Impl();
-     pMedium->LockOrigFileOnDemand( sal_True, sal_False );
- 
-+    AddToRecentlyUsedList();
-+
-     return bOk;
- }
- 
-+void SfxObjectShell::AddToRecentlyUsedList()
-+{
-+    INetURLObject aUrl( pMedium->GetOrigURL() );
-+
-+    if ( aUrl.GetProtocol() == INET_PROT_FILE )
-+    {
-+    const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
-+    Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
-+                          (pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
-+    }
-+}
-+
- //-------------------------------------------------------------------------
- 
- sal_Bool SfxObjectShell::ConvertFrom
--- 
-1.7.0.1
-