Start of work in progress on making dialogs work in the iOS app

Build the swui library for non-DESKTOP platforms, too. Handle fallout
for !HAVE_FEATURE_DBCONNECTIVITY and !HAVE_FEATURE_AVMEDIA (both of
which features we for now don't want to bother with in the iOS app).

Make VclAbstractDialogFactory::Create() do its thing also on
non-DESKTOP.

This commit just causes more code to be compiled for the non-DESKTOP
case, dialogs in general surely don't actually work yet in the iOS
app. For instance:

vcl/source/window/builder.cxx:2060: probably need to implement sfxlo-CustomPropertiesControl or add a makesfxlo-CustomPropertiesControl function

Change-Id: I579efba605f519dcbf407b675be88c7c6ee0f19b
Reviewed-on: https://gerrit.libreoffice.org/62794
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>

cui/source/dialogs/cuigaldlg.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <sal/config.h>
 
 #include <algorithm>
@@ -810,6 +812,7 @@ void TPGalleryThemeProperties::FillFilterList()
         }
     }
 
+#if HAVE_FEATURE_AVMEDIA
     // media filters
     static const char aWildcard[] = "*.";
     ::avmedia::FilterNameVector     aFilters;
@@ -839,6 +842,9 @@ void TPGalleryThemeProperties::FillFilterList()
             }
         }
     }
+#else
+    (void) nFirstExtFilterPos;
+#endif
 
     // 'All' filters
     OUString aExtensions;
@@ -863,6 +869,7 @@ void TPGalleryThemeProperties::FillFilterList()
         }
     }
 
+#if HAVE_FEATURE_AVMEDIA
     // media filters
     for(std::pair<OUString,OUString> & aFilter : aFilters)
     {
@@ -873,6 +880,7 @@ void TPGalleryThemeProperties::FillFilterList()
             aExtensions += aWildcard + aFilter.second.getToken( 0, ';', nIndex );
         }
      }
+#endif
 
 #if defined(_WIN32)
     if (aExtensions.getLength() > 240)
@@ -1007,13 +1015,14 @@ void TPGalleryThemeProperties::DoPreview()
             ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
             GetParent()->EnterWait();
         }
+#if HAVE_FEATURE_AVMEDIA
         else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) )
         {
             xMediaPlayer = ::avmedia::MediaWindow::createPlayer( _aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), "" );
             if( xMediaPlayer.is() )
                 xMediaPlayer->start();
         }
-
+#endif
         bInputAllowed = true;
         aPreviewString = aString;
     }

cui/source/options/treeopt.cxx

@@ -299,7 +299,9 @@ static VclPtr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, TabPageParent pPa
         case RID_SVXPAGE_INET_PROXY:                fnCreate = &SvxProxyTabPage::Create; break;
         case RID_SVXPAGE_INET_SECURITY:             fnCreate = &SvxSecurityTabPage::Create; break;
         case RID_SVXPAGE_INET_MAIL:                 fnCreate = &SvxEMailTabPage::Create; break;
+#if HAVE_FEATURE_DESKTOP
         case RID_SVXPAGE_PERSONALIZATION:           fnCreate = &SvxPersonalizationTabPage::Create; break;
+#endif
         case RID_SVXPAGE_COLORCONFIG:               fnCreate = &SvxColorOptionsTabPage::Create; break;
         case RID_OFAPAGE_HTMLOPT:                   fnCreate = &OfaHtmlTabPage::Create; break;
         case SID_OPTFILTER_MSOFFICE:                fnCreate = &OfaMSFilterTabPage::Create; break;

svx/source/gallery2/galctrl.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 
 #include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -61,11 +62,13 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
 {
     bool bRet = true;
     Graphic aGraphic;
+#if HAVE_FEATURE_AVMEDIA
     if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) )
     {
         aGraphic = BitmapEx(RID_SVXBMP_GALLERY_MEDIA);
     }
     else
+#endif
     {
         GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
         GalleryProgress aProgress( &rFilter );

sw/Module_sw.mk

@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,sw,\
 	Library_msword \
 	Library_sw \
 	Library_swd \
-	$(call gb_Helper_optional,DESKTOP,Library_swui) \
+	Library_swui \
 	UIConfig_sglobal \
 	UIConfig_sweb \
 	UIConfig_swform \

sw/source/ui/dialog/swdlgfact.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "swdlgfact.hxx"
 #include <svl/style.hxx>
 #include <svx/svxids.hrc>
@@ -377,7 +379,14 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::A
         uno::Reference< sdbc::XConnection> xConnection,
         uno::Reference< sdbc::XResultSet > xResultSet)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet);
+#else
+    (void) rSelection;
+    (void) rxSource;
+    (void) xConnection;
+    (void) xResultSet;
+#endif
 }
 
 bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
@@ -800,8 +809,13 @@ VclPtr<AbstractSwBreakDlg> SwAbstractDialogFactory_Impl::CreateSwBreakDlg(weld::
 
 VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& rVw)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     VclPtr<Dialog> pDlg = VclPtr<SwChangeDBDlg>::Create(rVw);
     return VclPtr<VclAbstractDialog_Impl>::Create(pDlg);
+#else
+    (void) rVw;
+    return nullptr;
+#endif
 }
 
 VclPtr<SfxAbstractTabDialog>  SwAbstractDialogFactory_Impl::CreateSwCharDlg(weld::Window* pParent, SwView& pVw,
@@ -826,8 +840,16 @@ VclPtr<AbstractSwInsertDBColAutoPilot> SwAbstractDialogFactory_Impl::CreateSwIns
         uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
         const SwDBData& rData)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     VclPtr<SwInsertDBColAutoPilot> pDlg = VclPtr<SwInsertDBColAutoPilot>::Create( rView, rxSource, xColSupp, rData );
     return VclPtr<AbstractSwInsertDBColAutoPilot_Impl>::Create( pDlg );
+#else
+    (void) rView;
+    (void) rxSource;
+    (void) xColSupp;
+    (void) rData;
+    return nullptr;
+#endif
 }
 
 VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(weld::Window *pParent, SwWrtShell &rSh)
@@ -1126,7 +1148,13 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg(
 VclPtr<AbstractMailMergeWizard> SwAbstractDialogFactory_Impl::CreateMailMergeWizard(
                                     SwView& rView, std::shared_ptr<SwMailMergeConfigItem>& rConfigItem)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     return VclPtr<AbstractMailMergeWizard_Impl>::Create( VclPtr<SwMailMergeWizard>::Create(rView, rConfigItem));
+#else
+    (void) rView;
+    (void) rConfigItem;
+    return nullptr;
+#endif
 }
 
 GlossaryGetCurrGroup    SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc()
@@ -1199,20 +1227,32 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
 
 void SwAbstractDialogFactory_Impl::ExecuteMMResultSaveDialog(weld::Window* pParent)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     SwMMResultSaveDialog aDialog(pParent);
     aDialog.run();
+#else
+    (void) pParent;
+#endif
 }
 
 void SwAbstractDialogFactory_Impl::ExecuteMMResultPrintDialog(weld::Window* pParent)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     SwMMResultPrintDialog aDialog(pParent);
     aDialog.run();
+#else
+    (void) pParent;
+#endif
 }
 
 void SwAbstractDialogFactory_Impl::ExecuteMMResultEmailDialog(weld::Window* pParent)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     SwMMResultEmailDialog aDialog(pParent);
     aDialog.run();
+#else
+    (void) pParent;
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/ui/fldui/fldedt.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
@@ -190,10 +192,12 @@ VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
                 pTabPage = SwFieldDokInfPage::Create(get_content_area(), pSet);
                 break;
             }
+#if HAVE_FEATURE_DBCONNECTIVITY
         case GRP_DB:
             pTabPage = SwFieldDBPage::Create(get_content_area(), nullptr);
             static_cast<SwFieldDBPage*>(pTabPage.get())->SetWrtShell(*pSh);
             break;
+#endif
         case GRP_VAR:
             pTabPage = SwFieldVarPage::Create(get_content_area(), nullptr);
             break;

sw/source/ui/fldui/fldtdlg.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <cmdid.h>
 #include <swtypes.hxx>
 #include <unotools/confignode.hxx>
@@ -79,6 +81,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pPa
                 -1,
                 utl::OConfigurationTreeRoot::CM_READONLY);
 
+#if HAVE_FEATURE_DBCONNECTIVITY
         bool bDatabaseFields = true;
         aCfgRoot.getNodeValue(
             OUString("DatabaseFields")) >>= bDatabaseFields;
@@ -86,6 +89,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pPa
         if (bDatabaseFields)
             m_nDbId = AddTabPage("database", SwFieldDBPage::Create, nullptr);
         else
+#endif
             RemoveTabPage("database");
     }
     else
@@ -276,6 +280,7 @@ void SwFieldDlg::InsertHdl()
 
 void SwFieldDlg::ActivateDatabasePage()
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     m_bDataBaseMode = true;
     ShowPage(m_nDbId);
     SfxTabPage* pDBPage = GetTabPage(m_nDbId);
@@ -289,6 +294,7 @@ void SwFieldDlg::ActivateDatabasePage()
     RemoveTabPage("docinfo");
     RemoveTabPage("ref");
     RemoveTabPage("functions");
+#endif
 }
 
 void SwFieldDlg::ShowReferencePage()
@@ -298,6 +304,7 @@ void SwFieldDlg::ShowReferencePage()
 
 void SwFieldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
 {
+#if HAVE_FEATURE_DBCONNECTIVITY
     if (nId == m_nDbId)
     {
         SfxDispatcher* pDispatch = m_pBindings->GetDispatcher();
@@ -313,6 +320,10 @@ void SwFieldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
                 static_cast<SwFieldDBPage&>(rPage).SetWrtShell(static_cast<SwView*>(pViewShell)->GetWrtShell());
         }
     }
+#else
+    (void) nId;
+    (void) rPage;
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/uibase/dialog/swabstdlg.cxx

@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <swabstdlg.hxx>
 
 #include <osl/module.hxx>
@@ -38,7 +36,6 @@ extern "C" SwAbstractDialogFactory* SwCreateDialogFactory();
 SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 {
     SwFuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
     static const OUString sLibName(SWUI_DLL_NAME);
@@ -49,7 +46,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 #else
     fp = SwCreateDialogFactory;
 #endif
-#endif
+
     if ( fp )
         return fp();
     return nullptr;

sw/source/uibase/shells/basesh.cxx

@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <sal/config.h>
 
 #include <hintids.hxx>
@@ -2868,6 +2870,7 @@ void SwBaseShell::ExecField( SfxRequest const & rReq )
     sal_uInt16 nSlot = rReq.GetSlot();
     switch( nSlot )
     {
+#if HAVE_FEATURE_DBCONNECTIVITY
         case FN_CHANGE_DBFIELD:
         {
             SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2875,6 +2878,7 @@ void SwBaseShell::ExecField( SfxRequest const & rReq )
             pDlg->Execute();
         }
         break;
+#endif
         default:
             OSL_FAIL("wrong dispatcher");
     }

vcl/source/window/abstdlg.cxx

@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
-
 #include <rtl/ustring.hxx>
 #include <osl/module.hxx>
 #include <vcl/abstdlg.hxx>
@@ -35,7 +33,6 @@ extern "C" VclAbstractDialogFactory* CreateDialogFactory();
 VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
 {
     FuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     static ::osl::Module aDialogLibrary;
     if (aDialogLibrary.is() ||
@@ -47,7 +44,6 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
     }
 #else
     fp = CreateDialogFactory;
-#endif
 #endif
     if ( fp )
         return fp();