mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb59 (1.12.6); FILE MERGED

Browse Source 
2006/08/30 13:51:40 sb 1.12.6.2: #i67535# Made code warning-free (GCC 4.1.1).
2006/08/11 15:36:03 thb 1.12.6.1: #i68336# Removed unused params; added a few using declarations for hidden methods; added a few casts; added some default statements to get cppcanvas warning free
This commit is contained in:
Oliver Bolte
2006-10-12 14:00:26 +00:00
parent 065a3db228
commit 56c18f416f
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cppcanvas/source/mtfrenderer/textaction.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: textaction.cxx,v $ * $RCSfile: textaction.cxx,v $
* *
* $Revision: 1.13 $ * $Revision: 1.14 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 12:50:20 $ * last change: $Author: obo $ $Date: 2006-10-12 15:00:26 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -506,7 +506,7 @@ namespace cppcanvas
*/ */
bool renderEffectText( const TextRenderer& rRenderer, bool renderEffectText( const TextRenderer& rRenderer,
const rendering::RenderState& rRenderState, const rendering::RenderState& rRenderState,
const rendering::ViewState& rViewState, const rendering::ViewState& /*rViewState*/,
const uno::Reference< rendering::XCanvas >& xCanvas, const uno::Reference< rendering::XCanvas >& xCanvas,
const ::Color& rShadowColor, const ::Color& rShadowColor,
const ::Size& rShadowOffset, const ::Size& rShadowOffset,
@@ -633,7 +633,6 @@ namespace cppcanvas
const ::rtl::OUString& rString, const ::rtl::OUString& rString,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ); const OutDevState& rState );
@@ -641,7 +640,6 @@ namespace cppcanvas
const ::rtl::OUString& rString, const ::rtl::OUString& rString,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform ); const ::basegfx::B2DHomMatrix& rTextTransform );
@@ -675,7 +673,6 @@ namespace cppcanvas
const ::rtl::OUString& rString, const ::rtl::OUString& rString,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) : const OutDevState& rState ) :
mxFont( rState.xFont ), mxFont( rState.xFont ),
@@ -696,7 +693,6 @@ namespace cppcanvas
const ::rtl::OUString& rString, const ::rtl::OUString& rString,
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform ) : const ::basegfx::B2DHomMatrix& rTextTransform ) :
@@ -729,7 +725,7 @@ namespace cppcanvas
} }
bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation, bool TextAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const const Subset& /*rSubset*/ ) const
{ {
OSL_ENSURE( false, OSL_ENSURE( false,
"TextAction::render(): Subset not supported by this object" ); "TextAction::render(): Subset not supported by this object" );
@@ -761,7 +757,7 @@ namespace cppcanvas
} }
::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation, ::basegfx::B2DRange TextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const const Subset& /*rSubset*/ ) const
{ {
OSL_ENSURE( false, OSL_ENSURE( false,
"TextAction::getBounds(): Subset not supported by this object" ); "TextAction::getBounds(): Subset not supported by this object" );
@@ -967,7 +963,7 @@ namespace cppcanvas
} }
bool EffectTextAction::render( const ::basegfx::B2DHomMatrix& rTransformation, bool EffectTextAction::render( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const const Subset& /*rSubset*/ ) const
{ {
OSL_ENSURE( false, OSL_ENSURE( false,
"EffectTextAction::render(): Subset not supported by this object" ); "EffectTextAction::render(): Subset not supported by this object" );
@@ -1004,7 +1000,7 @@ namespace cppcanvas
} }
::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation, ::basegfx::B2DRange EffectTextAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const const Subset& /*rSubset*/ ) const
{ {
OSL_ENSURE( false, OSL_ENSURE( false,
"EffectTextAction::getBounds(): Subset not supported by this object" ); "EffectTextAction::getBounds(): Subset not supported by this object" );
@@ -1036,7 +1032,6 @@ namespace cppcanvas
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ); const OutDevState& rState );
@@ -1045,7 +1040,6 @@ namespace cppcanvas
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform ); const ::basegfx::B2DHomMatrix& rTextTransform );
@@ -1078,7 +1072,6 @@ namespace cppcanvas
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) : const OutDevState& rState ) :
mxTextLayout(), mxTextLayout(),
@@ -1101,7 +1094,6 @@ namespace cppcanvas
sal_Int32 nStartPos, sal_Int32 nStartPos,
sal_Int32 nLen, sal_Int32 nLen,
const uno::Sequence< double >& rOffsets, const uno::Sequence< double >& rOffsets,
VirtualDevice& rVDev,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform ) : const ::basegfx::B2DHomMatrix& rTextTransform ) :
@@ -1928,7 +1920,7 @@ namespace cppcanvas
} }
::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation, ::basegfx::B2DRange OutlineAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
const Subset& rSubset ) const const Subset& /*rSubset*/ ) const
{ {
OSL_ENSURE( false, OSL_ENSURE( false,
"OutlineAction::getBounds(): Subset not yet supported by this object" ); "OutlineAction::getBounds(): Subset not yet supported by this object" );
@@ -2195,7 +2187,6 @@ namespace cppcanvas
rText, rText,
nStartPos, nStartPos,
nLen, nLen,
rVDev,
rCanvas, rCanvas,
rState, rState,
rParms.maTextTransformation.getValue() ) ); rParms.maTextTransformation.getValue() ) );
@@ -2207,7 +2198,6 @@ namespace cppcanvas
rText, rText,
nStartPos, nStartPos,
nLen, nLen,
rVDev,
rCanvas, rCanvas,
rState ) ); rState ) );
} }
@@ -2260,7 +2250,6 @@ namespace cppcanvas
nStartPos, nStartPos,
nLen, nLen,
aCharWidths, aCharWidths,
rVDev,
rCanvas, rCanvas,
rState, rState,
rParms.maTextTransformation.getValue() ) ); rParms.maTextTransformation.getValue() ) );
@@ -2271,7 +2260,6 @@ namespace cppcanvas
nStartPos, nStartPos,
nLen, nLen,
aCharWidths, aCharWidths,
rVDev,
rCanvas, rCanvas,
rState ) ); rState ) );
} }
@@ -2309,6 +2297,12 @@ namespace cppcanvas
rState ) ); rState ) );
} }
} }
#if defined __GNUC__
#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 1
// Unreachable; to avoid bogus warning:
return ActionSharedPtr();
#endif
#endif
} }
} }
} }