diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-11-02 22:58:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-05 12:47:33 +0100 |
| commit | ad54ffb44f76e8294b9f8974409fcf821e523bf9 (patch) | |
| tree | 4a1b4fece189030edd101daeb6c612969244190d /cui | |
| parent | 261a97037396868b5f9943728d849e48192c7e3e (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/62865
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 11 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index edd5e8ac8fe6..65aec29c2f8e 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> @@ -869,6 +871,7 @@ void TPGalleryThemeProperties::FillFilterList() } } +#if HAVE_FEATURE_AVMEDIA // media filters static const char aWildcard[] = "*."; ::avmedia::FilterNameVector aFilters; @@ -898,6 +901,9 @@ void TPGalleryThemeProperties::FillFilterList() } } } +#else + (void) nFirstExtFilterPos; +#endif // 'All' filters OUString aExtensions; @@ -922,6 +928,7 @@ void TPGalleryThemeProperties::FillFilterList() } } +#if HAVE_FEATURE_AVMEDIA // media filters for(std::pair<OUString,OUString> & aFilter : aFilters) { @@ -932,6 +939,7 @@ void TPGalleryThemeProperties::FillFilterList() aExtensions += aWildcard + aFilter.second.getToken( 0, ';', nIndex ); } } +#endif #if defined(_WIN32) if (aExtensions.getLength() > 240) @@ -1064,13 +1072,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 a924be6442f8..45659f1cdd25 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -297,7 +297,9 @@ VclPtr<SfxTabPage> CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, c 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; |