|
 |
f325b2 |
From 03ea9bee49bbd6961677ab020695f8d2f7af9d4e Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Jan Holesovsky <kendy@collabora.com>
|
|
|
f325b2 |
Date: Wed, 21 Oct 2015 09:21:34 +0200
|
|
|
f325b2 |
Subject: [PATCH 222/398] lok: Avoid adding to recent documents completely.
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit dcdba6ed8984fd135a346a921b3a7888ecef9cb0)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I292281e300e8976bf5ae286262a6a3e20de41858
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sfx2/source/appl/sfxpicklist.cxx | 11 +++++++----
|
|
|
f325b2 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
|
|
|
f325b2 |
index 0f3196df45cc..24754ca01b74 100644
|
|
|
f325b2 |
--- a/sfx2/source/appl/sfxpicklist.cxx
|
|
|
f325b2 |
+++ b/sfx2/source/appl/sfxpicklist.cxx
|
|
|
f325b2 |
@@ -19,6 +19,7 @@
|
|
|
f325b2 |
|
|
|
f325b2 |
#include <config_features.h>
|
|
|
f325b2 |
|
|
|
f325b2 |
+#include <comphelper/lok.hxx>
|
|
|
f325b2 |
#include <com/sun/star/document/XDocumentProperties.hpp>
|
|
|
f325b2 |
#include <unotools/historyoptions.hxx>
|
|
|
f325b2 |
#include <unotools/useroptions.hxx>
|
|
|
f325b2 |
@@ -161,6 +162,9 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex )
|
|
|
f325b2 |
|
|
|
f325b2 |
void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
f325b2 |
+ return;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
SfxMedium *pMed = pDocSh->GetMedium();
|
|
|
f325b2 |
if( !pMed )
|
|
|
f325b2 |
return;
|
|
|
f325b2 |
@@ -193,10 +197,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
|
|
|
f325b2 |
if ( pFilter )
|
|
|
f325b2 |
aFilter = pFilter->GetFilterName();
|
|
|
f325b2 |
|
|
|
f325b2 |
- // generate a thumbnail
|
|
|
f325b2 |
boost::optional<OUString> aThumbnail;
|
|
|
f325b2 |
- // don't generate thumbnail when in headless mode, or on non-desktop (?)
|
|
|
f325b2 |
-#if HAVE_FEATURE_DESKTOP
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ // generate the thumbnail
|
|
|
f325b2 |
if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled())
|
|
|
f325b2 |
{
|
|
|
f325b2 |
// not modified => the document matches what is in the shell
|
|
|
f325b2 |
@@ -224,7 +227,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
-#endif
|
|
|
f325b2 |
+
|
|
|
f325b2 |
// add to svtool history options
|
|
|
f325b2 |
SvtHistoryOptions().AppendItem( ePICKLIST,
|
|
|
f325b2 |
aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|