[Libreoffice-commits] core.git: framework/source lotuswordpro/source vcl/inc vcl/win

[Mike Kaganski (via logerrit)]

 framework/source/uielement/fontsizemenucontroller.cxx |    2 +-
 lotuswordpro/source/filter/tocread.cxx                |    2 +-
 lotuswordpro/source/filter/tocread.hxx                |   13 +++++++------
 vcl/inc/win/saldata.hxx                               |    4 +++-
 vcl/win/gdi/gdiimpl.hxx                               |    3 ++-
 5 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit c74f614a4cc7a2b0c9ba6d9eaf24c77d8db5e12b
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Nov 11 16:10:03 2020 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Nov 11 20:26:13 2020 +0100

    Fix 64-bit --disable-pch build on Windows
    
    Change-Id: Ieeef0309faa77558fb30fceaed83ad97fb6e26ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105590
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 7678c2bfcd25..a217cc8ff9ed 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -174,7 +174,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co
     // first insert font size names (for simplified/traditional chinese)
     float           fPoint;
     FontSizeNames   aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() );
-    m_pHeightArray.reset( new long[nSizeCount+aFontSizeNames.Count()] );
+    m_pHeightArray.reset(new tools::Long[nSizeCount + aFontSizeNames.Count()]);
     OUString   aCommand;
 
     if ( !aFontSizeNames.IsEmpty() )
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index dff08e68e3cf..53f7e2b929f8 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -457,7 +457,7 @@ CBenTOCReader::ReadSegment(CBenValue * pValue, BenByte * pLookAhead)
 }
 
 bool
-CBenTOCReader::CanGetData(unsigned long Amt)
+CBenTOCReader::CanGetData(tools::ULong Amt)
 {
     return cCurr + Amt <= cTOCSize;
 }
diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx
index b2645b0af4dd..10e3adc3272a 100644
--- a/lotuswordpro/source/filter/tocread.hxx
+++ b/lotuswordpro/source/filter/tocread.hxx
@@ -58,6 +58,7 @@
 
 #include "bento.hxx"
 #include <memory>
+#include <tools/long.hxx>
 
 namespace OpenStormBento
 {
@@ -74,23 +75,23 @@ public: // Methods
     BenError ReadLabelAndTOC();
 
 private: // Methods
-    BenError ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize);
+    BenError ReadLabel(tools::ULong* pTOCOffset, tools::ULong* pTOCSize);
     BenError SearchForLabel(BenByte * pLabel);
     BenError ReadTOC();
     BenError ReadSegments(CBenValue * pValue, BenByte * pLookAhead);
     BenError ReadSegment(CBenValue * pValue, BenByte * pLookAhead);
-    bool CanGetData(unsigned long Amt);
+    bool CanGetData(tools::ULong Amt);
     BenError GetByte(BenByte * pByte);
     BenError GetDWord(BenDWord * pDWord);
     BenByte GetCode();
-    BenError GetData(void * pBuffer, unsigned long Amt);
+    BenError GetData(void* pBuffer, tools::ULong Amt);
 
 private: // Data
     LtcBenContainer * cpContainer;
     std::unique_ptr<BenByte[]> cpTOC;
-    unsigned long cBlockSize;
-    unsigned long cCurr;
-    unsigned long cTOCSize;
+    tools::ULong cBlockSize;
+    tools::ULong cCurr;
+    tools::ULong cTOCSize;
 };
 }//end namespace OpenStormBento
 #endif
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index eadc7ade8957..b12352ee2e9d 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -28,6 +28,8 @@
 #include <svdata.hxx>
 #include <salwtype.hxx>
 
+#include <tools/long.hxx>
+
 #include <win/wincomp.hxx>
 
 #include <set>
@@ -86,7 +88,7 @@ public:
     HGLOBAL                 mhDitherDIB;            // dither memory handle
     BYTE*                   mpDitherDIB;            // dither memory
     BYTE*                   mpDitherDIBData;        // beginning of DIB data
-    long*                   mpDitherDiff;           // Dither mapping table
+    tools::Long*            mpDitherDiff;           // Dither mapping table
     BYTE*                   mpDitherLow;            // Dither mapping table
     BYTE*                   mpDitherHigh;           // Dither mapping table
     HHOOK                   mhSalObjMsgHook;        // hook to get interesting msg for SalObject
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index c6844a2b4325..52cbd8c53a62 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX
 
 #include <salgdiimpl.hxx>
+#include <tools/long.hxx>
 #include <win/salgdi.h>
 #include <win/wingdiimpl.hxx>
 
@@ -51,7 +52,7 @@ private:
     Color                maFillColor;
 
     bool TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap);
-    void DrawPixelImpl(long nX, long nY, COLORREF crColor);
+    void DrawPixelImpl(tools::Long nX, tools::Long nY, COLORREF crColor);
 
     HPEN SearchStockPen(COLORREF nPenColor);
     HPEN MakePen(Color nColor);