basctl/source/basicide/baside2.hxx | 10 +++++-----
basctl/source/basicide/baside2b.cxx | 10 +++++-----
cui/source/tabpages/numfmt.cxx | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f433d9cf8be6507f0299492794da9ed5d749a6ad
Author: VaibhavMalik4187 <vaibhavmalik2...@gmail.com>
AuthorDate: Wed Mar 16 15:50:01 2022 +0530
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Fri Mar 18 21:06:56 2022 +0100
tdf#114441 Convert sal_uLong to other types
Change-Id: I5651788dad4386aa325e20fa8bbfc0908dbfa629
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128767
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 8d07cd81ddc1..f43ee79d2c4f 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -94,7 +94,7 @@ private:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
override;
- void ImpDoHighlight( sal_uLong nLineOff );
+ void ImpDoHighlight( sal_uInt32 nLineOff );
void ImplSetFont();
bool bHighlighting;
@@ -104,7 +104,7 @@ private:
virtual css::uno::Reference< css::awt::XWindowPeer >
GetComponentInterface(bool bCreate = true) override;
CodeCompleteDataCache aCodeCompleteCache;
VclPtr<CodeCompleteWindow> pCodeCompleteWnd;
- OUString GetActualSubName( sal_uLong nLine ); // gets the actual
subroutine name according to line number
+ OUString GetActualSubName( sal_uInt32 nLine ); // gets the actual
subroutine name according to line number
void SetupAndShowCodeCompleteWnd(const std::vector< OUString >&
aEntryVect, TextSelection aSel );
void HandleAutoCorrect();
void HandleAutoCloseParen();
@@ -123,7 +123,7 @@ private:
virtual void LoseFocus() override;
virtual void RequestHelp( const HelpEvent& rHEvt ) override;
- void DoSyntaxHighlight( sal_uLong nPara );
+ void DoSyntaxHighlight( sal_uInt32 nPara );
OUString GetWordAtCursor();
bool ImpCanModify();
@@ -138,8 +138,8 @@ public:
void CreateProgress( const OUString& rText, sal_uInt32 nRange );
void DestroyProgress();
- void ParagraphInsertedDeleted( sal_uLong nNewPara, bool
bInserted );
- void DoDelayedSyntaxHighlight( sal_uLong nPara );
+ void ParagraphInsertedDeleted( sal_uInt32 nNewPara, bool
bInserted );
+ void DoDelayedSyntaxHighlight( sal_uInt32 nPara );
void CreateEditEngine();
void SetScrollBarRanges();
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 00c5dce2f185..e15ccc3ef3ed 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1141,7 +1141,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
}
}
-OUString EditorWindow::GetActualSubName( sal_uLong nLine )
+OUString EditorWindow::GetActualSubName( sal_uInt32 nLine )
{
SbxArrayRef pMethods = rModulWindow.GetSbModule()->GetMethods();
for (sal_uInt32 i = 0; i < pMethods->Count(); i++)
@@ -1195,7 +1195,7 @@ void EditorWindow::InitScrollBars()
}
}
-void EditorWindow::ImpDoHighlight( sal_uLong nLine )
+void EditorWindow::ImpDoHighlight( sal_uInt32 nLine )
{
if ( !bDoSyntaxHighlight )
return;
@@ -1259,7 +1259,7 @@ void EditorWindow::ImplSetFont()
}
}
-void EditorWindow::DoSyntaxHighlight( sal_uLong nPara )
+void EditorWindow::DoSyntaxHighlight( sal_uInt32 nPara )
{
// because of the DelayedSyntaxHighlight it's possible
// that this line does not exist anymore!
@@ -1272,7 +1272,7 @@ void EditorWindow::DoSyntaxHighlight( sal_uLong nPara )
}
}
-void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
+void EditorWindow::DoDelayedSyntaxHighlight( sal_uInt32 nPara )
{
// line is only added to list, processed in TimerHdl
// => don't manipulate breaks while EditEngine is formatting
@@ -1314,7 +1314,7 @@ IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Timer *,
void)
bHighlighting = false;
}
-void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted )
+void EditorWindow::ParagraphInsertedDeleted( sal_uInt32 nPara, bool bInserted )
{
if ( pProgress )
pProgress->StepProgress();
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 5ef4f7c96b96..63dc3828bb7b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1281,10 +1281,10 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl,
weld::Button&, rIB, void)
bool SvxNumberFormatTabPage::Click_Impl(const weld::Button& rIB)
{
- sal_uLong nReturn = 0;
- constexpr sal_uLong nReturnChanged = 0x1; // THE boolean return value
- constexpr sal_uLong nReturnAdded = 0x2; // temp: format added
- constexpr sal_uLong nReturnOneArea = 0x4; // temp: one area but category
changed => ignored
+ sal_uInt8 nReturn = 0;
+ constexpr sal_uInt8 nReturnChanged = 0x1; // THE boolean return value
+ constexpr sal_uInt8 nReturnAdded = 0x2; // temp: format added
+ constexpr sal_uInt8 nReturnOneArea = 0x4; // temp: one area but category
changed => ignored
if (&rIB == m_xIbAdd.get())
{ // Also called from FillItemSet() if a temporary currency format has
