diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-11-02 22:58:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-03 15:31:08 +0100 |
| commit | 1c39485653d97e26aa3d5b51bf2fd0a1f4e14f0c (patch) | |
| tree | c6006d9bd7ba231404bc9f7e426b6426257db9f4 /svx | |
| parent | 882c7f4a1feb81ed74b4243d884ecc3a954e3bed (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 'svx')
| -rw-r--r-- | svx/source/gallery2/galctrl.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 5fd5b35762b1..3560421cacc7 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/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 ); |