summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-09-18 14:29:18 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-10-06 16:27:30 +0200
commit8f95f34195e638e6689f090b85def209194fac5d (patch)
tree4f0599dd6c9b76e32449ed69525d03b0d072e0c1 /framework
parent8dc6418d4ee6d536a80d43843dc63d826f225be7 (diff)
sw: implement per-view LOK_CALLBACK_TEXT_SELECTION
Also: - let the unit test set the global LOK flag, as sw code now depends on that - in framework, don't return early after emitting the LOK status indicator callback, otherwise CppunitTest_sw_tiledrendering shows how sw LOK callbacks are missing Change-Id: I0c4ac12f2ef5118d29afd131676bcb27d5db7746 (cherry picked from commit 1a83f30ebe2c56b00804ce774537b34f1049be84)
Diffstat (limited to 'framework')
-rw-r--r--framework/source/helper/statusindicator.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 5c9dafc5ba81..ce8310a07cf5 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -43,7 +43,6 @@ void SAL_CALL StatusIndicator::start(const OUString& sText ,
m_nLastCallbackPercent = -1;
comphelper::LibreOfficeKit::statusIndicatorStart();
- return;
}
css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory);
@@ -60,7 +59,6 @@ void SAL_CALL StatusIndicator::end()
if (comphelper::LibreOfficeKit::isActive())
{
comphelper::LibreOfficeKit::statusIndicatorFinish();
- return;
}
css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory(m_xFactory);