Working static Writer (use SAL_VCL_QT5_USE_CAIRO)

Change-Id: Ie1aab718cbf36b43621e2be644328fdc3fa1c90b

6 files changed, 194 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index 8e9a9b3dd73e..2bf0c06806eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5161,7 +5161,7 @@ if test "$enable_gui" = "no"; then
     fi
     USING_X11=
     DISABLE_GUI=TRUE
-    AC_DEFINE(HAVE_FEATURE_UI,0)
+#    AC_DEFINE(HAVE_FEATURE_UI,0)
     test_cairo=yes
 fi
 AC_SUBST(DISABLE_GUI)
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index 0172e4c94a16..25e006d07c96 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -20,6 +20,7 @@
 #include <config_folders.h>
 
 #include <sal/config.h>
+#include <sal/log.hxx>
 
 #include <cassert>
 
@@ -85,7 +86,9 @@ OUString cppu::getUnoIniUri() {
     }
 #endif
 #endif
-    return uri + "/" SAL_CONFIGFILE("uno");
+    uri += "/" SAL_CONFIGFILE("uno");
+    SAL_INFO("cppuhelper", "expected uno config: " << uri);
+    return uri;
 }
 
 bool cppu::nextDirectoryItem(osl::Directory & directory, OUString * url) {
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 087474487b97..3288f74de4cc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3149,7 +3149,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
         return;
     }
 
-#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
+#if defined(UNX) && !defined(MACOSX) && !defined(DISABLE_GUI)
 
     // Painting of zoomed or HiDPI spreadsheets is special, we actually draw everything at 100%,
     // and only set cairo's (or CoreGraphic's, in the iOS case) scale factor accordingly, so that
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 97e75c13a001..447cd97941b8 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -281,8 +281,8 @@ $(eval $(call gb_Rdb_add_components,services,\
 		shell/source/unix/exec/syssh \
 	) \
 	$(if $(filter-out MACOSX WNT,$(OS)), \
-		$(if $(DISABLE_GUI),, \
 			shell/source/backends/desktopbe/desktopbe1 \
+		$(if $(DISABLE_GUI),, \
 			vcl/vcl.unx \
 		) \
 	) \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 06e01a495237..de59f7093023 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -704,7 +704,187 @@ desktop_factory_list = [
     ]
 
 desktop_constructor_list = [
+    "com_sun_star_comp_bridge_BridgeFactory_get_implementation",
+    "com_sun_star_comp_bridge_BridgeFactory_get_implementation",
+    "com_sun_star_comp_configuration_ConfigurationProvider_get_implementation",
+    "com_sun_star_comp_configuration_ConfigurationRegistry_get_implementation",
+    "com_sun_star_comp_configuration_DefaultProvider_get_implementation",
+    "com_sun_star_comp_configuration_ReadOnlyAccess_get_implementation",
+    "com_sun_star_comp_configuration_ReadWriteAccess_get_implementation",
+    "com_sun_star_comp_deployment_component_PackageRegistryBackend_get_implementation",
+    "com_sun_star_comp_deployment_configuration_PackageRegistryBackend_get_implementation",
+    "com_sun_star_comp_deployment_executable_PackageRegistryBackend_get_implementation",
     "com_sun_star_comp_deployment_ExtensionManager_get_implementation",
+    "com_sun_star_comp_deployment_ExtensionManager_get_implementation",
+    "com_sun_star_comp_deployment_help_PackageRegistryBackend_get_implementation",
+    "com_sun_star_comp_deployment_PackageManagerFactory_get_implementation",
+    "com_sun_star_comp_deployment_PackageManagerFactory_get_implementation",
+    "com_sun_star_comp_deployment_ProgressLog_get_implementation",
+    "com_sun_star_comp_deployment_script_PackageRegistryBackend_get_implementation",
+    "com_sun_star_comp_deployment_sfwk_PackageRegistryBackend_get_implementation",
+    "com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
+    "com_sun_star_comp_frame_SessionListener_get_implementation",
+    "com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation",
+    "com_sun_star_comp_framework_Desktop_get_implementation",
+    "com_sun_star_comp_framework_DocumentAcceleratorConfiguration_get_implementation",
+    "com_sun_star_comp_framework_Frame_get_implementation",
+    "com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation",
+    "com_sun_star_comp_framework_GenericPopupToolbarController_get_implementation",
+    "com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation",
+    "com_sun_star_comp_framework_JobExecutor_get_implementation",
+    "com_sun_star_comp_framework_LangSelectionStatusbarController_get_implementation",
+    "com_sun_star_comp_framework_LayoutManager_get_implementation",
+    "com_sun_star_comp_framework_MenuBarFactory_get_implementation",
+    "com_sun_star_comp_framework_MenuBarFactory_get_implementation",
+    "com_sun_star_comp_framework_ModuleAcceleratorConfiguration_get_implementation",
+    "com_sun_star_comp_framework_ModuleManager_get_implementation",
+    "com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation",
+    "com_sun_star_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementation",
+    "com_sun_star_comp_framework_ObjectMenuController_get_implementation",
+    "com_sun_star_comp_framework_PathSettings_get_implementation",
+    "com_sun_star_comp_framework_PathSubstitution_get_implementation",
+    "com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation",
+    "com_sun_star_comp_framework_RecentFilesMenuController_get_implementation",
+    "com_sun_star_comp_framework_RecentFilesMenuController_get_implementation",
+    "com_sun_star_comp_framework_ResourceMenuController_get_implementation",
+    "com_sun_star_comp_framework_SaveToolbarController_get_implementation",
+    "com_sun_star_comp_framework_SaveToolbarController_get_implementation",
+    "com_sun_star_comp_framework_StatusBarControllerFactory_get_implementation",
+    "com_sun_star_comp_framework_StatusBarFactory_get_implementation",
+    "com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation",
+    "com_sun_star_comp_framework_SubToolBarController_get_implementation",
+    "com_sun_star_comp_framework_SubToolBarController_get_implementation",
+    "com_sun_star_comp_framework_TaskCreator_get_implementation",
+    "com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation",
+    "com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation",
+    "com_sun_star_comp_framework_ToolBarFactory_get_implementation",
+    "com_sun_star_comp_framework_ToolBarFactory_get_implementation",
+    "com_sun_star_comp_framework_UICommandDescription_get_implementation",
+    "com_sun_star_comp_framework_UICommandDescription_get_implementation",
+    "com_sun_star_comp_framework_UIConfigurationManager_get_implementation",
+    "com_sun_star_comp_framework_UIElementFactoryManager_get_implementation",
+    "com_sun_star_comp_framework_URLTransformer_get_implementation",
+    "com_sun_star_comp_framework_WindowListMenuController_get_implementation",
+    "com_sun_star_comp_framework_WindowListMenuController_get_implementation",
+    "com_sun_star_comp_framework_WindowStateConfiguration_get_implementation",
+    "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
+    "com_sun_star_comp_office_FrameLoader_get_implementation",
+    "com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation",
+    "com_sun_star_comp_sfx2_BackingComp_get_implementation",
+    "com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
+    "com_sun_star_comp_sfx2_InsertSymbolToolBoxControl_get_implementation",
+    "com_sun_star_comp_sfx2_InsertSymbolToolBoxControl_get_implementation",
+    "com_sun_star_comp_stoc_CoreReflection_get_implementation",
+    "com_sun_star_comp_stoc_Introspection_get_implementation",
+    "com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_CTLToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation",
+    "com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation",
+    "com_sun_star_comp_svx_LineSpacingToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_RecoveryUI_get_implementation",
+    "com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_TableToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_TableToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_UnderlineToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_UndoRedoToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_UndoRedoToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_VertTextToolBoxControl_get_implementation",
+    "com_sun_star_comp_svx_VertTextToolBoxControl_get_implementation",
+    "com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation",
+    "com_sun_star_comp_uri_UriReferenceFactory_get_implementation",
+    "com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation",
+    "com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation",
+    "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
+    "com_sun_star_extensions_xml_sax_Writer_get_implementation",
+    "com_sun_star_frame_VCLSessionManagerClient_get_implementation",
+    "com_sun_star_i18n_BreakIterator_get_implementation",
+    "com_sun_star_i18n_BreakIterator_Unicode_get_implementation",
+    "com_sun_star_i18n_CharacterClassification_get_implementation",
+    "com_sun_star_i18n_CharacterClassification_Unicode_get_implementation",
+    "com_sun_star_i18n_Collator_get_implementation",
+    "com_sun_star_i18n_LocaleDataImpl_get_implementation",
+    "com_sun_star_i18n_NumberFormatCodeMapper_get_implementation",
+    "com_sun_star_i18n_Transliteration_get_implementation",
+    "com_sun_star_i18n_Transliteration_IGNORE_CASE_get_implementation",
+    "com_sun_star_i18n_Transliteration_IGNORE_KANA_get_implementation",
+    "com_sun_star_i18n_Transliteration_IGNORE_WIDTH_get_implementation",
+    "com_sun_star_svx_DownSearchToolboxController_get_implementation",
+    "com_sun_star_svx_ExitFindbarToolboxController_get_implementation",
+    "com_sun_star_svx_FindAllToolboxController_get_implementation",
+    "com_sun_star_svx_FindTextToolboxController_get_implementation",
+    "com_sun_star_svx_FontHeightToolBoxController_get_implementation",
+    "com_sun_star_svx_MatchCaseToolboxController_get_implementation",
+    "com_sun_star_svx_SearchLabelToolboxController_get_implementation",
+    "com_sun_star_svx_UpSearchToolboxController_get_implementation",
+    "com_sun_star_text_DefaultNumberingProvider_get_implementation",
+    "dtrans_CMimeContentTypeFactory_get_implementation",
+    "filter_ConfigFlush_get_implementation",
+    "filter_ContentHandlerFactory_get_implementation",
+    "filter_FilterFactory_get_implementation",
+    "filter_FrameLoaderFactory_get_implementation",
+    "filter_TypeDetection_get_implementation",
+    "framework_FooterMenuController_get_implementation",
+    "framework_FooterMenuController_get_implementation",
+    "framework_HeaderMenuController_get_implementation",
+    "framework_HeaderMenuController_get_implementation",
+    "framework_LanguageSelectionMenuController_get_implementation",
+    "framework_LanguageSelectionMenuController_get_implementation",
+    "framework_MacrosMenuController_get_implementation",
+    "framework_MacrosMenuController_get_implementation",
+    "framework_NewMenuController_get_implementation",
+    "framework_NewMenuController_get_implementation",
+    "framework_ServiceHandler_get_implementation",
+    "framework_ServiceHandler_get_implementation",
+    "framework_ToolbarsMenuController_get_implementation",
+    "framework_ToolbarsMenuController_get_implementation",
+    "i18npool_Collator_Unicode_get_implementation",
+    "IndexedPropertyValuesContainer_get_implementation",
+    "lingucomponent_Hyphenator_get_implementation",
+    "lingucomponent_LangGuess_get_implementation",
+    "lingucomponent_SpellChecker_get_implementation",
+    "lingucomponent_Thesaurus_get_implementation",
+    "linguistic_DicList_get_implementation",
+    "linguistic_GrammarCheckingIterator_get_implementation",
+    "linguistic_LinguProps_get_implementation",
+    "linguistic_LngSvcMgr_get_implementation",
+    "lo_writer_NavElementToolBoxController_get_implementation",
+    "lo_writer_NextScrollToolboxController_get_implementation",
+    "lo_writer_PreviousScrollToolboxController_get_implementation",
+    "org_apache_openoffice_comp_framework_ContextChangeEventMultiplexer_get_implementation",
+    "org_apache_openoffice_comp_framework_NewToolbarController_get_implementation",
+    "org_apache_openoffice_comp_framework_NewToolbarController_get_implementation",
+    "org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation",
+    "package_ManifestReader_get_implementation",
+    "package_OStorageFactory_get_implementation",
+    "package_OZipFileAccess_get_implementation",
+    "package_ZipPackage_get_implementation",
+    "SfxDocumentMetaData_get_implementation",
+    "shell_DesktopBackend_get_implementation",
+    "shell_LocaleBackend_get_implementation",
+    "stardiv_Toolkit_VCLXPopupMenu_get_implementation",
+    "stardiv_Toolkit_VCLXToolkit_get_implementation",
+    "stoc_FactoryImpl_get_implementation",
+    "svl_FSStorageFactory_get_implementation",
+    "ucb_expand_ExpandContentProviderImpl_get_implementation",
+    "ucb_file_FileProvider_get_implementation",
+    "ucb_OFileAccess_get_implementation",
+    "ucb_tdoc_ContentProvider_get_implementation",
+    "ucb_tdoc_DocumentContentFactory_get_implementation",
+    "ucb_UcbContentProviderProxyFactory_get_implementation",
+    "ucb_UcbStore_get_implementation",
+    "ucb_UniversalContentBroker_get_implementation",
+    "unotools_OTempFileService_get_implementation",
+    "unoxml_CDocumentBuilder_get_implementation",
+    "unoxml_CURI_get_implementation",
+    "unoxml_CXPathAPI_get_implementation",
+    "unoxml_rdfRepository_get_implementation",
+    "vcl_SystemClipboard_get_implementation",
+    "Writer_SwTextDocument_get_implementation",
+    "com_sun_star_comp_svx_FrameToolBoxControl_get_implementation",
+    "com_sun_star_i18n_InputSequenceChecker_get_implementation",
     ]
 
 factory_map = {
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index f8e5c016db90..55d795719cc8 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -176,9 +176,14 @@ OUString SwResId(const char* pId, int nCardinality)
 uno::Reference< scanner::XScannerManager2 > const &
 SwModule::GetScannerManager()
 {
-    if (!m_xScannerManager.is())
+    static bool bTestScannerManager = true;
+    if (bTestScannerManager && !m_xScannerManager.is())
     {
-        m_xScannerManager = scanner::ScannerManager::create( comphelper::getProcessComponentContext() );
+        try {
+            m_xScannerManager = scanner::ScannerManager::create( comphelper::getProcessComponentContext() );
+        }
+        catch (...) {}
+        bTestScannerManager = false;
     }
     return m_xScannerManager;
 }