[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source sw/source

[Tomaž Vajngerl]

 sfx2/source/appl/sfxpicklist.cxx    |    2 +-
 sw/source/core/uibase/app/docsh.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dafe3409026cc2975962c7629c58e6a9f65e6abf
Author: Tomaž Vajngerl <tomaz.vajngerl at 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 36b8741..6272f02 100644
--- a/sw/source/core/uibase/app/docsh.cxx
+++ b/sw/source/core/uibase/app/docsh.cxx
@@ -709,7 +709,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#