mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 64-bit --disable-pch build on Windows

Browse Source 
Change-Id: Ieeef0309faa77558fb30fceaed83ad97fb6e26ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105590
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Mike Kaganski 2020-11-11 16:10:03 +03:00 committed by Noel Grandin
parent f7ca7e1994
commit c74f614a4c
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/source/uielement/fontsizemenucontroller.cxx
View File

@ -174,7 +174,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co
// first insert font size names (for simplified/traditional chinese) // first insert font size names (for simplified/traditional chinese)
float fPoint; float fPoint;
FontSizeNames aFontSizeNames( Application::GetSettings().GetUILanguageTag().getLanguageType() ); 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; OUString aCommand;
if ( !aFontSizeNames.IsEmpty() ) if ( !aFontSizeNames.IsEmpty() )

2
lotuswordpro/source/filter/tocread.cxx
View File

@ -457,7 +457,7 @@ CBenTOCReader::ReadSegment(CBenValue * pValue, BenByte * pLookAhead)
} }
bool bool
CBenTOCReader::CanGetData(unsigned long Amt) CBenTOCReader::CanGetData(tools::ULong Amt)
{ {
return cCurr + Amt <= cTOCSize; return cCurr + Amt <= cTOCSize;
} }

13
lotuswordpro/source/filter/tocread.hxx
View File

@ -58,6 +58,7 @@
#include "bento.hxx" #include "bento.hxx"
#include <memory> #include <memory>
#include <tools/long.hxx>
namespace OpenStormBento namespace OpenStormBento
{ {
@ -74,23 +75,23 @@ public: // Methods
BenError ReadLabelAndTOC(); BenError ReadLabelAndTOC();
private: // Methods private: // Methods
BenError ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize); BenError ReadLabel(tools::ULong* pTOCOffset, tools::ULong* pTOCSize);
BenError SearchForLabel(BenByte * pLabel); BenError SearchForLabel(BenByte * pLabel);
BenError ReadTOC(); BenError ReadTOC();
BenError ReadSegments(CBenValue * pValue, BenByte * pLookAhead); BenError ReadSegments(CBenValue * pValue, BenByte * pLookAhead);
BenError ReadSegment(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 GetByte(BenByte * pByte);
BenError GetDWord(BenDWord * pDWord); BenError GetDWord(BenDWord * pDWord);
BenByte GetCode(); BenByte GetCode();
BenError GetData(void * pBuffer, unsigned long Amt); BenError GetData(void* pBuffer, tools::ULong Amt);
private: // Data private: // Data
LtcBenContainer * cpContainer; LtcBenContainer * cpContainer;
std::unique_ptr<BenByte[]> cpTOC; std::unique_ptr<BenByte[]> cpTOC;
unsigned long cBlockSize; tools::ULong cBlockSize;
unsigned long cCurr; tools::ULong cCurr;
unsigned long cTOCSize; tools::ULong cTOCSize;
}; };
}//end namespace OpenStormBento }//end namespace OpenStormBento
#endif #endif

4
vcl/inc/win/saldata.hxx
View File

@ -28,6 +28,8 @@
#include <svdata.hxx> #include <svdata.hxx>
#include <salwtype.hxx> #include <salwtype.hxx>
#include <tools/long.hxx>
#include <win/wincomp.hxx> #include <win/wincomp.hxx>
#include <set> #include <set>
@ -86,7 +88,7 @@ public:
HGLOBAL mhDitherDIB; // dither memory handle HGLOBAL mhDitherDIB; // dither memory handle
BYTE* mpDitherDIB; // dither memory BYTE* mpDitherDIB; // dither memory
BYTE* mpDitherDIBData; // beginning of DIB data BYTE* mpDitherDIBData; // beginning of DIB data
long* mpDitherDiff; // Dither mapping table tools::Long* mpDitherDiff; // Dither mapping table
BYTE* mpDitherLow; // Dither mapping table BYTE* mpDitherLow; // Dither mapping table
BYTE* mpDitherHigh; // Dither mapping table BYTE* mpDitherHigh; // Dither mapping table
HHOOK mhSalObjMsgHook; // hook to get interesting msg for SalObject HHOOK mhSalObjMsgHook; // hook to get interesting msg for SalObject

3
vcl/win/gdi/gdiimpl.hxx
View File

@ -21,6 +21,7 @@
#define INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX #define INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX
#include <salgdiimpl.hxx> #include <salgdiimpl.hxx>
#include <tools/long.hxx>
#include <win/salgdi.h> #include <win/salgdi.h>
#include <win/wingdiimpl.hxx> #include <win/wingdiimpl.hxx>
@ -51,7 +52,7 @@ private:
Color maFillColor; Color maFillColor;
bool TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap); 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 SearchStockPen(COLORREF nPenColor);
HPEN MakePen(Color nColor); HPEN MakePen(Color nColor);