summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-10-27 14:18:05 +0200
committerNoel Grandin <noel@peralex.com>2014-10-28 08:10:20 +0200
commit1e21c77561b802bae4cb84631614f8aa612785a6 (patch)
tree46e776222ba369e12256e1c8f29f4db6a8a2ef0b
parent14a2cfc27f86112469f2a2252bdc154ad8d3219f (diff)
loplugin: cstylecast
Change-Id: I287dcb0ca728747ec91b5c3cdd986e60998e3928
-rw-r--r--cui/source/tabpages/transfrm.cxx2
-rw-r--r--sc/inc/drwlayer.hxx4
-rw-r--r--sc/source/core/opencl/openclwrapper.cxx4
-rw-r--r--sc/source/filter/excel/excimp8.cxx2
-rw-r--r--sc/source/filter/excel/tokstack.cxx52
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx56
-rw-r--r--sc/source/filter/html/htmlexp2.cxx4
-rw-r--r--sc/source/filter/html/htmlimp.cxx26
-rw-r--r--sc/source/filter/inc/scflt.hxx24
-rw-r--r--sc/source/filter/inc/tokstack.hxx2
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx4
-rw-r--r--sc/source/filter/rtf/rtfexp.cxx16
-rw-r--r--sc/source/filter/rtf/rtfimp.cxx2
-rw-r--r--sc/source/filter/rtf/rtfparse.cxx6
-rw-r--r--sc/source/filter/starcalc/scflt.cxx10
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx6
-rw-r--r--sc/source/filter/xcl97/xcl97esc.cxx10
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx4
19 files changed, 118 insertions, 118 deletions
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 54fd77472801..ba6587b62374 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -528,7 +528,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
if( pItem )
{
const double fUIScale(double(pView->GetModel()->GetUIScale()));
- const double fTmp((double)((const SdrMetricItem*)pItem)->GetValue() / fUIScale);
+ const double fTmp((double)static_cast<const SdrMetricItem*>(pItem)->GetValue() / fUIScale);
SetMetricValue(*m_pMtrRadius, basegfx::fround(fTmp), ePoolUnit);
}
else
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 7d917bb626c4..6917c2aaa4f2 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -43,7 +43,7 @@ public:
ScTabDeletedHint( SCTAB nTabNo = SCTAB_MAX );
virtual ~ScTabDeletedHint();
- SCTAB GetTab() { return nTab; }
+ SCTAB GetTab() const { return nTab; }
};
class ScTabSizeChangedHint : public SfxHint
@@ -54,7 +54,7 @@ public:
ScTabSizeChangedHint( SCTAB nTabNo = SCTAB_MAX );
virtual ~ScTabSizeChangedHint();
- SCTAB GetTab() { return nTab; }
+ SCTAB GetTab() const { return nTab; }
};
// Adjusting of detective UserData and draw undo's both have to be in SdrUndoGroup;
diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx
index 629ccaa463b2..245fb77fd697 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -620,7 +620,7 @@ bool OpenCLDevice::initOpenCLRunEnv( GPUEnv *gpuInfo )
// Use available platform.
cl_context_properties cps[3];
cps[0] = CL_CONTEXT_PLATFORM;
- cps[1] = (cl_context_properties) gpuInfo->mpPlatformID;
+ cps[1] = reinterpret_cast<cl_context_properties>(gpuInfo->mpPlatformID);
cps[2] = 0;
// Set device type for OpenCL
if ( getenv("SC_OPENCLCPU") )
@@ -936,7 +936,7 @@ bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv
cl_context_properties cps[3];
cps[0] = CL_CONTEXT_PLATFORM;
- cps[1] = (cl_context_properties) platformId;
+ cps[1] = reinterpret_cast<cl_context_properties>(platformId);
cps[2] = 0;
cl_context context = clCreateContext( cps, 1, &pDeviceId, NULL, NULL, &nState );
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 38b7cf65052c..3f6317fccd99 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -553,7 +553,7 @@ void XclImpAutoFilterData::SetCellAttribs()
ScDocument& rDoc = pExcRoot->pIR->GetDoc();
for ( SCCOL nCol = StartCol(); nCol <= EndCol(); nCol++ )
{
- sal_Int16 nFlag = ((ScMergeFlagAttr*) rDoc.GetAttr( nCol, StartRow(), Tab(), ATTR_MERGE_FLAG ))->GetValue();
+ sal_Int16 nFlag = static_cast<const ScMergeFlagAttr*>( rDoc.GetAttr( nCol, StartRow(), Tab(), ATTR_MERGE_FLAG ))->GetValue();
rDoc.ApplyAttr( nCol, StartRow(), Tab(), ScMergeFlagAttr( nFlag | SC_MF_AUTO) );
}
}
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 5c7568b7129d..724b49574432 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -587,7 +587,7 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
void TokenPool::operator >>( TokenId& rId )
{
- rId = ( TokenId ) ( nElementAkt + 1 );
+ rId = static_cast<TokenId>( nElementAkt + 1 );
if( nElementAkt >= nElement )
if (!GrowElement())
@@ -606,11 +606,11 @@ const TokenId TokenPool::Store( const double& rDouble )
{
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_DblAkt >= nP_Dbl )
if (!GrowDouble())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_DblAkt; // Index in Double-Array
pType[ nElementAkt ] = T_D; // set Typeinfo Double
@@ -622,7 +622,7 @@ const TokenId TokenPool::Store( const double& rDouble )
nElementAkt++;
nP_DblAkt++;
- return ( const TokenId ) nElementAkt; // return old value + 1!
+ return static_cast<const TokenId>(nElementAkt); // return old value + 1!
}
const TokenId TokenPool::Store( const sal_uInt16 nIndex )
@@ -635,11 +635,11 @@ const TokenId TokenPool::Store( const OUString& rString )
// mostly copied to Store( const sal_Char* ), to avoid a temporary string
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_StrAkt >= nP_Str )
if (!GrowString())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array
pType[ nElementAkt ] = T_Str; // set Typeinfo String
@@ -661,18 +661,18 @@ const TokenId TokenPool::Store( const OUString& rString )
nElementAkt++;
nP_StrAkt++;
- return ( const TokenId ) nElementAkt; // return old value + 1!
+ return static_cast<const TokenId>(nElementAkt); // return old value + 1!
}
const TokenId TokenPool::Store( const ScSingleRefData& rTr )
{
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_RefTrAkt >= nP_RefTr )
if (!GrowTripel())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_RefTrAkt;
pType[ nElementAkt ] = T_RefC; // set Typeinfo Cell-Ref
@@ -685,18 +685,18 @@ const TokenId TokenPool::Store( const ScSingleRefData& rTr )
nElementAkt++;
nP_RefTrAkt++;
- return ( const TokenId ) nElementAkt; // return old value + 1!
+ return static_cast<const TokenId>(nElementAkt); // return old value + 1!
}
const TokenId TokenPool::Store( const ScComplexRefData& rTr )
{
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_RefTrAkt + 1 >= nP_RefTr )
if (!GrowTripel( 2))
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_RefTrAkt;
pType[ nElementAkt ] = T_RefA; // setTypeinfo Area-Ref
@@ -715,18 +715,18 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr )
nElementAkt++;
- return ( const TokenId ) nElementAkt; // return old value + 1!
+ return static_cast<const TokenId>(nElementAkt); // return old value + 1!
}
const TokenId TokenPool::Store( const DefTokenId e, const OUString& r )
{
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_ExtAkt >= nP_Ext )
if (!GrowExt())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_ExtAkt;
pType[ nElementAkt ] = T_Ext; // set Typeinfo String
@@ -742,18 +742,18 @@ const TokenId TokenPool::Store( const DefTokenId e, const OUString& r )
nElementAkt++;
nP_ExtAkt++;
- return ( const TokenId ) nElementAkt; // return old value + 1!
+ return static_cast<const TokenId>(nElementAkt); // return old value + 1!
}
const TokenId TokenPool::StoreNlf( const ScSingleRefData& rTr )
{
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_NlfAkt >= nP_Nlf )
if (!GrowNlf())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_NlfAkt;
pType[ nElementAkt ] = T_Nlf;
@@ -768,7 +768,7 @@ const TokenId TokenPool::StoreNlf( const ScSingleRefData& rTr )
nElementAkt++;
nP_NlfAkt++;
- return ( const TokenId ) nElementAkt;
+ return static_cast<const TokenId>(nElementAkt);
}
const TokenId TokenPool::StoreMatrix()
@@ -777,11 +777,11 @@ const TokenId TokenPool::StoreMatrix()
if( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
if( nP_MatrixAkt >= nP_Matrix )
if (!GrowMatrix())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[ nElementAkt ] = nP_MatrixAkt;
pType[ nElementAkt ] = T_Matrix;
@@ -793,14 +793,14 @@ const TokenId TokenPool::StoreMatrix()
nElementAkt++;
nP_MatrixAkt++;
- return ( const TokenId ) nElementAkt;
+ return static_cast<const TokenId>(nElementAkt);
}
const TokenId TokenPool::StoreName( sal_uInt16 nIndex, bool bGlobal )
{
if ( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[nElementAkt] = static_cast<sal_uInt16>(maRangeNames.size());
pType[nElementAkt] = T_RN;
@@ -819,7 +819,7 @@ const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const OUString& rName
{
if ( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[nElementAkt] = static_cast<sal_uInt16>(maExtNames.size());
pType[nElementAkt] = T_ExtName;
@@ -838,7 +838,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const OUString& rTabNa
{
if ( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[nElementAkt] = static_cast<sal_uInt16>(maExtCellRefs.size());
pType[nElementAkt] = T_ExtRefC;
@@ -858,7 +858,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const OUString& rTabNa
{
if ( nElementAkt >= nElement )
if (!GrowElement())
- return (const TokenId) nElementAkt+1;
+ return static_cast<const TokenId>(nElementAkt+1);
pElement[nElementAkt] = static_cast<sal_uInt16>(maExtAreaRefs.size());
pType[nElementAkt] = T_ExtRefA;
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 933cd1e6108c..6d0c56c43a6b 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1480,7 +1480,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
com::sun::star::beans::PropertyValue aTextRotateAngle;
aTextRotateAngle.Name = "TextRotateAngle";
aTextRotateAngle.Value <<= fAngle;
- SdrCustomShapeGeometryItem aGeometryItem((SdrCustomShapeGeometryItem&)pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
+ SdrCustomShapeGeometryItem aGeometryItem(static_cast<const SdrCustomShapeGeometryItem&>(pObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )));
aGeometryItem.SetPropertyValue( aTextRotateAngle );
pObjCustomShape->SetMergedItem( aGeometryItem );
}
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 9e87e0320b48..aa4c01061a57 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -254,7 +254,7 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocume
const SfxPoolItem* pItem = pDocSh->GetItem( SID_ORIGURL );
if( pItem )
{
- aCId = ((const SfxStringItem *)pItem)->GetValue();
+ aCId = static_cast<const SfxStringItem *>(pItem)->GetValue();
OSL_ENSURE( !aCId.isEmpty(), "CID without length!" );
}
}
@@ -447,11 +447,11 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
const SfxItemSet& rSetPara = pStyleSheet->GetItemSet();
aHTMLStyle.nDefaultScriptType = ScGlobal::GetDefaultScriptType();
- aHTMLStyle.aFontFamilyName = ((const SvxFontItem&)(rSetPara.Get(
+ aHTMLStyle.aFontFamilyName = static_cast<const SvxFontItem&>((rSetPara.Get(
ScGlobal::GetScriptedWhichID(
aHTMLStyle.nDefaultScriptType, ATTR_FONT
)))).GetFamilyName();
- aHTMLStyle.nFontHeight = ((const SvxFontHeightItem&)(rSetPara.Get(
+ aHTMLStyle.nFontHeight = static_cast<const SvxFontHeightItem&>((rSetPara.Get(
ScGlobal::GetScriptedWhichID(
aHTMLStyle.nDefaultScriptType, ATTR_FONT_HEIGHT
)))).GetHeight();
@@ -468,7 +468,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
const SfxItemSet& rSet = pStyleSheet->GetItemSet();
if ( !aHTMLStyle.bInitialized )
{
- const SvxBrushItem* pBrushItem = (const SvxBrushItem*)&rSet.Get( ATTR_BACKGROUND );
+ const SvxBrushItem* pBrushItem = static_cast<const SvxBrushItem*>(&rSet.Get( ATTR_BACKGROUND ));
aHTMLStyle.aBackgroundColor = pBrushItem->GetColor();
aHTMLStyle.bInitialized = true;
}
@@ -550,7 +550,7 @@ OString ScHTMLExport::BorderToStyle(const char* pBorderName,
void ScHTMLExport::WriteBody()
{
const SfxItemSet& rSet = PageDefaults( bAll ? 0 : aRange.aStart.Tab() );
- const SvxBrushItem* pBrushItem = (const SvxBrushItem*)&rSet.Get( ATTR_BACKGROUND );
+ const SvxBrushItem* pBrushItem = static_cast<const SvxBrushItem*>(&rSet.Get( ATTR_BACKGROUND ));
// default text color black
if (!mbSkipHeaderFooter)
@@ -834,7 +834,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
const SfxItemSet* pCondItemSet = pDoc->GetCondResult( nCol, nRow, nTab );
- const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG, pCondItemSet );
+ const ScMergeFlagAttr& rMergeFlagAttr = static_cast<const ScMergeFlagAttr&>( pAttr->GetItem( ATTR_MERGE_FLAG, pCondItemSet ) );
if ( rMergeFlagAttr.IsOverlapped() )
return ;
@@ -874,7 +874,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
OStringBuffer aStrTD(OOO_STRING_SVTOOLS_HTML_tabledata);
// border of the cells
- SvxBoxItem* pBorder = (SvxBoxItem*) pDoc->GetAttr( nCol, nRow, nTab, ATTR_BORDER );
+ const SvxBoxItem* pBorder = static_cast<const SvxBoxItem*>( pDoc->GetAttr( nCol, nRow, nTab, ATTR_BORDER ) );
if ( pBorder && (pBorder->GetTop() || pBorder->GetBottom() || pBorder->GetLeft() || pBorder->GetRight()) )
{
aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_style).
@@ -896,7 +896,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
const sal_Char* pChar;
sal_uInt16 nHeightPixel;
- const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE, pCondItemSet );
+ const ScMergeAttr& rMergeAttr = static_cast<const ScMergeAttr&>( pAttr->GetItem( ATTR_MERGE, pCondItemSet ) );
if ( pGraphEntry || rMergeAttr.IsMerged() )
{
SCCOL nC, jC;
@@ -942,36 +942,36 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
append(static_cast<sal_Int32>(nHeightPixel)).append('"');
}
- const SvxFontItem& rFontItem = (const SvxFontItem&) pAttr->GetItem(
+ const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>( pAttr->GetItem(
ScGlobal::GetScriptedWhichID( nScriptType, ATTR_FONT),
- pCondItemSet);
+ pCondItemSet) );
- const SvxFontHeightItem& rFontHeightItem = (const SvxFontHeightItem&)
+ const SvxFontHeightItem& rFontHeightItem = static_cast<const SvxFontHeightItem&>(
pAttr->GetItem( ScGlobal::GetScriptedWhichID( nScriptType,
- ATTR_FONT_HEIGHT), pCondItemSet);
+ ATTR_FONT_HEIGHT), pCondItemSet) );
- const SvxWeightItem& rWeightItem = (const SvxWeightItem&) pAttr->GetItem(
+ const SvxWeightItem& rWeightItem = static_cast<const SvxWeightItem&>( pAttr->GetItem(
ScGlobal::GetScriptedWhichID( nScriptType, ATTR_FONT_WEIGHT),
- pCondItemSet);
+ pCondItemSet) );
- const SvxPostureItem& rPostureItem = (const SvxPostureItem&)
+ const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&>(
pAttr->GetItem( ScGlobal::GetScriptedWhichID( nScriptType,
- ATTR_FONT_POSTURE), pCondItemSet);
+ ATTR_FONT_POSTURE), pCondItemSet) );
- const SvxUnderlineItem& rUnderlineItem = (const SvxUnderlineItem&)
- pAttr->GetItem( ATTR_FONT_UNDERLINE, pCondItemSet );
+ const SvxUnderlineItem& rUnderlineItem = static_cast<const SvxUnderlineItem&>(
+ pAttr->GetItem( ATTR_FONT_UNDERLINE, pCondItemSet ) );
- const SvxColorItem& rColorItem = (const SvxColorItem&) pAttr->GetItem(
- ATTR_FONT_COLOR, pCondItemSet );
+ const SvxColorItem& rColorItem = static_cast<const SvxColorItem&>( pAttr->GetItem(
+ ATTR_FONT_COLOR, pCondItemSet ) );
- const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)
- pAttr->GetItem( ATTR_HOR_JUSTIFY, pCondItemSet );
+ const SvxHorJustifyItem& rHorJustifyItem = static_cast<const SvxHorJustifyItem&>(
+ pAttr->GetItem( ATTR_HOR_JUSTIFY, pCondItemSet ) );
- const SvxVerJustifyItem& rVerJustifyItem = (const SvxVerJustifyItem&)
- pAttr->GetItem( ATTR_VER_JUSTIFY, pCondItemSet );
+ const SvxVerJustifyItem& rVerJustifyItem = static_cast<const SvxVerJustifyItem&>(
+ pAttr->GetItem( ATTR_VER_JUSTIFY, pCondItemSet ) );
- const SvxBrushItem& rBrushItem = (const SvxBrushItem&) pAttr->GetItem(
- ATTR_BACKGROUND, pCondItemSet );
+ const SvxBrushItem& rBrushItem = static_cast<const SvxBrushItem&>( pAttr->GetItem(
+ ATTR_BACKGROUND, pCondItemSet ) );
Color aBgColor;
if ( rBrushItem.GetColor().GetTransparency() == 255 )
@@ -1205,11 +1205,11 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
SfxItemSet aSet = rEngine.GetAttribs( aSel );
if ( aSet.GetItemState( EE_FEATURE_FIELD, false, &pItem ) == SfxItemState::SET )
{
- const SvxFieldData* pField = ((const SvxFieldItem*)pItem)->GetField();
+ const SvxFieldData* pField = static_cast<const SvxFieldItem*>(pItem)->GetField();
if ( pField && pField->ISA(SvxURLField) )
{
bUrl = true;
- const SvxURLField* pURLField = (const SvxURLField*)pField;
+ const SvxURLField* pURLField = static_cast<const SvxURLField*>(pField);
// String aFieldText = rEngine.GetText( aSel );
rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_anchor ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_href ).WriteCharPtr( "=\"" );
OUT_STR( pURLField->GetURL() );
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index f361a5a2df0a..c96388db77ab 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -135,8 +135,8 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
{
case OBJ_GRAF:
{
- const SdrGrafObj* pSGO = (SdrGrafObj*)pObject;
- const SdrGrafObjGeoData* pGeo = (SdrGrafObjGeoData*)pSGO->GetGeoData();
+ const SdrGrafObj* pSGO = static_cast<SdrGrafObj*>(pObject);
+ const SdrGrafObjGeoData* pGeo = static_cast<SdrGrafObjGeoData*>(pSGO->GetGeoData());
sal_uInt16 nMirrorCase = (pGeo->aGeo.nRotationAngle == 18000 ?
( pGeo->bMirrored ? 3 : 4 ) : ( pGeo->bMirrored ? 2 : 1 ));
bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) );
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 0a05a6a79881..24d6df0eee5e 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -65,18 +65,18 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const S
Size aPageSize;
OutputDevice* pDefaultDev = Application::GetDefaultDevice();
const OUString& aPageStyle = mpDoc->GetPageStyle( rRange.aStart.Tab() );
- ScStyleSheet* pStyleSheet = (ScStyleSheet*)mpDoc->
- GetStyleSheetPool()->Find( aPageStyle, SFX_STYLE_FAMILY_PAGE );
+ ScStyleSheet* pStyleSheet = static_cast<ScStyleSheet*>(mpDoc->
+ GetStyleSheetPool()->Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ));
if ( pStyleSheet )
{
const SfxItemSet& rSet = pStyleSheet->GetItemSet();
- const SvxLRSpaceItem* pLRItem = (const SvxLRSpaceItem*) &rSet.Get( ATTR_LRSPACE );
+ const SvxLRSpaceItem* pLRItem = static_cast<const SvxLRSpaceItem*>( &rSet.Get( ATTR_LRSPACE ) );
long nLeftMargin = pLRItem->GetLeft();
long nRightMargin = pLRItem->GetRight();
- const SvxULSpaceItem* pULItem = (const SvxULSpaceItem*) &rSet.Get( ATTR_ULSPACE );
+ const SvxULSpaceItem* pULItem = static_cast<const SvxULSpaceItem*>( &rSet.Get( ATTR_ULSPACE ) );
long nTopMargin = pULItem->GetUpper();
long nBottomMargin = pULItem->GetLower();
- aPageSize = ((const SvxSizeItem&) rSet.Get(ATTR_PAGE_SIZE)).GetSize();
+ aPageSize = static_cast<const SvxSizeItem&>(rSet.Get(ATTR_PAGE_SIZE)).GetSize();
if ( !aPageSize.Width() || !aPageSize.Height() )
{
OSL_FAIL("PageSize Null ?!?!?");
@@ -102,7 +102,7 @@ ScHTMLImport::~ScHTMLImport()
{
// Ordering is important, otherwise we get an error in some other Dtor!
// OK, as ScEEImport is the Base Class
- delete (ScHTMLParser*) mpParser; // before EditEngine!
+ delete static_cast<ScHTMLParser*>(mpParser); // before EditEngine!
}
void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const OUString& rName, const ScRange& rRange )
@@ -135,25 +135,25 @@ void ScHTMLImport::WriteToDocument(
if( (pEntry->nColOverlap > 1) || (pEntry->nRowOverlap > 1) )
{
SCTAB nTab = maRange.aStart.Tab();
- const ScMergeAttr* pItem = (ScMergeAttr*) mpDoc->GetAttr( pEntry->nCol, pEntry->nRow, nTab, ATTR_MERGE );
+ const ScMergeAttr* pItem = static_cast<const ScMergeAttr*>( mpDoc->GetAttr( pEntry->nCol, pEntry->nRow, nTab, ATTR_MERGE ) );
if( pItem->IsMerged() )
{
SCCOL nColMerge = pItem->GetColMerge();
SCROW nRowMerge = pItem->GetRowMerge();
- const SvxBoxItem* pToItem = (const SvxBoxItem*)
- mpDoc->GetAttr( pEntry->nCol, pEntry->nRow, nTab, ATTR_BORDER );
+ const SvxBoxItem* pToItem = static_cast<const SvxBoxItem*>(
+ mpDoc->GetAttr( pEntry->nCol, pEntry->nRow, nTab, ATTR_BORDER ) );
SvxBoxItem aNewItem( *pToItem );
if( nColMerge > 1 )
{
- const SvxBoxItem* pFromItem = (const SvxBoxItem*)
- mpDoc->GetAttr( pEntry->nCol + nColMerge - 1, pEntry->nRow, nTab, ATTR_BORDER );
+ const SvxBoxItem* pFromItem = static_cast<const SvxBoxItem*>(
+ mpDoc->GetAttr( pEntry->nCol + nColMerge - 1, pEntry->nRow, nTab, ATTR_BORDER ) );
aNewItem.SetLine( pFromItem->GetLine( BOX_LINE_RIGHT ), BOX_LINE_RIGHT );
}
if( nRowMerge > 1 )
{
- const SvxBoxItem* pFromItem = (const SvxBoxItem*)
- mpDoc->GetAttr( pEntry->nCol, pEntry->nRow + nRowMerge - 1, nTab, ATTR_BORDER );
+ const SvxBoxItem* pFromItem = static_cast<const SvxBoxItem*>(
+ mpDoc->GetAttr( pEntry->nCol, pEntry->nRow + nRowMerge - 1, nTab, ATTR_BORDER ) );
aNewItem.SetLine( pFromItem->GetLine( BOX_LINE_BOTTOM ), BOX_LINE_BOTTOM );
}
mpDoc->ApplyAttr( pEntry->nCol, pEntry->nRow, nTab, aNewItem );
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 2ac116800193..fc6af9a43fc7 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -620,8 +620,8 @@ protected:
sal_uLong nError;
public:
Sc10FontCollection( SvStream& rStream );
- sal_uLong GetError() { return nError; }
- Sc10FontData* At(sal_uInt16 nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); }
+ sal_uLong GetError() { return nError; }
+ Sc10FontData* At(sal_uInt16 nIndex) { return static_cast<Sc10FontData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
};
@@ -651,11 +651,11 @@ public :
class Sc10NameCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ sal_uLong nError;
public:
Sc10NameCollection(SvStream& rStream);
-sal_uLong GetError() { return nError; }
-Sc10NameData* At(sal_uInt16 nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); }
+ sal_uLong GetError() { return nError; }
+ Sc10NameData* At(sal_uInt16 nIndex) { return static_cast<Sc10NameData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
};
@@ -702,11 +702,11 @@ virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternD
class Sc10PatternCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ sal_uLong nError;
public:
Sc10PatternCollection(SvStream& rStream);
- sal_uLong GetError() { return nError; }
- Sc10PatternData* At(sal_uInt16 nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); }
+ sal_uLong GetError() { return nError; }
+ Sc10PatternData* At(sal_uInt16 nIndex) { return static_cast<Sc10PatternData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
};
@@ -730,12 +730,12 @@ virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBase
class Sc10DataBaseCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ sal_uLong nError;
sal_Char ActName[32];
public:
Sc10DataBaseCollection(SvStream& rStream);
- sal_uLong GetError() { return nError; }
- Sc10DataBaseData* At(sal_uInt16 nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); }
+ sal_uLong GetError() { return nError; }
+ Sc10DataBaseData* At(sal_uInt16 nIndex) { return static_cast<Sc10DataBaseData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
};
@@ -755,7 +755,7 @@ class Sc10PageCollection : public ScCollection
{
public:
Sc10PageCollection() : ScCollection(1,1) {};
- Sc10PageData* At(sal_uInt16 nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); }
+ Sc10PageData* At(sal_uInt16 nIndex) { return static_cast<Sc10PageData*>(ScCollection::At(nIndex)); }
sal_uInt16 InsertFormat( const Sc10PageFormat& rData );
void PutToDoc( ScDocument* pDoc );
private:
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index ddf5ddd2d449..8609d9302f29 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -356,7 +356,7 @@ inline const TokenId TokenPool::Store( const sal_Int16 nWert )
inline const TokenId TokenPool::LastId( void ) const
{
- return ( TokenId ) nElementAkt; // correct, as Ausgabe with Offset 1!
+ return static_cast<TokenId>(nElementAkt); // correct, as Ausgabe with Offset 1!
}
const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 1989a2e9534b..11335684946c 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -167,7 +167,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
// EditView.GetAttribs always returns complete Set filled with
// defaults
const SfxPoolItem& rItem = aSet.Get( EE_PARA_JUST );
- if ( ((const SvxAdjustItem&)rItem).GetAdjust() == SVX_ADJUST_LEFT )
+ if ( static_cast<const SvxAdjustItem&>(rItem).GetAdjust() == SVX_ADJUST_LEFT )
aSet.ClearItem( EE_PARA_JUST );
// Test whether simple String without mixed attributes
@@ -182,7 +182,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
{
if ( nId == EE_CHAR_ESCAPEMENT ) // Super-/Subscript always via EE
{
- if ( (SvxEscapement)((const SvxEscapementItem*)pItem)->GetEnumValue()
+ if ( (SvxEscapement)static_cast<const SvxEscapementItem*>(pItem)->GetEnumValue()
!= SVX_ESCAPEMENT_OFF )
bSimple = false;
}
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 05032f2d41c9..03434f302e8d 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -108,8 +108,8 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
{
const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
- const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE );
- const SvxVerJustifyItem& rVerJustifyItem= (const SvxVerJustifyItem&)pAttr->GetItem( ATTR_VER_JUSTIFY );
+ const ScMergeAttr& rMergeAttr = static_cast<const ScMergeAttr&>( pAttr->GetItem( ATTR_MERGE ));
+ const SvxVerJustifyItem& rVerJustifyItem= static_cast<const SvxVerJustifyItem&>(pAttr->GetItem( ATTR_VER_JUSTIFY ));
const sal_Char* pChar;
@@ -117,7 +117,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMGF );
else
{
- const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG );
+ const ScMergeFlagAttr& rMergeFlagAttr = static_cast<const ScMergeFlagAttr&>( pAttr->GetItem( ATTR_MERGE_FLAG ) );
if ( rMergeFlagAttr.IsHorOverlapped() )
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CLMRG );
}
@@ -156,7 +156,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
{
const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
- const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG );
+ const ScMergeFlagAttr& rMergeFlagAttr = static_cast<const ScMergeFlagAttr&>( pAttr->GetItem( ATTR_MERGE_FLAG ) );
if ( rMergeFlagAttr.IsHorOverlapped() )
{
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELL );
@@ -194,10 +194,10 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
bool bResetAttr(false);
- const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
- const SvxWeightItem& rWeightItem = (const SvxWeightItem&) pAttr->GetItem( ATTR_FONT_WEIGHT );
- const SvxPostureItem& rPostureItem = (const SvxPostureItem&) pAttr->GetItem( ATTR_FONT_POSTURE );
- const SvxUnderlineItem& rUnderlineItem = (const SvxUnderlineItem&) pAttr->GetItem( ATTR_FONT_UNDERLINE );
+ const SvxHorJustifyItem& rHorJustifyItem = static_cast<const SvxHorJustifyItem&>(pAttr->GetItem( ATTR_HOR_JUSTIFY ));
+ const SvxWeightItem& rWeightItem = static_cast<const SvxWeightItem&>( pAttr->GetItem( ATTR_FONT_WEIGHT ));
+ const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&>( pAttr->GetItem( ATTR_FONT_POSTURE ));
+ const SvxUnderlineItem& rUnderlineItem = static_cast<const SvxUnderlineItem&>( pAttr->GetItem( ATTR_FONT_UNDERLINE ));
const sal_Char* pChar;
diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx
index 682c1e799037..bca3af1bbff6 100644
--- a/sc/source/filter/rtf/rtfimp.cxx
+++ b/sc/source/filter/rtf/rtfimp.cxx
@@ -50,7 +50,7 @@ ScRTFImport::~ScRTFImport()
{
// ordering is important; get error in some other Dtor otherwise!
// Is correct, as ScEEImport is Base Class
- delete (ScRTFParser*) mpParser; // before EditEngine!
+ delete static_cast<ScRTFParser*>(mpParser); // before EditEngine!
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 6a44a09c16ae..87716da3c118 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -166,7 +166,7 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo )
break;
case RTFIMP_START:
{
- SvxRTFParser* pParser = (SvxRTFParser*) pInfo->pParser;
+ SvxRTFParser* pParser = static_cast<SvxRTFParser*>(pInfo->pParser);
pParser->SetAttrPool( pPool );
RTFPardAttrMapIds& rMap = pParser->GetPardMap();
rMap.nBrush = ATTR_BACKGROUND;
@@ -392,11 +392,11 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) )
{
case RTF_SHADINGDEF:
- ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(
+ static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBackgroundAttr(
pInfo->nToken, pInsDefault->aItemSet, sal_True );
break;
case RTF_BRDRDEF:
- ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(
+ static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(
pInfo->nToken, pInsDefault->aItemSet, sal_True );
break;
}
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 39b272a3e389..bdade94c4ce8 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -691,9 +691,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
OUString aName = lcl_MakeOldPageStyleFormatName( i );
- ScStyleSheet* pSheet = (ScStyleSheet*) &pStylePool->Make( aName,
+ ScStyleSheet* pSheet = static_cast<ScStyleSheet*>( &pStylePool->Make( aName,
SFX_STYLE_FAMILY_PAGE,
- SFXSTYLEBIT_USERDEF | SCSTYLEBIT_STANDARD );
+ SFXSTYLEBIT_USERDEF | SCSTYLEBIT_STANDARD ) );
// #i68483# set page style name at sheet...
pDoc->SetPageStyle( static_cast< SCTAB >( i ), aName );
@@ -1589,7 +1589,7 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
case ctValue :
{
const SfxPoolItem* pValueFormat = pDoc->GetAttr(Col, static_cast<SCROW> (Row), Tab, ATTR_VALUE_FORMAT);
- sal_uLong nFormat = ((SfxUInt32Item*)pValueFormat)->GetValue();
+ sal_uLong nFormat = static_cast<const SfxUInt32Item*>(pValueFormat)->GetValue();
double Value = ScfTools::ReadLongDouble(rStream);
//rStream.Read(&Value, sizeof(Value));
@@ -2092,8 +2092,8 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
Sc10PatternData* pPattern = pPatternCollection->At(nPatternIndex);
if (pPattern != NULL)
{
- ScStyleSheet* pStyle = (ScStyleSheet*) pStylePool->Find(
- SC10TOSTRING( pPattern->Name ), SFX_STYLE_FAMILY_PARA);
+ ScStyleSheet* pStyle = static_cast<ScStyleSheet*>( pStylePool->Find(
+ SC10TOSTRING( pPattern->Name ), SFX_STYLE_FAMILY_PARA) );
if (pStyle != NULL)
pDoc->ApplyStyleAreaTab(Col, nStart, Col, nEnd, Tab, *pStyle);
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 04a64eb3d6d0..4cf119b0e634 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -709,7 +709,7 @@ void XclExpChTrAction::AddDependentContents(
for( itChangeAction = aActionMap.begin(); itChangeAction != aActionMap.end(); ++itChangeAction )
if( itChangeAction->second->GetType() == SC_CAT_CONTENT )
SetAddAction( new XclExpChTrCellContent(
- *((const ScChangeActionContent*) itChangeAction->second), rRoot, rIdBuffer ) );
+ *static_cast<const ScChangeActionContent*>(itChangeAction->second), rRoot, rIdBuffer ) );
}
void XclExpChTrAction::SetIndex( sal_uInt32& rIndex )
@@ -1567,7 +1567,7 @@ void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction )
switch( rAction.GetType() )
{
case SC_CAT_CONTENT:
- pXclAction = new XclExpChTrCellContent( (const ScChangeActionContent&) rAction, GetRoot(), *pTabIdBuffer );
+ pXclAction = new XclExpChTrCellContent( static_cast<const ScChangeActionContent&>(rAction), GetRoot(), *pTabIdBuffer );
break;
case SC_CAT_INSERT_ROWS:
case SC_CAT_INSERT_COLS:
@@ -1587,7 +1587,7 @@ void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction )
break;
case SC_CAT_MOVE:
if (pTempChangeTrack)
- pXclAction = new XclExpChTrMoveRange( (const ScChangeActionMove&) rAction, GetRoot(), *pTabIdBuffer, *pTempChangeTrack );
+ pXclAction = new XclExpChTrMoveRange( static_cast<const ScChangeActionMove&>(rAction), GetRoot(), *pTabIdBuffer, *pTempChangeTrack );
break;
default:;
}
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 216f3c5c6583..271519abcc50 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -177,9 +177,9 @@ bool lcl_IsFontwork( const SdrObject* pObj )
if( pObj->GetObjIdentifier() == OBJ_CUSTOMSHAPE )
{
const OUString aTextPath = "TextPath";
- SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)
- pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
- if( Any* pAny = rGeometryItem.GetPropertyValueByName( aTextPath, aTextPath ) )
+ const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(
+ pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
+ if( const Any* pAny = rGeometryItem.GetPropertyValueByName( aTextPath, aTextPath ) )
*pAny >>= bIsFontwork;
}
return bIsFontwork;
@@ -218,7 +218,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
if( mbIsRootDff )
{
//! not-const because GetObjRef may load the OLE object
- Reference < XClassifiedObject > xObj( ((SdrOle2Obj*)pObj)->GetObjRef(), UNO_QUERY );
+ Reference < XClassifiedObject > xObj( static_cast<SdrOle2Obj*>(pObj)->GetObjRef(), UNO_QUERY );
if ( xObj.is() )
{
SvGlobalName aObjClsId( xObj->getClassID() );
@@ -394,7 +394,7 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID )
EscherExHostAppData* XclEscherEx::EnterAdditionalTextGroup()
{
nAdditionalText = 1;
- pAdditionalText = (XclEscherClientTextbox*) pCurrAppData->GetClientTextbox();
+ pAdditionalText = static_cast<XclEscherClientTextbox*>( pCurrAppData->GetClientTextbox() );
pCurrAppData->SetClientTextbox( NULL );
return pCurrAppData;
}
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index a18c514ee57c..9a306b44541b 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -895,7 +895,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
STREAM_READWRITE| STREAM_SHARE_DENYALL );
if( xOleStg.Is() )
{
- uno::Reference < embed::XEmbeddedObject > xObj( ((SdrOle2Obj&)rOleObj).GetObjRef() );
+ uno::Reference < embed::XEmbeddedObject > xObj( static_cast<const SdrOle2Obj&>(rOleObj).GetObjRef() );
if ( xObj.is() )
{
// set version to "old" version, because it must be
@@ -925,7 +925,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
// OBJFLAGS subrecord, undocumented as usual
rStrm.StartRecord( EXC_ID_OBJFLAGS, 2 );
sal_uInt16 nFlags = EXC_OBJ_PIC_MANUALSIZE;
- ::set_flag( nFlags, EXC_OBJ_PIC_SYMBOL, ((SdrOle2Obj&)rOleObj).GetAspect() == embed::Aspects::MSOLE_ICON );
+ ::set_flag( nFlags, EXC_OBJ_PIC_SYMBOL, static_cast<const SdrOle2Obj&>(rOleObj).GetAspect() == embed::Aspects::MSOLE_ICON );
rStrm << nFlags;
rStrm.EndRecord();