Kaydet (Commit) 928068cc authored tarafından Jan Holesovsky's avatar Jan Holesovsky

lok: Avoid adding to recent documents completely.

Change-Id: I292281e300e8976bf5ae286262a6a3e20de41858
üst 5a10f877
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <config_features.h> #include <config_features.h>
#include <comphelper/lok.hxx>
#include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentProperties.hpp>
#include <unotools/historyoptions.hxx> #include <unotools/historyoptions.hxx>
#include <unotools/useroptions.hxx> #include <unotools/useroptions.hxx>
...@@ -161,7 +162,7 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex ) ...@@ -161,7 +162,7 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex )
void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
{ {
if (pDocSh->IsAvoidRecentDocs()) if (pDocSh->IsAvoidRecentDocs() || comphelper::LibreOfficeKit::isActive())
return; return;
SfxMedium *pMed = pDocSh->GetMedium(); SfxMedium *pMed = pDocSh->GetMedium();
...@@ -196,10 +197,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) ...@@ -196,10 +197,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
if ( pFilter ) if ( pFilter )
aFilter = pFilter->GetFilterName(); aFilter = pFilter->GetFilterName();
// generate a thumbnail
boost::optional<OUString> aThumbnail; 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()) if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled())
{ {
// not modified => the document matches what is in the shell // not modified => the document matches what is in the shell
...@@ -227,7 +227,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) ...@@ -227,7 +227,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh )
} }
} }
} }
#endif
// add to svtool history options // add to svtool history options
SvtHistoryOptions().AppendItem( ePICKLIST, SvtHistoryOptions().AppendItem( ePICKLIST,
aURL.GetURLNoPass( INetURLObject::NO_DECODE ), aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment