editeng/source/editeng/editdbg.cxx | 2 +-
sw/source/filter/ww8/WW8TableInfo.cxx | 16 ++++++++--------
vcl/workben/vcldemo.cxx | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 9e0de138a5afaa7132ee535a15741effc983d2b0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Nov 25 11:00:23 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Nov 25 14:07:07 2020 +0100
Use sal_Int64 to printf tools::Long values
(The "%l" format specifiers had now caused -Werror,-Wformat with clang-cl
for a
Windows 64-bit build.)
Change-Id: I86b9617310f7348d72172cc7a29f0976c7030dd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106576
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index cee32beafcc2..3598036e2240 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditEngine::DumpData(const EditEngine* pEE, bool
bInfoBox)
fprintf( fp, "\nControl: %x", unsigned( pEE->GetControlWord() ) );
fprintf( fp, "\nRefMapMode: %i", int(
pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() ) );
fprintf( fp, "\nPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64,
sal_Int64(pEE->GetPaperSize().Width()), sal_Int64(pEE->GetPaperSize().Height())
);
- fprintf( fp, "\nMaxAutoPaperSize: %li x %li",
pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );
+ fprintf( fp, "\nMaxAutoPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64,
sal_Int64(pEE->GetMaxAutoPaperSize().Width()),
sal_Int64(pEE->GetMaxAutoPaperSize().Height()) );
fprintf( fp, "\nMinAutoPaperSize: %" SAL_PRIdINT64 " x %" SAL_PRIdINT64 ,
sal_Int64(pEE->GetMinAutoPaperSize().Width()),
sal_Int64(pEE->GetMinAutoPaperSize().Height()) );
fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() );
fprintf( fp, "\nNumber of Views: %" SAL_PRI_SIZET "i", pEE->GetViewCount()
);
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 03f376fbeec9..907e4131cec0 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -998,15 +998,15 @@ std::string CellInfo::toString() const
static char sBuffer[256];
snprintf(sBuffer, sizeof(sBuffer),
- "<cellinfo left=\"%ld\""
- " right=\"%ld\""
- " top=\"%ld\""
- " bottom=\"%ld\""
+ "<cellinfo left=\"%" SAL_PRIdINT64 "\""
+ " right=\"%" SAL_PRIdINT64 "\""
+ " top=\"%" SAL_PRIdINT64 "\""
+ " bottom=\"%" SAL_PRIdINT64 "\""
" node=\"%p\"/>",
- left(),
- right(),
- top(),
- bottom(),
+ sal_Int64(left()),
+ sal_Int64(right()),
+ sal_Int64(top()),
+ sal_Int64(bottom()),
m_pNodeInfo);
return sBuffer;
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 68a04d1384a9..cca89f8a2ecc 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1794,7 +1794,7 @@ public:
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect) override
{
mrRenderer.SetSizePixel(GetSizePixel());
- fprintf(stderr, "DemoWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(),
rRect.getY(), rRect.getWidth(), rRect.getHeight());
+ fprintf(stderr, "DemoWin::Paint(%" SAL_PRIdINT64 ",%" SAL_PRIdINT64
",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ")\n", sal_Int64(rRect.getX()),
sal_Int64(rRect.getY()), sal_Int64(rRect.getWidth()),
sal_Int64(rRect.getHeight()));
if (mrRenderer.getIterCount() == 0)
mrRenderer.drawToDevice(rRenderContext, GetSizePixel(), false);
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
