diff options
author | Tor Lillqvist <tml@collabora.com> | 2019-03-13 10:01:00 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2019-03-13 10:05:20 +0200 |
commit | f6fdcbeb81f9879a2e117d87d9d60a8a8a0111f5 (patch) | |
tree | 07f0240520c3a66f42ab98f945363277e01a0c61 /framework | |
parent | f480c6cb7f41bf38a2259dface77b8cca87ce6ec (diff) |
tdf#124042: There are no progress bars that vcl would handle on iOS or Android
Don't even bother trying to dislay such. Any progress feedback to the
user will be handled through LibreOfficeKit callbacks.
(Sure, the code probably thought it had created a "window" for the
progress bar, but there wasn't anything real in the data structure
that would actually display anything anywhere, no CG context (on iOS)
etc.)
Change-Id: Ie0ca18bbb22da41882bdaba4a0ce77a52112a059
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/helper/statusindicator.cxx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index 134a6f5a2448..e729702125d6 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -43,13 +43,16 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , comphelper::LibreOfficeKit::statusIndicatorStart(); } - +#if !defined(IOS) && !defined(ANDROID) css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->start(this, sText, nRange); } +#else + (void) sText; +#endif } void SAL_CALL StatusIndicator::end() @@ -58,39 +61,44 @@ void SAL_CALL StatusIndicator::end() { comphelper::LibreOfficeKit::statusIndicatorFinish(); } - +#if !defined(IOS) && !defined(ANDROID) css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->end(this); } +#endif } void SAL_CALL StatusIndicator::reset() { if (comphelper::LibreOfficeKit::isActive()) return; - +#if !defined(IOS) && !defined(ANDROID) css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->reset(this); } +#endif } void SAL_CALL StatusIndicator::setText(const OUString& sText) { if (comphelper::LibreOfficeKit::isActive()) return; - +#if !defined(IOS) && !defined(ANDROID) css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->setText(this, sText); } +#else + (void) sText; +#endif } void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) @@ -105,13 +113,14 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) } return; } - +#if !defined(IOS) && !defined(ANDROID) css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory); if (xFactory.is()) { StatusIndicatorFactory* pFactory = static_cast<StatusIndicatorFactory*>(xFactory.get()); pFactory->setValue(this, nValue); } +#endif } } // namespace framework |