[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - framework/source

[Libreoffice Gerrit user]

 framework/source/helper/statusindicator.cxx |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 0fd1dd8e285ad97384827c6027e3a090c3b40dcd
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Mar 13 10:01:00 2019 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Mar 13 10:01:00 2019 +0200

    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

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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits