diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:08:37 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-28 19:09:29 +0100 |
commit | 44b9b27b1ad161191d254f5497e7eb0766854966 (patch) | |
tree | c3ddcfcdb6e4c64fa0d019d4d1d03759118b5f10 /xmloff/source/style | |
parent | 1bfdea75d23d79e8b0d2d7c1548d716d0ca27488 (diff) |
Clean up C-style casts from pointers to void
Change-Id: I962bd44f2ef6204ed2ea51f79b752bd948f67209
Diffstat (limited to 'xmloff/source/style')
-rw-r--r-- | xmloff/source/style/XMLConstantsPropertyHandler.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/XMLPageExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/impastpl.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/prstylei.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/styleexp.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/xmlbahdl.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnume.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlstyle.cxx | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index 9a38098d5095..ca3843f25fe1 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -67,7 +67,7 @@ bool XMLConstantsPropertyHandler::exportXML( if( rValue.hasValue() && (rValue.getValueTypeClass() == TypeClass_ENUM)) { - nEnum = *((sal_Int32*)rValue.getValue()); + nEnum = *static_cast<sal_Int32 const *>(rValue.getValue()); bRet = true; } else diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 0bd5d951e469..7713b664cefa 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -92,7 +92,7 @@ bool XMLPageExport::exportStyle( if( xPropSetInfo->hasPropertyByName( sIsPhysical ) ) { Any aAny = xPropSet->getPropertyValue( sIsPhysical ); - if( !*(sal_Bool *)aAny.getValue() ) + if( !*static_cast<sal_Bool const *>(aAny.getValue()) ) return false; } diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 3147edad34db..b6e1b2ae176a 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -86,7 +86,7 @@ struct2string(void *data, result.append(":"); result.append(compoundType->ppMemberNames[i]); result.append("="); - result.append(data2string(((char *)data)+compoundType->pMemberOffsets[i], + result.append(data2string(static_cast<char *>(data)+compoundType->pMemberOffsets[i], compoundType->ppTypeRefs[i])); } diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index bda107563879..47f19100bac0 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -367,7 +367,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) if( !bNew && xPropSetInfo->hasPropertyByName( msIsPhysical ) ) { Any aAny = xPropSet->getPropertyValue( msIsPhysical ); - bNew = !*(sal_Bool *)aAny.getValue(); + bNew = !*static_cast<sal_Bool const *>(aAny.getValue()); } SetNew( bNew ); if( rName != GetName() ) diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 2089fb08748c..43fbab803388 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -96,7 +96,7 @@ bool XMLStyleExport::exportStyle( if( xPropSetInfo->hasPropertyByName( sIsPhysical ) ) { aAny = xPropSet->getPropertyValue( sIsPhysical ); - if( !*(sal_Bool *)aAny.getValue() ) + if( !*static_cast<sal_Bool const *>(aAny.getValue()) ) return false; } @@ -164,7 +164,7 @@ bool XMLStyleExport::exportStyle( if( xPropSetInfo->hasPropertyByName( sIsAutoUpdate ) ) { aAny = xPropSet->getPropertyValue( sIsAutoUpdate ); - if( *(sal_Bool *)aAny.getValue() ) + if( *static_cast<sal_Bool const *>(aAny.getValue()) ) GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_AUTO_UPDATE, XML_TRUE ); } @@ -472,7 +472,7 @@ void XMLStyleExport::exportStyleFamily( if( xPropSetInfo->hasPropertyByName( sIsPhysical ) ) { Any aAny( xPropSet->getPropertyValue( sIsPhysical ) ); - if( !*(sal_Bool *)aAny.getValue() ) + if( !*static_cast<sal_Bool const *>(aAny.getValue()) ) continue; } diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index bee67a4a70bf..6c93da92755f 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -695,7 +695,7 @@ bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal // MIB: This looks a bit strange, because bTransPropValue == bValue should // do the same, but this only applies if 'true' is represented by the same // 8 bit value in bValue and bTransPropValue. Who will ensure this? - bool bValue = *(sal_Bool *)rValue.getValue(); + bool bValue = *static_cast<sal_Bool const *>(rValue.getValue()); bool bIsTrans = bTransPropValue ? bValue : !bValue; if( bIsTrans ) diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index db278ab3d6c6..c658ed14add6 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -680,7 +680,7 @@ void SvxXMLNumRuleExport::exportNumberingRule( xPropSetInfo->hasPropertyByName( sIsContinuousNumbering ) ) { Any aAny( xPropSet->getPropertyValue( sIsContinuousNumbering ) ); - bContNumbering = *(sal_Bool *)aAny.getValue(); + bContNumbering = *static_cast<sal_Bool const *>(aAny.getValue()); } if( bContNumbering ) GetExport().AddAttribute( XML_NAMESPACE_TEXT, @@ -708,7 +708,7 @@ bool SvxXMLNumRuleExport::exportStyle( const Reference< XStyle >& rStyle ) if( xPropSetInfo->hasPropertyByName( sIsPhysical ) ) { aAny = xPropSet->getPropertyValue( sIsPhysical ); - if( !*(sal_Bool *)aAny.getValue() ) + if( !*static_cast<sal_Bool const *>(aAny.getValue()) ) return false; } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 810a7244e5b3..bea31bfc5574 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1191,7 +1191,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) if( !bNew && xPropSetInfo->hasPropertyByName( sIsPhysical ) ) { Any aAny = xPropSet->getPropertyValue( sIsPhysical ); - bNew = !*(sal_Bool *)aAny.getValue(); + bNew = !*static_cast<sal_Bool const *>(aAny.getValue()); } if ( xPropSetInfo->hasPropertyByName( "Hidden" ) ) diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index a4600a409c16..93ede0727a19 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -701,7 +701,7 @@ Reference < XAutoStyleFamily > SvXMLStylesContext::GetAutoStyles( sal_uInt16 nFa if (xAutoStyleFamilies->hasByName(sName)) { Any aAny = xAutoStyleFamilies->getByName( sName ); - xAutoStyles = *(Reference<XAutoStyleFamily>*)aAny.getValue(); + xAutoStyles = *static_cast<Reference<XAutoStyleFamily> const *>(aAny.getValue()); if( bPara ) const_cast<SvXMLStylesContext *>(this)->mxParaAutoStyles = xAutoStyles; else |