diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:55:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:55:15 +0000 |
| commit | b7445a461717ddda86f5c4ec120b68dc470742fa (patch) | |
| tree | ff55165325f0e5eb65b6fd40dd90c13867bdfaad /slideshow | |
| parent | c0c98dc107c21cf0eaf7c66d3f8949be54a68f73 (diff) | |
INTEGRATION: CWS sb59 (1.4.46); FILE MERGED
2006/08/11 20:35:43 thb 1.4.46.1: #i68336# Made slideshow warning free
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapeattributelayer.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx index 67e025529e09..dddf1fe66ea9 100644 --- a/slideshow/source/engine/shapeattributelayer.cxx +++ b/slideshow/source/engine/shapeattributelayer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeattributelayer.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 08:27:32 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:55:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -594,11 +594,11 @@ namespace presentation // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbFillStyleValid ) - return meFillStyle; + return (sal_Int16)meFillStyle; else if( haveChild() ) - return mpChild->getFillStyle(); + return (sal_Int16)mpChild->getFillStyle(); else - return drawing::FillStyle_SOLID; + return (sal_Int16)drawing::FillStyle_SOLID; } void ShapeAttributeLayer::setFillStyle( const sal_Int16& rStyle ) @@ -619,11 +619,11 @@ namespace presentation // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbLineStyleValid ) - return meLineStyle; + return (sal_Int16)meLineStyle; else if( haveChild() ) - return mpChild->getLineStyle(); + return (sal_Int16)mpChild->getLineStyle(); else - return drawing::LineStyle_SOLID; + return (sal_Int16)drawing::LineStyle_SOLID; } void ShapeAttributeLayer::setLineStyle( const sal_Int16& rStyle ) @@ -785,11 +785,11 @@ namespace presentation // mnAdditiveMode is ignored, cannot combine strings in // any sensible way if( mbCharPostureValid ) - return meCharPosture; + return (sal_Int16)meCharPosture; else if( haveChild() ) - return mpChild->getCharPosture(); + return (sal_Int16)mpChild->getCharPosture(); else - return awt::FontSlant_NONE; + return (sal_Int16)awt::FontSlant_NONE; } void ShapeAttributeLayer::setCharPosture( const sal_Int16& rStyle ) |