sfx2/source/appl/sfxpicklist.cxx | 2 +- sw/source/core/uibase/app/docsh.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 0f9f8e05dcb572bff6e8d719f9dcef8fb1e0f2c7 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.com> Date: Wed May 21 15:01:48 2014 +0200 speed-up writer conversion in headless mode Change-Id: Ie5ccd62608c0643e3c8f019aea136ba74b282274 diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 0cfa9b7..19c1c31 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -196,7 +196,7 @@ 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::IsHeadlessModeRequested()) + if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled()) { // not modified => the document matches what is in the shell boost::shared_ptr<GDIMetaFile> pMetaFile = pDocSh->GetPreviewMetaFile(); diff --git a/sw/source/core/uibase/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx index 23abaf7..fbe60dd 100644 --- a/sw/source/core/uibase/app/docsh.cxx +++ b/sw/source/core/uibase/app/docsh.cxx @@ -710,7 +710,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) const OUString aFileName( rMedium.GetName() ); // No View, so the whole Document! - if ( pWrtShell ) + if ( pWrtShell && !Application::IsHeadlessModeEnabled() ) { SwWait aWait( *this, true ); // #i106906#
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits