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>
71 lines
3.0 KiB
C++
71 lines
3.0 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 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_XMLOFF_PROGRESSBARHELPER_HXX
|
|
#define INCLUDED_XMLOFF_PROGRESSBARHELPER_HXX
|
|
|
|
#include <sal/config.h>
|
|
#include <xmloff/dllapi.h>
|
|
#include <com/sun/star/task/XStatusIndicator.hpp>
|
|
#include <com/sun/star/frame/XModel.hpp>
|
|
|
|
#define XML_PROGRESSRANGE "ProgressRange"
|
|
#define XML_PROGRESSMAX "ProgressMax"
|
|
#define XML_PROGRESSCURRENT "ProgressCurrent"
|
|
#define XML_PROGRESSREPEAT "ProgressRepeat"
|
|
|
|
class XMLOFF_DLLPUBLIC ProgressBarHelper
|
|
{
|
|
css::uno::Reference < css::task::XStatusIndicator > xStatusIndicator;
|
|
sal_Int32 nRange;
|
|
sal_Int32 nReference;
|
|
sal_Int32 nValue;
|
|
double fOldPercent;
|
|
bool bStrict;
|
|
// #96469#; if the value goes over the Range the progressbar starts again
|
|
bool bRepeat;
|
|
|
|
#ifdef DBG_UTIL
|
|
bool bFailure;
|
|
#endif
|
|
public:
|
|
ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xStatusIndicator,
|
|
const bool bStrict);
|
|
~ProgressBarHelper();
|
|
|
|
void SetRange(sal_Int32 nVal) { nRange = nVal; }
|
|
void SetReference(sal_Int32 nVal) { nReference = nVal; }
|
|
void SetValue(sal_Int32 nValue);
|
|
void SetRepeat(bool bValue) { bRepeat = bValue; }
|
|
inline void Increment(sal_Int32 nInc = 1) { SetValue( nValue+nInc ); }
|
|
void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); }
|
|
|
|
// set the new reference and returns the new value which gives the
|
|
// Progress Bar the sam position as before
|
|
void ChangeReference(sal_Int32 nNewReference);
|
|
|
|
sal_Int32 GetReference() { return nReference; }
|
|
sal_Int32 GetValue() { return nValue; }
|
|
bool GetRepeat() { return bRepeat; }
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|