summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortymyjan <tymyjan@yahoo.co.uk>2016-07-08 21:55:00 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-09 07:53:15 +0000
commit5a6ab81651a98dd726ab7d40101dc81f62895fd4 (patch)
tree6740dd98e048e1e0fa1d66e253a3e2e96e0a33e9
parent81889ab4ce49e83ef4914dbff403b839c718a08a (diff)
tdf#75280 Cleaning up of sal_uIntPtr usage #2
Change-Id: I673d99a61b6805e8ad2ef91736839620283a898c Reviewed-on: https://gerrit.libreoffice.org/27063 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
-rw-r--r--include/sfx2/progress.hxx10
-rw-r--r--sfx2/source/bastyp/progress.cxx8
2 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 882d38d8d053..9153dae3758c 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -37,19 +37,19 @@ struct SvProgressArg;
class SFX2_DLLPUBLIC SfxProgress
{
std::unique_ptr< SfxProgress_Impl > pImpl;
- sal_uIntPtr nVal;
+ sal_uInt32 nVal;
bool bSuspended;
public:
SfxProgress( SfxObjectShell* pObjSh,
const rtl::OUString& rText,
- sal_uIntPtr nRange,
+ sal_uInt32 nRange,
bool bWait = true);
virtual ~SfxProgress();
- void SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal );
- void SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
- sal_uIntPtr GetState() const { return nVal; }
+ void SetStateText( sal_uInt32 nVal, const rtl::OUString &rVal );
+ void SetState( sal_uInt32 nVal, sal_uInt32 nNewRange = 0 );
+ sal_uInt32 GetState() const { return nVal; }
void Resume();
void Suspend();
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index df5a8fea3247..a9bcff553e61 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -119,7 +119,7 @@ SfxProgress::SfxProgress
const OUString& rText, /* Text, which appears before the Statusmonitor
in the status line */
- sal_uIntPtr nRange, /* Max value for range */
+ sal_uInt32 nRange, /* Max value for range */
bool bWait /* Activate the wait-Pointer initially (TRUE) */
)
@@ -210,7 +210,7 @@ void SfxProgress::Stop()
void SfxProgress::SetStateText
(
- sal_uLong nNewVal, /* New value for the progress-bar */
+ sal_uInt32 nNewVal, /* New value for the progress-bar */
const OUString& rNewVal /* Status as Text */
)
@@ -221,9 +221,9 @@ void SfxProgress::SetStateText
void SfxProgress::SetState
(
- sal_uLong nNewVal, /* new value for the progress bar */
+ sal_uInt32 nNewVal, /* new value for the progress bar */
- sal_uLong nNewRange /* new maximum value, 0 for retaining the old */
+ sal_uInt32 nNewRange /* new maximum value, 0 for retaining the old */
)
/* [Description]