diff options
| author | Christian Lippka <christian.lippka@oracle.com> | 2010-12-05 11:40:40 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@oracle.com> | 2010-12-05 11:40:40 +0100 |
| commit | c826fd1aa7e83a58dc4cb2e647e6db8affa50a81 (patch) | |
| tree | 4ad17d7f4421440b6e5c26a816fa8a3a123f2fde /sd | |
| parent | 00a326249f7bb4e7ded9c743836d9d572d3a9d7f (diff) | |
impress206: fixed compiler warning
Diffstat (limited to 'sd')
| -rw-r--r--[-rwxr-xr-x] | sd/source/filter/eppt/epptso.cxx | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | sd/source/filter/ppt/propread.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f4462da6b8b8..b3d5fcb62eac 100755..100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -5012,7 +5012,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; } else if ( ( mType == "drawing.OLE2" ) || ( mType == "presentation.OLE2" ) - || ( mType == "presentation.Chart" ) || ( mType == "presentation.Table" ) + || ( mType == "presentation.Chart" ) || ( mType == "presentation.Calc" ) || ( mType == "presentation.OrgChart" ) ) { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -5203,7 +5203,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } } } - else if ( mType == "drawing.Table" ) + else if ( (mType == "drawing.Table") || (mType == "presentation.Table") ) { SvMemoryStream* pTmp = NULL; if ( bEffect && !mbUseNewAnimations ) diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index ff1250bdf090..b77c2563fc03 100755..100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -99,7 +99,7 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize) if (nSize > STRING_MAXLEN) nSize = STRING_MAXLEN; - return nSize; + return static_cast< xub_StrLen >( nSize ); } BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) |