[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sd/CppunitTest_sd_dialogs_test.mk sd/qa vcl/source

[Katarina Behrens]

 sd/CppunitTest_sd_dialogs_test.mk |    2 +-
 sd/qa/unit/dialogs-test.cxx       |    8 --------
 vcl/source/app/settings.cxx       |    2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 8f6529df74c1712d3f55e2625312ce288b335b1d
Author: Katarina Behrens <katarina.behr...@cib.de>
Date:   Tue Jun 21 14:13:27 2016 +0200

    Remove code that worked around pseudo-headless mode
    
    start test with use_vcl_non_headless_with_windows instead
    
    Change-Id: Id6ff9c6f15ec927e1cbe2c599c526857982a76d2

diff --git a/sd/CppunitTest_sd_dialogs_test.mk 
b/sd/CppunitTest_sd_dialogs_test.mk
index d6027e6..04571a2 100644
--- a/sd/CppunitTest_sd_dialogs_test.mk
+++ b/sd/CppunitTest_sd_dialogs_test.mk
@@ -61,7 +61,7 @@ $(eval $(call 
gb_CppunitTest_use_external,sd_dialogs_test,boost_headers))
 $(eval $(call gb_CppunitTest_use_sdk_api,sd_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_dialogs_test))
-$(eval $(call gb_CppunitTest_use_vcl_non_headless,sd_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,sd_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_rdb,sd_dialogs_test,services))
 
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index c5a6d4d..93d3cf0 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -670,14 +670,6 @@ void SdDialogsTest::openAnyDialog()
 
         if (pDlg)
         {
-            if (false)
-            {
-                const Application::DialogCancelMode 
aOriginalDialogCancelMode(Application::GetDialogCancelMode());
-                
Application::SetDialogCancelMode(Application::DialogCancelMode::Off);
-                pDlg->Execute();
-                Application::SetDialogCancelMode(aOriginalDialogCancelMode);
-            }
-
             dumpDialogToPath(*pDlg, aTempTargetPath + OUString::number(a));
             delete pDlg;
         }
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 14dea6a..90482c6 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2410,7 +2410,7 @@ ImplMiscData::ImplMiscData()
     // Should we display any windows?
 
     // need to hardly mask here for now, needs to be adapted of course...
-    mbPseudoHeadless = false; // getenv("VCL_HIDE_WINDOWS") || 
comphelper::LibreOfficeKit::isActive();
+    mbPseudoHeadless = getenv("VCL_HIDE_WINDOWS") || 
comphelper::LibreOfficeKit::isActive();
 }
 
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits