[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source

[Maxim Monastirsky]

 sfx2/source/appl/sfxpicklist.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a628ea1cd72585b889d591052680ebf79887dcef
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Aug 24 13:26:13 2014 +0300

    fdo#80755 Don't generate thumbnails for encrypted files
    
    (cherry picked from commit a75e0f8e4e5f0baa5805d01c5f8edc7b40fceb0f)
    
    Change-Id: If52532b8e8ca38e82fd95c13080d521d9cb529aa
    Reviewed-on: https://gerrit.libreoffice.org/11120
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 19c1c31..92e3ced 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -196,7 +196,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
     OUString aThumbnail;
     // don't generate thumbnail when in headless mode, or on non-desktop (?)
 #if HAVE_FEATURE_DESKTOP
-    if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled())
+    SFX_ITEMSET_ARG( pMed->GetItemSet(), pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false );
+
+    if (!pDocSh->IsModified() && !pEncryptionDataItem && !Application::IsHeadlessModeEnabled())
     {
         // not modified => the document matches what is in the shell
         boost::shared_ptr<GDIMetaFile> pMetaFile = pDocSh->GetPreviewMetaFile();