diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-10-21 09:21:34 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-10-21 09:42:12 +0200 |
| commit | 928068cc9f6169f9a8fbe207f6e4d610ac9dbf46 (patch) | |
| tree | ae43c8beb58b0b23876269dfbe201dd2c56d8c4c /sfx2/source | |
| parent | 5a10f87708363217feabaebc88b993edce06940b (diff) | |
lok: Avoid adding to recent documents completely.
Change-Id: I292281e300e8976bf5ae286262a6a3e20de41858
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index b2eaa3232487..32a7cd941dda 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -19,6 +19,7 @@ #include <config_features.h> +#include <comphelper/lok.hxx> #include <com/sun/star/document/XDocumentProperties.hpp> #include <unotools/historyoptions.hxx> #include <unotools/useroptions.hxx> @@ -161,7 +162,7 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex ) void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) { - if (pDocSh->IsAvoidRecentDocs()) + if (pDocSh->IsAvoidRecentDocs() || comphelper::LibreOfficeKit::isActive()) return; SfxMedium *pMed = pDocSh->GetMedium(); @@ -196,10 +197,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) if ( pFilter ) aFilter = pFilter->GetFilterName(); - // generate a thumbnail boost::optional<OUString> aThumbnail; - // don't generate thumbnail when in headless mode, or on non-desktop (?) -#if HAVE_FEATURE_DESKTOP + + // generate the thumbnail if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled()) { // not modified => the document matches what is in the shell @@ -227,7 +227,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) } } } -#endif + // add to svtool history options SvtHistoryOptions().AppendItem( ePICKLIST, aURL.GetURLNoPass( INetURLObject::NO_DECODE ), |