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

INTEGRATION: CWS sb59 (1.16.12); FILE MERGED

Browse Source 
2006/08/18 19:02:01 sb 1.16.12.4: RESYNC: (1.16-1.18); FILE MERGED
2006/08/11 22:47:21 thb 1.16.12.3: #i68336# Made cppcanvas warning free for wntmsci10
2006/08/11 22:44:39 thb 1.16.12.2: #i68336# Made cppcanvas warning free for wntmsci10
2006/08/11 15:36:03 thb 1.16.12.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 13:59:41 +00:00
parent 6361c35204
commit 9c8bf8e311
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: implrenderer.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: obo $ $Date: 2006-09-17 12:49:12 $
* last change: $Author: obo $ $Date: 2006-10-12 14:59:41 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -184,7 +184,7 @@ namespace
const cppcanvas::CanvasSharedPtr& rCanvas )
{
// set rIsColorSet and check for true at the same time
if( (rIsColorSet=pAct->IsSetting()) )
if( (rIsColorSet=pAct->IsSetting()) != false )
{
::Color aColor( pAct->GetColor() );
@@ -457,7 +457,7 @@ namespace cppcanvas
"ImplRenderer::skipContent(): NULL string given" );
MetaAction* pCurrAct;
while( (pCurrAct=rMtf.NextAction()) )
while( (pCurrAct=rMtf.NextAction()) != NULL )
{
// increment action index, we've skipped an action.
++io_rCurrActionIndex;
@@ -489,7 +489,7 @@ namespace cppcanvas
ULONG nPos( 1 );
MetaAction* pCurrAct;
while( (pCurrAct=rMtf.NextAction()) )
while( (pCurrAct=rMtf.NextAction()) != NULL )
{
if( pCurrAct->GetType() == nType )
{
@@ -568,15 +568,15 @@ namespace cppcanvas
// scale color coefficients with gradient intensities
const USHORT nStartIntensity( rGradient.GetStartIntensity() );
::Color aVCLStartColor( rGradient.GetStartColor() );
aVCLStartColor.SetRed( aVCLStartColor.GetRed() * nStartIntensity / 100 );
aVCLStartColor.SetGreen( aVCLStartColor.GetGreen() * nStartIntensity / 100 );
aVCLStartColor.SetBlue( aVCLStartColor.GetBlue() * nStartIntensity / 100 );
aVCLStartColor.SetRed( (UINT8)(aVCLStartColor.GetRed() * nStartIntensity / 100) );
aVCLStartColor.SetGreen( (UINT8)(aVCLStartColor.GetGreen() * nStartIntensity / 100) );
aVCLStartColor.SetBlue( (UINT8)(aVCLStartColor.GetBlue() * nStartIntensity / 100) );
const USHORT nEndIntensity( rGradient.GetEndIntensity() );
::Color aVCLEndColor( rGradient.GetEndColor() );
aVCLEndColor.SetRed( aVCLEndColor.GetRed() * nEndIntensity / 100 );
aVCLEndColor.SetGreen( aVCLEndColor.GetGreen() * nEndIntensity / 100 );
aVCLEndColor.SetBlue( aVCLEndColor.GetBlue() * nEndIntensity / 100 );
aVCLEndColor.SetRed( (UINT8)(aVCLEndColor.GetRed() * nEndIntensity / 100) );
aVCLEndColor.SetGreen( (UINT8)(aVCLEndColor.GetGreen() * nEndIntensity / 100) );
aVCLEndColor.SetBlue( (UINT8)(aVCLEndColor.GetBlue() * nEndIntensity / 100) );
const uno::Sequence< double > aStartColor(
::vcl::unotools::colorToDoubleSequence( rCanvas->getUNOCanvas()->getDevice(),
@@ -641,6 +641,9 @@ namespace cppcanvas
aTexture.Gradient = xFactory->createAxialHorizontalGradient( aStartColor,
aEndColor );
break;
default: // other cases can't happen
break;
}
// apply border offset values
@@ -789,6 +792,9 @@ namespace cppcanvas
aBounds.Right(),
aBounds.Bottom() ) );
break;
default: // other cases can't happen
break;
}
nScaleX = ::basegfx::pruneScaleValue( nScaleX );
@@ -982,7 +988,7 @@ namespace cppcanvas
const OutDevState& rState( getState( rStates ) );
// TODO(F2): implement all text effects
if( rState.textAlignment ); // TODO(F2): NYI
// if( rState.textAlignment ); // TODO(F2): NYI
::Color aShadowColor( COL_AUTO );
::Color aReliefColor( COL_AUTO );
@@ -1494,7 +1500,7 @@ namespace cppcanvas
// TODO(Q2): define and use appropriate enumeration types
rState.textReliefStyle = (sal_Int8)rFont.GetRelief();
rState.textUnderlineStyle = rParms.maFontUnderline.isValid() ?
(rParms.maFontUnderline.getValue() ? UNDERLINE_SINGLE : UNDERLINE_NONE) :
(rParms.maFontUnderline.getValue() ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) :
(sal_Int8)rFont.GetUnderline();
rState.textStrikeoutStyle = (sal_Int8)rFont.GetStrikeout();
rState.textEmphasisMarkStyle = (sal_Int8)rFont.GetEmphasisMark();
@@ -1646,7 +1652,7 @@ namespace cppcanvas
MetaGradientExAction* pGradAction = NULL;
bool bDone( false );
while( !bDone &&
(pCurrAct=rMtf.NextAction()) )
(pCurrAct=rMtf.NextAction()) != NULL )
{
switch( pCurrAct->GetType() )
{
@@ -2885,6 +2891,10 @@ namespace cppcanvas
CanvasGraphicHelper( rCanvas ),
maActions()
{
// TODO(F3): property modification parameters are
// currently ignored for Bitmaps
(void)rParams;
RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::ImplRenderer::ImplRenderer(bitmap)" );
OSL_ENSURE( rCanvas.get() != NULL && rCanvas->getUNOCanvas().is(),