[Libreoffice-commits] core.git: editeng/source include/editeng sc/source

[Noel Grandin (via logerrit)]

 editeng/source/items/textitem.cxx   |    2 +-
 include/editeng/fhgtitem.hxx        |    3 +--
 sc/source/filter/excel/fontbuff.cxx |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9c930c4f3109d123c0831d0fcecf9c8b32e5bbc7
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun May 2 18:52:02 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 2 21:26:09 2021 +0200

    sal_uLong->sal_uInt32 in SvxFontHeightItem
    
    Change-Id: Id9bec39765d504d787e5421bf40e88e09c5f180d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115006
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 776d1210450c..051c1418d4fc 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -558,7 +558,7 @@ void SvxWeightItem::dumpAsXml(xmlTextWriterPtr pWriter) 
const
 
 // class SvxFontHeightItem -----------------------------------------------
 
-SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
+SvxFontHeightItem::SvxFontHeightItem( const sal_uInt32 nSz,
                                       const sal_uInt16 nPrp,
                                       const sal_uInt16 nId ) :
     SfxPoolItem( nId )
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index f5b8ac3f9672..efaad86bdfa8 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -21,7 +21,6 @@
 
 #include <svl/poolitem.hxx>
 #include <tools/debug.hxx>
-#include <tools/solar.h>
 #include <editeng/editengdllapi.h>
 
 // class SvxFontHeightItem -----------------------------------------------
@@ -49,7 +48,7 @@ private:
 public:
     static SfxPoolItem* CreateDefault();
 
-    SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 
nPropHeight /*= 100*/,
+    SvxFontHeightItem( const sal_uInt32 nSz /*= 240*/, const sal_uInt16 
nPropHeight /*= 100*/,
                        const sal_uInt16 nId  );
 
     // "pure virtual Methods" from SfxPoolItem
diff --git a/sc/source/filter/excel/fontbuff.cxx 
b/sc/source/filter/excel/fontbuff.cxx
index bb25f6409b43..5f5a0f099ae6 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -84,7 +84,7 @@ void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, 
const sal_uInt16 nHeig
 {
     OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array too 
small!" );
     if( nIndex < nSize )
-        pData[ nIndex ].Height( std::make_unique<SvxFontHeightItem>( 
static_cast<sal_uLong>(nHeight) * 20, 100, ATTR_FONT_HEIGHT ) );
+        pData[ nIndex ].Height( std::make_unique<SvxFontHeightItem>( 
static_cast<sal_uInt32>(nHeight) * 20, 100, ATTR_FONT_HEIGHT ) );
 }
 
 void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType 
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits