summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-11-02 22:58:16 +0200
committerTor Lillqvist <tml@collabora.com>2018-11-03 15:31:08 +0100
commit1c39485653d97e26aa3d5b51bf2fd0a1f4e14f0c (patch)
treec6006d9bd7ba231404bc9f7e426b6426257db9f4 /cui/source
parent882c7f4a1feb81ed74b4243d884ecc3a954e3bed (diff)
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>
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx11
-rw-r--r--cui/source/options/treeopt.cxx2
2 files changed, 12 insertions, 1 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3bb5d6154677..c6cdada72e37 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/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;
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 56501b26b8d7..08d8f5974d3c 100644
--- a/cui/source/options/treeopt.cxx
+++ b/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;