[Libreoffice-commits] core.git: 4 commits - basctl/source basic/source bridges/inc bridges/source canvas/source connectivity/source cppcanvas/source cppu/source dbaccess/source desktop/source editeng/source filter/source forms/source hwpfilter/source include/filter include/oox include/sot include/svl include/tools include/vcl linguistic/source lotuswordpro/source oox/source opencl/inc reportdesign/source rsc/source sc/inc sc/source sd/source sfx2/source slideshow/source sot/source store/source svgio/qa svl/source svx/source sw/source test/source tools/qa tools/source unotools/source vcl/inc vcl/qa vcl/source vcl/unx vcl/win writerfilter/source
Michael Stahl
mstahl at redhat.com
Thu Sep 15 10:06:58 UTC 2016
basctl/source/basicide/baside2b.cxx | 2
basic/source/basmgr/basmgr.cxx | 5
basic/source/runtime/iosys.cxx | 16 -
basic/source/runtime/methods.cxx | 20 -
basic/source/runtime/methods1.cxx | 10
basic/source/sbx/sbxbase.cxx | 8
basic/source/sbx/sbxobj.cxx | 8
basic/source/uno/scriptcont.cxx | 6
bridges/inc/vtablefactory.hxx | 2
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx | 2
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx | 2
bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx | 2
bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 2
bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx | 2
bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 2
bridges/source/cpp_uno/shared/vtablefactory.cxx | 8
canvas/source/cairo/cairo_canvashelper.cxx | 88 +++---
canvas/source/tools/canvastools.cxx | 104 +++----
connectivity/source/drivers/dbase/DTable.cxx | 50 +--
connectivity/source/drivers/dbase/dindexnode.cxx | 6
connectivity/source/inc/dbase/DTable.hxx | 4
cppcanvas/source/mtfrenderer/emfplus.cxx | 8
cppu/source/threadpool/threadpool.cxx | 4
cppu/source/uno/sequence.cxx | 2
dbaccess/source/ui/misc/HtmlReader.cxx | 2
dbaccess/source/ui/misc/RtfReader.cxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 2
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 2
desktop/source/migration/services/wordbookmigration.cxx | 4
editeng/source/editeng/editobj.cxx | 8
editeng/source/editeng/eeobj.cxx | 3
editeng/source/items/bulitem.cxx | 6
editeng/source/items/frmitems.cxx | 2
editeng/source/items/textitem.cxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/msfilter/dffpropset.cxx | 2
filter/source/msfilter/escherex.cxx | 4
filter/source/msfilter/mscodec.cxx | 40 +-
filter/source/msfilter/msdffimp.cxx | 8
filter/source/svg/gfxtypes.hxx | 2
filter/source/svg/svgreader.cxx | 12
filter/source/textfilterdetect/filterdetect.cxx | 2
filter/source/xmlfilterdetect/filterdetect.cxx | 2
forms/source/component/imgprod.cxx | 10
hwpfilter/source/hwpreader.cxx | 2
include/filter/msfilter/dffrecordheader.hxx | 4
include/filter/msfilter/mscodec.hxx | 20 -
include/oox/dump/dumperbase.hxx | 4
include/oox/ole/vbaexport.hxx | 4
include/sot/storage.hxx | 4
include/svl/instrm.hxx | 4
include/svl/outstrm.hxx | 4
include/tools/pstm.hxx | 4
include/tools/stream.hxx | 82 +++---
include/vcl/sysdata.hxx | 6
linguistic/source/dicimp.cxx | 4
lotuswordpro/source/filter/bento.hxx | 4
lotuswordpro/source/filter/utbenvs.cxx | 4
oox/source/dump/dumperbase.cxx | 6
oox/source/export/drawingml.cxx | 2
oox/source/ole/vbaexport.cxx | 10
opencl/inc/opencl_device_selection.h | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 2
rsc/source/rsc/rsc.cxx | 4
rsc/source/tools/rscchar.cxx | 2
sc/inc/autoform.hxx | 2
sc/source/core/tool/autoform.cxx | 2
sc/source/filter/excel/excform.cxx | 24 -
sc/source/filter/excel/excform8.cxx | 22 -
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/excrecds.cxx | 30 +-
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/excel/read.cxx | 10
sc/source/filter/excel/xechart.cxx | 6
sc/source/filter/excel/xehelper.cxx | 4
sc/source/filter/excel/xepivot.cxx | 6
sc/source/filter/excel/xerecord.cxx | 10
sc/source/filter/excel/xestream.cxx | 48 +--
sc/source/filter/excel/xestring.cxx | 6
sc/source/filter/excel/xetable.cxx | 10
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xicontent.cxx | 2
sc/source/filter/excel/xiescher.cxx | 38 +-
sc/source/filter/excel/xilink.cxx | 8
sc/source/filter/excel/xistream.cxx | 64 ++--
sc/source/filter/ftools/fprogressbar.cxx | 24 -
sc/source/filter/inc/XclExpChangeTrack.hxx | 46 +--
sc/source/filter/inc/excform.hxx | 16 -
sc/source/filter/inc/excrecds.hxx | 32 +-
sc/source/filter/inc/formel.hxx | 4
sc/source/filter/inc/fprogressbar.hxx | 32 +-
sc/source/filter/inc/xcl97rec.hxx | 24 -
sc/source/filter/inc/xechart.hxx | 4
sc/source/filter/inc/xehelper.hxx | 4
sc/source/filter/inc/xepivot.hxx | 2
sc/source/filter/inc/xerecord.hxx | 20 -
sc/source/filter/inc/xestream.hxx | 20 -
sc/source/filter/inc/xestring.hxx | 4
sc/source/filter/inc/xetable.hxx | 16 -
sc/source/filter/inc/xichart.hxx | 4
sc/source/filter/inc/xiescher.hxx | 30 +-
sc/source/filter/inc/xiname.hxx | 4
sc/source/filter/inc/xistream.hxx | 58 ++--
sc/source/filter/inc/xlchart.hxx | 2
sc/source/filter/inc/xlstream.hxx | 4
sc/source/filter/lotus/filter.cxx | 2
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 52 +--
sc/source/filter/xcl97/xcl97rec.cxx | 24 -
sc/source/ui/unoobj/exceldetect.cxx | 6
sd/source/filter/eppt/pptexanimations.cxx | 2
sd/source/filter/eppt/pptexanimations.hxx | 2
sd/source/filter/ppt/pptatom.cxx | 4
sd/source/ui/app/sdmod1.cxx | 4
sd/source/ui/dlg/RemoteDialog.cxx | 2
sfx2/source/bastyp/mieclip.cxx | 2
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/doc/oleprops.cxx | 12
sfx2/source/doc/oleprops.hxx | 4
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 52 +--
slideshow/source/engine/shapes/appletshape.cxx | 8
slideshow/source/engine/shapes/appletshape.hxx | 2
slideshow/source/engine/shapes/viewappletshape.cxx | 4
slideshow/source/engine/shapes/viewappletshape.hxx | 2
sot/source/sdstor/stgole.cxx | 4
sot/source/sdstor/stgole.hxx | 4
sot/source/sdstor/stgstrms.cxx | 4
sot/source/sdstor/stgstrms.hxx | 4
sot/source/sdstor/storage.cxx | 8
sot/source/sdstor/storinfo.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 16 -
store/source/storbase.cxx | 4
store/source/storcach.cxx | 14 -
store/source/storcach.hxx | 2
svgio/qa/cppunit/SvgImportTest.cxx | 2
svl/source/items/lckbitem.cxx | 2
svl/source/misc/inettype.cxx | 14 -
svl/source/misc/strmadpt.cxx | 24 -
svx/source/svdraw/svdograf.cxx | 2
svx/source/table/tablelayouter.cxx | 4
svx/source/xoutdev/xexch.cxx | 2
sw/source/filter/basflt/iodetect.cxx | 2
sw/source/filter/html/parcss1.cxx | 2
sw/source/filter/ww8/WW8Sttbf.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 4
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 30 +-
sw/source/filter/ww8/ww8par2.cxx | 8
sw/source/filter/ww8/ww8par2.hxx | 2
sw/source/filter/ww8/ww8scan.cxx | 32 +-
sw/source/filter/ww8/ww8scan.hxx | 4
sw/source/uibase/app/docsh2.cxx | 4
test/source/htmltesttools.cxx | 2
test/source/xmltesttools.cxx | 2
tools/qa/cppunit/test_stream.cxx | 2
tools/source/generic/config.cxx | 2
tools/source/ref/pstm.cxx | 8
tools/source/stream/stream.cxx | 134 +++++-----
tools/source/stream/strmunx.cxx | 28 +-
tools/source/stream/strmwnt.cxx | 20 -
unotools/source/streaming/streamhelper.cxx | 4
unotools/source/streaming/streamwrap.cxx | 2
unotools/source/ucbhelper/ucblockbytes.cxx | 10
unotools/source/ucbhelper/ucblockbytes.hxx | 4
unotools/source/ucbhelper/xtempfile.cxx | 4
vcl/inc/unx/i18n_ic.hxx | 2
vcl/qa/cppunit/canvasbitmaptest.cxx | 16 -
vcl/source/bitmap/BitmapTools.cxx | 2
vcl/source/filter/graphicfilter2.cxx | 4
vcl/source/filter/igif/gifread.cxx | 6
vcl/source/filter/wmf/enhwmf.cxx | 4
vcl/source/filter/wmf/winwmf.cxx | 2
vcl/source/filter/wmf/wmfwr.cxx | 2
vcl/source/gdi/dibtools.cxx | 8
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/gdi/jobset.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/gdi/pngread.cxx | 6
vcl/source/gdi/svmconverter.cxx | 2
vcl/source/helper/canvasbitmap.cxx | 72 ++---
vcl/source/helper/canvastools.cxx | 26 -
vcl/source/window/mouse.cxx | 4
vcl/unx/generic/app/i18n_ic.cxx | 2
vcl/unx/generic/dtrans/X11_droptarget.cxx | 2
vcl/unx/generic/dtrans/X11_selection.cxx | 10
vcl/unx/generic/print/psputil.cxx | 4
vcl/unx/generic/print/psputil.hxx | 4
vcl/unx/generic/print/text_gfx.cxx | 2
vcl/unx/gtk3/gtk3gtkframe.cxx | 2
vcl/unx/gtk3/gtk3gtkinst.cxx | 4
vcl/unx/gtk3/gtk3gtkobject.cxx | 2
vcl/win/gdi/salprn.cxx | 2
writerfilter/source/rtftok/rtfdispatchdestination.cxx | 6
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 12
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 10
writerfilter/source/rtftok/rtflookahead.cxx | 4
writerfilter/source/rtftok/rtflookahead.hxx | 2
writerfilter/source/rtftok/rtftokenizer.cxx | 10
writerfilter/source/rtftok/rtftokenizer.hxx | 6
221 files changed, 1113 insertions(+), 1101 deletions(-)
New commits:
commit f6536d875bff70767b5bf389fe2ae34802a6b022
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 14 20:03:39 2016 +0200
vcl: consistently use sal_IntPtr to marshal drag source / drop target
This may be either an X11 Window or a GtkSalFrame*.
Change-Id: Ib963cfb329bb711cfaab47f2748da139117cdbae
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 4951198..458725d 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_SYSDATA_HXX
#define INCLUDED_VCL_SYSDATA_HXX
+#include <sal/types.h>
+
#include <vector>
#include <cstddef>
@@ -70,7 +72,9 @@ struct SystemEnvData
int nDepth; // depth of said visual
long aColormap; // the colormap being used
void* pAppContext; // the application context in use
- long aShellWindow; // the window of the frame's shell
+ // note: this is a "long" in Xlib *but* in the protocol it's only 32-bit
+ // however, the GTK3 vclplug wants to store pointers in here!
+ sal_IntPtr aShellWindow; // the window of the frame's shell
void* pShellWidget; // the frame's shell widget
const char* pToolkit; // the toolkit in use (gtk2 vs gtk3)
#endif
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index b47949d..516db21 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -748,9 +748,9 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource()
aDropTargetSN = "com.sun.star.datatransfer.dnd.X11DropTarget";
aDragSourceAL[ 0 ] = makeAny( Application::GetDisplayConnection() );
- aDragSourceAL[ 1 ] = makeAny( (sal_Size)(pEnvData->aShellWindow) );
+ aDragSourceAL[ 1 ] = makeAny(static_cast<sal_IntPtr>(pEnvData->aShellWindow));
aDropTargetAL[ 0 ] = makeAny( Application::GetDisplayConnection() );
- aDropTargetAL[ 1 ] = makeAny( (sal_Size)(pEnvData->aShellWindow) );
+ aDropTargetAL[ 1 ] = makeAny(static_cast<sal_IntPtr>(pEnvData->aShellWindow));
#endif
if( !aDragSourceSN.isEmpty() )
mpWindowImpl->mpFrameData->mxDragSource.set(
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index 413101f..b6892eb 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -65,7 +65,7 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( css::uno:
if( m_pSelectionManager->getDisplay() ) // #136582# sanity check
{
- sal_Size aWindow = None;
+ sal_IntPtr aWindow = None;
arguments.getConstArray()[1] >>= aWindow;
m_pSelectionManager->registerDropTarget( aWindow, this );
m_aTargetWindow = aWindow;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index bdf0867..3a6eef7 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1099,7 +1099,7 @@ void GtkSalFrame::InitCommon()
//system data
m_aSystemData.nSize = sizeof( SystemEnvData );
m_aSystemData.aWindow = GetNativeWindowHandle(m_pWindow);
- m_aSystemData.aShellWindow = reinterpret_cast<long>(this);
+ m_aSystemData.aShellWindow = reinterpret_cast<sal_IntPtr>(this);
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
m_aSystemData.nScreen = m_nXScreen.getXScreen();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 92ebb30..7c04b1d 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -734,7 +734,7 @@ void GtkDropTarget::initialize(const Sequence<Any>& rArguments) throw( Exception
static_cast<OWeakObject*>(this));
}
- sal_Size nFrame = 0;
+ sal_IntPtr nFrame = 0;
rArguments.getConstArray()[1] >>= nFrame;
if (!nFrame)
@@ -870,7 +870,7 @@ void GtkDragSource::initialize(const css::uno::Sequence<css::uno::Any >& rArgume
static_cast<OWeakObject*>(this));
}
- sal_Size nFrame = 0;
+ sal_IntPtr nFrame = 0;
rArguments.getConstArray()[1] >>= nFrame;
if (!nFrame)
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index b57c4dc..039a4ba 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -48,7 +48,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
// system data
m_aSystemData.nSize = sizeof( SystemEnvData );
m_aSystemData.aWindow = pParent->GetNativeWindowHandle(m_pSocket);
- m_aSystemData.aShellWindow = reinterpret_cast<long>(this);
+ m_aSystemData.aShellWindow = reinterpret_cast<sal_IntPtr>(this);
m_aSystemData.pSalFrame = nullptr;
m_aSystemData.pWidget = m_pSocket;
m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen();
commit ab7d6b0d4fa8c91306f7b4f460a4596abc159912
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 14 19:47:52 2016 +0200
tools: SvFileStream::LockRange/UnlockRange take 64 bit positions
Change-Id: I85d9cc00daaaa127817aaaa6f54d3e6f86907fb6
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 6a37b26..2154c6f 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -573,8 +573,8 @@ private:
SvFileStream (const SvFileStream&) = delete;
SvFileStream & operator= (const SvFileStream&) = delete;
- bool LockRange( std::size_t nByteOffset, std::size_t nBytes );
- bool UnlockRange( std::size_t nByteOffset, std::size_t nBytes );
+ bool LockRange( sal_uInt64 nByteOffset, std::size_t nBytes );
+ bool UnlockRange( sal_uInt64 nByteOffset, std::size_t nBytes );
bool LockFile();
void UnlockFile();
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 36ed303..66a5e1a 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -48,20 +48,20 @@ struct LockMutex : public rtl::Static< osl::Mutex, LockMutex > {};
struct InternalStreamLock
{
- std::size_t m_nStartPos;
- std::size_t m_nEndPos;
+ sal_uInt64 m_nStartPos;
+ sal_uInt64 m_nEndPos;
SvFileStream* m_pStream;
osl::DirectoryItem m_aItem;
- InternalStreamLock( std::size_t, std::size_t, SvFileStream* );
+ InternalStreamLock( sal_uInt64, sal_uInt64, SvFileStream* );
~InternalStreamLock();
};
struct LockList : public rtl::Static< std::vector<InternalStreamLock>, LockList > {};
InternalStreamLock::InternalStreamLock(
- std::size_t nStart,
- std::size_t nEnd,
+ sal_uInt64 const nStart,
+ sal_uInt64 const nEnd,
SvFileStream* pStream ) :
m_nStartPos( nStart ),
m_nEndPos( nEnd ),
@@ -90,7 +90,7 @@ InternalStreamLock::~InternalStreamLock()
#endif
}
-bool lockFile( std::size_t nStart, std::size_t nEnd, SvFileStream* pStream )
+bool lockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream* pStream )
{
osl::DirectoryItem aItem;
if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) != osl::FileBase::E_None )
@@ -145,7 +145,7 @@ bool lockFile( std::size_t nStart, std::size_t nEnd, SvFileStream* pStream )
return true;
}
-void unlockFile( std::size_t nStart, std::size_t nEnd, SvFileStream const * pStream )
+void unlockFile( sal_uInt64 const nStart, sal_uInt64 const nEnd, SvFileStream const * pStream )
{
osl::MutexGuard aGuard( LockMutex::get() );
std::vector<InternalStreamLock> &rLockList = LockList::get();
@@ -379,7 +379,7 @@ void SvFileStream::FlushData()
// does not exist locally
}
-bool SvFileStream::LockRange( std::size_t nByteOffset, std::size_t nBytes )
+bool SvFileStream::LockRange(sal_uInt64 const nByteOffset, std::size_t nBytes)
{
int nLockMode = 0;
@@ -428,7 +428,7 @@ bool SvFileStream::LockRange( std::size_t nByteOffset, std::size_t nBytes )
return true;
}
-bool SvFileStream::UnlockRange( std::size_t nByteOffset, std::size_t nBytes )
+bool SvFileStream::UnlockRange(sal_uInt64 const nByteOffset, std::size_t nBytes)
{
if ( ! IsOpen() )
return false;
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 22c1066..627471c 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -192,7 +192,7 @@ void SvFileStream::FlushData()
}
}
-bool SvFileStream::LockRange( std::size_t nByteOffset, std::size_t nBytes )
+bool SvFileStream::LockRange(sal_uInt64 const nByteOffset, std::size_t nBytes)
{
bool bRetVal = false;
if( IsOpen() )
@@ -204,7 +204,7 @@ bool SvFileStream::LockRange( std::size_t nByteOffset, std::size_t nBytes )
return bRetVal;
}
-bool SvFileStream::UnlockRange( std::size_t nByteOffset, std::size_t nBytes )
+bool SvFileStream::UnlockRange(sal_uInt64 const nByteOffset, std::size_t nBytes)
{
bool bRetVal = false;
if( IsOpen() )
commit b647996a9babbee7b33cf45192e57df6a124628b
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 14 17:01:50 2016 +0200
replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos)
... except in include/rtl, include/sal, include/uno, where sal_Size is
retained for compatibility, and where callers of rtl functions pass in
pointers that are incompatible on MSVC.
Change-Id: I8344453780689f5120ba0870e44965b6d292450c
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index e511f74..1c31380 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -101,7 +101,7 @@ OUString getTextEngineText (ExtTextEngine& rEngine)
aMemStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 );
aMemStream.SetLineDelimiter( LINEEND_LF );
rEngine.Write( aMemStream );
- sal_Size nSize = aMemStream.Tell();
+ std::size_t nSize = aMemStream.Tell();
OUString aText( static_cast<const sal_Char*>(aMemStream.GetData()),
nSize, RTL_TEXTENCODING_UTF8 );
return aText;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index cfbcd56..55ccad2 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -987,7 +987,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
bool BasicManager::ImplEncryptStream( SvStream& rStrm )
{
- sal_Size nPos = rStrm.Tell();
+ sal_uInt64 const nPos = rStrm.Tell();
sal_uInt32 nCreator;
rStrm.ReadUInt32( nCreator );
rStrm.Seek( nPos );
@@ -1832,7 +1832,8 @@ uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog )
{
SvMemoryStream aMemStream;
pDialog->Store( aMemStream );
- sal_Size nLen = aMemStream.Tell();
+ sal_Int32 nLen = aMemStream.Tell();
+ if (nLen < 0) { abort(); }
uno::Sequence< sal_Int8 > aData( nLen );
sal_Int8* pDestData = aData.getArray();
const sal_Int8* pSrcData = static_cast<const sal_Int8*>(aMemStream.GetData());
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index fa68d4d..05020f6 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -213,8 +213,8 @@ class OslStream : public SvStream
public:
OslStream( const OUString& rName, StreamMode nStrmMode );
virtual ~OslStream() override;
- virtual sal_Size GetData( void* pData, sal_Size nSize ) override;
- virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
+ virtual std::size_t GetData(void* pData, std::size_t nSize) override;
+ virtual std::size_t PutData(const void* pData, std::size_t nSize) override;
virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
virtual void FlushData() override;
virtual void SetSize( sal_uInt64 nSize) override;
@@ -257,14 +257,14 @@ OslStream::~OslStream()
maFile.close();
}
-sal_Size OslStream::GetData(void* pData, sal_Size nSize)
+std::size_t OslStream::GetData(void* pData, std::size_t nSize)
{
sal_uInt64 nBytesRead = nSize;
maFile.read( pData, nBytesRead, nBytesRead );
return nBytesRead;
}
-sal_Size OslStream::PutData(const void* pData, sal_Size nSize)
+std::size_t OslStream::PutData(const void* pData, std::size_t nSize)
{
sal_uInt64 nBytesWritten;
maFile.write( pData, nSize, nBytesWritten );
@@ -309,8 +309,8 @@ public:
explicit UCBStream( Reference< XInputStream > & xIS );
explicit UCBStream( Reference< XStream > & xS );
virtual ~UCBStream() override;
- virtual sal_Size GetData( void* pData, sal_Size nSize ) override;
- virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
+ virtual std::size_t GetData( void* pData, std::size_t nSize ) override;
+ virtual std::size_t PutData( const void* pData, std::size_t nSize ) override;
virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
virtual void FlushData() override;
virtual void SetSize( sal_uInt64 nSize ) override;
@@ -352,7 +352,7 @@ UCBStream::~UCBStream()
}
}
-sal_Size UCBStream::GetData(void* pData, sal_Size nSize)
+std::size_t UCBStream::GetData(void* pData, std::size_t nSize)
{
try
{
@@ -383,7 +383,7 @@ sal_Size UCBStream::GetData(void* pData, sal_Size nSize)
return 0;
}
-sal_Size UCBStream::PutData(const void* pData, sal_Size nSize)
+std::size_t UCBStream::PutData(const void* pData, std::size_t nSize)
{
try
{
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8671417..5d0da42 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -905,7 +905,7 @@ RTLFUNC(InStr)
(void)pBasic;
(void)bWrite;
- sal_Size nArgCount = rPar.Count()-1;
+ std::size_t nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
else
@@ -978,7 +978,7 @@ RTLFUNC(InStrRev)
(void)pBasic;
(void)bWrite;
- sal_Size nArgCount = rPar.Count()-1;
+ std::size_t nArgCount = rPar.Count()-1;
if ( nArgCount < 2 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -1340,7 +1340,7 @@ RTLFUNC(Replace)
(void)pBasic;
(void)bWrite;
- sal_Size nArgCount = rPar.Count()-1;
+ std::size_t nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 6 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
@@ -3388,7 +3388,7 @@ RTLFUNC(Loc)
return;
}
SvStream* pSvStrm = pSbStrm->GetStrm();
- sal_Size nPos;
+ std::size_t nPos;
if( pSbStrm->IsRandom())
{
short nBlockLen = pSbStrm->GetBlockLen();
@@ -3436,8 +3436,8 @@ RTLFUNC(Lof)
return;
}
SvStream* pSvStrm = pSbStrm->GetStrm();
- sal_Size nOldPos = pSvStrm->Tell();
- sal_Size nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
+ sal_uInt64 const nOldPos = pSvStrm->Tell();
+ sal_uInt64 const nLen = pSvStrm->Seek( STREAM_SEEK_TO_END );
pSvStrm->Seek( nOldPos );
rPar.Get(0)->PutLong( (sal_Int32)nLen );
}
@@ -3468,7 +3468,7 @@ RTLFUNC(Seek)
if ( nArgs == 2 ) // Seek-Function
{
- sal_Size nPos = pStrm->Tell();
+ sal_uInt64 nPos = pStrm->Tell();
if( pSbStrm->IsRandom() )
{
nPos = nPos / pSbStrm->GetBlockLen();
@@ -3490,7 +3490,7 @@ RTLFUNC(Seek)
{
nPos *= pSbStrm->GetBlockLen();
}
- pStrm->Seek( (sal_Size)nPos );
+ pStrm->Seek( static_cast<sal_uInt64>(nPos) );
pSbStrm->SetExpandOnWriteTo( nPos );
}
}
@@ -3602,7 +3602,7 @@ RTLFUNC(Shell)
(void)pBasic;
(void)bWrite;
- sal_Size nArgCount = rPar.Count();
+ std::size_t nArgCount = rPar.Count();
if ( nArgCount < 2 || nArgCount > 5 )
{
rPar.Get(0)->PutLong(0);
@@ -4247,7 +4247,7 @@ RTLFUNC(StrConv)
(void)pBasic;
(void)bWrite;
- sal_Size nArgCount = rPar.Count()-1;
+ std::size_t nArgCount = rPar.Count()-1;
if( nArgCount < 2 || nArgCount > 3 )
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 93183d2..a60b16d 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -984,7 +984,7 @@ RTLFUNC(FindPropertyObject)
static bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
bool bBinary, short nBlockLen, bool bIsArray )
{
- sal_Size nFPos = pStrm->Tell();
+ sal_uInt64 const nFPos = pStrm->Tell();
bool bIsVariant = !rVar.IsFixed();
SbxDataType eType = rVar.GetType();
@@ -1091,7 +1091,7 @@ static bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm,
double aDouble;
- sal_Size nFPos = pStrm->Tell();
+ sal_uInt64 const nFPos = pStrm->Tell();
bool bIsVariant = !rVar.IsFixed();
SbxDataType eVarType = rVar.GetType();
@@ -1261,7 +1261,9 @@ void PutGet( SbxArray& rPar, bool bPut )
if( bHasRecordNo )
{
- sal_Size nFilePos = bRandom ? (sal_Size)(nBlockLen * nRecordNo) : (sal_Size)nRecordNo;
+ sal_uInt64 const nFilePos = bRandom
+ ? static_cast<sal_uInt64>(nBlockLen * nRecordNo)
+ : static_cast<sal_uInt64>(nRecordNo);
pStrm->Seek( nFilePos );
}
@@ -1277,7 +1279,7 @@ void PutGet( SbxArray& rPar, bool bPut )
if( pArr )
{
- sal_Size nFPos = pStrm->Tell();
+ sal_uInt64 const nFPos = pStrm->Tell();
short nDims = pArr->GetDims();
std::unique_ptr<short[]> pDims(new short[ nDims ]);
bRet = lcl_WriteReadSbxArray(*pArr,pStrm,!bRandom,nDims,pDims.get(),bPut);
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index d0296fc..1204e9f 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -198,7 +198,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
if( nFlags & SbxFlagBits::Reserved )
nFlags = ( nFlags & ~SbxFlagBits::Reserved ) | SbxFlagBits::GlobalSearch;
- sal_Size nOldPos = rStrm.Tell();
+ sal_uInt64 nOldPos = rStrm.Tell();
rStrm.ReadUInt32( nSize );
SbxBase* p = Create( nSbxId, nCreator );
if( p )
@@ -206,7 +206,7 @@ SbxBase* SbxBase::Load( SvStream& rStrm )
p->nFlags = nFlags;
if( p->LoadData( rStrm, nVer ) )
{
- sal_Size nNewPos = rStrm.Tell();
+ sal_uInt64 const nNewPos = rStrm.Tell();
nOldPos += nSize;
DBG_ASSERT( nOldPos >= nNewPos, "SBX: Too much data loaded" );
if( nOldPos != nNewPos )
@@ -239,10 +239,10 @@ bool SbxBase::Store( SvStream& rStrm )
.WriteUInt16( GetSbxId() )
.WriteUInt16( static_cast<sal_uInt16>(GetFlags()) )
.WriteUInt16( GetVersion() );
- sal_Size nOldPos = rStrm.Tell();
+ sal_uInt64 const nOldPos = rStrm.Tell();
rStrm.WriteUInt32( 0 );
bool bRes = StoreData( rStrm );
- sal_Size nNewPos = rStrm.Tell();
+ sal_uInt64 const nNewPos = rStrm.Tell();
rStrm.Seek( nOldPos );
rStrm.WriteUInt32( nNewPos - nOldPos );
rStrm.Seek( nNewPos );
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index d1b4ad9..5382b49 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -603,9 +603,9 @@ bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
OUString aDfltProp;
aClassName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US);
aDfltProp = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US);
- sal_Size nPos = rStrm.Tell();
+ sal_uInt64 nPos = rStrm.Tell();
rStrm.ReadUInt32( nSize );
- sal_Size nNewPos = rStrm.Tell();
+ sal_uInt64 const nNewPos = rStrm.Tell();
nPos += nSize;
DBG_ASSERT( nPos >= nNewPos, "SBX: Loaded too much data" );
if( nPos != nNewPos )
@@ -640,9 +640,9 @@ bool SbxObject::StoreData( SvStream& rStrm ) const
}
write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US);
write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US);
- sal_Size nPos = rStrm.Tell();
+ sal_uInt64 const nPos = rStrm.Tell();
rStrm.WriteUInt32( 0 );
- sal_Size nNew = rStrm.Tell();
+ sal_uInt64 const nNew = rStrm.Tell();
rStrm.Seek( nPos );
rStrm.WriteUInt32( nNew - nPos );
rStrm.Seek( nNew );
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index ff1b567..29ace24 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -634,7 +634,8 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
SvMemoryStream aMemStream;
/*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream, B_CURVERSION );
- sal_Size nSize = aMemStream.Tell();
+ sal_Int32 const nSize = aMemStream.Tell();
+ if (nSize < 0) { abort(); }
Sequence< sal_Int8 > aBinSeq( nSize );
sal_Int8* pData = aBinSeq.getArray();
memcpy( pData, aMemStream.GetData(), nSize );
@@ -775,7 +776,8 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
SvMemoryStream aMemStream;
/*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream, B_CURVERSION );
- sal_Size nSize = aMemStream.Tell();
+ sal_Int32 const nSize = aMemStream.Tell();
+ if (nSize < 0) { abort(); }
Sequence< sal_Int8 > aBinSeq( nSize );
sal_Int8* pData = aBinSeq.getArray();
memcpy( pData, aMemStream.GetData(), nSize );
diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 7e8566e..3d431ef 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -143,7 +143,7 @@ private:
by slotCount)
@return the size of the raw vtable block, in bytes
*/
- static sal_Size getBlockSize(sal_Int32 slotCount);
+ static std::size_t getBlockSize(sal_Int32 slotCount);
// This function is not defined in the generic part, but instead has to be
// defined individually for each CPP--UNO bridge:
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index 35dff67..2e6fdd1 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -579,7 +579,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index e81c17f..0a8a7bd 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -501,7 +501,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot);
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index 92b053c..64ac9ed 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -492,7 +492,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot);
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
index addf414..ae661903 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
@@ -462,7 +462,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot);
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
index e700aa8..3d8eea4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
@@ -396,7 +396,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) {
return static_cast<Slot *>(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index 7425acd..bd0be39 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -593,7 +593,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 1dbf12f..5a53fb0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -493,7 +493,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index 97377d7..ed30fc0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -638,7 +638,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 7874de3..a9222c0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -601,7 +601,7 @@ bridges::cpp_uno::shared::VtableFactory::Slot * bridges::cpp_uno::shared::Vtable
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index f888ab4..31d0315 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -445,7 +445,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) {
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 53851c2..cbb6f33 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -450,7 +450,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index aeb0730..8caba36 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -731,7 +731,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
index fba5df3..13f6759 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
@@ -628,7 +628,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index f3327f9..8cb99c3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -710,7 +710,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index f9384a5..5499b50 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -672,7 +672,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index a9d386f..539e501 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -610,7 +610,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index 7db6d13..aa86340 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -573,7 +573,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index b47f81f..af4bd5f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -485,7 +485,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
index 746281d..d8bc9a2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/cpp2uno.cxx
@@ -658,7 +658,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index c389ede..af1d839 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -444,7 +444,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
index 6786c95..dccb9da 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx
@@ -440,7 +440,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 21c5722..5609bd6 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -439,7 +439,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index 5d53405..4e2efc3 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -483,7 +483,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index d693669..33d5590 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -435,7 +435,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
index d642520..c0b8dfa 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx
@@ -439,7 +439,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 2;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 62480db..28bdfd0 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -431,7 +431,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
return static_cast< Slot * >(block) + 1;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
return (slotCount + 1) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index c1a650b..dfa18c4 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -450,7 +450,7 @@ bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(
return static_cast< Slot * >(block) + 1;
}
-sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
+std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount )
{
return (slotCount + 1) * sizeof (Slot) + slotCount * codeSnippetSize;
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index c2c6b8e..15e24178 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -67,7 +67,7 @@ namespace {
extern "C" void * SAL_CALL allocExec(
SAL_UNUSED_PARAMETER rtl_arena_type *, sal_Size * size)
{
- sal_Size pagesize;
+ std::size_t pagesize;
#if defined SAL_UNX
#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY
pagesize = getpagesize();
@@ -81,7 +81,7 @@ extern "C" void * SAL_CALL allocExec(
#else
#error Unsupported platform
#endif
- sal_Size n = (*size + (pagesize - 1)) & ~(pagesize - 1);
+ std::size_t n = (*size + (pagesize - 1)) & ~(pagesize - 1);
void * p;
#if defined SAL_UNX
p = mmap(
@@ -228,8 +228,8 @@ VtableFactory::Vtables VtableFactory::getVtables(
#ifdef USE_DOUBLE_MMAP
bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
{
- sal_Size size = getBlockSize(slotCount);
- sal_Size pagesize = sysconf(_SC_PAGESIZE);
+ std::size_t size = getBlockSize(slotCount);
+ std::size_t pagesize = sysconf(_SC_PAGESIZE);
block.size = (size + (pagesize - 1)) & ~(pagesize - 1);
block.fd = -1;
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index c5e3419..77a693d 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1629,14 +1629,14 @@ namespace cairocanvas
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
const double fAlpha(pIn[3]);
if( fAlpha == 0.0 )
@@ -1650,14 +1650,14 @@ namespace cairocanvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
const double fAlpha(pIn[3]);
if( fAlpha == 0.0 )
@@ -1671,14 +1671,14 @@ namespace cairocanvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(pIn[3],pIn[2],pIn[1],pIn[1]);
pIn += 4;
@@ -1688,11 +1688,11 @@ namespace cairocanvas
virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Blue;
*pColors++ = pIn->Green;
@@ -1705,11 +1705,11 @@ namespace cairocanvas
virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Alpha*pIn->Blue;
*pColors++ = pIn->Alpha*pIn->Green;
@@ -1722,11 +1722,11 @@ namespace cairocanvas
virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Blue;
*pColors++ = pIn->Green;
@@ -1757,14 +1757,14 @@ namespace cairocanvas
if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence<double> aRes(nLen);
double* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
@@ -1804,14 +1804,14 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
const double fAlpha((sal_uInt8)pIn[3]);
if( fAlpha )
@@ -1830,14 +1830,14 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
const double fAlpha((sal_uInt8)pIn[3]);
if( fAlpha )
@@ -1856,14 +1856,14 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(
vcl::unotools::toDoubleColor(pIn[3]),
@@ -1879,11 +1879,11 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Blue);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -1898,11 +1898,11 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
const double fAlpha(pIn->Alpha);
*pColors++ = vcl::unotools::toByteColor(fAlpha*pIn->Blue);
@@ -1917,11 +1917,11 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Blue);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -1986,14 +1986,14 @@ namespace cairocanvas
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::RGBColor(pIn[2], pIn[1], pIn[0]);
pIn += 4;
@@ -2003,14 +2003,14 @@ namespace cairocanvas
uno::Sequence< rendering::ARGBColor > impl_convertToARGB( const uno::Sequence< double >& deviceColor )
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(1.0, pIn[2], pIn[1], pIn[0]);
pIn += 4;
@@ -2028,11 +2028,11 @@ namespace cairocanvas
virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Blue;
*pColors++ = pIn->Green;
@@ -2045,11 +2045,11 @@ namespace cairocanvas
uno::Sequence< double > impl_convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor )
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Blue;
*pColors++ = pIn->Green;
@@ -2088,14 +2088,14 @@ namespace cairocanvas
if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) )
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence<double> aRes(nLen);
double* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
@@ -2135,14 +2135,14 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::RGBColor( pIn[2], pIn[1], pIn[0] );
pIn += 4;
@@ -2163,14 +2163,14 @@ namespace cairocanvas
uno::Sequence< rendering::ARGBColor > impl_convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor )
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(
1.0,
@@ -2186,11 +2186,11 @@ namespace cairocanvas
throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Blue);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -2214,11 +2214,11 @@ namespace cairocanvas
uno::Sequence< ::sal_Int8 > impl_convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor )
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Blue);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 02b81a4..0b874e5 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -213,14 +213,14 @@ namespace canvas
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::RGBColor(pIn[0],pIn[1],pIn[2]);
pIn += 4;
@@ -231,14 +231,14 @@ namespace canvas
{
SAL_WARN_IF(deviceColor.getLength() == 0, "canvas", "empty deviceColor argument");
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(pIn[3],pIn[0],pIn[1],pIn[2]);
pIn += 4;
@@ -248,14 +248,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(pIn[3],pIn[3]*pIn[0],pIn[3]*pIn[1],pIn[3]*pIn[2]);
pIn += 4;
@@ -265,11 +265,11 @@ namespace canvas
virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Red;
*pColors++ = pIn->Green;
@@ -282,11 +282,11 @@ namespace canvas
virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Red;
*pColors++ = pIn->Green;
@@ -299,11 +299,11 @@ namespace canvas
virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Red/pIn->Alpha;
*pColors++ = pIn->Green/pIn->Alpha;
@@ -334,14 +334,14 @@ namespace canvas
if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) )
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence<double> aRes(nLen);
double* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
@@ -380,14 +380,14 @@ namespace canvas
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::RGBColor(
vcl::unotools::toDoubleColor(pIn[0]),
@@ -401,14 +401,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(
vcl::unotools::toDoubleColor(pIn[3]),
@@ -423,14 +423,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
const sal_Int8 nAlpha( pIn[3] );
*pOut++ = rendering::ARGBColor(
@@ -446,11 +446,11 @@ namespace canvas
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Red);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -464,11 +464,11 @@ namespace canvas
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Red);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -482,11 +482,11 @@ namespace canvas
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Red/pIn->Alpha);
*pColors++ = vcl::unotools::toByteColor(pIn->Green/pIn->Alpha);
@@ -551,14 +551,14 @@ namespace canvas
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::RGBColor(pIn[0],pIn[1],pIn[2]);
pIn += 4;
@@ -568,14 +568,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(1.0,pIn[0],pIn[1],pIn[2]);
pIn += 4;
@@ -585,14 +585,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const double* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(1.0,pIn[0],pIn[1],pIn[2]);
pIn += 4;
@@ -602,11 +602,11 @@ namespace canvas
virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Red;
*pColors++ = pIn->Green;
@@ -619,11 +619,11 @@ namespace canvas
virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Red;
*pColors++ = pIn->Green;
@@ -636,11 +636,11 @@ namespace canvas
virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< double > aRes(nLen*4);
double* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = pIn->Red/pIn->Alpha;
*pColors++ = pIn->Green/pIn->Alpha;
@@ -671,14 +671,14 @@ namespace canvas
if( dynamic_cast<StandardNoAlphaColorSpace*>(targetColorSpace.get()) )
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence<double> aRes(nLen);
double* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
*pOut++ = vcl::unotools::toDoubleColor(*pIn++);
@@ -717,14 +717,14 @@ namespace canvas
virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::RGBColor > aRes(nLen/4);
rendering::RGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::RGBColor(
vcl::unotools::toDoubleColor(pIn[0]),
@@ -738,14 +738,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(
1.0,
@@ -760,14 +760,14 @@ namespace canvas
virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const sal_Int8* pIn( deviceColor.getConstArray() );
- const sal_Size nLen( deviceColor.getLength() );
+ const std::size_t nLen( deviceColor.getLength() );
ENSURE_ARG_OR_THROW2(nLen%4==0,
"number of channels no multiple of 4",
static_cast<rendering::XColorSpace*>(this), 0);
uno::Sequence< rendering::ARGBColor > aRes(nLen/4);
rendering::ARGBColor* pOut( aRes.getArray() );
- for( sal_Size i=0; i<nLen; i+=4 )
+ for( std::size_t i=0; i<nLen; i+=4 )
{
*pOut++ = rendering::ARGBColor(
1.0,
@@ -782,11 +782,11 @@ namespace canvas
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::RGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Red);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -800,11 +800,11 @@ namespace canvas
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Red);
*pColors++ = vcl::unotools::toByteColor(pIn->Green);
@@ -818,11 +818,11 @@ namespace canvas
virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override
{
const rendering::ARGBColor* pIn( rgbColor.getConstArray() );
- const sal_Size nLen( rgbColor.getLength() );
+ const std::size_t nLen( rgbColor.getLength() );
uno::Sequence< sal_Int8 > aRes(nLen*4);
sal_Int8* pColors=aRes.getArray();
- for( sal_Size i=0; i<nLen; ++i )
+ for( std::size_t i=0; i<nLen; ++i )
{
*pColors++ = vcl::unotools::toByteColor(pIn->Red/pIn->Alpha);
*pColors++ = vcl::unotools::toByteColor(pIn->Green/pIn->Alpha);
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 4e9b60a..d5d2101 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -77,9 +77,9 @@ using namespace ::com::sun::star::i18n;
namespace
{
-sal_Size lcl_getFileSize(SvStream& _rStream)
+std::size_t lcl_getFileSize(SvStream& _rStream)
{
- sal_Size nFileSize = 0;
+ std::size_t nFileSize = 0;
_rStream.Seek(STREAM_SEEK_TO_END);
_rStream.SeekRel(-1);
char cEOL;
@@ -538,13 +538,13 @@ void ODbaseTable::construct()
}
fillColumns();
- sal_Size nFileSize = lcl_getFileSize(*m_pFileStream);
+ std::size_t nFileSize = lcl_getFileSize(*m_pFileStream);
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
// seems to be empty or someone wrote bullshit into the dbase file
// try and recover if m_aHeader.db_slng is sane
if (m_aHeader.db_anz == 0 && m_aHeader.db_slng)
{
- sal_Size nRecords = (nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng;
+ std::size_t nRecords = (nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng;
if (nRecords > 0)
m_aHeader.db_anz = nRecords;
}
@@ -804,12 +804,12 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
if (!bRetrieveData)
return true;
- sal_Size nByteOffset = 1;
+ std::size_t nByteOffset = 1;
// Fields:
OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin();
OSQLColumns::Vector::const_iterator aEnd = _rCols.get().end();
- const sal_Size nCount = _rRow->get().size();
- for (sal_Size i = 1; aIter != aEnd && nByteOffset <= m_nBufferSize && i < nCount;++aIter, i++)
+ const std::size_t nCount = _rRow->get().size();
+ for (std::size_t i = 1; aIter != aEnd && nByteOffset <= m_nBufferSize && i < nCount;++aIter, i++)
{
// Lengths depending on data type:
sal_Int32 nLen = 0;
@@ -1509,13 +1509,13 @@ bool ODbaseTable::InsertRow(OValueRefVector& rRow, const Reference<XIndexAccess>
// Copy new row completely:
// ... and add at the end as new Record:
- sal_Size nTempPos = m_nFilePos;
+ std::size_t nTempPos = m_nFilePos;
- m_nFilePos = (sal_Size)m_aHeader.db_anz + 1;
+ m_nFilePos = (std::size_t)m_aHeader.db_anz + 1;
bool bInsertRow = UpdateBuffer( rRow, nullptr, _xCols, true );
if ( bInsertRow )
{
- sal_Size nFileSize = 0, nMemoFileSize = 0;
+ std::size_t nFileSize = 0, nMemoFileSize = 0;
nFileSize = lcl_getFileSize(*m_pFileStream);
@@ -1562,11 +1562,11 @@ bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow, const
return false;
// position on desired record:
- sal_Size nPos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
+ std::size_t nPos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
m_pFileStream->Seek(nPos);
m_pFileStream->ReadBytes(m_pBuffer, m_aHeader.db_slng);
- sal_Size nMemoFileSize( 0 );
+ std::size_t nMemoFileSize( 0 );
if (HasMemoFields() && m_pMemoStream)
{
m_pMemoStream->Seek(STREAM_SEEK_TO_END);
@@ -1589,7 +1589,7 @@ bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
{
// Set the Delete-Flag (be it set or not):
// Position on desired record:
- sal_Size nFilePos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
+ std::size_t nFilePos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
m_pFileStream->Seek(nFilePos);
OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
@@ -1958,7 +1958,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
char cNext = pData[nLen]; // Mark's scratch and replaced by 0
pData[nLen] = '\0'; // This is because the buffer is always a sign of greater ...
- sal_Size nBlockNo = strtol(pData,nullptr,10); // Block number read
+ std::size_t nBlockNo = strtol(pData,nullptr,10); // Block number read
// Next initial character restore again:
pData[nLen] = cNext;
@@ -2015,10 +2015,10 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
}
-bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
+bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr)
{
// if the BlockNo 0 is given, the block will be appended at the end
- sal_Size nSize = 0;
+ std::size_t nSize = 0;
OString aStr;
css::uno::Sequence<sal_Int8> aValue;
sal_uInt8 nHeader[4];
@@ -2051,7 +2051,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
m_pMemoStream->SeekRel(4L);
m_pMemoStream->ReadBytes(sHeader, 4);
- sal_Size nOldSize;
+ std::size_t nOldSize;
if (m_aMemoHeader.db_typ == MemoFoxPro)
nOldSize = ((((unsigned char)sHeader[0]) * 256 +
(unsigned char)sHeader[1]) * 256 +
@@ -2064,7 +2064,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
(unsigned char)sHeader[0] - 8;
// fits the new length in the used blocks
- sal_Size nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
+ std::size_t nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
nOldUsedBlocks = ((nOldSize + 8) / m_aMemoHeader.db_size) + (((nOldSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0);
bAppend = nUsedBlocks > nOldUsedBlocks;
}
@@ -2073,7 +2073,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
if (bAppend)
{
- sal_Size nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+ sal_uInt64 const nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
// fill last block
rBlockNr = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
@@ -2137,7 +2137,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr)
// Write the new block number
if (bAppend)
{
- sal_Size nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+ sal_uInt64 const nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
m_aMemoHeader.db_next = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
// Write the new block number
@@ -2629,16 +2629,16 @@ bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32
goto Error;
else
{
- sal_Size nEntryLen = m_aHeader.db_slng;
+ std::size_t nEntryLen = m_aHeader.db_slng;
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
- sal_Size nPos = m_aHeader.db_kopf + (sal_Size)(m_nFilePos-1) * nEntryLen;
+ std::size_t nPos = m_aHeader.db_kopf + (std::size_t)(m_nFilePos-1) * nEntryLen;
m_pFileStream->Seek(nPos);
if (m_pFileStream->GetError() != ERRCODE_NONE)
goto Error;
- sal_Size nRead = m_pFileStream->ReadBytes(m_pBuffer, nEntryLen);
+ std::size_t nRead = m_pFileStream->ReadBytes(m_pBuffer, nEntryLen);
if (nRead != nEntryLen)
{
SAL_WARN("connectivity.drivers", "ODbaseTable::seekRow: short read!");
@@ -2675,7 +2675,7 @@ End:
return true;
}
-bool ODbaseTable::ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable)
+bool ODbaseTable::ReadMemo(std::size_t nBlockNo, ORowSetValue& aVariable)
{
m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
switch (m_aMemoHeader.db_typ)
@@ -2776,7 +2776,7 @@ bool ODbaseTable::WriteBuffer()
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
// position on desired record:
- sal_Size nPos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
+ std::size_t nPos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
m_pFileStream->Seek(nPos);
return m_pFileStream->WriteBytes(m_pBuffer, m_aHeader.db_slng) > 0;
}
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 44d90cd..60521a0 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -862,7 +862,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage& rPage)
{
// Page doesn't exist yet
- sal_Size nSize = rPage.GetPagePos() + 1;
+ std::size_t nSize = rPage.GetPagePos() + 1;
nSize *= DINDEX_PAGE_SIZE;
if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
{
@@ -886,9 +886,9 @@ SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage&
// check if we have to fill the stream with '\0'
if(i < rPage.rIndex.getHeader().db_maxkeys)
{
- sal_Size nTell = rStream.Tell() % DINDEX_PAGE_SIZE;
+ std::size_t nTell = rStream.Tell() % DINDEX_PAGE_SIZE;
sal_uInt16 nBufferSize = rStream.GetBufferSize();
- sal_Size nRemainSize = nBufferSize - nTell;
+ std::size_t nRemainSize = nBufferSize - nTell;
if ( nRemainSize <= nBufferSize )
{
std::unique_ptr<char[]> pEmptyData( new char[nRemainSize] );
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index de0b6d2..24492ce 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -106,9 +106,9 @@ namespace connectivity
bool CreateMemoFile(const INetURLObject& aFile);
bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
bool ReadMemoHeader();
- bool ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable);
+ bool ReadMemo(std::size_t nBlockNo, ORowSetValue& aVariable);
- bool WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr);
+ bool WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr);
bool WriteBuffer();
bool UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRow, const css::uno::Reference< css::container::XIndexAccess>& _xCols, bool bForceAllFields);
css::uno::Reference< css::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 3fda678..e16fe7c 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -584,7 +584,7 @@ namespace cppcanvas
s.ReadInt32( pathLength );
SAL_INFO("cppcanvas.emf", "EMF+\tpath length: " << pathLength);
- sal_Size pos = s.Tell ();
+ sal_uInt64 const pos = s.Tell ();
sal_uInt32 pathHeader;
sal_Int32 pathPoints, pathFlags;
@@ -1068,7 +1068,7 @@ namespace cppcanvas
{
s.ReadInt32( customStartCapLen );
SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomStartCapLen: " << customStartCapLen);
- sal_Size pos = s.Tell();
+ sal_uInt64 const pos = s.Tell();
customStartCap = new EMFPCustomLineCap();
customStartCap->Read(s, rR);
@@ -1083,7 +1083,7 @@ namespace cppcanvas
{
s.ReadInt32( customEndCapLen );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list