[Libreoffice-commits] core.git: sfx2/source

[Jan Holesovsky]

 sfx2/source/appl/sfxpicklist.cxx |    6 +++---
 sfx2/source/inc/sfxpicklist.hxx  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 192e1cd86f0b072c3efaa7ad32afb303efbff9d9
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Oct 16 11:54:57 2015 +0200

    Revert "tdf#95095: Don't create thumbnails on load."
    
    It looks more ugly than I had hoped :-(  I'll try to fine-tune it more.
    
    This reverts commit 468b55301f385771d65d2f15f9ad7879af29f1cf.

diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index be6956e..f3930be 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -159,7 +159,7 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex )
         return 0;
 }
 
-void SfxPickList::AddDocumentToPickList(SfxObjectShell* pDocSh, bool bAvoidThumbnail)
+void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
 {
     SfxMedium *pMed = pDocSh->GetMedium();
     if( !pMed )
@@ -197,7 +197,7 @@ void SfxPickList::AddDocumentToPickList(SfxObjectShell* pDocSh, bool bAvoidThumb
     boost::optional<OUString> aThumbnail;
     // don't generate thumbnail when in headless mode, or on non-desktop (?)
 #if HAVE_FEATURE_DESKTOP
-    if (!bAvoidThumbnail && !pDocSh->IsModified() && !Application::IsHeadlessModeEnabled())
+    if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled())
     {
         // not modified => the document matches what is in the shell
         SFX_ITEMSET_ARG( pMed->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false );
@@ -414,7 +414,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
             case SFX_EVENT_OPENDOC:
             {
-                AddDocumentToPickList(pDocSh, /* bAvoidThumbnail = */ true);
+                AddDocumentToPickList(pDocSh);
             }
             break;
 
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 19b378d..5252a61 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -58,7 +58,7 @@ class SfxPickList : public SfxListener
        certain requirements, e.g. being writable. Check implementation for requirement
        details.
      */
-    static void             AddDocumentToPickList(SfxObjectShell* pDocShell, bool bAvoidThumbnail = false);
+    static void             AddDocumentToPickList( SfxObjectShell* pDocShell );
 
     public:
         static SfxPickList& Get();