include/svx/imapdlg.hxx | 2
include/svx/sdasitm.hxx | 1
svx/source/accessibility/AccessibleOLEShape.cxx | 2
svx/source/accessibility/ShapeTypeHandler.cxx | 2
svx/source/customshapes/EnhancedCustomShape3d.cxx | 76 ++++----
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 24 +-
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 26 +-
svx/source/dialog/_bmpmask.cxx | 28 +--
svx/source/dialog/compressgraphicdialog.cxx | 2
svx/source/dialog/connctrl.cxx | 4
svx/source/dialog/contwnd.cxx | 4
svx/source/dialog/dlgctl3d.cxx | 48 ++---
svx/source/dialog/dlgctrl.cxx | 8
svx/source/dialog/docrecovery.cxx | 2
svx/source/dialog/fntctrl.cxx | 78 ++++----
svx/source/dialog/fontwork.cxx | 2
svx/source/dialog/hdft.cxx | 68 +++----
svx/source/dialog/imapdlg.cxx | 2
svx/source/dialog/imapwnd.cxx | 34 +--
svx/source/dialog/optgrid.cxx | 8
svx/source/dialog/rubydialog.cxx | 4
svx/source/dialog/rulritem.cxx | 38 ++--
svx/source/dialog/srchctrl.cxx | 4
svx/source/dialog/srchdlg.cxx | 52 ++---
svx/source/dialog/svxgrahicitem.cxx | 2
svx/source/dialog/txencbox.cxx | 6
svx/source/engine3d/float3d.cxx | 94 +++++-----
svx/source/fmcomp/fmgridcl.cxx | 16 -
svx/source/fmcomp/fmgridif.cxx | 60 +++---
svx/source/fmcomp/gridcell.cxx | 114 ++++++------
svx/source/fmcomp/gridctrl.cxx | 44 ++--
svx/source/form/datanavi.cxx | 6
svx/source/form/filtnav.cxx | 26 +-
svx/source/form/fmPropBrw.cxx | 4
svx/source/form/fmexpl.cxx | 8
svx/source/form/fmitems.cxx | 2
svx/source/form/fmmodel.cxx | 4
svx/source/form/fmobj.cxx | 2
svx/source/form/fmpage.cxx | 6
svx/source/form/fmpgeimp.cxx | 4
svx/source/form/fmshell.cxx | 2
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/fmtextcontrolshell.cxx | 8
svx/source/form/fmundo.cxx | 4
svx/source/form/fmview.cxx | 4
svx/source/form/fmvwimp.cxx | 6
svx/source/form/formcontroller.cxx | 12 -
svx/source/form/navigatortree.cxx | 18 -
svx/source/form/navigatortreemodel.cxx | 30 +--
svx/source/form/tabwin.cxx | 4
svx/source/form/tbxform.cxx | 6
svx/source/inc/filtnav.hxx | 2
svx/source/items/algitem.cxx | 8
svx/source/items/customshapeitem.cxx | 20 ++
svx/source/items/hlnkitem.cxx | 4
svx/source/items/numinf.cxx | 2
svx/source/items/ofaitem.cxx | 2
svx/source/items/pageitem.cxx | 2
svx/source/items/viewlayoutitem.cxx | 2
svx/source/items/zoomslideritem.cxx | 2
svx/source/mnuctrls/fntctl.cxx | 2
svx/source/mnuctrls/fntszctl.cxx | 6
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 28 +--
svx/source/sdr/properties/attributeproperties.cxx | 20 +-
svx/source/sdr/properties/captionproperties.cxx | 4
svx/source/sdr/properties/circleproperties.cxx | 6
svx/source/sdr/properties/connectorproperties.cxx | 4
svx/source/sdr/properties/e3dcompoundproperties.cxx | 6
svx/source/sdr/properties/e3dextrudeproperties.cxx | 2
svx/source/sdr/properties/e3dlatheproperties.cxx | 2
svx/source/sdr/properties/e3dproperties.cxx | 4
svx/source/sdr/properties/e3dsceneproperties.cxx | 20 +-
svx/source/sdr/properties/e3dsphereproperties.cxx | 2
svx/source/sdr/properties/graphicproperties.cxx | 4
svx/source/sdr/properties/groupproperties.cxx | 16 -
svx/source/sdr/properties/itemsettools.cxx | 2
svx/source/sdr/properties/measureproperties.cxx | 4
svx/source/sdr/properties/properties.cxx | 2
svx/source/sdr/properties/rectangleproperties.cxx | 4
svx/source/sdr/properties/textproperties.cxx | 34 +--
svx/source/sidebar/SelectionAnalyzer.cxx | 4
svx/source/sidebar/area/AreaPropertyPanel.cxx | 44 ++--
svx/source/sidebar/line/LinePropertyPanel.cxx | 12 -
svx/source/sidebar/line/LineWidthControl.cxx | 18 -
svx/source/sidebar/nbdtmg.cxx | 149 ++++++++--------
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 16 -
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4
svx/source/sidebar/text/TextPropertyPanel.cxx | 6
svx/source/sidebar/text/TextUnderlineControl.cxx | 22 +-
svx/source/sidebar/tools/ColorControl.cxx | 2
svx/source/stbctrls/insctrl.cxx | 2
svx/source/stbctrls/modctrl.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 8
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 4
svx/source/svdraw/sdrmasterpagedescriptor.cxx | 2
svx/source/svdraw/svdattr.cxx | 6
svx/source/svdraw/svdcrtv.cxx | 12 -
svx/source/svdraw/svddrgmt.cxx | 8
svx/source/svdraw/svddrgv.cxx | 4
svx/source/svdraw/svdedtv.cxx | 4
svx/source/svdraw/svdedtv1.cxx | 76 ++++----
svx/source/svdraw/svdedtv2.cxx | 8
svx/source/svdraw/svdedxv.cxx | 10 -
svx/source/svdraw/svdetc.cxx | 16 -
svx/source/svdraw/svdfmtf.cxx | 108 +++++------
svx/source/svdraw/svdhdl.cxx | 14 -
svx/source/svdraw/svdibrow.cxx | 102 +++++-----
svx/source/svdraw/svdmark.cxx | 2
svx/source/svdraw/svdmodel.cxx | 16 -
svx/source/svdraw/svdmrkv.cxx | 32 +--
svx/source/svdraw/svdoashp.cxx | 90 ++++-----
svx/source/svdraw/svdoattr.cxx | 8
svx/source/svdraw/svdobj.cxx | 66 +++----
svx/source/svdraw/svdocapt.cxx | 24 +-
svx/source/svdraw/svdocirc.cxx | 42 ++--
svx/source/svdraw/svdoedge.cxx | 52 ++---
svx/source/svdraw/svdograf.cxx | 32 +--
svx/source/svdraw/svdomeas.cxx | 72 +++----
svx/source/svdraw/svdopath.cxx | 20 +-
svx/source/svdraw/svdorect.cxx | 2
svx/source/svdraw/svdotext.cxx | 76 ++++----
svx/source/svdraw/svdotextdecomposition.cxx | 30 +--
svx/source/svdraw/svdotxat.cxx | 10 -
svx/source/svdraw/svdotxdr.cxx | 4
svx/source/svdraw/svdotxed.cxx | 2
svx/source/svdraw/svdotxln.cxx | 2
svx/source/svdraw/svdpage.cxx | 6
svx/source/svdraw/svdpagv.cxx | 4
svx/source/svdraw/svdpntv.cxx | 24 +-
svx/source/svdraw/svdview.cxx | 20 +-
svx/source/table/cell.cxx | 22 +-
svx/source/table/svdotable.cxx | 6
svx/source/table/tablecontroller.cxx | 18 -
svx/source/table/tablelayouter.cxx | 2
svx/source/table/tablertfexporter.cxx | 6
svx/source/table/tablertfimporter.cxx | 4
svx/source/table/viewcontactoftableobj.cxx | 4
svx/source/table/viewcontactoftableobj.hxx | 10 -
svx/source/tbxctrls/PaletteManager.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 6
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 40 ++--
svx/source/tbxctrls/itemwin.cxx | 4
svx/source/tbxctrls/lboxctrl.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 24 +-
svx/source/tbxctrls/tbcontrl.cxx | 24 +-
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 18 -
svx/source/toolbars/extrusionbar.cxx | 70 +++----
svx/source/toolbars/fontworkbar.cxx | 36 +--
svx/source/unodraw/UnoGraphicExporter.cxx | 10 -
svx/source/unodraw/UnoNameItemTable.cxx | 22 +-
svx/source/unodraw/UnoNamespaceMap.cxx | 2
svx/source/unodraw/XPropertyTable.cxx | 12 -
svx/source/unodraw/unomod.cxx | 6
svx/source/unodraw/unomtabl.cxx | 29 +--
svx/source/unodraw/unopage.cxx | 6
svx/source/unodraw/unopool.cxx | 4
svx/source/unodraw/unoshap2.cxx | 34 +--
svx/source/unodraw/unoshap3.cxx | 18 -
svx/source/unodraw/unoshap4.cxx | 4
svx/source/unodraw/unoshape.cxx | 26 +-
svx/source/unodraw/unoshtxt.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 6
svx/source/xoutdev/xattr.cxx | 70 +++----
svx/source/xoutdev/xattrbmp.cxx | 6
svx/source/xoutdev/xexch.cxx | 4
svx/source/xoutdev/xtabbtmp.cxx | 4
svx/source/xoutdev/xtabcolr.cxx | 6
svx/source/xoutdev/xtabdash.cxx | 6
svx/source/xoutdev/xtabgrdt.cxx | 6
svx/source/xoutdev/xtabhtch.cxx | 6
svx/source/xoutdev/xtablend.cxx | 4
xmlhelp/source/cxxhelp/provider/databases.cxx | 2
175 files changed, 1576 insertions(+), 1555 deletions(-)
New commits:
commit 3bb30a68e0604b3006f367fdb4c0a797846c23bc
Author: Noel Grandin <n...@peralex.com>
Date: Mon Oct 20 11:52:06 2014 +0200
loplugin: cstylecast
Change-Id: If50022b55a558c4124d71acbbe0ef5eb48801d0b
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 76bc59f..5530488 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -162,7 +162,7 @@ public:
|*
\************************************************************************/
-#define SVXIMAPDLG() ( (SvxIMapDlg*) (
SfxViewFrame::Current()->GetChildWindow( \
+#define SVXIMAPDLG() ( static_cast<SvxIMapDlg*>(
SfxViewFrame::Current()->GetChildWindow( \
SvxIMapDlgChildWindow::GetChildWindowId() )-> \
GetWindow() ) )
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 108a77a..7c93eea 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -280,13 +280,13 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
aSet.Put( SfxBoolItem( nWSharedFirst,
m_pCntSharedFirstBox->IsChecked() ) );
if(m_pDynSpacingCB->IsVisible() && SFX_WHICH_MAX > nWDynSpacing)
{
- boost::scoped_ptr<SfxBoolItem>
pBoolItem((SfxBoolItem*)pPool->GetDefaultItem(nWDynSpacing).Clone());
+ boost::scoped_ptr<SfxBoolItem>
pBoolItem(static_cast<SfxBoolItem*>(pPool->GetDefaultItem(nWDynSpacing).Clone()));
pBoolItem->SetValue(m_pDynSpacingCB->IsChecked());
aSet.Put(*pBoolItem);
}
// Size
- SvxSizeItem aSizeItem( (const SvxSizeItem&)rOldSet.Get( nWSize ) );
+ SvxSizeItem aSizeItem( const_cast<SvxSizeItem&>( static_cast<const
SvxSizeItem&>(rOldSet.Get( nWSize )) ));
Size aSize( aSizeItem.GetSize() );
long nDist = GetCoreValue( *m_pDistEdit, eUnit );
long nH = GetCoreValue( *m_pHeightEdit, eUnit );
@@ -386,29 +386,29 @@ void SvxHFPage::Reset( const SfxItemSet* rSet )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
const SfxBoolItem& rHeaderOn =
- (const SfxBoolItem&)rHeaderSet.Get(GetWhich(SID_ATTR_PAGE_ON));
+ static_cast<const
SfxBoolItem&>(rHeaderSet.Get(GetWhich(SID_ATTR_PAGE_ON)));
m_pTurnOnBox->Check(rHeaderOn.GetValue());
if ( rHeaderOn.GetValue() )
{
const SfxBoolItem& rDynamic =
- (const SfxBoolItem&)rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_DYNAMIC ) );
+ static_cast<const SfxBoolItem&>(rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_DYNAMIC ) ));
const SfxBoolItem& rShared =
- (const SfxBoolItem&)rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_SHARED ) );
+ static_cast<const SfxBoolItem&>(rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_SHARED ) ));
const SfxBoolItem* pSharedFirst = 0;
if (rHeaderSet.HasItem(GetWhich(SID_ATTR_PAGE_SHARED_FIRST)))
- pSharedFirst = (const SfxBoolItem*)&rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_SHARED_FIRST ) );
+ pSharedFirst = static_cast<const
SfxBoolItem*>(&rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SHARED_FIRST ) ));
const SvxSizeItem& rSize =
- (const SvxSizeItem&)rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_SIZE ) );
+ static_cast<const SvxSizeItem&>(rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_SIZE ) ));
const SvxULSpaceItem& rUL =
- (const SvxULSpaceItem&)rHeaderSet.Get( GetWhich(
SID_ATTR_ULSPACE ) );
+ static_cast<const SvxULSpaceItem&>(rHeaderSet.Get( GetWhich(
SID_ATTR_ULSPACE ) ));
const SvxLRSpaceItem& rLR =
- (const SvxLRSpaceItem&)rHeaderSet.Get( GetWhich(
SID_ATTR_LRSPACE ) );
+ static_cast<const SvxLRSpaceItem&>(rHeaderSet.Get( GetWhich(
SID_ATTR_LRSPACE ) ));
if(m_pDynSpacingCB->IsVisible())
{
const SfxBoolItem& rDynSpacing =
- (const
SfxBoolItem&)rHeaderSet.Get(GetWhich(SID_ATTR_HDFT_DYNAMIC_SPACING));
+ static_cast<const
SfxBoolItem&>(rHeaderSet.Get(GetWhich(SID_ATTR_HDFT_DYNAMIC_SPACING)));
m_pDynSpacingCB->Check(rDynSpacing.GetValue());
}
@@ -470,7 +470,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet )
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
sal_uInt16 nHtmlMode = 0;
- nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue();
+ nHtmlMode = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
if(nHtmlMode & HTMLMODE_ON)
{
m_pCntSharedBox->Hide();
@@ -646,7 +646,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
{
// If a SfxItemSet from the SetItem for SID_ATTR_PAGE_HEADERSET or
// SID_ATTR_PAGE_FOOTERSET exists, use it's content
- pBBSet->Put(((SvxSetItem*)pItem)->GetItemSet());
+ pBBSet->Put(static_cast<const SvxSetItem*>(pItem)->GetItemSet());
}
else
{
@@ -734,7 +734,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
if(pBBSet->GetItemState(nWhich) == SfxItemState::SET)
{
- const SvxBoxItem& rItem = (const
SvxBoxItem&)pBBSet->Get(nWhich);
+ const SvxBoxItem& rItem = static_cast<const
SvxBoxItem&>(pBBSet->Get(nWhich));
if(nId == SID_ATTR_PAGE_HEADERSET)
m_pBspWin->SetHdBorder(rItem);
@@ -812,7 +812,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet&
rSet )
if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
{
const SvxBoxItem& rItem =
- (const SvxBoxItem&)rTmpSet.Get(nWhich);
+ static_cast<const SvxBoxItem&>(rTmpSet.Get(nWhich));
m_pBspWin->SetHdBorder(rItem);
}
}
@@ -900,7 +900,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem )
{
// Set left and right margins
- const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)*pItem;
+ const SvxLRSpaceItem& rLRSpace = static_cast<const
SvxLRSpaceItem&>(*pItem);
m_pBspWin->SetLeft( rLRSpace.GetLeft() );
m_pBspWin->SetRight( rLRSpace.GetRight() );
@@ -916,7 +916,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem )
{
// Set top and bottom margins
- const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)*pItem;
+ const SvxULSpaceItem& rULSpace = static_cast<const
SvxULSpaceItem&>(*pItem);
m_pBspWin->SetTop( rULSpace.GetUpper() );
m_pBspWin->SetBottom( rULSpace.GetLower() );
@@ -931,7 +931,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
pItem = GetItem( rSet, SID_ATTR_PAGE );
if ( pItem )
- nUsage = ( (const SvxPageItem*)pItem )->GetPageUsage();
+ nUsage = static_cast<const SvxPageItem*>(pItem)->GetPageUsage();
m_pBspWin->SetUsage( nUsage );
@@ -947,7 +947,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem )
{
// Orientation and Size from the PageItem
- const SvxSizeItem& rSize = (const SvxSizeItem&)*pItem;
+ const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(*pItem);
// if the size is already swapped (Landscape)
m_pBspWin->SetSize( rSize.GetSize() );
}
@@ -961,16 +961,16 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
const SfxBoolItem& rHeaderOn =
- (const SfxBoolItem&)rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
+ static_cast<const SfxBoolItem&>(rHeaderSet.Get( GetWhich(
SID_ATTR_PAGE_ON ) ));
if ( rHeaderOn.GetValue() )
{
- const SvxSizeItem& rSize = (const SvxSizeItem&)
- rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) );
- const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)
- rHeaderSet.Get( GetWhich(SID_ATTR_ULSPACE ) );
- const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)
- rHeaderSet.Get( GetWhich( SID_ATTR_LRSPACE ) );
+ const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(
+ rHeaderSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) ));
+ const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(
+ rHeaderSet.Get( GetWhich(SID_ATTR_ULSPACE ) ));
+ const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(
+ rHeaderSet.Get( GetWhich( SID_ATTR_LRSPACE ) ));
long nDist = rUL.GetLower();
m_pBspWin->SetHdHeight( rSize.GetSize().Height() - nDist );
@@ -1001,16 +1001,16 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
{
const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
const SfxBoolItem& rFooterOn =
- (const SfxBoolItem&)rFooterSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
+ static_cast<const SfxBoolItem&>(rFooterSet.Get( GetWhich(
SID_ATTR_PAGE_ON ) ));
if ( rFooterOn.GetValue() )
{
- const SvxSizeItem& rSize = (const SvxSizeItem&)
- rFooterSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) );
- const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)
- rFooterSet.Get( GetWhich( SID_ATTR_ULSPACE ) );
- const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)
- rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) );
+ const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(
+ rFooterSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) ));
+ const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(
+ rFooterSet.Get( GetWhich( SID_ATTR_ULSPACE ) ));
+ const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(
+ rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) ));
long nDist = rUL.GetUpper();
m_pBspWin->SetFtHeight( rSize.GetSize().Height() - nDist );
@@ -1039,7 +1039,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem && pItem->ISA(SfxBoolItem) )
{
m_pBspWin->SetTable( true );
- m_pBspWin->SetHorz( ( (SfxBoolItem*)pItem )->GetValue() );
+ m_pBspWin->SetHorz( static_cast<const SfxBoolItem*>(pItem)->GetValue()
);
}
pItem = GetItem( rSet, SID_ATTR_PAGE_EXT2 );
@@ -1047,7 +1047,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem && pItem->ISA(SfxBoolItem) )
{
m_pBspWin->SetTable( true );
- m_pBspWin->SetVert( ( (SfxBoolItem*)pItem )->GetValue() );
+ m_pBspWin->SetVert( static_cast<const SfxBoolItem*>(pItem)->GetValue()
);
}
ResetBackground_Impl( rSet );
RangeHdl( 0 );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 5c247de..abcc768 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -99,7 +99,7 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window*
_pParent, sal_uInt16
SfxChildWindow( _pParent, nId )
{
pWindow = new SvxIMapDlg( pBindings, this, _pParent );
- SvxIMapDlg* pDlg = (SvxIMapDlg*) pWindow;
+ SvxIMapDlg* pDlg = static_cast<SvxIMapDlg*>(pWindow);
if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
pDlg->RollUp();
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 0d7f66a..6502ff6 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -158,7 +158,7 @@ const ImageMap& IMapWindow::GetImageMap()
for ( size_t i = nCount; i; )
{
--i;
- aIMap.InsertIMapObject( *( ( (IMapUserData*) pPage->GetObj( i
)->GetUserData( 0 ) )->GetObject() ) );
+ aIMap.InsertIMapObject( *( static_cast<IMapUserData*>(
pPage->GetObj( i )->GetUserData( 0 ) )->GetObject() ) );
}
}
@@ -191,7 +191,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject*
pIMapObj )
{
case( IMAP_OBJ_RECTANGLE ):
{
- IMapRectangleObject* pIMapRectObj = (IMapRectangleObject*)
pIMapObj;
+ const IMapRectangleObject* pIMapRectObj = static_cast<const
IMapRectangleObject*>(pIMapObj);
Rectangle aDrawRect( pIMapRectObj->GetRectangle(
false ) );
// clipped on CanvasPane
@@ -204,7 +204,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject*
pIMapObj )
case( IMAP_OBJ_CIRCLE ):
{
- IMapCircleObject* pIMapCircleObj = (IMapCircleObject*) pIMapObj;
+ const IMapCircleObject* pIMapCircleObj = static_cast<const
IMapCircleObject*>(pIMapObj);
const Point aCenter( pIMapCircleObj->GetCenter( false ) );
const long nRadius = pIMapCircleObj->GetRadius( false );
const Point aOffset( nRadius, nRadius );
@@ -220,7 +220,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject*
pIMapObj )
case( IMAP_OBJ_POLYGON ):
{
- IMapPolygonObject* pIMapPolyObj = (IMapPolygonObject*) pIMapObj;
+ const IMapPolygonObject* pIMapPolyObj = static_cast<const
IMapPolygonObject*>(pIMapObj);
// If it actually is an ellipse, then another ellipse is created
again
if ( pIMapPolyObj->HasExtraEllipse() )
@@ -298,7 +298,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
{
case( OBJ_RECT ):
{
- SdrRectObj* pRectObj = (SdrRectObj*) &rObj;
+ SdrRectObj* pRectObj =
const_cast<SdrRectObj*>(static_cast<const SdrRectObj*>(&rObj));
IMapRectangleObject* pObj = new IMapRectangleObject(
pRectObj->GetLogicRect(), "", "", "", "", "", true, false );
pRectObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) )
);
@@ -307,8 +307,8 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
case( OBJ_CIRC ):
{
- SdrCircObj* pCircObj = (SdrCircObj*) &rObj;
- SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj(
false, false );
+ SdrCircObj* pCircObj = const_cast<SdrCircObj*>( static_cast<const
SdrCircObj*>(&rObj) );
+ SdrPathObj* pPathObj = static_cast<SdrPathObj*>(
pCircObj->ConvertToPolyObj( false, false ) );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
delete pPathObj;
@@ -323,7 +323,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
case( OBJ_PATHPOLY ):
case( OBJ_PATHFILL ):
{
- SdrPathObj* pPathObj = (SdrPathObj*) &rObj;
+ SdrPathObj* pPathObj = const_cast<SdrPathObj*>( static_cast<const
SdrPathObj*>(&rObj) );
const basegfx::B2DPolyPolygon& rXPolyPoly =
pPathObj->GetPathPoly();
if ( rXPolyPoly.count() )
@@ -342,7 +342,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
void IMapWindow::SdrObjChanged( const SdrObject& rObj )
{
- IMapUserData* pUserData = (IMapUserData*) rObj.GetUserData( 0 );
+ IMapUserData* pUserData = static_cast<IMapUserData*>( rObj.GetUserData( 0
) );
if ( pUserData )
{
@@ -366,15 +366,15 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
{
case( OBJ_RECT ):
{
- pUserData->ReplaceObject( IMapObjectPtr(new
IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(),
+ pUserData->ReplaceObject( IMapObjectPtr(new
IMapRectangleObject( static_cast<const SdrRectObj&>(rObj).GetLogicRect(),
aURL, aAltText, aDesc, aTarget, "", bActive, false )
) );
}
break;
case( OBJ_CIRC ):
{
- const SdrCircObj& rCircObj = (const SdrCircObj&) rObj;
- SdrPathObj* pPathObj = (SdrPathObj*)
rCircObj.ConvertToPolyObj( false, false );
+ const SdrCircObj& rCircObj = static_cast<const
SdrCircObj&>(rObj);
+ SdrPathObj* pPathObj = static_cast<SdrPathObj*>(
rCircObj.ConvertToPolyObj( false, false ) );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL,
aAltText, aDesc, aTarget, "", bActive, false );
@@ -391,7 +391,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
case( OBJ_PATHPOLY ):
case( OBJ_PATHFILL ):
{
- const SdrPathObj& rPathObj = (const SdrPathObj&) rObj;
+ const SdrPathObj& rPathObj = static_cast<const
SdrPathObj&>(rObj);
const basegfx::B2DPolyPolygon& rXPolyPoly =
rPathObj.GetPathPoly();
if ( rXPolyPoly.count() )
@@ -455,7 +455,7 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject*
pSdrObj ) const
if ( pSdrObj )
{
- IMapUserData* pUserData = (IMapUserData*) pSdrObj->GetUserData( 0 );
+ IMapUserData* pUserData = static_cast<IMapUserData*>(
pSdrObj->GetUserData( 0 ) );
if ( pUserData )
pIMapObj = pUserData->GetObject().get();
@@ -657,7 +657,7 @@ void IMapWindow::DoMacroAssign()
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
{
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
- pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get(
SID_ATTR_MACROITEM )).GetMacroTable() );
+ pIMapObj->SetMacroTable( static_cast<const SvxMacroItem&
>(pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
pModel->SetChanged( true );
UpdateInfo( false );
}
@@ -788,7 +788,7 @@ void IMapWindow::CreateDefaultObject()
aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.RightCenter().X(),
aNewObjectRectangle.RightCenter().Y()));
aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.BottomRight().X(),
aNewObjectRectangle.BottomRight().Y()));
aInnerPoly.setClosed(true);
-
((SdrPathObj*)pObj)->SetPathPoly(basegfx::B2DPolyPolygon(aInnerPoly));
+
static_cast<SdrPathObj*>(pObj)->SetPathPoly(basegfx::B2DPolyPolygon(aInnerPoly));
break;
}
case OBJ_FREEFILL:
@@ -797,7 +797,7 @@ void IMapWindow::CreateDefaultObject()
sal_Int32 nWdt(aNewObjectRectangle.GetWidth() / 2);
sal_Int32 nHgt(aNewObjectRectangle.GetHeight() / 2);
basegfx::B2DPolygon
aInnerPoly(XPolygon(aNewObjectRectangle.Center(), nWdt, nHgt).getB2DPolygon());
-
((SdrPathObj*)pObj)->SetPathPoly(basegfx::B2DPolyPolygon(aInnerPoly));
+
static_cast<SdrPathObj*>(pObj)->SetPathPoly(basegfx::B2DPolyPolygon(aInnerPoly));
break;
}
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index bd178f8..5d36cad 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -88,7 +88,7 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "different types ");
- const SvxGridItem& rItem = (const SvxGridItem&) rAttr;
+ const SvxGridItem& rItem = static_cast<const SvxGridItem&>(rAttr);
return ( bUseGridsnap == rItem.bUseGridsnap &&
bSynchronize == rItem.bSynchronize &&
@@ -214,7 +214,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet )
if( SfxItemState::SET == rSet->GetItemState( SID_ATTR_GRID_OPTIONS , false,
(const SfxPoolItem**)&pAttr ))
{
- const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr;
+ const SvxGridItem* pGridAttr = static_cast<const SvxGridItem*>(pAttr);
pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap );
pCbxSynchronize->Check( pGridAttr->bSynchronize );
pCbxGridVisible->Check( pGridAttr->bGridVisible );
@@ -240,7 +240,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false,
(const SfxPoolItem**)&pAttr ))
{
- const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr;
+ const SvxGridItem* pGridAttr = static_cast<const SvxGridItem*>(pAttr);
pCbxUseGridsnap->Check( pGridAttr->bUseGridsnap );
ChangeGridsnapHdl_Impl( pCbxUseGridsnap );
@@ -251,7 +251,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC , false,
(const SfxPoolItem**)&pAttr ))
{
- const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr;
+ const SfxUInt16Item* pItem = static_cast<const SfxUInt16Item*>(pAttr);
FieldUnit eFUnit = (FieldUnit)(long)pItem->GetValue();
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index e70c516..8bc89cf 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -291,7 +291,7 @@ void SvxRubyDialog::Activate()
SfxModelessDialog::Activate();
SfxPoolItem* pState = 0;
SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState
);
- bool bEnable = (eState < SfxItemState::DEFAULT) || !pState ||
!((SfxBoolItem*)pState)->GetValue();
+ bool bEnable = (eState < SfxItemState::DEFAULT) || !pState ||
!static_cast<SfxBoolItem*>(pState)->GetValue();
delete pState;
m_pStylistPB->Enable(bEnable);
//get selection from current view frame
@@ -565,7 +565,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl)
{
SfxPoolItem* pState = 0;
SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState
);
- if(eState <= SfxItemState::SET || !pState ||
!((SfxBoolItem*)pState)->GetValue())
+ if(eState <= SfxItemState::SET || !pState ||
!static_cast<SfxBoolItem*>(pState)->GetValue())
{
pBindings->GetDispatcher()->Execute( SID_STYLE_DESIGNER,
SfxCallMode::ASYNCHRON |
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index a94085b..949dfbf 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -35,8 +35,8 @@ TYPEINIT1(SvxObjectItem, SfxPoolItem);
bool SvxLongLRSpaceItem::operator==( const SfxPoolItem& rCmp) const
{
return SfxPoolItem::operator==(rCmp) &&
- mlLeft == ((const SvxLongLRSpaceItem &)rCmp).mlLeft &&
- mlRight == ((const SvxLongLRSpaceItem &)rCmp).mlRight;
+ mlLeft == static_cast<const SvxLongLRSpaceItem &>(rCmp).mlLeft &&
+ mlRight == static_cast<const SvxLongLRSpaceItem &>(rCmp).mlRight;
}
OUString SvxLongLRSpaceItem::GetValueText() const
@@ -169,8 +169,8 @@ void SvxLongLRSpaceItem::SetRight(long lArgRight)
bool SvxLongULSpaceItem::operator==( const SfxPoolItem& rCmp) const
{
return SfxPoolItem::operator==(rCmp) &&
- mlLeft == ((const SvxLongULSpaceItem&)rCmp).mlLeft &&
- mlRight == ((const SvxLongULSpaceItem&)rCmp).mlRight;
+ mlLeft == static_cast<const SvxLongULSpaceItem&>(rCmp).mlLeft &&
+ mlRight == static_cast<const SvxLongULSpaceItem&>(rCmp).mlRight;
}
@@ -302,9 +302,9 @@ void SvxLongULSpaceItem::SetLower(long lArgRight)
bool SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
{
return SfxPoolItem::operator==(rCmp) &&
- aPos == ((const SvxPagePosSizeItem &)rCmp).aPos &&
- lWidth == ((const SvxPagePosSizeItem &)rCmp).lWidth &&
- lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
+ aPos == static_cast<const SvxPagePosSizeItem &>(rCmp).aPos &&
+ lWidth == static_cast<const SvxPagePosSizeItem &>(rCmp).lWidth &&
+ lHeight == static_cast<const SvxPagePosSizeItem &>(rCmp).lHeight;
}
bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId ) const
@@ -420,17 +420,17 @@ SvxPagePosSizeItem::SvxPagePosSizeItem() :
bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
{
if(!SfxPoolItem::operator==(rCmp) ||
- nActColumn != ((const SvxColumnItem&)rCmp).nActColumn ||
- nLeft != ((const SvxColumnItem&)rCmp).nLeft ||
- nRight != ((const SvxColumnItem&)rCmp).nRight ||
- bTable != ((const SvxColumnItem&)rCmp).bTable ||
- Count() != ((const SvxColumnItem&)rCmp).Count())
+ nActColumn != static_cast<const SvxColumnItem&>(rCmp).nActColumn ||
+ nLeft != static_cast<const SvxColumnItem&>(rCmp).nLeft ||
+ nRight != static_cast<const SvxColumnItem&>(rCmp).nRight ||
+ bTable != static_cast<const SvxColumnItem&>(rCmp).bTable ||
+ Count() != static_cast<const SvxColumnItem&>(rCmp).Count())
return false;
- const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
+ const sal_uInt16 nCount = static_cast<const SvxColumnItem&>(rCmp).Count();
for(sal_uInt16 i = 0; i < nCount;++i)
{
- if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
+ if( (*this)[i] != static_cast<const SvxColumnItem&>(rCmp)[i] )
return false;
}
return true;
@@ -706,11 +706,11 @@ bool SvxColumnItem::IsConsistent() const
bool SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const
{
return SfxPoolItem::operator==(rCmp) &&
- nStartX == ((const SvxObjectItem&)rCmp).nStartX &&
- nEndX == ((const SvxObjectItem&)rCmp).nEndX &&
- nStartY == ((const SvxObjectItem&)rCmp).nStartY &&
- nEndY == ((const SvxObjectItem&)rCmp).nEndY &&
- bLimits == ((const SvxObjectItem&)rCmp).bLimits;
+ nStartX == static_cast<const SvxObjectItem&>(rCmp).nStartX &&
+ nEndX == static_cast<const SvxObjectItem&>(rCmp).nEndX &&
+ nStartY == static_cast<const SvxObjectItem&>(rCmp).nStartY &&
+ nEndY == static_cast<const SvxObjectItem&>(rCmp).nEndY &&
+ bLimits == static_cast<const SvxObjectItem&>(rCmp).bLimits;
}
OUString SvxObjectItem::GetValueText() const
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 16f7643..e26a85a 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -55,13 +55,13 @@ void SvxSearchController::StateChanged( sal_uInt16 nSID,
SfxItemState eState,
else if ( SID_SEARCH_OPTIONS == nSID )
{
DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" );
- sal_uInt16 nFlags = (sal_uInt16)( (SfxUInt16Item*)pState
)->GetValue();
+ sal_uInt16 nFlags = (sal_uInt16) static_cast<const
SfxUInt16Item*>(pState)->GetValue();
rSrchDlg.EnableControls_Impl( nFlags );
}
else if ( SID_SEARCH_ITEM == nSID )
{
DBG_ASSERT( pState->ISA(SvxSearchItem), "wrong item type" );
- rSrchDlg.SetItem_Impl( (const SvxSearchItem*)pState );
+ rSrchDlg.SetItem_Impl( static_cast<const SvxSearchItem*>(pState) );
}
}
else if ( SID_SEARCH_OPTIONS == nSID || SID_SEARCH_ITEM == nSID )
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d5230e3..a306762 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -134,8 +134,8 @@ struct SearchDlg_Impl
void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst,
ComboBox& rCBox )
{
- SfxStringListItem* pSrchItem =
- (SfxStringListItem*)SfxGetpApp()->GetItem( nId );
+ const SfxStringListItem* pSrchItem =
+ static_cast<const SfxStringListItem*>(SfxGetpApp()->GetItem( nId ));
if (pSrchItem)
{
@@ -389,13 +389,13 @@ void SvxSearchDialog::Construct_Impl()
// Get attribute sets only once in construtor()
const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
const SvxSetItem* pSrchSetItem =
- (const SvxSetItem*) rBindings.GetDispatcher()->Execute(
FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs );
+ static_cast<const SvxSetItem*>( rBindings.GetDispatcher()->Execute(
FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs ) );
if ( pSrchSetItem )
InitAttrList_Impl( &pSrchSetItem->GetItemSet(), 0 );
const SvxSetItem* pReplSetItem =
- (const SvxSetItem*)rBindings.GetDispatcher()->Execute(
FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs );
+ static_cast<const SvxSetItem*>( rBindings.GetDispatcher()->Execute(
FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs ) );
if ( pReplSetItem )
InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() );
@@ -822,13 +822,13 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
// Get attribute sets, if it not has been done already
const SfxPoolItem* ppArgs[] = { pSearchItem, 0 };
const SvxSetItem* pSrchSetItem =
- (const SvxSetItem*)rBindings.GetDispatcher()->Execute(
FID_SEARCH_SEARCHSET, SfxCallMode::SLOT, ppArgs );
+ static_cast<const
SvxSetItem*>(rBindings.GetDispatcher()->Execute( FID_SEARCH_SEARCHSET,
SfxCallMode::SLOT, ppArgs ));
if ( pSrchSetItem )
InitAttrList_Impl( &pSrchSetItem->GetItemSet(), 0 );
const SvxSetItem* pReplSetItem =
- (const SvxSetItem*)rBindings.GetDispatcher()->Execute(
FID_SEARCH_REPLACESET, SfxCallMode::SLOT, ppArgs );
+ static_cast<const SvxSetItem*>(
rBindings.GetDispatcher()->Execute( FID_SEARCH_REPLACESET, SfxCallMode::SLOT,
ppArgs ) );
if ( pReplSetItem )
InitAttrList_Impl( 0, &pReplSetItem->GetItemSet() );
@@ -1753,7 +1753,7 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem*
pItem )
if ( pItem )
{
delete pSearchItem;
- pSearchItem = (SvxSearchItem*)pItem->Clone();
+ pSearchItem = static_cast<SvxSearchItem*>(pItem->Clone());
Init_Impl( pSearchItem->GetPattern() &&
( !pSearchList || !pSearchList->Count() ) );
}
@@ -1792,9 +1792,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *,
pCtrl )
}
bSet = true;
- ( (ComboBox*)pCtrl )->SetSelection( Selection( SELECTION_MIN,
SELECTION_MAX ) );
+ static_cast<ComboBox*>(pCtrl)->SetSelection( Selection( SELECTION_MIN,
SELECTION_MAX ) );
- ModifyHdl_Impl( (ComboBox*)pCtrl );
+ ModifyHdl_Impl( static_cast<ComboBox*>(pCtrl) );
if (bFormat && nTxtLen)
m_pLayoutBtn->SetText(aLayoutStr);
@@ -2098,37 +2098,37 @@ void SvxSearchDialog::PaintAttrText_Impl()
void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
{
- if ( m_pSearchLB == (ComboBox*)pCtrl )
+ if ( m_pSearchLB == static_cast<const ComboBox*>(pCtrl) )
nModifyFlag |= MODIFY_SEARCH;
- else if ( m_pReplaceLB == (ComboBox*)pCtrl )
+ else if ( m_pReplaceLB == static_cast<const ComboBox*>(pCtrl) )
nModifyFlag |= MODIFY_REPLACE;
- else if ( m_pWordBtn == (CheckBox*)pCtrl )
+ else if ( m_pWordBtn == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_WORD;
- else if ( m_pMatchCaseCB == (CheckBox*)pCtrl )
+ else if ( m_pMatchCaseCB == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_EXACT;
- else if ( m_pBackwardsBtn == (CheckBox*)pCtrl )
+ else if ( m_pBackwardsBtn == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_BACKWARDS;
- else if ( m_pNotesBtn == (CheckBox*)pCtrl )
+ else if ( m_pNotesBtn == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_NOTES;
- else if ( m_pSelectionBtn == (CheckBox*)pCtrl )
+ else if ( m_pSelectionBtn == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_SELECTION;
- else if ( m_pRegExpBtn == (CheckBox*)pCtrl )
+ else if ( m_pRegExpBtn == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_REGEXP;
- else if ( m_pLayoutBtn == (CheckBox*)pCtrl )
+ else if ( m_pLayoutBtn == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_LAYOUT;
- else if ( m_pSimilarityBox == (CheckBox*)pCtrl )
+ else if ( m_pSimilarityBox == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_SIMILARITY;
- else if ( m_pCalcSearchInLB == (ListBox*)pCtrl )
+ else if ( m_pCalcSearchInLB == static_cast<const ListBox*>(pCtrl) )
{
nModifyFlag |= MODIFY_FORMULAS;
nModifyFlag |= MODIFY_VALUES;
nModifyFlag |= MODIFY_CALC_NOTES;
}
- else if ( m_pRowsBtn == (RadioButton*)pCtrl )
+ else if ( m_pRowsBtn == static_cast<const RadioButton*>(pCtrl) )
nModifyFlag |= MODIFY_ROWS;
- else if ( m_pColumnsBtn == (RadioButton*)pCtrl )
+ else if ( m_pColumnsBtn == static_cast<const RadioButton*>(pCtrl) )
nModifyFlag |= MODIFY_COLUMNS;
- else if ( m_pAllSheetsCB == (CheckBox*)pCtrl )
+ else if ( m_pAllSheetsCB == static_cast<const CheckBox*>(pCtrl) )
nModifyFlag |= MODIFY_ALLTABLES;
}
@@ -2257,7 +2257,7 @@ static vcl::Window* lcl_GetSearchLabelWindow()
return 0;
css::uno::Reference< css::awt::XWindow > xWindow(
xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW);
- ToolBox* pToolBox = (ToolBox*) VCLUnoHelper::GetWindow(xWindow);
+ ToolBox* pToolBox = static_cast<ToolBox*>(
VCLUnoHelper::GetWindow(xWindow) );
for (size_t i = 0; pToolBox && i < pToolBox->GetItemCount(); ++i)
if (pToolBox->GetItemCommand(i) == ".uno:SearchLabel")
return pToolBox->GetItemWindow(i);
@@ -2284,8 +2284,8 @@ void SvxSearchDialogWrapper::SetSearchLabel(const
SearchLabel& rSL)
pSearchLabel->Show();
}
}
- if (SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)
SfxViewFrame::Current()->
- GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() ))
+ if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>(
SfxViewFrame::Current()->
+ GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
pWrp->getDialog()->SetSearchLabel(sStr);
}
diff --git a/svx/source/dialog/svxgrahicitem.cxx
b/svx/source/dialog/svxgrahicitem.cxx
index f845495..ff040ed 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -31,7 +31,7 @@ SvxGraphicItem::SvxGraphicItem( const SvxGraphicItem& rItem)
bool SvxGraphicItem::operator==( const SfxPoolItem& rItem) const
{
- return ((SvxGraphicItem&)rItem).aGraphic == aGraphic;
+ return static_cast<const SvxGraphicItem&>(rItem).aGraphic == aGraphic;
}
SfxPoolItem* SvxGraphicItem::Clone( SfxItemPool * ) const
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index cfa119d..1f453d5 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -69,7 +69,7 @@ sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl(
rtl_TextEncoding nEnc ) const
sal_Int32 nCount = GetEntryCount();
for ( sal_Int32 i=0; i<nCount; i++ )
{
- if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) )
+ if ( nEnc == rtl_TextEncoding(
reinterpret_cast<sal_uIntPtr>(GetEntryData(i)) ) )
return i;
}
return LISTBOX_ENTRY_NOTFOUND;
@@ -201,7 +201,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const
rtl_TextEncoding nEnc,
const OUString& rEntry, sal_Int32 nPos )
{
sal_Int32 nAt = InsertEntry( rEntry, nPos );
- SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );
+ SetEntryData( nAt, reinterpret_cast<void*>(nEnc) );
}
@@ -222,7 +222,7 @@ rtl_TextEncoding
SvxTextEncodingBox::GetSelectTextEncoding() const
sal_Int32 nPos = GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) );
+ return rtl_TextEncoding(
reinterpret_cast<sal_uIntPtr>(GetEntryData(nPos)) );
else
return RTL_TEXTENCODING_DONTKNOW;
}
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d95fbd8..6030a40 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -520,7 +520,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, false,
&pItem );
if( SfxItemState::SET == eState )
{
- sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
+ sal_uInt32 nState = static_cast<const
SfxUInt32Item*>(pItem)->GetValue();
bool bExtrude = ( nState & 2 );
bool bSphere = ( nState & 4 );
bool bCube = ( nState & 8 );
@@ -601,7 +601,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
if(eState != SfxItemState::DONTCARE)
{
- drawing::FillStyle eXFS = (drawing::FillStyle)((const
XFillStyleItem&)rAttrs.Get(XATTR_FILLSTYLE)).GetValue();
+ drawing::FillStyle eXFS = (drawing::FillStyle)static_cast<const
XFillStyleItem&>(rAttrs.Get(XATTR_FILLSTYLE)).GetValue();
bBitmap = (eXFS == drawing::FillStyle_BITMAP || eXFS ==
drawing::FillStyle_GRADIENT || eXFS == drawing::FillStyle_HATCH);
}
@@ -632,7 +632,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_HORZ_SEGS);
if(eState != SfxItemState::DONTCARE)
{
- sal_uInt32 nValue = ((const
SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_HORZ_SEGS)).GetValue();
+ sal_uInt32 nValue = static_cast<const
SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_HORZ_SEGS)).GetValue();
if(nValue != (sal_uInt32 )aNumHorizontal.GetValue())
{
aNumHorizontal.SetValue( nValue );
@@ -657,7 +657,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt32 nValue = ((const
SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
+ sal_uInt32 nValue = static_cast<const
SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
if( nValue != (sal_uInt32) aNumVertical.GetValue() )
{
aNumVertical.SetValue( nValue );
@@ -682,7 +682,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt32 nValue = ((const
SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
+ sal_uInt32 nValue = static_cast<const
SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
if( nValue != nValue2 )
{
@@ -709,7 +709,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED);
if( eState != SfxItemState::DONTCARE )
{
- bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
+ bool bValue = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
if( bValue != aBtnDoubleSided.IsChecked() )
{
aBtnDoubleSided.Check( bValue );
@@ -733,7 +733,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
SfxUInt16Item&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
+ sal_uInt16 nValue = static_cast<const
SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
if( nValue != aMtrPercentDiagonal.GetValue() )
{
aMtrPercentDiagonal.SetValue( nValue );
@@ -758,7 +758,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
SfxUInt16Item&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
+ sal_uInt16 nValue = static_cast<const
SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
if( nValue != aMtrBackscale.GetValue() )
{
aMtrBackscale.SetValue( nValue );
@@ -783,7 +783,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE);
if( eState != SfxItemState::DONTCARE )
{
- sal_Int32 nValue = ((const
SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
+ sal_Int32 nValue = static_cast<const
SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
if( nValue != aMtrEndAngle.GetValue() )
{
aMtrEndAngle.SetValue( nValue );
@@ -804,7 +804,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
+ sal_uInt16 nValue = static_cast<const
Svx3DNormalsKindItem&>(rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) ||
( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) ||
@@ -833,7 +833,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT);
if( eState != SfxItemState::DONTCARE )
{
- bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
+ bool bValue = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
if( bValue != aBtnNormalsInvert.IsChecked() )
{
aBtnNormalsInvert.Check( bValue );
@@ -855,7 +855,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
if( eState != SfxItemState::DONTCARE )
{
- bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
+ bool bValue = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
if( bValue != aBtnTwoSidedLighting.IsChecked() )
{
aBtnTwoSidedLighting.Check( bValue );
@@ -878,7 +878,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
+ sal_uInt16 nValue = static_cast<const
Svx3DShadeModeItem&>(rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
if( nValue != aLbShademode.GetSelectEntryPos() )
{
aLbShademode.SelectEntryPos( nValue );
@@ -898,7 +898,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D);
if( eState != SfxItemState::DONTCARE )
{
- bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
+ bool bValue = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
if( bValue != aBtnShadow3d.IsChecked() )
{
aBtnShadow3d.Check( bValue );
@@ -922,7 +922,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
SfxUInt16Item&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
+ sal_uInt16 nValue = static_cast<const
SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
if( nValue != aMtrSlant.GetValue() )
{
aMtrSlant.SetValue( nValue );
@@ -942,7 +942,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt32 nValue = ((const
SfxUInt32Item&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
+ sal_uInt32 nValue = static_cast<const
SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
if( nValue != nValue2 )
{
@@ -966,7 +966,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt32 nValue = ((const
SfxUInt32Item&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
+ sal_uInt32 nValue = static_cast<const
SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
if( nValue != nValue2 )
{
@@ -993,7 +993,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_1);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue();
ColorLB* pLb = &aLbLight1;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1013,7 +1013,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight1 )) ||
( !bOn && GetUILightState( aBtnLight1 )) )
{
@@ -1042,7 +1042,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_2);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue();
ColorLB* pLb = &aLbLight2;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1062,7 +1062,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight2 )) ||
( !bOn && GetUILightState( aBtnLight2 )) )
{
@@ -1091,7 +1091,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_3);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue();
ColorLB* pLb = &aLbLight3;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1111,7 +1111,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight3)) ||
( !bOn && GetUILightState( aBtnLight3)) )
{
@@ -1140,7 +1140,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_4);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue();
ColorLB* pLb = &aLbLight4;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1160,7 +1160,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight4 )) ||
( !bOn && GetUILightState( aBtnLight4 )) )
{
@@ -1189,7 +1189,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_5);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue();
ColorLB* pLb = &aLbLight5;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1209,7 +1209,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight5 )) ||
( !bOn && GetUILightState( aBtnLight5 )) )
{
@@ -1238,7 +1238,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_6);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue();
ColorLB* pLb = &aLbLight6;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1258,7 +1258,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight6 )) ||
( !bOn && GetUILightState( aBtnLight6 )) )
{
@@ -1287,7 +1287,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_7);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue();
ColorLB* pLb = &aLbLight7;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1307,7 +1307,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight7 )) ||
( !bOn && GetUILightState( aBtnLight7 )) )
{
@@ -1336,7 +1336,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_8);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue();
ColorLB* pLb = &aLbLight8;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1356,7 +1356,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8);
if( eState != SfxItemState::DONTCARE )
{
- bool bOn = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
+ bool bOn = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue();
if( ( bOn && !GetUILightState( aBtnLight8 )) ||
( !bOn && GetUILightState( aBtnLight8 )) )
{
@@ -1385,7 +1385,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_AMBIENTCOLOR);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue();
ColorLB* pLb = &aLbAmbientlight;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1410,7 +1410,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
+ sal_uInt16 nValue = static_cast<const
Svx3DTextureKindItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) ||
( !aBtnTexColor.IsChecked() && nValue == 3 ) )
@@ -1435,7 +1435,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
+ sal_uInt16 nValue = static_cast<const
Svx3DTextureModeItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) ||
( !aBtnTexModulate.IsChecked() && nValue == 2 ) )
@@ -1460,7 +1460,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
+ sal_uInt16 nValue = static_cast<const
Svx3DTextureProjectionXItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) ||
( !aBtnTexParallelX.IsChecked() && nValue == 1 ) ||
@@ -1489,7 +1489,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
+ sal_uInt16 nValue = static_cast<const
Svx3DTextureProjectionYItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) ||
( !aBtnTexParallelY.IsChecked() && nValue == 1 ) ||
@@ -1518,7 +1518,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER);
if( eState != SfxItemState::DONTCARE )
{
- bool bValue = ((const
SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
+ bool bValue = static_cast<const
SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
if( bValue != aBtnTexFilter.IsChecked() )
{
aBtnTexFilter.Check( bValue );
@@ -1545,7 +1545,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(XATTR_FILLCOLOR);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
XFillColorItem&)rAttrs.Get(XATTR_FILLCOLOR)).GetColorValue();
+ aColor = static_cast<const
XFillColorItem&>(rAttrs.Get(XATTR_FILLCOLOR)).GetColorValue();
ColorLB* pLb = &aLbMatColor;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1566,7 +1566,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_EMISSION);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_EMISSION)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DOBJ_MAT_EMISSION)).GetValue();
ColorLB* pLb = &aLbMatEmission;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1587,7 +1587,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR);
if( eState != SfxItemState::DONTCARE )
{
- aColor = ((const
SvxColorItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR)).GetValue();
+ aColor = static_cast<const
SvxColorItem&>(rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR)).GetValue();
ColorLB* pLb = &aLbMatSpecular;
if( aColor != pLb->GetSelectEntryColor() )
{
@@ -1608,7 +1608,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY);
if( eState != SfxItemState::DONTCARE )
{
- sal_uInt16 nValue = ((const
SfxUInt16Item&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
+ sal_uInt16 nValue = static_cast<const
SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
if( nValue != aMtrMatSpecularIntensity.GetValue() )
{
aMtrMatSpecularIntensity.SetValue( nValue );
@@ -1630,7 +1630,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_PERSPECTIVE);
if( eState != SfxItemState::DONTCARE )
{
- ProjectionType ePT = (ProjectionType)((const
Svx3DPerspectiveItem&)rAttrs.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue();
+ ProjectionType ePT = (ProjectionType)static_cast<const
Svx3DPerspectiveItem&>(rAttrs.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue();
if( ( !aBtnPerspective.IsChecked() && ePT == PR_PERSPECTIVE ) ||
( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) )
{
@@ -2651,7 +2651,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
if( pBtn->IsChecked() )
{
- SetUILightState( *(ImageButton*)pBtn, !GetUILightState(
*(ImageButton*)pBtn ) );
+ SetUILightState( *static_cast<ImageButton*>(pBtn),
!GetUILightState( *static_cast<ImageButton*>(pBtn) ) );
}
else
{
@@ -2698,7 +2698,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aLbLight8.Hide();
}
}
- bool bEnable = GetUILightState( *(ImageButton*)pBtn );
+ bool bEnable = GetUILightState( *static_cast<ImageButton*>(pBtn) );
aBtnLightColor.Enable( bEnable );
pLb->Enable( bEnable );
@@ -2939,7 +2939,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn)
ColorLB* pLb = GetLbByButton( &rBtn );
Color aColor( pLb->GetSelectEntryColor() );
SfxItemSet
aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes());
- const bool bOnOff(GetUILightState( (const ImageButton&)rBtn ));
+ const bool bOnOff(GetUILightState( static_cast<const ImageButton&>(rBtn)
));
switch(nLightSource)
{
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 72b815a..ae552aa 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -792,7 +792,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
sal_Int32 nPos = i - rItems.begin();
if (pData->ISA(FmFilterItems))
{
- FmFormItem* pFormItem = (FmFormItem*)pParent;
+ FmFormItem* pFormItem = static_cast<FmFormItem*>(pParent);
try
{
@@ -802,7 +802,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
if ( bEmptyLastTerm )
{
// remove all children (by setting an empty predicate
expression)
- ::std::vector< FmFilterData* >& rChildren =
((FmFilterItems*)pData)->GetChildren();
+ ::std::vector< FmFilterData* >& rChildren =
static_cast<FmFilterItems*>(pData)->GetChildren();
while ( !rChildren.empty() )
{
::std::vector< FmFilterData* >::iterator removePos =
rChildren.end() - 1;
@@ -937,7 +937,7 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
// search for the condition
if (pCurrent)
{
- FmFormItem* pFormItem = (FmFormItem*)pCurrent->GetParent();
+ FmFormItem* pFormItem =
static_cast<FmFormItem*>(pCurrent->GetParent());
::std::vector<FmFilterData*>& rItems = pFormItem->GetChildren();
::std::vector<FmFilterData*>::const_iterator i =
::std::find(rItems.begin(), rItems.end(), pCurrent);
@@ -1025,7 +1025,7 @@ void FmFilterItemsString::Paint(
const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/,
const SvTreeListEntry* pEntry)
{
FmFilterItems* pRow = (FmFilterItems*)pEntry->GetUserData();
- FmFormItem* pForm = (FmFormItem*)pRow->GetParent();
+ FmFormItem* pForm = static_cast<FmFormItem*>(pRow->GetParent());
// current filter is significant painted
const bool bIsCurrentFilter = pForm->GetChildren()[
pForm->GetFilterController()->getActiveTerm() ] == pRow;
@@ -1443,21 +1443,21 @@ bool FmFilterNavigator::Select( SvTreeListEntry*
pEntry, bool bSelect )
{
FmFormItem* pFormItem = NULL;
if (((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem))
- pFormItem =
(FmFormItem*)((FmFilterItem*)pEntry->GetUserData())->GetParent()->GetParent();
+ pFormItem =
static_cast<FmFormItem*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()->GetParent());
else if
(((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItems))
- pFormItem =
(FmFormItem*)((FmFilterItem*)pEntry->GetUserData())->GetParent()->GetParent();
+ pFormItem =
static_cast<FmFormItem*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()->GetParent());
else if (((FmFilterData*)pEntry->GetUserData())->ISA(FmFormItem))
pFormItem = (FmFormItem*)pEntry->GetUserData();
if (pFormItem)
{
// will the controller be exchanged?
- if (((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem))
-
m_pModel->SetCurrentItems((FmFilterItems*)((FmFilterItem*)pEntry->GetUserData())->GetParent());
- else if
(((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItems))
+ if
(static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItem))
+
m_pModel->SetCurrentItems(static_cast<FmFilterItems*>(static_cast<FmFilterItem*>(pEntry->GetUserData())->GetParent()));
+ else if
(static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFilterItems))
m_pModel->SetCurrentItems((FmFilterItems*)pEntry->GetUserData());
- else if
(((FmFilterData*)pEntry->GetUserData())->ISA(FmFormItem))
-
m_pModel->SetCurrentController(((FmFormItem*)pEntry->GetUserData())->GetController());
+ else if
(static_cast<FmFilterData*>(pEntry->GetUserData())->ISA(FmFormItem))
+
m_pModel->SetCurrentController(static_cast<FmFormItem*>(pEntry->GetUserData())->GetController());
}
}
return true;
@@ -1912,7 +1912,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID,
SfxItemState eState, c
if( eState >= SfxItemState::DEFAULT )
{
- FmFormShell* pShell = PTR_CAST(
FmFormShell,((SfxObjectItem*)pState)->GetShell() );
+ FmFormShell* pShell = PTR_CAST( FmFormShell, static_cast<const
SfxObjectItem*>(pState)->GetShell() );
UpdateContent( pShell );
}
else
@@ -1997,7 +1997,7 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr(
vcl::Window *_pParent, sal_uIn
{
pWindow = new FmFilterNavigatorWin( _pBindings, this, _pParent );
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- ((SfxDockingWindow*)pWindow)->Initialize( _pInfo );
+ static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo );
}
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 19685b5..d28b67d 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -85,7 +85,7 @@ FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16
_nId,
{
pWindow = new FmPropBrw( ::comphelper::getProcessComponentContext(),
_pBindings, this, _pParent, _pInfo );
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- ((SfxFloatingWindow*)pWindow)->Initialize( _pInfo );
+ static_cast<SfxFloatingWindow*>(pWindow)->Initialize( _pInfo );
}
@@ -629,7 +629,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState
eState, const SfxPool
{
if (eState >= SfxItemState::DEFAULT)
{
- FmFormShell* pShell =
PTR_CAST(FmFormShell,((SfxObjectItem*)pState)->GetShell());
+ FmFormShell* pShell = PTR_CAST(FmFormShell, static_cast<const
SfxObjectItem*>(pState)->GetShell());
InterfaceBag aSelection;
if ( pShell )
pShell->GetImpl()->getCurrentSelection( aSelection );
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 32e0116..4c9f2fa 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -145,7 +145,7 @@ void FmRecordCountListener::NotifyCurrentCount()
if (m_lnkWhoWantsToKnow.IsSet())
{
DBG_ASSERT(m_xListening.is(),
"FmRecordCountListener::NotifyCurrentCount : I have no propset ... !?");
- void* pTheCount =
(void*)(sal_IntPtr)::comphelper::getINT32(m_xListening->getPropertyValue(FM_PROP_ROWCOUNT));
+ void* pTheCount =
reinterpret_cast<void*>(::comphelper::getINT32(m_xListening->getPropertyValue(FM_PROP_ROWCOUNT)));
m_lnkWhoWantsToKnow.Call(pTheCount);
}
}
@@ -1111,7 +1111,7 @@ IMPL_LINK(FmSearchEngine, OnNewRecordCount, void*,
pCounterAsVoid)
return 0L;
FmSearchProgress aProgress;
- aProgress.nCurrentRecord = (sal_uIntPtr)pCounterAsVoid;
+ aProgress.nCurrentRecord = reinterpret_cast<sal_uIntPtr>(pCounterAsVoid);
aProgress.aSearchState = FmSearchProgress::STATE_PROGRESS_COUNTING;
m_aProgressHandler.Call(&aProgress);
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 8f0d11b..111ab2b 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -282,7 +282,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState
eState, const SfxPoo
if (eState >= SfxItemState::DEFAULT)
{
- FmFormShell* pShell =
PTR_CAST(FmFormShell,((SfxObjectItem*)pState)->GetShell());
+ FmFormShell* pShell = PTR_CAST(FmFormShell, static_cast<const
SfxObjectItem*>(pState)->GetShell());
UpdateContent(pShell);
}
else
@@ -418,7 +418,7 @@ FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent,
sal_uInt16 _nId,
pWindow = new FmFieldWin(_pBindings, this, _pParent);
SetHideNotDelete(true);
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- ((SfxFloatingWindow*)pWindow)->Initialize( _pInfo );
+ static_cast<SfxFloatingWindow*>(pWindow)->Initialize( _pInfo );
}
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 06ce8aa..f72ad7c 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -157,7 +157,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID,
SfxItemState eState, const
{
sal_uInt16 nSlot = 0;
if (eState >= SfxItemState::DEFAULT)
- nSlot = ((SfxUInt16Item*)pState)->GetValue();
+ nSlot = static_cast<const SfxUInt16Item*>(pState)->GetValue();
switch( nSlot )
{
@@ -253,7 +253,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID,
SfxItemState eState, cons
{
sal_uInt16 nId = GetId();
ToolBox* pToolBox = &GetToolBox();
- SvxFmAbsRecWin* pWin = (SvxFmAbsRecWin*)( pToolBox->GetItemWindow(nId)
);
+ SvxFmAbsRecWin* pWin = static_cast<SvxFmAbsRecWin*>(
pToolBox->GetItemWindow(nId) );
assert(pWin && "Control not found!");
@@ -370,7 +370,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID,
SfxItemState eState, co
OUString aText;
if (pState)
- aText = ((SfxStringItem*)pState)->GetValue();
+ aText = static_cast<const SfxStringItem*>(pState)->GetValue();
else
aText = "?";
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 13dde06..3bde69e 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -176,7 +176,7 @@ public:
void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem);
void SetTextForItem(FmFilterItem* pItem, const OUString& rText);
- FmFormItem* GetCurrentForm() const {return m_pCurrentItems ?
(FmFormItem*)m_pCurrentItems->GetParent() : NULL;}
+ FmFormItem* GetCurrentForm() const {return m_pCurrentItems ?
static_cast<FmFormItem*>(m_pCurrentItems->GetParent()) : NULL;}
FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;}
void SetCurrentItems(FmFilterItems* pCurrent);
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 0c9f16d..a9de3e2 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -267,10 +267,10 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem
) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
- return ( ( nLeftMargin == ( (SvxMarginItem&)rItem ).nLeftMargin ) &&
- ( nTopMargin == ( (SvxMarginItem&)rItem ).nTopMargin ) &&
- ( nRightMargin == ( (SvxMarginItem&)rItem ).nRightMargin ) &&
- ( nBottomMargin == ( (SvxMarginItem&)rItem ).nBottomMargin ) );
+ return ( ( nLeftMargin == static_cast<const
SvxMarginItem&>(rItem).nLeftMargin ) &&
+ ( nTopMargin == static_cast<const
SvxMarginItem&>(rItem).nTopMargin ) &&
+ ( nRightMargin == static_cast<const
SvxMarginItem&>(rItem).nRightMargin ) &&
+ ( nBottomMargin == static_cast<const
SvxMarginItem&>(rItem).nBottomMargin ) );
}
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index d75ad8e..08d6816 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -231,7 +231,7 @@ bool SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr
) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
- const SvxHyperlinkItem& rItem = (const SvxHyperlinkItem&) rAttr;
+ const SvxHyperlinkItem& rItem = static_cast<const
SvxHyperlinkItem&>(rAttr);
bool bRet = ( sName == rItem.sName &&
sURL == rItem.sURL &&
@@ -242,7 +242,7 @@ bool SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr
) const
if (!bRet)
return false;
- const SvxMacroTableDtor* pOther = ((SvxHyperlinkItem&)rAttr).pMacroTable;
+ const SvxMacroTableDtor* pOther = static_cast<const
SvxHyperlinkItem&>(rAttr).pMacroTable;
if( !pMacroTable )
return ( !pOther || pOther->empty() );
if( !pOther )
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index d9847b8..36665d3 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -133,7 +133,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem&
rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
- SvxNumberInfoItem& rOther = (SvxNumberInfoItem&)rItem;
+ const SvxNumberInfoItem& rOther = static_cast<const
SvxNumberInfoItem&>(rItem);
bool bEqual = false;
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index 6b33715..5b911ad 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -32,7 +32,7 @@ OfaPtrItem::OfaPtrItem( const OfaPtrItem& rItem)
bool OfaPtrItem::operator==( const SfxPoolItem& rItem) const
{
- return ((OfaPtrItem&)rItem).pPtr == pPtr;
+ return static_cast<const OfaPtrItem&>(rItem).pPtr == pPtr;
}
SfxPoolItem* OfaPtrItem::Clone( SfxItemPool * ) const
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 4093886..f44e9e1 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -62,7 +62,7 @@ SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const
bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
- const SvxPageItem& rItem = (SvxPageItem&)rAttr;
+ const SvxPageItem& rItem = static_cast<const SvxPageItem&>(rAttr);
return ( eNumType == rItem.eNumType &&
bLandscape == rItem.bLandscape &&
eUse == rItem.eUse );
diff --git a/svx/source/items/viewlayoutitem.cxx
b/svx/source/items/viewlayoutitem.cxx
index 9ad73c1..4d93c6b 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -85,7 +85,7 @@ bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr
) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
- SvxViewLayoutItem& rItem = (SvxViewLayoutItem&)rAttr;
+ const SvxViewLayoutItem& rItem = static_cast<const
SvxViewLayoutItem&>(rAttr);
return ( GetValue() == rItem.GetValue() &&
mbBookMode == rItem.IsBookMode() );
diff --git a/svx/source/items/zoomslideritem.cxx
b/svx/source/items/zoomslideritem.cxx
index d690f2a..f1e04af 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -82,7 +82,7 @@ bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr
) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
- SvxZoomSliderItem& rItem = (SvxZoomSliderItem&)rAttr;
+ const SvxZoomSliderItem& rItem = static_cast<const
SvxZoomSliderItem&>(rAttr);
return ( GetValue() == rItem.GetValue() && maValues == rItem.maValues &&
mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index a9d35b5..d1f68db 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -69,7 +69,7 @@ void SvxFontMenuControl::FillMenu()
if ( pDoc )
{
const SvxFontListItem* pFonts =
- (const SvxFontListItem*)pDoc->GetItem( SID_ATTR_CHAR_FONTLIST );
+ static_cast<const SvxFontListItem*>(pDoc->GetItem(
SID_ATTR_CHAR_FONTLIST ));
const FontList* pList = pFonts ? pFonts->GetFontList(): 0;
DBG_ASSERT( pList, "Kein Fonts gefunden" );
pMenu->Fill( pList );
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index c3d992e..ae0c13c 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -117,8 +117,8 @@ void SvxFontSizeMenuControl::StateChanged(
if ( pDoc )
{
- const SvxFontListItem* pFonts = (const SvxFontListItem*)
- pDoc->GetItem( SID_ATTR_CHAR_FONTLIST );
+ const SvxFontListItem* pFonts = static_cast<const
SvxFontListItem*>(
+ pDoc->GetItem( SID_ATTR_CHAR_FONTLIST ));
const FontList* pList = pFonts ? pFonts->GetFontList(): 0;
if ( pList )
@@ -141,7 +141,7 @@ void SvxFontSizeMenuControl::StateChanged(
{
// daf"ur von der Shell eine Fontliste besorgen
const SvxFontListItem* pFonts =
- (const SvxFontListItem*)pSh->GetItem( SID_ATTR_CHAR_FONTLIST );
+ static_cast<const SvxFontListItem*>(pSh->GetItem(
SID_ATTR_CHAR_FONTLIST ));
const FontList* pList = pFonts ? pFonts->GetFontList(): NULL;
if ( pList )
pMenu->Fill( pList->GetFontName(0), pList );
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx
b/svx/source/sidebar/SelectionAnalyzer.cxx
index d4985f7..f46350d 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -44,7 +44,7 @@ EnumContext::Context
SelectionAnalyzer::GetContextForSelection_SC (const SdrMark
case 1:
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if ( pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsInEditMode() )
+ if ( pObj->ISA(SdrTextObj) &&
static_cast<SdrTextObj*>(pObj)->IsInEditMode() )
{
eContext = EnumContext::Context_DrawText;
}
@@ -126,7 +126,7 @@ EnumContext::Context
SelectionAnalyzer::GetContextForSelection_SD (
case 1:
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if (pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsInEditMode())
+ if (pObj->ISA(SdrTextObj) &&
static_cast<SdrTextObj*>(pObj)->IsInEditMode())
{
if (pObj->GetObjIdentifier() == OBJ_TABLE)
{
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx
b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 189d5e9..9ab67b1 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -254,7 +254,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *,
pToolBox )
{
if(!mpLbFillAttr->GetEntryCount())
{
- const SvxGradientListItem aItem(*(const
SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
+ const SvxGradientListItem aItem(*static_cast<const
SvxGradientListItem*>(pSh->GetItem(SID_GRADIENT_LIST)));
mpLbFillAttr->Enable();
mpLbFillAttr->Clear();
mpLbFillAttr->Fill(aItem.GetGradientList());
@@ -264,7 +264,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *,
pToolBox )
if(LISTBOX_ENTRY_NOTFOUND != mnLastPosGradient)
{
- const SvxGradientListItem aItem(*(const
SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
+ const SvxGradientListItem aItem(*static_cast<const
SvxGradientListItem*>(pSh->GetItem(SID_GRADIENT_LIST)));
if(mnLastPosGradient <
aItem.GetGradientList()->Count())
{
@@ -293,7 +293,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *,
pToolBox )
{
if(!mpLbFillAttr->GetEntryCount())
{
- const SvxHatchListItem aItem( *(const
SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
+ const SvxHatchListItem aItem( *static_cast<const
SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST)));
mpLbFillAttr->Enable();
mpLbFillAttr->Clear();
mpLbFillAttr->Fill(aItem.GetHatchList());
@@ -303,7 +303,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *,
pToolBox )
if(LISTBOX_ENTRY_NOTFOUND != mnLastPosHatch)
{
- const SvxHatchListItem aItem(*(const
SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
+ const SvxHatchListItem aItem(*static_cast<const
SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST)));
if(mnLastPosHatch < aItem.GetHatchList()->Count())
{
@@ -332,7 +332,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *,
pToolBox )
{
if(!mpLbFillAttr->GetEntryCount())
{
- const SvxBitmapListItem aItem( *(const
SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
+ const SvxBitmapListItem aItem( *static_cast<const
SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST)));
mpLbFillAttr->Enable();
mpLbFillAttr->Clear();
mpLbFillAttr->Fill(aItem.GetBitmapList());
@@ -342,7 +342,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *,
pToolBox )
if(LISTBOX_ENTRY_NOTFOUND != mnLastPosBitmap)
{
- const SvxBitmapListItem aItem(*(const
SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
+ const SvxBitmapListItem aItem(*static_cast<const
SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST)));
if(mnLastPosBitmap < aItem.GetBitmapList()->Count())
{
@@ -414,7 +414,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*,
pToolBox )
if(LISTBOX_ENTRY_NOTFOUND != nPos && pSh &&
pSh->GetItem(SID_GRADIENT_LIST))
{
- const SvxGradientListItem aItem(*(const
SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
+ const SvxGradientListItem aItem(*static_cast<const
SvxGradientListItem*>(pSh->GetItem(SID_GRADIENT_LIST)));
if(nPos < aItem.GetGradientList()->Count())
{
@@ -445,7 +445,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*,
pToolBox )
if(LISTBOX_ENTRY_NOTFOUND != nPos && pSh &&
pSh->GetItem(SID_HATCH_LIST))
{
- const SvxHatchListItem aItem(*(const
SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
+ const SvxHatchListItem aItem(*static_cast<const
SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST)));
if(nPos < aItem.GetHatchList()->Count())
{
@@ -476,7 +476,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*,
pToolBox )
if(LISTBOX_ENTRY_NOTFOUND != nPos && pSh &&
pSh->GetItem(SID_BITMAP_LIST))
{
- const SvxBitmapListItem aItem(*(const
SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
+ const SvxBitmapListItem aItem(*static_cast<const
SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST)));
if(nPos < aItem.GetBitmapList()->Count())
{
@@ -755,7 +755,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
if(pItem && (!mpTransparanceItem || *pItem !=
*mpTransparanceItem))
{
-
mpTransparanceItem.reset((SfxUInt16Item*)pItem->Clone());
+
mpTransparanceItem.reset(static_cast<SfxUInt16Item*>(pItem->Clone()));
}
else
{
@@ -777,7 +777,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
if(pItem && (!mpFloatTransparenceItem || *pItem !=
*mpFloatTransparenceItem))
{
-
mpFloatTransparenceItem.reset((XFillFloatTransparenceItem*)pItem->Clone());
+
mpFloatTransparenceItem.reset(static_cast<XFillFloatTransparenceItem*>(pItem->Clone()));
}
else
{
@@ -849,7 +849,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
if(SfxItemState::DEFAULT == eState)
{
- mpColorItem.reset(pState ? (XFillColorItem*)pState->Clone() :
0);
+ mpColorItem.reset(pState ?
static_cast<XFillColorItem*>(pState->Clone()) : 0);
}
if(mpStyleItem && drawing::FillStyle_SOLID ==
(drawing::FillStyle)mpStyleItem->GetValue())
@@ -882,7 +882,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
if(SfxItemState::DEFAULT == eState)
{
- mpFillGradientItem.reset(pState ?
(XFillGradientItem*)pState->Clone() : 0);
+ mpFillGradientItem.reset(pState ?
static_cast<XFillGradientItem*>(pState->Clone()) : 0);
}
if(mpStyleItem && drawing::FillStyle_GRADIENT ==
(drawing::FillStyle)mpStyleItem->GetValue())
@@ -911,7 +911,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
if(SfxItemState::DEFAULT == eState)
{
- mpHatchItem.reset(pState ? (XFillHatchItem*)pState->Clone() :
0);
+ mpHatchItem.reset(pState ?
static_cast<XFillHatchItem*>(pState->Clone()) : 0);
}
if(mpStyleItem && drawing::FillStyle_HATCH ==
(drawing::FillStyle)mpStyleItem->GetValue())
@@ -940,7 +940,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
if(SfxItemState::DEFAULT == eState)
{
- mpBitmapItem.reset(pState ? (XFillBitmapItem*)pState->Clone()
: 0);
+ mpBitmapItem.reset(pState ?
static_cast<XFillBitmapItem*>(pState->Clone()) : 0);
}
if(mpStyleItem && drawing::FillStyle_BITMAP ==
(drawing::FillStyle)mpStyleItem->GetValue())
@@ -975,7 +975,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
const Color aColor = mpColorItem->GetColorValue();
const SfxObjectShell* pSh = SfxObjectShell::Current();
- const SvxColorListItem aItem(*(const
SvxColorListItem*)(pSh->GetItem(SID_COLOR_TABLE)));
+ const SvxColorListItem aItem(*static_cast<const
SvxColorListItem*>(pSh->GetItem(SID_COLOR_TABLE)));
mpLbFillAttr->Clear();
mpLbFillAttr->Enable();
@@ -1000,7 +1000,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
const OUString aString( mpFillGradientItem->GetName()
);
const SfxObjectShell* pSh = SfxObjectShell::Current();
- const SvxGradientListItem aItem( *(const
SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
+ const SvxGradientListItem aItem( *static_cast<const
SvxGradientListItem*>(pSh->GetItem(SID_GRADIENT_LIST)));
mpLbFillAttr->Clear();
mpLbFillAttr->Enable();
@@ -1025,7 +1025,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
const OUString aString( mpHatchItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current();
- const SvxHatchListItem aItem(*(const
SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
+ const SvxHatchListItem aItem(*static_cast<const
SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST)));
mpLbFillAttr->Clear();
mpLbFillAttr->Enable();
@@ -1050,7 +1050,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{
const OUString aString( mpBitmapItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current();
- const SvxBitmapListItem aItem(*(const
SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
+ const SvxBitmapListItem aItem(*static_cast<const
SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST)));
mpLbFillAttr->Clear();
mpLbFillAttr->Enable();
@@ -1109,7 +1109,7 @@ void AreaPropertyPanel::Update()
if(pSh && pSh->GetItem(SID_GRADIENT_LIST))
{
- const SvxGradientListItem aItem(*(const
SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
+ const SvxGradientListItem aItem(*static_cast<const
SvxGradientListItem*>(pSh->GetItem(SID_GRADIENT_LIST)));
mpLbFillAttr->Enable();
mpLbFillAttr->Clear();
mpLbFillAttr->Fill(aItem.GetGradientList());
@@ -1138,7 +1138,7 @@ void AreaPropertyPanel::Update()
if(pSh && pSh->GetItem(SID_HATCH_LIST))
{
- const SvxHatchListItem aItem(*(const
SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
+ const SvxHatchListItem aItem(*static_cast<const
SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST)));
mpLbFillAttr->Enable();
mpLbFillAttr->Clear();
mpLbFillAttr->Fill(aItem.GetHatchList());
@@ -1167,7 +1167,7 @@ void AreaPropertyPanel::Update()
if(pSh && pSh->GetItem(SID_BITMAP_LIST))
{
- const SvxBitmapListItem aItem(*(const
SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
+ const SvxBitmapListItem aItem(*static_cast<const
SvxBitmapListItem*>(pSh->GetItem(SID_BITMAP_LIST)));
mpLbFillAttr->Enable();
mpLbFillAttr->Clear();
mpLbFillAttr->Fill(aItem.GetBitmapList());
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx
b/svx/source/sidebar/line/LinePropertyPanel.cxx
index c46c772..4b4a312 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -396,7 +396,7 @@ void LinePropertyPanel::NotifyItemUpdate(
if(pItem)
{
- mpStyleItem.reset(pState ?
(XLineStyleItem*)pItem->Clone() : 0);
+ mpStyleItem.reset(pState ?
static_cast<XLineStyleItem*>(pItem->Clone()) : 0);
}
}
else // if(nSID == SID_ATTR_LINE_DASH)
@@ -405,7 +405,7 @@ void LinePropertyPanel::NotifyItemUpdate(
if(pItem)
{
- mpDashItem.reset(pState ?
(XLineDashItem*)pItem->Clone() : 0);
+ mpDashItem.reset(pState ?
static_cast<XLineDashItem*>(pItem->Clone()) : 0);
}
}
}
@@ -502,7 +502,7 @@ void LinePropertyPanel::NotifyItemUpdate(
if(pItem)
{
- mpStartItem.reset((XLineStartItem*)pItem->Clone());
+
mpStartItem.reset(static_cast<XLineStartItem*>(pItem->Clone()));
SelectEndStyle(true);
break;
}
@@ -531,7 +531,7 @@ void LinePropertyPanel::NotifyItemUpdate(
if(pItem)
{
- mpEndItem.reset((XLineEndItem*)pItem->Clone());
+
mpEndItem.reset(static_cast<XLineEndItem*>(pItem->Clone()));
SelectEndStyle(false);
break;
}
@@ -977,7 +977,7 @@ void LinePropertyPanel::FillLineEndList()
if ( pSh && pSh->GetItem( SID_LINEEND_LIST ) )
{
mpLBStart->Enable();
- SvxLineEndListItem aItem( *(const SvxLineEndListItem*)(pSh->GetItem(
SID_LINEEND_LIST ) ) );
+ SvxLineEndListItem aItem( *static_cast<const
SvxLineEndListItem*>(pSh->GetItem( SID_LINEEND_LIST ) ) );
mxLineEndList = aItem.GetLineEndList();
if (mxLineEndList.is())
@@ -1003,7 +1003,7 @@ void LinePropertyPanel::FillLineStyleList()
if ( pSh && pSh->GetItem( SID_DASH_LIST ) )
{
mpLBStyle->Enable();
- SvxDashListItem aItem( *(const SvxDashListItem*)(pSh->GetItem(
SID_DASH_LIST ) ) );
+ SvxDashListItem aItem( *static_cast<const
SvxDashListItem*>(pSh->GetItem( SID_DASH_LIST ) ) );
mxLineStyleList = aItem.GetDashList();
if (mxLineStyleList.is())
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx
b/svx/source/sidebar/line/LineWidthControl.cxx
index 97f518d..46830444 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -160,14 +160,14 @@ void LineWidthControl::Initialize()
maVSWidth.SetItemText(i, rStr[i-1]);
}
maVSWidth.SetUnit(rStr);
- maVSWidth.SetItemData(1,(void*)5);
- maVSWidth.SetItemData(2,(void*)8);
- maVSWidth.SetItemData(3,(void*)10);
- maVSWidth.SetItemData(4,(void*)15);
- maVSWidth.SetItemData(5,(void*)23);
- maVSWidth.SetItemData(6,(void*)30);
- maVSWidth.SetItemData(7,(void*)45);
- maVSWidth.SetItemData(8,(void*)60);
+ maVSWidth.SetItemData(1, reinterpret_cast<void*>(5));
+ maVSWidth.SetItemData(2, reinterpret_cast<void*>(8));
+ maVSWidth.SetItemData(3, reinterpret_cast<void*>(10));
+ maVSWidth.SetItemData(4, reinterpret_cast<void*>(15));
+ maVSWidth.SetItemData(5, reinterpret_cast<void*>(23));
+ maVSWidth.SetItemData(6, reinterpret_cast<void*>(30));
+ maVSWidth.SetItemData(7, reinterpret_cast<void*>(45));
+ maVSWidth.SetItemData(8, reinterpret_cast<void*>(60));
maVSWidth.SetImage(maIMGCusGray);
maVSWidth.SetSelItem(0);
@@ -271,7 +271,7 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
sal_uInt16 iPos = maVSWidth.GetSelectItemId();
if(iPos >= 1 && iPos <= 8)
{
- sal_IntPtr nVal = LogicToLogic((sal_IntPtr)maVSWidth.GetItemData(
iPos ) , MAP_POINT, (MapUnit)meMapUnit);
+ sal_IntPtr nVal =
LogicToLogic(reinterpret_cast<sal_IntPtr>(maVSWidth.GetItemData( iPos )),
MAP_POINT, (MapUnit)meMapUnit);
nVal = maMFWidth.Denormalize(nVal);
XLineWidthItem aWidthItem( nVal );
mpBindings->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH,
SfxCallMode::RECORD, &aWidthItem, 0L);
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index d52be9e..b7a63e7 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -818,24 +818,25 @@ MixBulletsTypeMgr::MixBulletsTypeMgr(const
MixBulletsTypeMgr& aTypeMgr):
pActualBullets[i]->nIndex = aTypeMgr.pActualBullets[i]->nIndex;
//index in the tab page display
pActualBullets[i]->nIndexDefault =
aTypeMgr.pActualBullets[i]->nIndexDefault;
pActualBullets[i]->pBullets = new
BulletsSettings_Impl(eNBType::BULLETS) ;
-
((BulletsSettings_Impl*)(pActualBullets[i]->pBullets))->cBulletChar =
((BulletsSettings_Impl*)(aTypeMgr.pActualBullets[i]->pBullets))->cBulletChar;
- ((BulletsSettings_Impl*)(pActualBullets[i]->pBullets))->aFont =
((BulletsSettings_Impl*)(aTypeMgr.pActualBullets[i]->pBullets))->aFont;
-
((BulletsSettings_Impl*)(pActualBullets[i]->pBullets))->sDescription =
((BulletsSettings_Impl*)(aTypeMgr.pActualBullets[i]->pBullets))->sDescription;
-
((BulletsSettings_Impl*)(pActualBullets[i]->pBullets))->bIsCustomized =
((BulletsSettings_Impl*)(aTypeMgr.pActualBullets[i]->pBullets))->bIsCustomized;
- ((BulletsSettings_Impl*)(pActualBullets[i]->pBullets))->eType =
((BulletsSettings_Impl*)(aTypeMgr.pActualBullets[i]->pBullets))->eType;
- }else if ( aTypeMgr.pActualBullets[i]->eType ==
eNBType::GRAPHICBULLETS )
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->cBulletChar =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->cBulletChar;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->aFont =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->aFont;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->sDescription =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->sDescription;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->bIsCustomized
=
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->eType =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->eType;
+ }
+ else if ( aTypeMgr.pActualBullets[i]->eType == eNBType::GRAPHICBULLETS
)
{
pActualBullets[i]->eType = aTypeMgr.pActualBullets[i]->eType;
pActualBullets[i]->nIndex = aTypeMgr.pActualBullets[i]->nIndex;
//index in the tab page display
pActualBullets[i]->nIndexDefault =
aTypeMgr.pActualBullets[i]->nIndexDefault;
pActualBullets[i]->pBullets = new
GrfBulDataRelation(eNBType::GRAPHICBULLETS) ;
- ((GrfBulDataRelation*)(pActualBullets[i]->pBullets))->sGrfName =
((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->sGrfName;
- ((GrfBulDataRelation*)(pActualBullets[i]->pBullets))->sDescription
= ((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->sDescription;
-
((GrfBulDataRelation*)(pActualBullets[i]->pBullets))->bIsCustomized =
((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->bIsCustomized;
- ((GrfBulDataRelation*)(pActualBullets[i]->pBullets))->eType =
((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->eType;
- if (
((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->bIsCustomized &&
((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->pGrfObj != NULL)
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sGrfName =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->sGrfName;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sDescription =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->sDescription;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->bIsCustomized =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->eType =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->eType;
+ if (
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized
&&
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj
!= NULL)
{
- ((GrfBulDataRelation*)(pActualBullets[i]->pBullets))->pGrfObj
= ((GrfBulDataRelation*)(aTypeMgr.pActualBullets[i]->pBullets))->pGrfObj;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->pGrfObj =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj;
}
}
}
@@ -851,11 +852,11 @@ void MixBulletsTypeMgr::Init()
pActualBullets[0]->nIndex = 0+1; //index in the tab page
display,decrease 1 to the index within arr
pActualBullets[0]->nIndexDefault = 2; //index in the tab page
display,decrease 1 to the index within arr
pActualBullets[0]->pBullets = new
BulletsSettings_Impl(eNBType::BULLETS) ;
- ((BulletsSettings_Impl*)(pActualBullets[0]->pBullets))->cBulletChar =
rBTMgr.GetBulChar(pActualBullets[0]->nIndexDefault-1);
- ((BulletsSettings_Impl*)(pActualBullets[0]->pBullets))->aFont =
rBTMgr.GetBulCharFont(pActualBullets[0]->nIndexDefault-1);
- ((BulletsSettings_Impl*)(pActualBullets[0]->pBullets))->sDescription =
rBTMgr.GetDescription(pActualBullets[0]->nIndexDefault-1);
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
