basctl/source/basicide/moduldl2.cxx | 2 +-
basctl/source/basicide/moduldlg.hxx | 2 +-
chart2/source/controller/dialogs/res_DataLabel.cxx | 6 +++---
chart2/source/controller/dialogs/res_DataLabel.hxx | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 0a059912bae4e3bc0b2640efb4e163d79f54a5d7
Author: Natalia Gavrilova <nataligavrilo...@gmail.com>
AuthorDate: Mon Oct 11 08:42:18 2021 +0300
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Nov 3 10:07:48 2021 +0100
tdf#114441 Convert use of sal_uLong to sal_uInt32, int
* Changed moduldlg.hxx, moduldl2.cxx
* Changed res_DataLabel.hxx, res_DataLabel.cxx
Change-Id: I845c9fb7b60b5a8f898aaac433c0b5e520c58678
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123360
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 7be53296159a..6c183c33035e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1226,7 +1226,7 @@ void LibPage::SetCurLib()
m_xLibBox->set_cursor(nEntry_);
}
-void LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos )
+void LibPage::ImpInsertLibEntry( const OUString& rLibName, int nPos )
{
// check, if library is password protected
bool bProtected = false;
diff --git a/basctl/source/basicide/moduldlg.hxx
b/basctl/source/basicide/moduldlg.hxx
index b7fb13d8901e..63be9953a290 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -189,7 +189,7 @@ class LibPage final : public OrganizePage
void FillListBox();
void InsertListBoxEntry( const ScriptDocument& rDocument,
LibraryLocation eLocation );
void SetCurLib();
- void ImpInsertLibEntry( const OUString& rLibName, sal_uLong
nPos );
+ void ImpInsertLibEntry( const OUString& rLibName, int nPos
);
public:
explicit LibPage(weld::Container* pParent, OrganizeDialog* pDialog);
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 841b75d2f9ef..6bba918d6937 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -46,7 +46,7 @@ namespace
const std::u16string_view our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u".
"};
-bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16
nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool&
rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
+bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16
nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uInt32& rnFormatKeyOut, bool&
rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
{
bool bSet = false;
const SfxPoolItem *pItem1 = nullptr;
@@ -191,7 +191,7 @@ IMPL_LINK(DataLabelResources, NumberFormatDialogHdl,
weld::Button&, rButton, voi
bool bPercent = (&rButton == m_xPB_NumberFormatForPercent.get());
- sal_uLong& rnFormatKey = bPercent ? m_nNumberFormatForPercent :
m_nNumberFormatForValue;
+ sal_uInt32& rnFormatKey = bPercent ? m_nNumberFormatForPercent :
m_nNumberFormatForValue;
bool& rUseSourceFormat = bPercent ? m_bSourceFormatForPercent :
m_bSourceFormatForValue;
bool& rbMixedState = bPercent ? m_bPercentFormatMixedState :
m_bNumberFormatMixedState;
bool& rbSourceMixedState = bPercent ? m_bPercentSourceMixedState :
m_bSourceFormatMixedState;
@@ -210,7 +210,7 @@ IMPL_LINK(DataLabelResources, NumberFormatDialogHdl,
weld::Button&, rButton, voi
if( pResult )
{
bool bOldSource = rUseSourceFormat;
- sal_uLong nOldFormat = rnFormatKey;
+ sal_uInt32 nOldFormat = rnFormatKey;
bool bOldMixedState = rbMixedState || rbSourceMixedState;
rbMixedState = !lcl_ReadNumberFormatFromItemSet( *pResult,
SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, rnFormatKey,
rUseSourceFormat, rbSourceMixedState );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 094291dc9a23..56115b2a779c 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -47,8 +47,8 @@ private:
SvNumberFormatter* m_pNumberFormatter;
bool m_bNumberFormatMixedState;
bool m_bPercentFormatMixedState;
- sal_uLong m_nNumberFormatForValue;
- sal_uLong m_nNumberFormatForPercent;
+ sal_uInt32 m_nNumberFormatForValue;
+ sal_uInt32 m_nNumberFormatForPercent;
bool m_bSourceFormatMixedState;
bool m_bPercentSourceMixedState;
