diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /slideshow | |
parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) |
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
Diffstat (limited to 'slideshow')
5 files changed, 34 insertions, 34 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 68667cec8320..55859d28a30c 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -494,14 +494,14 @@ namespace 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; @@ -511,14 +511,14 @@ namespace 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(pIn[3],pIn[0],pIn[1],pIn[2]); pIn += 4; @@ -528,14 +528,14 @@ namespace 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; @@ -545,11 +545,11 @@ namespace 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; @@ -562,11 +562,11 @@ namespace 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; @@ -579,11 +579,11 @@ namespace 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; @@ -614,14 +614,14 @@ namespace if( dynamic_cast<OGLColorSpace*>(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++); @@ -660,14 +660,14 @@ namespace 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]), @@ -681,14 +681,14 @@ namespace 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]), @@ -703,14 +703,14 @@ namespace 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( @@ -726,11 +726,11 @@ namespace 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); @@ -744,11 +744,11 @@ namespace 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); @@ -762,11 +762,11 @@ namespace 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/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 17aa2ec61833..30808b598325 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -69,7 +69,7 @@ namespace slideshow double nPrio, const OUString& rServiceName, const char** pPropCopyTable, - sal_Size nNumPropEntries, + std::size_t nNumPropEntries, const SlideShowContext& rContext ); // throw ShapeLoadFailedException; private: @@ -97,7 +97,7 @@ namespace slideshow const OUString maServiceName; const char** mpPropCopyTable; - const sal_Size mnNumPropEntries; + const std::size_t mnNumPropEntries; /// the list of active view shapes (one for each registered view layer) typedef ::std::vector< ViewAppletShapeSharedPtr > ViewAppletShapeVector; @@ -109,7 +109,7 @@ namespace slideshow double nPrio, const OUString& rServiceName, const char** pPropCopyTable, - sal_Size nNumPropEntries, + std::size_t nNumPropEntries, const SlideShowContext& rContext ) : ExternalShapeBase( xShape, nPrio, rContext ), maServiceName( rServiceName ), @@ -271,7 +271,7 @@ namespace slideshow double nPrio, const OUString& rServiceName, const char** pPropCopyTable, - sal_Size nNumPropEntries, + std::size_t nNumPropEntries, const SlideShowContext& rContext ) { std::shared_ptr< AppletShape > pAppletShape( diff --git a/slideshow/source/engine/shapes/appletshape.hxx b/slideshow/source/engine/shapes/appletshape.hxx index 979752588cc1..84d5f07d1ac2 100644 --- a/slideshow/source/engine/shapes/appletshape.hxx +++ b/slideshow/source/engine/shapes/appletshape.hxx @@ -40,7 +40,7 @@ namespace slideshow double nPrio, const OUString& rServiceName, const char** pPropCopyTable, - sal_Size nNumPropEntries, + std::size_t nNumPropEntries, const SlideShowContext& rContext ); } } diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 2b1ec969c6ae..c9de11fb34fd 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -61,7 +61,7 @@ namespace slideshow const uno::Reference< drawing::XShape >& rxShape, const OUString& rServiceName, const char** pPropCopyTable, - sal_Size nNumPropEntries, + std::size_t nNumPropEntries, const uno::Reference< uno::XComponentContext >& rxContext ) : mpViewLayer( rViewLayer ), mxViewer(), @@ -88,7 +88,7 @@ namespace slideshow // copy shape properties to applet viewer OUString aPropName; - for( sal_Size i=0; i<nNumPropEntries; ++i ) + for( std::size_t i=0; i<nNumPropEntries; ++i ) { aPropName = OUString::createFromAscii( pPropCopyTable[i] ); xViewerPropSet->setPropertyValue( aPropName, diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index 67075093e708..26d8b6ce004a 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -75,7 +75,7 @@ namespace slideshow const css::uno::Reference< css::drawing::XShape >& rxShape, const OUString& rServiceName, const char** pPropCopyTable, - sal_Size nNumPropEntries, + std::size_t nNumPropEntries, const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /** destroy the object |