20ad9893d5
This restores the state before commit
e1b78d3600 (#95181#; call the setValue
method of the XStatusIndicator as often as possible to enable
reschedule, 2001-11-26), which doesn't seem to be necessary anymore,
perhaps due to the current scheduler that has priorities.
Rather than a plain revert, still allow the progressbar to jump back, as
that seems to be used relatively frequently. So just filter out the
calls that would increment the value, but only with a small difference,
compared to the shown value.
Change-Id: I7136b20f1c64e267b0b4a35bbe2564e5163d9468
Reviewed-on: https://gerrit.libreoffice.org/25654
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
109 lines
3.2 KiB
C++
109 lines
3.2 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <xmloff/ProgressBarHelper.hxx>
|
|
#include <xmloff/xmltoken.hxx>
|
|
|
|
#include <osl/diagnose.h>
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
static const sal_Int32 nDefaultProgressBarRange = 1000000;
|
|
static const float fProgressStep = 0.5;
|
|
|
|
ProgressBarHelper::ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xTempStatusIndicator,
|
|
const bool bTempStrict)
|
|
: xStatusIndicator(xTempStatusIndicator)
|
|
, nRange(nDefaultProgressBarRange)
|
|
, nReference(100)
|
|
, nValue(0)
|
|
, fOldPercent(0.0)
|
|
, bStrict(bTempStrict)
|
|
, bRepeat(true)
|
|
#ifdef DBG_UTIL
|
|
, bFailure(false)
|
|
#endif
|
|
{
|
|
}
|
|
|
|
ProgressBarHelper::~ProgressBarHelper()
|
|
{
|
|
}
|
|
|
|
void ProgressBarHelper::ChangeReference(sal_Int32 nNewReference)
|
|
{
|
|
if((nNewReference > 0) && (nNewReference != nReference))
|
|
{
|
|
if (nReference)
|
|
{
|
|
double fPercent((double)nNewReference / nReference);
|
|
double fValue(nValue * fPercent);
|
|
nValue = static_cast<sal_Int32>(fValue);
|
|
nReference = nNewReference;
|
|
}
|
|
else
|
|
{
|
|
nReference = nNewReference;
|
|
nValue = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
|
|
{
|
|
if (xStatusIndicator.is() && (nReference > 0))
|
|
{
|
|
if ((nTempValue >= nValue) && (!bStrict || (nTempValue <= nReference)))
|
|
{
|
|
// #91317# no progress bar with values > 100%
|
|
if (nTempValue > nReference)
|
|
{
|
|
if (!bRepeat)
|
|
nValue = nReference;
|
|
else
|
|
{
|
|
xStatusIndicator->reset();
|
|
nValue = 0;
|
|
}
|
|
}
|
|
else
|
|
nValue = nTempValue;
|
|
|
|
double fValue(nValue);
|
|
double fNewValue ((fValue * nRange) / nReference);
|
|
|
|
double fPercent((fNewValue * 100) / nRange);
|
|
if (fPercent >= (fOldPercent + fProgressStep) || fPercent < fOldPercent)
|
|
{
|
|
xStatusIndicator->setValue((sal_Int32)fNewValue);
|
|
fOldPercent = fPercent;
|
|
}
|
|
}
|
|
#ifdef DBG_UTIL
|
|
else if (!bFailure)
|
|
{
|
|
OSL_FAIL("tried to set a wrong value on the progressbar");
|
|
bFailure = true;
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|