summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-08-24 13:26:13 +0300
committerCaolán McNamara <caolanm@redhat.com>2014-08-26 06:45:56 -0500
commita628ea1cd72585b889d591052680ebf79887dcef (patch)
treeffbb93269be825fccc3ac0e3d21ae7581c3d0150 /sfx2
parent3fc7bae2533c2b80c917c477a28c1fd90e6ad7c1 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 19c1c313fbbd..92e3cedf4d33 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();