editeng/source/uno/unoedhlp.cxx | 2 +-
include/editeng/unoedhlp.hxx | 3 +--
include/vcl/textdata.hxx | 7 +++----
vcl/source/edit/textdata.cxx | 2 +-
vcl/source/edit/textdoc.cxx | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit f52d165c887076d6f6ccf928c2be585cfc06058a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun May 2 18:24:43 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 2 20:46:08 2021 +0200
sal_uLong->sal_Int32 in TextHint
Change-Id: If8125e1343b74c2216fb8e9f9e1e16669062de14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115004
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 9b5b98fc6df2..2a1b1e2bd54f 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -33,7 +33,7 @@ SvxEditSourceHint::SvxEditSourceHint( SfxHintId _nId ) :
{
}
-SvxEditSourceHint::SvxEditSourceHint( SfxHintId _nId, sal_uLong nValue,
sal_Int32 nStart, sal_Int32 nEnd ) :
+SvxEditSourceHint::SvxEditSourceHint( SfxHintId _nId, sal_Int32 nValue,
sal_Int32 nStart, sal_Int32 nEnd ) :
TextHint( _nId, nValue ),
mnStart( nStart),
mnEnd( nEnd )
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index 24a9105453da..5b70de35ca55 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_EDITENG_UNOEDHLP_HXX
#include <memory>
-#include <tools/solar.h>
#include <vcl/textdata.hxx>
#include <svl/hint.hxx>
#include <tools/gen.hxx>
@@ -43,7 +42,7 @@ private:
public:
SvxEditSourceHint( SfxHintId nId );
- SvxEditSourceHint( SfxHintId nId, sal_uLong nValue, sal_Int32
nStart, sal_Int32 nEnd );
+ SvxEditSourceHint( SfxHintId nId, sal_Int32 nValue, sal_Int32
nStart, sal_Int32 nEnd );
using TextHint::GetValue;
sal_Int32 GetStartValue() const { return mnStart;}
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 2e595fb8995e..907a6fdd8852 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_TEXTDATA_HXX
#include <sal/types.h>
-#include <tools/solar.h>
#include <rtl/ustring.hxx>
#include <svl/hint.hxx>
#include <vcl/dllapi.h>
@@ -115,13 +114,13 @@ inline bool TextSelection::operator != ( const
TextSelection& rSel ) const
class VCL_DLLPUBLIC TextHint : public SfxHint
{
private:
- sal_uLong mnValue;
+ sal_Int32 mnValue;
public:
TextHint( SfxHintId nId );
- TextHint( SfxHintId nId, sal_uLong nValue );
+ TextHint( SfxHintId nId, sal_Int32 nValue );
- sal_uLong GetValue() const { return mnValue; }
+ sal_Int32 GetValue() const { return mnValue; }
};
struct TEIMEInfos
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index 79ddb8442d09..5c00cd5ebf0f 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -312,7 +312,7 @@ TextHint::TextHint( SfxHintId Id ) : SfxHint( Id ),
mnValue(0)
{
}
-TextHint::TextHint( SfxHintId Id, sal_uLong nValue ) : SfxHint( Id ),
mnValue(nValue)
+TextHint::TextHint( SfxHintId Id, sal_Int32 nValue ) : SfxHint( Id ),
mnValue(nValue)
{
}
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index cba52bc5d22d..2be8c372c273 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -504,7 +504,7 @@ TextPaM TextDoc::ConnectParagraphs( TextNode* pLeft, const
TextNode* pRight )
maTextNodes.erase( std::find_if( maTextNodes.begin(), maTextNodes.end(),
[&] (std::unique_ptr<TextNode> const & p)
{ return p.get() == pRight; } ) );
- sal_uLong nLeft = ::std::find_if( maTextNodes.begin(), maTextNodes.end(),
+ sal_Int32 nLeft = ::std::find_if( maTextNodes.begin(), maTextNodes.end(),
[&] (std::unique_ptr<TextNode> const &
p) { return p.get() == pLeft; } )
- maTextNodes.begin();
TextPaM aPaM( nLeft, nPrevLen );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
