[Libreoffice-commits] core.git: 2 commits - include/svtools include/vcl svtools/source vcl/source

[Noel Grandin (via logerrit)]

 include/svtools/htmlout.hxx       |    5 ++---
 include/vcl/toolkit/button.hxx    |    3 +--
 svtools/source/svhtml/htmlout.cxx |    4 ++--
 vcl/source/control/button.cxx     |    4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 5dad1d93a938cf995fd533b0c6a5cb7b0284f5c0
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun May 2 19:48:04 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon May 3 08:38:24 2021 +0200

    sal_uLong->sal_Int32 in Button
    
    Change-Id: Ib2a9f8eecbeee4de1ac8f0fc1a5bfa93f6746d48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115008
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index a470ea28d7c1..a9b81b0edb00 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -23,7 +23,6 @@
 #error "don't use this in new code"
 #endif
 
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
@@ -52,7 +51,7 @@ private:
 public:
     SAL_DLLPRIVATE DrawTextFlags    ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags );
     SAL_DLLPRIVATE void             ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos, Size& rSize,
-                                              sal_uLong nImageSep,
+                                              sal_Int32 nImageSep,
                                               DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false );
     SAL_DLLPRIVATE void             ImplSetFocusRect( const tools::Rectangle &rFocusRect );
     SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b08cc9772d62..d6529c8bf311 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -205,7 +205,7 @@ DrawTextFlags Button::ImplGetTextStyle( WinBits nWinStyle, DrawFlags nDrawFlags
 
 void Button::ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos,
                                   Size& rSize,
-                                  sal_uLong nImageSep,
+                                  sal_Int32 nImageSep,
                                   DrawTextFlags nTextStyle, tools::Rectangle *pSymbolRect,
                                   bool bAddImageSep)
 {
@@ -842,7 +842,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice *pDev, DrawFlags nDrawFl
     Size aSize = rRect.GetSize();
     Point aPos = rRect.TopLeft();
 
-    sal_uLong nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
+    sal_Int32 nImageSep = 1 + (pDev->GetTextHeight()-10)/2;
     if( nImageSep < 1 )
         nImageSep = 1;
     if ( mnDDStyle == PushButtonDropdownStyle::MenuButton ||
commit 13e49b4690f873b06175fe7b15454cba3c1e7a67
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun May 2 18:06:32 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon May 3 08:38:12 2021 +0200

    sal_uLong->sal_uInt32 in HTMLOutFuncs
    
    Change-Id: I112ac7c3eedcab912e54fb226c6253d88d64b6fd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115003
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 14065fe4c801..8e87855b527c 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -24,7 +24,6 @@
 #include <string_view>
 
 #include <svtools/svtdllapi.h>
-#include <tools/solar.h>
 #include <rtl/textenc.h>
 #include <rtl/string.hxx>
 #include <svl/macitem.hxx>
@@ -66,7 +65,7 @@ struct HTMLOutFuncs
     SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&,
                         rtl_TextEncoding eDestEnc,
                         OUString *pNonConvertableChars = nullptr );
-    SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen );
+    SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uInt32 nHex, sal_uInt8 nLen );
     SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, bool bXHTML = false );
     SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&,
                                    const HTMLOutEvent *pEventTable,
@@ -98,7 +97,7 @@ struct HTMLOutFuncs
 
     // <TD SDVAL="..." SDNUM="...">
     SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
-                bool bValue, double fVal, sal_uLong nFormat,
+                bool bValue, double fVal, sal_uInt32 nFormat,
                 SvNumberFormatter& rFormatter,
                 rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
                 OUString *pNonConvertableChars = nullptr);
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index c75d293b6f77..b39609ad38d8 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -562,7 +562,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream,
     return rStream;
 }
 
-SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen )
+SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt32 nHex, sal_uInt8 nLen )
 {                                                  // out into a stream
     char aNToABuf[] = "0000000000000000";
 
@@ -926,7 +926,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
 
 OString HTMLOutFuncs::CreateTableDataOptionsValNum(
             bool bValue,
-            double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter,
+            double fVal, sal_uInt32 nFormat, SvNumberFormatter& rFormatter,
             rtl_TextEncoding eDestEnc, OUString* pNonConvertableChars)
 {
     OStringBuffer aStrTD;