strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS presfixes12 (1.7.12); FILE MERGED

Browse source 
2007/02/02 08:47:50 thb 1.7.12.1: #i37778# Moved all old-style casts to sal::static_int_cast
This commit is contained in:
Oliver Bolte 2007-07-17 13:39:03 +00:00
parent 1c6e7bea32
commit 180b3f0fa6
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
slideshow/source/engine/shapeattributelayer.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: shapeattributelayer.cxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: kz $ $Date: 2006-12-13 15:18:50 $
* last change: $Author: obo $ $Date: 2007-07-17 14:39:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -576,11 +576,11 @@ namespace slideshow
// mnAdditiveMode is ignored, cannot combine strings in
// any sensible way
if( mbFillStyleValid )
return (sal_Int16)meFillStyle;
return sal::static_int_cast<sal_Int16>(meFillStyle);
else if( haveChild() )
return (sal_Int16)mpChild->getFillStyle();
return sal::static_int_cast<sal_Int16>(mpChild->getFillStyle());
else
return (sal_Int16)drawing::FillStyle_SOLID;
return sal::static_int_cast<sal_Int16>(drawing::FillStyle_SOLID);
}
void ShapeAttributeLayer::setFillStyle( const sal_Int16& rStyle )
@ -601,11 +601,11 @@ namespace slideshow
// mnAdditiveMode is ignored, cannot combine strings in
// any sensible way
if( mbLineStyleValid )
return (sal_Int16)meLineStyle;
return sal::static_int_cast<sal_Int16>(meLineStyle);
else if( haveChild() )
return (sal_Int16)mpChild->getLineStyle();
return sal::static_int_cast<sal_Int16>(mpChild->getLineStyle());
else
return (sal_Int16)drawing::LineStyle_SOLID;
return sal::static_int_cast<sal_Int16>(drawing::LineStyle_SOLID);
}
void ShapeAttributeLayer::setLineStyle( const sal_Int16& rStyle )
@ -767,11 +767,11 @@ namespace slideshow
// mnAdditiveMode is ignored, cannot combine strings in
// any sensible way
if( mbCharPostureValid )
return (sal_Int16)meCharPosture;
return sal::static_int_cast<sal_Int16>(meCharPosture);
else if( haveChild() )
return (sal_Int16)mpChild->getCharPosture();
return sal::static_int_cast<sal_Int16>(mpChild->getCharPosture());
else
return (sal_Int16)awt::FontSlant_NONE;
return sal::static_int_cast<sal_Int16>(awt::FontSlant_NONE);
}
void ShapeAttributeLayer::setCharPosture( const sal_Int16& rStyle )