summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2016-04-23 18:32:10 -0400
committerjan iversen <jani@documentfoundation.org>2016-05-26 09:02:24 +0000
commitffa4b788191aa55d3ab57b499e89bb6cb56dbe6a (patch)
tree740a8580549ea3eba04519828c71cd65c51946b2
parent2060543586fa01d77ed17fd7904a903313b2251e (diff)
lokit: ensure progress value sequential
When it is saving a impress file, the status indicator sometimes receives lower values, that it is reflected to client side a flash to the progress bar. Change-Id: Ib3e8499357984843650c8d897c7b1d6baeb65ff6 Reviewed-on: https://gerrit.libreoffice.org/24326 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
-rw-r--r--framework/source/helper/statusindicator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index ce8310a07cf5..fc0ecb7f2f85 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -103,7 +103,7 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
if (comphelper::LibreOfficeKit::isActive())
{
int nPercent = (100*nValue)/m_nRange;
- if (nPercent != m_nLastCallbackPercent)
+ if (nPercent >= m_nLastCallbackPercent)
{
comphelper::LibreOfficeKit::statusIndicatorSetValue(nPercent);
m_nLastCallbackPercent = nPercent;
ctx'> : com::sun::star::util::DateTime(hundredthSeconds,
seconds,
minutes,
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index a395bf548008..3c64fbe0dcff 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -376,7 +376,7 @@ StorageElementFactory::createStream( const rtl::OUString & rUri,
}
//=========================================================================
-void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW( () )
+void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW(())
{
OSL_ASSERT( pElement );
osl::MutexGuard aGuard( m_aMutex );