[Libreoffice-commits] core.git: sw/qa sw/source
Noel Grandin
noel at peralex.com
Thu Dec 4 01:16:34 PST 2014
sw/qa/core/uwriter.cxx | 2
sw/qa/extras/uiwriter/uiwriter.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 6 -
sw/source/ui/dbui/mmoutputpage.cxx | 8 -
sw/source/ui/frmdlg/column.cxx | 52 ++++-----
sw/source/ui/frmdlg/cption.cxx | 20 +--
sw/source/ui/frmdlg/frmdlg.cxx | 4
sw/source/ui/frmdlg/frmpage.cxx | 100 +++++++++---------
sw/source/ui/frmdlg/wrap.cxx | 36 +++---
sw/source/ui/index/cnttab.cxx | 200 ++++++++++++++++++-------------------
sw/source/ui/index/swuiidxmrk.cxx | 24 ++--
sw/source/ui/misc/glossary.cxx | 8 -
sw/source/ui/misc/insfnote.cxx | 6 -
sw/source/ui/misc/linenum.cxx | 4
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/pggrid.cxx | 18 +--
sw/source/ui/misc/titlepage.cxx | 2
sw/source/ui/table/tabledlg.cxx | 16 +-
sw/source/ui/vba/vbawindow.cxx | 4
19 files changed, 257 insertions(+), 257 deletions(-)
New commits:
commit 64a70d8cf56b4a9c1b6bdf920f71cc49c3a2240e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Dec 4 09:07:52 2014 +0200
loplugin: cstylecast
Change-Id: Id61218433add142e109bfc858549b8d2d8d1c28f
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index bad84c9..078bf2e 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -699,7 +699,7 @@ void SwDocTest::testSwScanner()
DateTime aDate(DateTime::SYSTEM);
SwPostItField aPostIt(
- (SwPostItFieldType*)m_pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD), OUString("An Author"),
+ static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), OUString("An Author"),
OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate );
m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFmtFld(aPostIt), 0);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8496e30..6fe83c2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -293,7 +293,7 @@ void SwUiWriterTest::testFdo74981()
// create a document with an input field
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwInputField aField((SwInputFieldType*)pWrtShell->GetFldType(0, RES_INPUTFLD), OUString("foo"), OUString("bar"), 0, 0);
+ SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
pWrtShell->Insert(aField);
// expect hints
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 04cc190..e565f8a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -913,7 +913,7 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const OUString& rTxt,
SwDBFieldType aFldType( rSh.GetDoc(), aSrch.sColumn,
aDBData );
pNew = new _DB_Column( rFndCol, *new SwDBField(
- (SwDBFieldType*)rSh.InsertFldType( aFldType ),
+ static_cast<SwDBFieldType*>(rSh.InsertFldType( aFldType )),
nFormat ) );
if( nSubType )
pNew->DB_ColumnData.pField->SetSubType( nSubType );
@@ -1226,8 +1226,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
}
}
aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale();
- SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh.
- GetFldType( 0, RES_DBNEXTSETFLD ),
+ SwDBNextSetField aNxtDBFld( static_cast<SwDBNextSetFieldType*>(rSh.
+ GetFldType( 0, RES_DBNEXTSETFLD )),
"1", "", aDBData );
bool bSetCrsr = true;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 51c5af6..01a4d1f 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -445,7 +445,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
OUString sAttach( m_sDefaultAttachmentST );
sAttach += ".";
sAttach += lcl_GetExtensionForDocType(
- (sal_uLong)m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos()));
+ reinterpret_cast<sal_uLong>(m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos())));
m_pAttachmentED->SetText( sAttach );
}
@@ -890,7 +890,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
{
- sal_uLong nDocType = (sal_uLong)pBox->GetEntryData(pBox->GetSelectEntryPos());
+ sal_uLong nDocType = reinterpret_cast<sal_uLong>(pBox->GetEntryData(pBox->GetSelectEntryPos()));
bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType;
m_pSendAsPB->Enable( bEnable );
m_pAttachmentGroup->Enable( bEnable );
@@ -970,7 +970,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding();
SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer();
const SfxFilter *pSfxFlt = 0;
- sal_uLong nDocType = (sal_uLong)m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos());
+ sal_uLong nDocType = reinterpret_cast<sal_uLong>(m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos()));
OUString sExtension = lcl_GetExtensionForDocType(nDocType);
switch( nDocType )
{
@@ -1060,7 +1060,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
++nTokenCount;
}
sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType(
- (sal_uLong)m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos())));
+ reinterpret_cast<sal_uLong>(m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos()))));
m_pAttachmentED->SetText(sAttach);
}
else
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index f80a721..d616f06 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -161,7 +161,7 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)
assert(pColPgSet);
// create TabPage
- pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), pColPgSet);
+ pTabPage = static_cast<SwColumnPage*>( SwColumnPage::Create(get_content_area(), pColPgSet) );
pTabPage->get<vcl::Window>("applytoft")->Show();
pTabPage->get(m_pApplyToLB, "applytolb");
m_pApplyToLB->Show();
@@ -169,31 +169,31 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh)
if (pCurrSection && (!rWrtShell.HasSelection() || 0 != nFullSectCnt))
{
m_pApplyToLB->RemoveEntry( m_pApplyToLB->GetEntryPos(
- (void*)(sal_IntPtr)( 1 >= nFullSectCnt
+ reinterpret_cast<void*>((sal_IntPtr)( 1 >= nFullSectCnt
? LISTBOX_SECTIONS
- : LISTBOX_SECTION )));
+ : LISTBOX_SECTION ))));
}
else
{
- m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( (void*)(sal_IntPtr)LISTBOX_SECTION ));
- m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( (void*)(sal_IntPtr)LISTBOX_SECTIONS ));
+ m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SECTION) ));
+ m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SECTIONS) ));
}
if (!( rWrtShell.HasSelection() && rWrtShell.IsInsRegionAvailable() &&
( !pCurrSection || ( 1 != nFullSectCnt &&
IsMarkInSameSection( rWrtShell, pCurrSection ) ))))
- m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( (void*)(sal_IntPtr)LISTBOX_SELECTION ));
+ m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SELECTION) ));
if (!rWrtShell.GetFlyFrmFmt())
- m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( (void*) LISTBOX_FRAME ));
+ m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(LISTBOX_FRAME) ));
- const sal_Int32 nPagePos = m_pApplyToLB->GetEntryPos( (void*) LISTBOX_PAGE );
+ const sal_Int32 nPagePos = m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(LISTBOX_PAGE) );
if (pPageSet && pPageDesc)
{
const OUString sPageStr = m_pApplyToLB->GetEntry(nPagePos) + pPageDesc->GetName();
m_pApplyToLB->RemoveEntry(nPagePos);
m_pApplyToLB->InsertEntry( sPageStr, nPagePos );
- m_pApplyToLB->SetEntryData( nPagePos, (void*) LISTBOX_PAGE);
+ m_pApplyToLB->SetEntryData( nPagePos, reinterpret_cast<void*>(LISTBOX_PAGE));
}
else
m_pApplyToLB->RemoveEntry( nPagePos );
@@ -249,7 +249,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
{
pTabPage->FillItemSet(pSet);
}
- nOldSelection = (sal_IntPtr)m_pApplyToLB->GetEntryData(m_pApplyToLB->GetSelectEntryPos());
+ nOldSelection = reinterpret_cast<sal_IntPtr>(m_pApplyToLB->GetEntryData(m_pApplyToLB->GetSelectEntryPos()));
long nWidth = nSelectionWidth;
switch(nOldSelection)
{
@@ -314,7 +314,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl)
if(pSelectionSet && SfxItemState::SET == pSelectionSet->GetItemState(RES_COL))
{
//insert region with columns
- const SwFmtCol& rColItem = (const SwFmtCol&)pSelectionSet->Get(RES_COL);
+ const SwFmtCol& rColItem = static_cast<const SwFmtCol&>(pSelectionSet->Get(RES_COL));
//only if there actually are columns!
if(rColItem.GetNumCols() > 1)
rWrtShell.GetView().GetViewFrame()->GetDispatcher()->Execute(
@@ -524,7 +524,7 @@ SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet)
{
pItem = pDocSh->GetItem( SID_COLOR_TABLE );
if ( pItem != NULL )
- pColorList = ( (SvxColorListItem*)pItem )->GetColorList();
+ pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList();
}
if ( pColorList.is() )
@@ -568,7 +568,7 @@ void SwColumnPage::connectPercentField(PercentField &rWrap, const OString &rName
void SwColumnPage::Reset(const SfxItemSet *rSet)
{
const sal_uInt16 nHtmlMode =
- ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
+ ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current()));
if(nHtmlMode & HTMLMODE_ON)
{
bHtmlMode = true;
@@ -593,8 +593,8 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
pColMgr->SetActualWidth(FRAME_FORMAT_WIDTH);
else
{
- const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)rSet->Get(RES_FRM_SIZE);
- const SvxBoxItem& rBox = (const SvxBoxItem&) rSet->Get(RES_BOX);
+ const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(rSet->Get(RES_FRM_SIZE));
+ const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(rSet->Get(RES_BOX));
pColMgr->SetActualWidth((sal_uInt16)rSize.GetSize().Width() - rBox.GetDistance());
}
}
@@ -602,7 +602,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
{
const SfxPoolItem* pItem;
if( SfxItemState::SET == rSet->GetItemState( RES_COLUMNBALANCE, false, &pItem ))
- m_pBalanceColsCB->Check(!((const SwFmtNoBalancedColumns*)pItem)->GetValue());
+ m_pBalanceColsCB->Check(!static_cast<const SwFmtNoBalancedColumns*>(pItem)->GetValue());
else
m_pBalanceColsCB->Check( true );
}
@@ -610,9 +610,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
//text direction
if( SfxItemState::DEFAULT <= rSet->GetItemState( RES_FRAMEDIR ) )
{
- const SvxFrameDirectionItem& rItem = (const SvxFrameDirectionItem&)rSet->Get(RES_FRAMEDIR);
+ const SvxFrameDirectionItem& rItem = static_cast<const SvxFrameDirectionItem&>(rSet->Get(RES_FRAMEDIR));
sal_uIntPtr nVal = rItem.GetValue();
- const sal_Int32 nPos = m_pTextDirectionLB->GetEntryPos( (void*) nVal );
+ const sal_Int32 nPos = m_pTextDirectionLB->GetEntryPos( reinterpret_cast<void*>(nVal) );
m_pTextDirectionLB->SelectEntryPos( nPos );
m_pTextDirectionLB->SaveValue();
}
@@ -649,7 +649,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet)
const sal_Int32 nPos = m_pTextDirectionLB->GetSelectEntryPos();
if ( m_pTextDirectionLB->IsValueChangedFromSaved() )
{
- sal_uInt32 nDirection = (sal_uInt32)(sal_IntPtr)m_pTextDirectionLB->GetEntryData( nPos );
+ sal_uInt32 nDirection = (sal_uInt32)reinterpret_cast<sal_IntPtr>(m_pTextDirectionLB->GetEntryData( nPos ));
rSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR));
}
}
@@ -1159,11 +1159,11 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
{
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_PAGE_SIZE ))
{
- const SvxSizeItem& rSize = (const SvxSizeItem&)rSet.Get(
- SID_ATTR_PAGE_SIZE);
- const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rSet.Get(
- RES_LR_SPACE );
- const SvxBoxItem& rBox = (const SvxBoxItem&) rSet.Get(RES_BOX);
+ const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(rSet.Get(
+ SID_ATTR_PAGE_SIZE));
+ const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rSet.Get(
+ RES_LR_SPACE ));
+ const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>( rSet.Get(RES_BOX));
const sal_uInt16 nActWidth = static_cast< sal_uInt16 >(rSize.GetSize().Width()
- rLRSpace.GetLeft() - rLRSpace.GetRight() - rBox.GetDistance());
@@ -1185,8 +1185,8 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
m_pFrmExampleWN->Show();
// Size
- const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE);
- const SvxBoxItem& rBox = (const SvxBoxItem&) rSet.Get(RES_BOX);
+ const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE));
+ const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>( rSet.Get(RES_BOX));
long nDistance = rBox.GetDistance();
const sal_uInt16 nTotalWish = bFormat ? FRAME_FORMAT_WIDTH : sal_uInt16(rSize.GetWidth() - 2 * nDistance);
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 2ee98b0..ac174be 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -146,7 +146,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
{
SwFieldType *pType = pMgr->GetFldType( USHRT_MAX, i );
if( pType->Which() == RES_SETEXPFLD &&
- ((SwSetExpFieldType *) pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
+ static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
m_pCategoryBox->InsertEntry(pType->GetName());
}
@@ -268,7 +268,7 @@ void SwCaptionDialog::Apply()
aOpt.SetCategory(comphelper::string::strip(aName, ' '));
aOpt.SetNumSeparator( m_pNumberingSeparatorED->GetText() );
}
- aOpt.SetNumType( (sal_uInt16)(sal_uIntPtr)m_pFormatBox->GetEntryData( m_pFormatBox->GetSelectEntryPos() ) );
+ aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetEntryData( m_pFormatBox->GetSelectEntryPos() )) );
aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() );
aOpt.SetCaption( m_pTextEdit->GetText() );
aOpt.SetPos( m_pPosBox->GetSelectEntryPos() );
@@ -352,8 +352,8 @@ void SwCaptionDialog::DrawSample()
bool bNone = sFldTypeName == m_sNone;
if( !bNone )
{
- const sal_uInt16 nNumFmt = (sal_uInt16)(sal_uIntPtr)m_pFormatBox->GetEntryData(
- m_pFormatBox->GetSelectEntryPos() );
+ const sal_uInt16 nNumFmt = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetEntryData(
+ m_pFormatBox->GetSelectEntryPos() ));
if( SVX_NUM_NUMBER_NONE != nNumFmt )
{
// category
@@ -366,8 +366,8 @@ void SwCaptionDialog::DrawSample()
}
SwWrtShell &rSh = rView.GetWrtShell();
- SwSetExpFieldType* pFldType = (SwSetExpFieldType*)rSh.GetFldType(
- RES_SETEXPFLD, sFldTypeName );
+ SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(rSh.GetFldType(
+ RES_SETEXPFLD, sFldTypeName ));
if( pFldType && pFldType->GetOutlineLvl() < MAXLEVEL )
{
sal_Int8 nLvl = pFldType->GetOutlineLvl();
@@ -433,8 +433,8 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
m_pLbLevel->InsertEntry( OUString::number(n+1) );
- SwSetExpFieldType* pFldType = (SwSetExpFieldType*)rSh.GetFldType(
- RES_SETEXPFLD, aFldTypeName );
+ SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(rSh.GetFldType(
+ RES_SETEXPFLD, aFldTypeName ));
sal_Unicode nLvl = MAXLEVEL;
OUString sDelim(": ");
@@ -459,8 +459,8 @@ SwSequenceOptionDialog::~SwSequenceOptionDialog()
void SwSequenceOptionDialog::Apply()
{
SwWrtShell &rSh = rView.GetWrtShell();
- SwSetExpFieldType* pFldType = (SwSetExpFieldType*)rSh.GetFldType(
- RES_SETEXPFLD, aFldTypeName );
+ SwSetExpFieldType* pFldType = static_cast<SwSetExpFieldType*>(rSh.GetFldType(
+ RES_SETEXPFLD, aFldTypeName ));
sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectEntryPos() - 1);
sal_Unicode cDelim = m_pEdDelim->GetText()[0];
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 19e074d..94f5b90 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -168,8 +168,8 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
static_cast<SwColumnPage&>(rPage).SetFrmMode(true);
static_cast<SwColumnPage&>(rPage).SetFormatUsed(m_bFormat);
- const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)
- m_rSet.Get( RES_FRM_SIZE );
+ const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(
+ m_rSet.Get( RES_FRM_SIZE ));
static_cast<SwColumnPage&>(rPage).SetPageWidth( rSize.GetWidth() );
}
else if (nId == m_nMacroId)
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index ab0f069..451bba0 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -843,7 +843,7 @@ void SwFrmPage::EnableGraficMode( void )
SwWrtShell *SwFrmPage::getFrmDlgParentShell()
{
- return ((SwFrmDlg*)GetParentDialog())->GetWrtShell();
+ return static_cast<SwFrmDlg*>(GetParentDialog())->GetWrtShell();
}
void SwFrmPage::Reset( const SfxItemSet *rSet )
@@ -861,12 +861,12 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
SetMetric( *m_pAtVertPosED, aMetric );
const SfxPoolItem* pItem = NULL;
- const SwFmtAnchor& rAnchor = (const SwFmtAnchor&)rSet->Get(RES_ANCHOR);
+ const SwFmtAnchor& rAnchor = static_cast<const SwFmtAnchor&>(rSet->Get(RES_ANCHOR));
if (SfxItemState::SET == rSet->GetItemState(FN_OLE_IS_MATH, false, &pItem))
- m_bIsMathOLE = ((const SfxBoolItem*)pItem)->GetValue();
+ m_bIsMathOLE = static_cast<const SfxBoolItem*>(pItem)->GetValue();
if (SfxItemState::SET == rSet->GetItemState(FN_MATH_BASELINE_ALIGNMENT, false, &pItem))
- m_bIsMathBaselineAlignment = ((const SfxBoolItem*)pItem)->GetValue();
+ m_bIsMathBaselineAlignment = static_cast<const SfxBoolItem*>(pItem)->GetValue();
EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment
&& FLY_AS_CHAR == rAnchor.GetAnchorId()) );
@@ -894,7 +894,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
OSL_ENSURE(pSh , "shell not found");
//OS: only for the variant Insert/Graphic/Properties
if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_GRF_REALSIZE, false, &pItem))
- aGrfSize = ((const SvxSizeItem*)pItem)->GetSize();
+ aGrfSize = static_cast<const SvxSizeItem*>(pItem)->GetSize();
else
pSh->GetGrfSize( aGrfSize );
@@ -916,7 +916,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
}
else
{
- aGrfSize = ((const SwFmtFrmSize&)rSet->Get(RES_FRM_SIZE)).GetSize();
+ aGrfSize = static_cast<const SwFmtFrmSize&>(rSet->Get(RES_FRM_SIZE)).GetSize();
}
// entering procent value made possible
@@ -925,7 +925,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet )
//the available space is not yet known so the RefValue has to be calculated from size and relative size values
//this is needed only if relative values are already set
- const SwFmtFrmSize& rFrmSize = (const SwFmtFrmSize&)rSet->Get(RES_FRM_SIZE);
+ const SwFmtFrmSize& rFrmSize = static_cast<const SwFmtFrmSize&>(rSet->Get(RES_FRM_SIZE));
m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::FRAME));
m_pRelWidthRelationLB->InsertEntry(aFramePosString.GetString(SwFPos::REL_PG_FRAME));
@@ -1034,7 +1034,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
if ( !bFormat )
{
pOldItem = GetOldItem(*rSet, RES_ANCHOR);
- if (bNew || !pOldItem || eAnchorId != ((const SwFmtAnchor*)pOldItem)->GetAnchorId())
+ if (bNew || !pOldItem || eAnchorId != static_cast<const SwFmtAnchor*>(pOldItem)->GetAnchorId())
{
SwFmtAnchor aAnc( eAnchorId, pSh->GetPhyPageNum() );
bRet = 0 != rSet->Put( aAnc );
@@ -1043,8 +1043,8 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
if ( pHMap )
{
- SwFmtHoriOrient aHoriOrient( (const SwFmtHoriOrient&)
- rOldSet.Get(RES_HORI_ORIENT) );
+ SwFmtHoriOrient aHoriOrient( static_cast<const SwFmtHoriOrient&>(
+ rOldSet.Get(RES_HORI_ORIENT)) );
const sal_Int32 nMapPos = GetMapPos(pHMap, *m_pHorizontalDLB);
const sal_Int16 eHOri = GetAlignment(pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
@@ -1068,7 +1068,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
bool bSame = false;
if ((bNew == bFormat) && pOldItem)
{
- bSame = aHoriOrient == (SwFmtHoriOrient&)*pOldItem;
+ bSame = aHoriOrient == static_cast<const SwFmtHoriOrient&>(*pOldItem);
}
if ((bNew && !bFormat) || ((bAtHorzPosModified || bMod) && !bSame))
{
@@ -1079,8 +1079,8 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
if ( pVMap )
{
// alignment vertical
- SwFmtVertOrient aVertOrient( (const SwFmtVertOrient&)
- rOldSet.Get(RES_VERT_ORIENT) );
+ SwFmtVertOrient aVertOrient( static_cast<const SwFmtVertOrient&>(
+ rOldSet.Get(RES_VERT_ORIENT)) );
const sal_Int32 nMapPos = GetMapPos(pVMap, *m_pVerticalDLB);
const sal_Int16 eVOri = GetAlignment(pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
@@ -1108,10 +1108,10 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
if((bNew == bFormat) && pOldItem)
{
bSame = bFormat ?
- aVertOrient.GetVertOrient() == ((SwFmtVertOrient*)pOldItem)->GetVertOrient() &&
- aVertOrient.GetRelationOrient() == ((SwFmtVertOrient*)pOldItem)->GetRelationOrient() &&
- aVertOrient.GetPos() == ((SwFmtVertOrient*)pOldItem)->GetPos()
- : aVertOrient == (SwFmtVertOrient&)*pOldItem;
+ aVertOrient.GetVertOrient() == static_cast<const SwFmtVertOrient*>(pOldItem)->GetVertOrient() &&
+ aVertOrient.GetRelationOrient() == static_cast<const SwFmtVertOrient*>(pOldItem)->GetRelationOrient() &&
+ aVertOrient.GetPos() == static_cast<const SwFmtVertOrient*>(pOldItem)->GetPos()
+ : aVertOrient == static_cast<const SwFmtVertOrient&>(*pOldItem);
}
if( ( bNew && !bFormat ) || ((bAtVertPosModified || bMod) && !bSame ))
{
@@ -1124,7 +1124,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet *rSet)
// for a graphic that isn't even loaded, are set. Then no SetSize
// is done here when the size settings were not changed by the
// user.
- const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE);
+ const SwFmtFrmSize& rOldSize = static_cast<const SwFmtFrmSize& >(rOldSet.Get(RES_FRM_SIZE));
SwFmtFrmSize aSz( rOldSize );
sal_Int32 nRelWidthRelation = m_pRelWidthRelationLB->GetSelectEntryPos();
@@ -1765,7 +1765,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl)
SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell()
: getFrmDlgParentShell();
OSL_ENSURE(pSh , "shell not found");
- SwFlyFrmAttrMgr aMgr( bNew, pSh, (const SwAttrSet&)GetItemSet() );
+ SwFlyFrmAttrMgr aMgr( bNew, pSh, static_cast<const SwAttrSet&>(GetItemSet()) );
SvxSwFrameValidation aVal;
aVal.nAnchorType = static_cast< sal_Int16 >(GetAnchor());
@@ -1820,7 +1820,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl)
if(GetTabDialog()->GetExampleSet() &&
SfxItemState::DEFAULT <= GetTabDialog()->GetExampleSet()->GetItemState(RES_COL))
{
- const SwFmtCol& rCol = (const SwFmtCol&)GetTabDialog()->GetExampleSet()->Get(RES_COL);
+ const SwFmtCol& rCol = static_cast<const SwFmtCol&>(GetTabDialog()->GetExampleSet()->Get(RES_COL));
if ( rCol.GetColumns().size() > 1 )
{
for ( size_t i = 0; i < rCol.GetColumns().size(); ++i )
@@ -2168,7 +2168,7 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
}
}
- const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE);
+ const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE));
sal_Int64 nWidth = m_aWidthED.NormalizePercent(rSize.GetWidth());
sal_Int64 nHeight = m_aHeightED.NormalizePercent(rSize.GetHeight());
@@ -2224,18 +2224,18 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
m_pAutoHeightCB->Hide();
// organise circulation-gap for character bound frames
- const SvxULSpaceItem &rUL = (const SvxULSpaceItem &)rSet.Get(RES_UL_SPACE);
+ const SvxULSpaceItem &rUL = static_cast<const SvxULSpaceItem &>(rSet.Get(RES_UL_SPACE));
nUpperBorder = rUL.GetUpper();
nLowerBorder = rUL.GetLower();
if(SfxItemState::SET == rSet.GetItemState(FN_KEEP_ASPECT_RATIO))
{
- m_pFixedRatioCB->Check(((const SfxBoolItem&)rSet.Get(FN_KEEP_ASPECT_RATIO)).GetValue());
+ m_pFixedRatioCB->Check(static_cast<const SfxBoolItem&>(rSet.Get(FN_KEEP_ASPECT_RATIO)).GetValue());
m_pFixedRatioCB->SaveValue();
}
// columns
- SwFmtCol aCol( (const SwFmtCol&)rSet.Get(RES_COL) );
+ SwFmtCol aCol( static_cast<const SwFmtCol&>(rSet.Get(RES_COL)) );
::FitToActualSize( aCol, (sal_uInt16)rSize.GetWidth() );
RndStdIds eAnchorId = (RndStdIds)GetAnchor();
@@ -2244,8 +2244,8 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
InitPos(eAnchorId, -1, 0, -1, 0, LONG_MAX, LONG_MAX);
else
{
- const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT);
- const SwFmtVertOrient& rVert = (const SwFmtVertOrient&)rSet.Get(RES_VERT_ORIENT);
+ const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
+ const SwFmtVertOrient& rVert = static_cast<const SwFmtVertOrient&>(rSet.Get(RES_VERT_ORIENT));
nOldH = rHori.GetHoriOrient();
nOldHRel = rHori.GetRelationOrient();
nOldV = rVert.GetVertOrient(),
@@ -2277,12 +2277,12 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset)
// transparent for example
// circulation for example
- const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet.Get(RES_SURROUND);
+ const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(rSet.Get(RES_SURROUND));
m_pExampleWN->SetWrap ( static_cast< sal_uInt16 >(rSurround.GetSurround()) );
if ( rSurround.GetSurround() == SURROUND_THROUGHT )
{
- const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)rSet.Get(RES_OPAQUE);
+ const SvxOpaqueItem& rOpaque = static_cast<const SvxOpaqueItem&>(rSet.Get(RES_OPAQUE));
m_pExampleWN->SetTransparent(!rOpaque.GetValue());
}
@@ -2380,11 +2380,11 @@ SfxTabPage* SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
void SwGrfExtPage::Reset(const SfxItemSet *rSet)
{
const SfxPoolItem* pItem;
- const sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
+ const sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current()));
bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
if( SfxItemState::SET == rSet->GetItemState( FN_PARAM_GRF_CONNECT, true, &pItem)
- && ((const SfxBoolItem *)pItem)->GetValue() )
+ && static_cast<const SfxBoolItem *>(pItem)->GetValue() )
{
m_pBrowseBT->Enable();
m_pConnectED->SetReadOnly(false);
@@ -2395,7 +2395,7 @@ void SwGrfExtPage::Reset(const SfxItemSet *rSet)
void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
{
- const SvxProtectItem& rProt = (const SvxProtectItem& )rSet.Get(RES_PROTECT);
+ const SvxProtectItem& rProt = static_cast<const SvxProtectItem& >(rSet.Get(RES_PROTECT));
bool bProtCntnt = rProt.IsCntntProtected();
const SfxPoolItem* pItem = 0;
@@ -2410,7 +2410,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
bEnable = true;
- MirrorGraph eMirror = static_cast< MirrorGraph >(((const SwMirrorGrf* )pItem)->GetValue());
+ MirrorGraph eMirror = static_cast< MirrorGraph >(static_cast<const SwMirrorGrf* >(pItem)->GetValue());
switch( eMirror )
{
case RES_MIRROR_GRAPH_DONT: break;
@@ -2423,7 +2423,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
;
}
- const int nPos = (((const SwMirrorGrf* )pItem)->IsGrfToggle() ? 1 : 0)
+ const int nPos = (static_cast<const SwMirrorGrf* >(pItem)->IsGrfToggle() ? 1 : 0)
+ ((eMirror == RES_MIRROR_GRAPH_VERT || eMirror == RES_MIRROR_GRAPH_BOTH) ? 2 : 0);
bEnableMirrorRB = nPos != 0;
@@ -2448,7 +2448,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) )
{
- const SvxBrushItem& rBrush = *(SvxBrushItem*)pItem;
+ const SvxBrushItem& rBrush = *static_cast<const SvxBrushItem*>(pItem);
if( !rBrush.GetGraphicLink().isEmpty() )
{
aGrfName = aNewGrfName = rBrush.GetGraphicLink();
@@ -2718,7 +2718,7 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet )
if ( SfxItemState::SET == rSet->GetItemState( SID_DOCFRAME, true, &pItem))
{
boost::scoped_ptr<TargetList> pList(new TargetList);
- ((const SfxFrameItem*)pItem)->GetFrame()->GetTargetList(*pList);
+ static_cast<const SfxFrameItem*>(pItem)->GetFrame()->GetTargetList(*pList);
if( !pList->empty() )
{
size_t nCount = pList->size();
@@ -2731,7 +2731,7 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet )
if ( SfxItemState::SET == rSet->GetItemState( RES_URL, true, &pItem ) )
{
- const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem;
+ const SwFmtURL* pFmtURL = static_cast<const SwFmtURL*>(pItem);
pURLED->SetText( INetURLObject::decode( pFmtURL->GetURL(),
'%',
INetURLObject::DECODE_UNAMBIGUOUS,
@@ -2755,10 +2755,10 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet )
bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet)
{
bool bModified = false;
- const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(*rSet, RES_URL);
+ const SwFmtURL* pOldURL = static_cast<const SwFmtURL*>(GetOldItem(*rSet, RES_URL));
boost::scoped_ptr<SwFmtURL> pFmtURL;
if(pOldURL)
- pFmtURL.reset((SwFmtURL*)pOldURL->Clone());
+ pFmtURL.reset(static_cast<SwFmtURL*>(pOldURL->Clone()));
else
pFmtURL.reset(new SwFmtURL());
@@ -2863,7 +2863,7 @@ SfxTabPage* SwFrmAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
void SwFrmAddPage::Reset(const SfxItemSet *rSet )
{
const SfxPoolItem* pItem;
- sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current());
+ sal_uInt16 nHtmlMode = ::GetHtmlMode(static_cast<const SwDocShell*>(SfxObjectShell::Current()));
bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0;
if (bHtmlMode)
{
@@ -2883,7 +2883,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
if(SfxItemState::SET == rSet->GetItemState(FN_SET_FRM_ALT_NAME, false, &pItem))
{
- pAltNameED->SetText(((const SfxStringItem*)pItem)->GetValue());
+ pAltNameED->SetText(static_cast<const SfxStringItem*>(pItem)->GetValue());
pAltNameED->SaveValue();
}
@@ -2894,7 +2894,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
OUString aTmpName1;
if(SfxItemState::SET == rSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
{
- aTmpName1 = ((const SfxStringItem*)pItem)->GetValue();
+ aTmpName1 = static_cast<const SfxStringItem*>(pItem)->GetValue();
}
OSL_ENSURE(pWrtSh, "keine Shell?");
@@ -2984,16 +2984,16 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
}
}
// Pos Protected
- const SvxProtectItem& rProt = (const SvxProtectItem& )rSet->Get(RES_PROTECT);
+ const SvxProtectItem& rProt = static_cast<const SvxProtectItem& >(rSet->Get(RES_PROTECT));
pProtectFrameCB->Check(rProt.IsPosProtected());
pProtectContentCB->Check(rProt.IsCntntProtected());
pProtectSizeCB->Check(rProt.IsSizeProtected());
- const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet->Get(RES_EDIT_IN_READONLY);
+ const SwFmtEditInReadonly& rEdit = static_cast<const SwFmtEditInReadonly& >(rSet->Get(RES_EDIT_IN_READONLY));
pEditInReadonlyCB->Check(rEdit.GetValue()); pEditInReadonlyCB->SaveValue();
// print
- const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet->Get(RES_PRINT);
+ const SvxPrintItem& rPrt = static_cast<const SvxPrintItem&>(rSet->Get(RES_PRINT));
pPrintFrameCB->Check(rPrt.GetValue()); pPrintFrameCB->SaveValue();
// textflow
@@ -3010,12 +3010,12 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
if(bHtmlMode)
{
sal_uLong nData = FRMDIR_VERT_TOP_RIGHT;
- pTextFlowLB->RemoveEntry(pTextFlowLB->GetEntryPos((void*)nData));
+ pTextFlowLB->RemoveEntry(pTextFlowLB->GetEntryPos(reinterpret_cast<void*>(nData)));
}
- sal_uInt16 nVal = ((SvxFrameDirectionItem&)rSet->Get(RES_FRAMEDIR)).GetValue();
+ sal_uInt16 nVal = static_cast<const SvxFrameDirectionItem&>(rSet->Get(RES_FRAMEDIR)).GetValue();
sal_Int32 nPos;
for( nPos = pTextFlowLB->GetEntryCount(); nPos; )
- if( (sal_uInt16)(sal_IntPtr)pTextFlowLB->GetEntryData( --nPos ) == nVal )
+ if( (sal_uInt16)reinterpret_cast<sal_IntPtr>(pTextFlowLB->GetEntryData( --nPos )) == nVal )
break;
pTextFlowLB->SelectEntryPos( nPos );
pTextFlowLB->SaveValue();
@@ -3029,7 +3029,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet )
// Content alignment
if ( rSet->GetItemState(RES_TEXT_VERT_ADJUST) > SfxItemState::DEFAULT )
{
- SdrTextVertAdjust nAdjust = ((const SdrTextVertAdjustItem&)rSet->Get(RES_TEXT_VERT_ADJUST)).GetValue();
+ SdrTextVertAdjust nAdjust = static_cast<const SdrTextVertAdjustItem&>(rSet->Get(RES_TEXT_VERT_ADJUST)).GetValue();
sal_Int32 nPos = 0;
switch(nAdjust)
{
@@ -3052,7 +3052,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
bRet |= 0 != rSet->Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText()));
const SfxPoolItem* pOldItem;
- SvxProtectItem aProt ( (const SvxProtectItem& )GetItemSet().Get(RES_PROTECT) );
+ SvxProtectItem aProt ( static_cast<const SvxProtectItem& >(GetItemSet().Get(RES_PROTECT)) );
aProt.SetCntntProtect( pProtectContentCB->IsChecked() );
aProt.SetSizeProtect ( pProtectSizeCB->IsChecked() );
aProt.SetPosProtect ( pProtectFrameCB->IsChecked() );
@@ -3072,7 +3072,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet *rSet)
sal_Int32 nPos = pTextFlowLB->GetSelectEntryPos();
if( pTextFlowLB->IsValueChangedFromSaved() )
{
- sal_uInt16 nData = (sal_uInt16)(sal_IntPtr)pTextFlowLB->GetEntryData( nPos );
+ sal_uInt16 nData = (sal_uInt16)reinterpret_cast<sal_IntPtr>(pTextFlowLB->GetEntryData( nPos ));
bRet |= 0 != rSet->Put( SvxFrameDirectionItem(
(SvxFrameDirection)nData, RES_FRAMEDIR ));
}
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 1875c49..cee2b50 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -56,7 +56,7 @@ SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bo
{
// create TabPage
- SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), &rSet);
+ SwWrapTabPage* pNewPage = static_cast<SwWrapTabPage*>( SwWrapTabPage::Create(get_content_area(), &rSet) );
pNewPage->SetFormatUsed(false, bDrawMode);
pNewPage->SetShell(pWrtShell);
SetTabPage(pNewPage);
@@ -147,7 +147,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
m_pWrapOutlineCB->Show();
m_pWrapOutsideCB->Show();
- m_pWrapTransparentCB->Check( 0 == ((const SfxInt16Item&)rSet->Get(
+ m_pWrapTransparentCB->Check( 0 == static_cast<const SfxInt16Item&>(rSet->Get(
FN_DRAW_WRAP_DLG)).GetValue() );
m_pWrapTransparentCB->SaveValue();
}
@@ -178,10 +178,10 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
SetMetric(*m_pTopMarginED, aMetric);
SetMetric(*m_pBottomMarginED, aMetric);
- const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet->Get(RES_SURROUND);
+ const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(rSet->Get(RES_SURROUND));
SwSurround nSur = rSurround.GetSurround();
- const SwFmtAnchor &rAnch = (const SwFmtAnchor&)rSet->Get(RES_ANCHOR);
+ const SwFmtAnchor &rAnch = static_cast<const SwFmtAnchor&>(rSet->Get(RES_ANCHOR));
nAnchorId = rAnch.GetAnchorId();
if (((nAnchorId == FLY_AT_PARA) || (nAnchorId == FLY_AT_CHAR))
@@ -217,7 +217,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
if (!bDrawMode)
{
- const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)rSet->Get(RES_OPAQUE);
+ const SvxOpaqueItem& rOpaque = static_cast<const SvxOpaqueItem&>(rSet->Get(RES_OPAQUE));
m_pWrapTransparentCB->Check(!rOpaque.GetValue());
}
break;
@@ -255,8 +255,8 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
}
m_pWrapTransparentCB->Enable( pBtn == m_pWrapThroughRB && !bHtmlMode );
- const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)rSet->Get(RES_UL_SPACE);
- const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)rSet->Get(RES_LR_SPACE);
+ const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(rSet->Get(RES_UL_SPACE));
+ const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(rSet->Get(RES_LR_SPACE));
// gap to text
m_pLeftMarginED->SetValue(m_pLeftMarginED->Normalize(rLR.GetLeft()), FUNIT_TWIP);
@@ -273,14 +273,14 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet)
{
bool bModified = false;
const SfxPoolItem* pOldItem;
- const SwFmtSurround& rOldSur = (const SwFmtSurround&)GetItemSet().Get(RES_SURROUND);
+ const SwFmtSurround& rOldSur = static_cast<const SwFmtSurround&>(GetItemSet().Get(RES_SURROUND));
SwFmtSurround aSur( rOldSur );
SvxOpaqueItem aOp( RES_OPAQUE);
if (!bDrawMode)
{
- const SvxOpaqueItem& rOpaque = (const SvxOpaqueItem&)GetItemSet().Get(RES_OPAQUE);
+ const SvxOpaqueItem& rOpaque = static_cast<const SvxOpaqueItem&>(GetItemSet().Get(RES_OPAQUE));
aOp = rOpaque;
aOp.SetValue(true);
}
@@ -374,31 +374,31 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet)
void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
{
// anchor
- const SwFmtAnchor &rAnch = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR);
+ const SwFmtAnchor &rAnch = static_cast<const SwFmtAnchor&>(rSet.Get(RES_ANCHOR));
nAnchorId = rAnch.GetAnchorId();
bool bEnable = (nAnchorId != FLY_AS_CHAR);
if (!bDrawMode)
{
SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() : pWrtSh;
- SwFlyFrmAttrMgr aMgr( bNew, pSh, (const SwAttrSet&)GetItemSet() );
+ SwFlyFrmAttrMgr aMgr( bNew, pSh, static_cast<const SwAttrSet&>(GetItemSet()) );
SvxSwFrameValidation aVal;
// size
- const SwFmtFrmSize& rFrmSize = (const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE);
+ const SwFmtFrmSize& rFrmSize = static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE));
Size aSize = rFrmSize.GetSize();
// margin
- const SvxULSpaceItem& rUL = (const SvxULSpaceItem&)rSet.Get(RES_UL_SPACE);
- const SvxLRSpaceItem& rLR = (const SvxLRSpaceItem&)rSet.Get(RES_LR_SPACE);
+ const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(rSet.Get(RES_UL_SPACE));
+ const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE));
nOldLeftMargin = static_cast< sal_uInt16 >(rLR.GetLeft());
nOldRightMargin = static_cast< sal_uInt16 >(rLR.GetRight());
nOldUpperMargin = static_cast< sal_uInt16 >(rUL.GetUpper());
nOldLowerMargin = static_cast< sal_uInt16 >(rUL.GetLower());
// position
- const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT);
- const SwFmtVertOrient& rVert = (const SwFmtVertOrient&)rSet.Get(RES_VERT_ORIENT);
+ const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
+ const SwFmtVertOrient& rVert = static_cast<const SwFmtVertOrient&>(rSet.Get(RES_VERT_ORIENT));
aVal.nAnchorType = static_cast< sal_Int16 >(nAnchorId);
aVal.bAutoHeight = rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE;
@@ -473,13 +473,13 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
RangeModifyHdl(m_pTopMarginED);
}
- const SwFmtSurround& rSurround = (const SwFmtSurround&)rSet.Get(RES_SURROUND);
+ const SwFmtSurround& rSurround = static_cast<const SwFmtSurround&>(rSet.Get(RES_SURROUND));
SwSurround nSur = rSurround.GetSurround();
m_pWrapTransparentCB->Enable( bEnable && !bHtmlMode && nSur == SURROUND_THROUGHT );
if(bHtmlMode)
{
- const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT);
+ const SwFmtHoriOrient& rHori = static_cast<const SwFmtHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
sal_Int16 eHOrient = rHori.GetHoriOrient();
sal_Int16 eHRelOrient = rHori.GetRelationOrient();
m_pWrapOutlineCB->Hide();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 868a9dc..1703860 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -274,8 +274,8 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
pDescArr[nArrayIndex] = CreateTOXDescFromTOXBase(pCurTOX);
if(TOX_AUTHORITIES == eCurrentTOXType.eType)
{
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr));
if(pFType)
{
OUString sBrackets;
@@ -348,17 +348,17 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
else if(nId == m_nColumnId)
{
- const SwFmtFrmSize& rSize = (const SwFmtFrmSize&)GetInputSetImpl()->Get(RES_FRM_SIZE);
+ const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE));
- ((SwColumnPage&)rPage).SetPageWidth(rSize.GetWidth());
+ static_cast<SwColumnPage&>(rPage).SetPageWidth(rSize.GetWidth());
}
else if (nId == m_nEntriesId)
- ((SwTOXEntryTabPage&)rPage).SetWrtShell(rSh);
+ static_cast<SwTOXEntryTabPage&>(rPage).SetWrtShell(rSh);
else if (nId == m_nSelectId)
{
- ((SwTOXSelectTabPage&)rPage).SetWrtShell(rSh);
+ static_cast<SwTOXSelectTabPage&>(rPage).SetWrtShell(rSh);
if(USHRT_MAX != nInitialTOXType)
- ((SwTOXSelectTabPage&)rPage).SelectType((TOXTypes)nInitialTOXType);
+ static_cast<SwTOXSelectTabPage&>(rPage).SelectType((TOXTypes)nInitialTOXType);
}
}
@@ -415,8 +415,8 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
}
if(TOX_AUTHORITIES == eType.eType)
{
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr));
if(pFType)
{
pDescArr[nIndex]->SetAuthBrackets(OUString(pFType->GetPrefix()) +
@@ -542,7 +542,7 @@ SwIndexTreeLB::SwIndexTreeLB(SvSimpleTableContainer& rParent, WinBits nBits)
sal_IntPtr SwIndexTreeLB::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
{
- sal_IntPtr nData = (sal_IntPtr)pEntry->GetUserData();
+ sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(pEntry->GetUserData());
if(nData != USHRT_MAX)
{
HeaderBar& rStylesHB = GetTheHeaderBar();
@@ -562,7 +562,7 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
bool bChanged = false;
if(pEntry)
{
- sal_IntPtr nLevel = (sal_IntPtr)pEntry->GetUserData();
+ sal_IntPtr nLevel = reinterpret_cast<sal_IntPtr>(pEntry->GetUserData());
if(aCode.GetCode() == KEY_ADD )
{
if(nLevel < MAXLEVEL - 1)
@@ -581,7 +581,7 @@ void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
}
if(bChanged)
{
- pEntry->SetUserData((void*)nLevel);
+ pEntry->SetUserData(reinterpret_cast<void*>(nLevel));
Invalidate();
}
}
@@ -697,7 +697,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,
}
if (!pEntry)
{
- m_pHeaderTree->InsertEntry(aName)->SetUserData((void*)USHRT_MAX);
+ m_pHeaderTree->InsertEntry(aName)->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
}
}
}
@@ -717,7 +717,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl)
SvTreeListEntry* pEntry = m_pHeaderTree->First();
while(pEntry)
{
- sal_IntPtr nLevel = (sal_IntPtr)pEntry->GetUserData();
+ sal_IntPtr nLevel = reinterpret_cast<sal_IntPtr>(pEntry->GetUserData());
if(nLevel != USHRT_MAX)
{
if(!pStyleArr[nLevel].isEmpty())
@@ -744,7 +744,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn)
SvTreeListEntry* pEntry = m_pHeaderTree->FirstSelected();
if(pEntry)
{
- sal_IntPtr nLevel = (sal_IntPtr)pEntry->GetUserData();
+ sal_IntPtr nLevel = reinterpret_cast<sal_IntPtr>(pEntry->GetUserData());
if(bLeft)
{
if(!nLevel)
@@ -759,7 +759,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn)
else if(nLevel == USHRT_MAX)
nLevel = 0;
}
- pEntry->SetUserData((void*)nLevel);
+ pEntry->SetUserData(reinterpret_cast<void*>(nLevel));
m_pHeaderTree->Invalidate();
}
return 0;
@@ -840,7 +840,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
for(sal_uInt32 i = 0; i < rNames.Count(); i++)
{
m_pFromObjCLB->InsertEntry(rNames.GetString(i));
- m_pFromObjCLB->SetEntryData( i, (void*)rNames.GetValue(i) );
+ m_pFromObjCLB->SetEntryData( i, reinterpret_cast<void*>(rNames.GetValue(i)) );
}
SetExchangeSupport();
@@ -890,13 +890,13 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh)
if(nUserTypeCount > 1)
{
//insert all new user indexes names after the standard user index
- sal_Int32 nPos = m_pTypeLB->GetEntryPos((void*)(sal_uInt32)TO_USER) + 1;
+ sal_Int32 nPos = m_pTypeLB->GetEntryPos(reinterpret_cast<void*>((sal_uInt32)TO_USER)) + 1;
for(sal_uInt16 nUser = 1; nUser < nUserTypeCount; nUser++)
{
nPos = m_pTypeLB->InsertEntry(rSh.GetTOXType(TOX_USER, nUser)->GetTypeName(), nPos);
sal_uIntPtr nEntryData = nUser << 8;
nEntryData |= TO_USER;
- m_pTypeLB->SetEntryData(nPos, (void*)nEntryData);
+ m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nEntryData));
}
}
}
@@ -934,7 +934,7 @@ void SwTOXSelectTabPage::SelectType(TOXTypes eSet)
CurTOXType eCurType (eSet, 0);
sal_IntPtr nData = lcl_TOXTypesToUserData(eCurType);
- m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos((void*)nData));
+ m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos(reinterpret_cast<void*>(nData)));
m_pTypeFT->Enable(false);
m_pTypeLB->Enable(false);
TOXTypeHdl(m_pTypeLB);
@@ -966,7 +966,7 @@ static CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData)
void SwTOXSelectTabPage::ApplyTOXDescription()
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType);
m_pReadOnlyCB->Check(rDesc.IsReadonly());
@@ -1045,7 +1045,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
long nOLEData = rDesc.GetOLEOptions();
for(sal_uLong nFromObj = 0; nFromObj < m_pFromObjCLB->GetEntryCount(); nFromObj++)
{
- sal_IntPtr nData = (sal_IntPtr)m_pFromObjCLB->GetEntryData(nFromObj);
+ sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(m_pFromObjCLB->GetEntryData(nFromObj));
m_pFromObjCLB->CheckEntryPos(nFromObj, 0 != (nData & nOLEData));
}
}
@@ -1079,7 +1079,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
void SwTOXSelectTabPage::FillTOXDescription()
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType);
rDesc.SetTitle(m_pTitleED->GetText());
@@ -1144,7 +1144,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
{
if(m_pFromObjCLB->IsChecked(i))
{
- sal_IntPtr nData = (sal_IntPtr)m_pFromObjCLB->GetEntryData(i);
+ sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(m_pFromObjCLB->GetEntryData(i));
nOLEData |= nData;
}
}
@@ -1193,11 +1193,11 @@ void SwTOXSelectTabPage::FillTOXDescription()
void SwTOXSelectTabPage::Reset( const SfxItemSet* )
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
SwWrtShell& rSh = pTOXDlg->GetWrtShell();
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
sal_IntPtr nData = lcl_TOXTypesToUserData(aCurType);
- m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos((void*)nData));
+ m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos(reinterpret_cast<void*>(nData)));
sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(),
'%',
@@ -1211,7 +1211,7 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* )
{
SwFieldType *pType = rSh.GetFldType( i, RES_SETEXPFLD );
if( pType->Which() == RES_SETEXPFLD &&
- ((SwSetExpFieldType *) pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
+ static_cast<SwSetExpFieldType *>( pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
m_pCaptionSequenceLB->InsertEntry(pType->GetName());
}
@@ -1241,7 +1241,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
_pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE,
- (sal_uInt16)(sal_IntPtr)m_pTypeLB->GetEntryData( m_pTypeLB->GetSelectEntryPos() )));
+ (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetEntryData( m_pTypeLB->GetSelectEntryPos() ))));
FillTOXDescription();
return LEAVE_PAGE;
}
@@ -1253,7 +1253,7 @@ SfxTabPage* SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet*
IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(
pBox->GetEntryData( pBox->GetSelectEntryPos() )));
CurTOXType eCurType = lcl_UserData2TOXTypes(nType);
@@ -1323,7 +1323,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl)
if(!m_bWaitingInitialSettings)
{
FillTOXDescription();
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
pTOXDlg->CreateOrUpdateExample(pTOXDlg->GetCurrentTOXType().eType, TOX_PAGE_SELECT);
}
return 0;
@@ -1331,7 +1331,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl)
IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox )
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
if(TOX_CONTENT == aCurType.eType)
{
@@ -1410,7 +1410,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
{
boost::scoped_ptr<SwAddStylesDlg_Impl> pDlg(new SwAddStylesDlg_Impl(pButton,
- ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(),
+ static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(),
aStyleArr));
pDlg->Execute();
pDlg.reset();
@@ -1476,7 +1476,7 @@ public:
bool IsNextControl() const {return bNextControl;}
void SetPrevNextLink( const Link& rLink ) {aPrevNextControlLink = rLink;}
- const SwFormToken& GetFormToken()
+ const SwFormToken& GetFormToken()
{
aFormToken.sText = GetText();
return aFormToken;
@@ -1877,7 +1877,7 @@ IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid)
{
UpdateDescriptor();
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
if (pTOXDlg)
{
sal_uInt16 nCurLevel = static_cast< sal_uInt16 >(m_pLevelLB->GetModel()->GetAbsPos(m_pLevelLB->FirstSelected()) + 1);
@@ -1901,7 +1901,7 @@ bool SwTOXEntryTabPage::FillItemSet( SfxItemSet* )
void SwTOXEntryTabPage::Reset( const SfxItemSet* )
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
m_pCurrentForm = pTOXDlg->GetForm(aCurType);
if(TOX_INDEX == aCurType.eType)
@@ -1926,7 +1926,7 @@ void SwTOXEntryTabPage::Reset( const SfxItemSet* )
void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
m_pCurrentForm = pTOXDlg->GetForm(aCurType);
@@ -1956,8 +1956,8 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
if(bToxIsAuthorities)
{
SwWrtShell& rSh = pTOXDlg->GetWrtShell();
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr);
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ rSh.GetFldType(RES_AUTHORITY, aEmptyOUStr));
if(pFType)
{
if(pFType->IsSortByDocument())
@@ -1970,7 +1970,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
{
const SwTOXSortKey* pKey = pFType->GetSortKey(0);
m_pFirstKeyLB->SelectEntryPos(
- m_pFirstKeyLB->GetEntryPos((void*)(sal_uIntPtr)pKey->eField));
+ m_pFirstKeyLB->GetEntryPos(reinterpret_cast<void*>((sal_uIntPtr)pKey->eField)));
m_pFirstSortUpRB->Check(pKey->bSortAscending);
m_pFirstSortDownRB->Check(!pKey->bSortAscending);
}
@@ -1978,7 +1978,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
{
const SwTOXSortKey* pKey = pFType->GetSortKey(1);
m_pSecondKeyLB->SelectEntryPos(
- m_pSecondKeyLB->GetEntryPos((void*)(sal_uIntPtr)pKey->eField));
+ m_pSecondKeyLB->GetEntryPos(reinterpret_cast<void*>((sal_uIntPtr)pKey->eField)));
m_pSecondSortUpRB->Check(pKey->bSortAscending);
m_pSecondSortDownRB->Check(!pKey->bSortAscending);
}
@@ -1986,7 +1986,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
{
const SwTOXSortKey* pKey = pFType->GetSortKey(2);
m_pThirdKeyLB->SelectEntryPos(
- m_pThirdKeyLB->GetEntryPos((void*)(sal_uIntPtr)pKey->eField));
+ m_pThirdKeyLB->GetEntryPos(reinterpret_cast<void*>((sal_uIntPtr)pKey->eField)));
m_pThirdSortUpRB->Check(pKey->bSortAscending);
m_pThirdSortDownRB->Check(!pKey->bSortAscending);
}
@@ -2034,7 +2034,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
void SwTOXEntryTabPage::UpdateDescriptor()
{
WriteBackLevel();
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aLastTOXType);
if(TOX_INDEX == aLastTOXType.eType)
{
@@ -2049,14 +2049,14 @@ void SwTOXEntryTabPage::UpdateDescriptor()
{
rDesc.SetSortByDocument(m_pSortDocPosRB->IsChecked());
SwTOXSortKey aKey1, aKey2, aKey3;
- aKey1.eField = (ToxAuthorityField)(sal_uIntPtr)m_pFirstKeyLB->GetEntryData(
- m_pFirstKeyLB->GetSelectEntryPos());
+ aKey1.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pFirstKeyLB->GetEntryData(
+ m_pFirstKeyLB->GetSelectEntryPos()));
aKey1.bSortAscending = m_pFirstSortUpRB->IsChecked();
- aKey2.eField = (ToxAuthorityField)(sal_uIntPtr)m_pSecondKeyLB->GetEntryData(
- m_pSecondKeyLB->GetSelectEntryPos());
+ aKey2.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pSecondKeyLB->GetEntryData(
+ m_pSecondKeyLB->GetSelectEntryPos()));
aKey2.bSortAscending = m_pSecondSortUpRB->IsChecked();
- aKey3.eField = (ToxAuthorityField)(sal_uIntPtr)m_pThirdKeyLB->GetEntryData(
- m_pThirdKeyLB->GetSelectEntryPos());
+ aKey3.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pThirdKeyLB->GetEntryData(
+ m_pThirdKeyLB->GetSelectEntryPos()));
aKey3.bSortAscending = m_pThirdSortUpRB->IsChecked();
rDesc.SetSortKeys(aKey1, aKey2, aKey3);
@@ -2089,7 +2089,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn)
SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_CHAR);
vcl::Window* pDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pBtn );
- ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell().
+ static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell().
GetView().GetViewFrame()->GetDispatcher()->Execute(
SID_STYLE_EDIT, SfxCallMode::SYNCHRON|SfxCallMode::MODAL,
&aStyle, &aFamily, 0L);
@@ -2106,7 +2106,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton)
sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectEntryPos();
const OUString sToInsert(m_pAuthFieldsLB->GetSelectEntry());
SwFormToken aInsert(TOKEN_AUTHORITY);
- aInsert.nAuthorityField = (sal_uInt16)(sal_uIntPtr)m_pAuthFieldsLB->GetEntryData(nSelPos);
+ aInsert.nAuthorityField = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pAuthFieldsLB->GetEntryData(nSelPos));
m_pTokenWIN->InsertAtSelection(SwForm::GetFormAuth(), aInsert);
m_pAuthFieldsLB->RemoveEntry(sToInsert);
m_pAuthFieldsLB->SelectEntryPos( nSelPos ? nSelPos - 1 : 0);
@@ -2118,9 +2118,9 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton)
if( WINDOW_EDIT != pCtrl->GetType() )
{
//fill it into the ListBox
- const SwFormToken& rToken = ((SwTOXButton*)pCtrl)->GetFormToken();
+ const SwFormToken& rToken = static_cast<SwTOXButton*>(pCtrl)->GetFormToken();
PreTokenButtonRemoved(rToken);
- m_pTokenWIN->RemoveControl((SwTOXButton*)pCtrl);
+ m_pTokenWIN->RemoveControl(static_cast<SwTOXButton*>(pCtrl));
}
}
ModifyHdl(0);
@@ -2132,7 +2132,7 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken)
//fill it into the ListBox
sal_uInt32 nData = rToken.nAuthorityField;
sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SW_RESSTR(STR_AUTH_FIELD_START + nData));
- m_pAuthFieldsLB->SetEntryData(nPos, (void*)(sal_uIntPtr)(nData));
+ m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)nData));
}
void SwTOXEntryTabPage::SetFocus2theAllBtn()
@@ -2259,7 +2259,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox)
for( sal_uInt32 i = 0; i < AUTH_FIELD_END; i++)
{
sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SW_RESSTR(STR_AUTH_FIELD_START + i));
- m_pAuthFieldsLB->SetEntryData(nPos, (void*)(sal_uIntPtr)(i));
+ m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)i));
}
// #i21237#
@@ -2272,7 +2272,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox)
if(TOKEN_AUTHORITY == aToken.eTokenType)
{
sal_uInt32 nSearch = aToken.nAuthorityField;
- sal_Int32 nLstBoxPos = m_pAuthFieldsLB->GetEntryPos( (void*)(sal_uIntPtr)nSearch );
+ sal_Int32 nLstBoxPos = m_pAuthFieldsLB->GetEntryPos( reinterpret_cast<void*>((sal_uIntPtr)nSearch) );
OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?");
m_pAuthFieldsLB->RemoveEntry(nLstBoxPos);
}
@@ -2411,7 +2411,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox*, pBox)
{
OUString sEntry = pBox->GetSelectEntry();
- const sal_uInt16 nId = (sal_uInt16)(sal_IntPtr)pBox->GetEntryData(pBox->GetSelectEntryPos());
+ const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(pBox->GetEntryData(pBox->GetSelectEntryPos()));
const bool bEqualsNoCharStyle = sEntry == sNoCharStyle;
m_pEditStylePB->Enable(!bEqualsNoCharStyle);
if (bEqualsNoCharStyle)
@@ -2421,9 +2421,9 @@ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox*, pBox)
if(pCtrl)
{
if(WINDOW_EDIT == pCtrl->GetType())
- ((SwTOXEdit*)pCtrl)->SetCharStyleName(sEntry, nId);
+ static_cast<SwTOXEdit*>(pCtrl)->SetCharStyleName(sEntry, nId);
else
- ((SwTOXButton*)pCtrl)->SetCharStyleName(sEntry, nId);
+ static_cast<SwTOXButton*>(pCtrl)->SetCharStyleName(sEntry, nId);
}
ModifyHdl(0);
@@ -2438,7 +2438,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox*, pBox)
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl, "no active control?");
if(pCtrl && WINDOW_EDIT != pCtrl->GetType())
- ((SwTOXButton*)pCtrl)->SetChapterInfo(nPos);
+ static_cast<SwTOXButton*>(pCtrl)->SetChapterInfo(nPos);
ModifyHdl(0);
}
@@ -2452,7 +2452,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, NumericField*, pField)
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl, "no active control?");
if(pCtrl && WINDOW_EDIT != pCtrl->GetType())
- ((SwTOXButton*)pCtrl)->SetOutlineLevel(nLevel);
+ static_cast<SwTOXButton*>(pCtrl)->SetOutlineLevel(nLevel);
ModifyHdl(0);
return 0;
@@ -2468,7 +2468,7 @@ IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox*, pBox)
OSL_ENSURE(pCtrl, "no active control?");
if(pCtrl && WINDOW_EDIT != pCtrl->GetType())
{
- ((SwTOXButton*)pCtrl)->SetEntryNumberFormat(nPos);//i89791
+ static_cast<SwTOXButton*>(pCtrl)->SetEntryNumberFormat(nPos);//i89791
}
ModifyHdl(0);
}
@@ -2479,11 +2479,11 @@ IMPL_LINK(SwTOXEntryTabPage, TabPosHdl, MetricField*, pField)
{
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl && WINDOW_EDIT != pCtrl->GetType() &&
- TOKEN_TAB_STOP == ((SwTOXButton*)pCtrl)->GetFormToken().eTokenType,
+ TOKEN_TAB_STOP == static_cast<SwTOXButton*>(pCtrl)->GetFormToken().eTokenType,
"no active style::TabStop control?");
if( pCtrl && WINDOW_EDIT != pCtrl->GetType() )
{
- ((SwTOXButton*)pCtrl)->SetTabPosition( static_cast< SwTwips >(
+ static_cast<SwTOXButton*>(pCtrl)->SetTabPosition( static_cast< SwTwips >(
pField->Denormalize( pField->GetValue( FUNIT_TWIP ))));
}
ModifyHdl(0);
@@ -2494,7 +2494,7 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox)
{
Control* pCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(pCtrl && WINDOW_EDIT != pCtrl->GetType() &&
- TOKEN_TAB_STOP == ((SwTOXButton*)pCtrl)->GetFormToken().eTokenType,
+ TOKEN_TAB_STOP == static_cast<SwTOXButton*>(pCtrl)->GetFormToken().eTokenType,
"no active style::TabStop control?");
if(pCtrl && WINDOW_EDIT != pCtrl->GetType())
{
@@ -2503,7 +2503,7 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox)
cSet = pBox->GetText()[0];
else
cSet = ' ';
- ((SwTOXButton*)pCtrl)->SetFillChar( cSet );
+ static_cast<SwTOXButton*>(pCtrl)->SetFillChar( cSet );
}
ModifyHdl(0);
return 0;
@@ -2514,13 +2514,13 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox)
//the most right style::TabStop is usually right aligned
Control* pCurCtrl = m_pTokenWIN->GetActiveControl();
OSL_ENSURE(WINDOW_EDIT != pCurCtrl->GetType() &&
- ((SwTOXButton*)pCurCtrl)->GetFormToken().eTokenType == TOKEN_TAB_STOP,
+ static_cast<SwTOXButton*>(pCurCtrl)->GetFormToken().eTokenType == TOKEN_TAB_STOP,
"no style::TabStop selected!");
- const SwFormToken& rToken = ((SwTOXButton*)pCurCtrl)->GetFormToken();
+ const SwFormToken& rToken = static_cast<SwTOXButton*>(pCurCtrl)->GetFormToken();
bool bChecked = pBox->IsChecked();
if(rToken.eTokenType == TOKEN_TAB_STOP)
- ((SwTOXButton*)pCurCtrl)->SetTabAlign(
+ static_cast<SwTOXButton*>(pCurCtrl)->SetTabAlign(
bChecked ? SVX_TAB_ADJUST_END : SVX_TAB_ADJUST_LEFT);
m_pTabPosFT->Enable(!bChecked);
m_pTabPosMF->Enable(!bChecked);
@@ -2549,7 +2549,7 @@ void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh)
OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
{
OUString sRet;
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
if( TOX_INDEX == aCurType.eType )
SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(1 == nLevel ? RES_POOLCOLL_TOX_IDXBREAK
@@ -2727,9 +2727,9 @@ void SwTokenWindow::SetActiveControl(Control* pSet)
//it must be a SwTOXEdit
const SwFormToken* pFToken;
if( WINDOW_EDIT == pActiveCtrl->GetType() )
- pFToken = &((SwTOXEdit*)pActiveCtrl)->GetFormToken();
+ pFToken = &static_cast<SwTOXEdit*>(pActiveCtrl)->GetFormToken();
else
- pFToken = &((SwTOXButton*)pActiveCtrl)->GetFormToken();
+ pFToken = &static_cast<SwTOXButton*>(pActiveCtrl)->GetFormToken();
SwFormToken aTemp( *pFToken );
aButtonSelectedHdl.Call( &aTemp );
@@ -2853,7 +2853,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
if( WINDOW_EDIT != pControl->GetType())
{
const SwFormToken& rNewToken =
- ((SwTOXButton*)pControl)->GetFormToken();
+ static_cast<const SwTOXButton*>(pControl)->GetFormToken();
if( TOKEN_LINK_START == rNewToken.eTokenType )
{
@@ -2885,7 +2885,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
WINDOW_EDIT != pControl->GetType())
{
const SwFormToken& rNewToken =
- ((SwTOXButton*)pControl)->GetFormToken();
+ static_cast<const SwTOXButton*>(pControl)->GetFormToken();
if( TOKEN_LINK_START == rNewToken.eTokenType )
{
@@ -2918,8 +2918,8 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
OSL_ENSURE(pExchange, "no control to exchange?");
if(pExchange)
{
- ((SwTOXButton*)pExchange)->SetLinkEnd();
- ((SwTOXButton*)pExchange)->SetText(aButtonTexts[TOKEN_LINK_END]);
+ const_cast<SwTOXButton*>(static_cast<const SwTOXButton*>(pExchange))->SetLinkEnd();
+ const_cast<SwTOXButton*>(static_cast<const SwTOXButton*>(pExchange))->SetText(aButtonTexts[TOKEN_LINK_END]);
}
}
@@ -2929,8 +2929,8 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
if(pExchange)
{
- ((SwTOXButton*)pExchange)->SetLinkStart();
- ((SwTOXButton*)pExchange)->SetText(aButtonTexts[TOKEN_LINK_START]);
+ const_cast<SwTOXButton*>(static_cast<const SwTOXButton*>(pExchange))->SetLinkStart();
+ const_cast<SwTOXButton*>(static_cast<const SwTOXButton*>(pExchange))->SetText(aButtonTexts[TOKEN_LINK_START]);
}
}
}
@@ -2950,15 +2950,15 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken&
{
++iterActive;
- Selection aSel = ((SwTOXEdit*)pActiveCtrl)->GetSelection();
+ Selection aSel = static_cast<SwTOXEdit*>(pActiveCtrl)->GetSelection();
aSel.Justify();
- const OUString sEditText = ((SwTOXEdit*)pActiveCtrl)->GetText();
+ const OUString sEditText = static_cast<SwTOXEdit*>(pActiveCtrl)->GetText();
const OUString sLeft = sEditText.copy( 0, aSel.A() );
const OUString sRight = sEditText.copy( aSel.B() );
- ((SwTOXEdit*)pActiveCtrl)->SetText(sLeft);
- ((SwTOXEdit*)pActiveCtrl)->AdjustSize();
+ static_cast<SwTOXEdit*>(pActiveCtrl)->SetText(sLeft);
+ static_cast<SwTOXEdit*>(pActiveCtrl)->AdjustSize();
SwFormToken aTmpToken(TOKEN_TEXT);
SwTOXEdit* pEdit = new SwTOXEdit(m_pCtrlParentWin, this, aTmpToken);
@@ -3045,9 +3045,9 @@ void SwTokenWindow::RemoveControl(SwTOXButton* pDel, bool bInternalCall )
Control *pLeftEdit = *itLeft;
Control *pRightEdit = *itRight;
- ((SwTOXEdit*)pLeftEdit)->SetText(((SwTOXEdit*)pLeftEdit)->GetText() +
- ((SwTOXEdit*)pRightEdit)->GetText());
- ((SwTOXEdit*)pLeftEdit)->AdjustSize();
+ static_cast<SwTOXEdit*>(pLeftEdit)->SetText(static_cast<SwTOXEdit*>(pLeftEdit)->GetText() +
+ static_cast<SwTOXEdit*>(pRightEdit)->GetText());
+ static_cast<SwTOXEdit*>(pLeftEdit)->AdjustSize();
aControlList.erase(itRight);
delete pRightEdit;
@@ -3252,8 +3252,8 @@ OUString SwTokenWindow::GetPattern() const
const Control *pCtrl = *it;
const SwFormToken &rNewToken = pCtrl->GetType() == WINDOW_EDIT
- ? ((SwTOXEdit*)pCtrl)->GetFormToken()
- : ((SwTOXButton*)pCtrl)->GetFormToken();
+ ? const_cast<SwTOXEdit*>(static_cast<const SwTOXEdit*>(pCtrl))->GetFormToken()
+ : static_cast<const SwTOXButton*>(pCtrl)->GetFormToken();
//TODO: prevent input of TOX_STYLE_DELIMITER in KeyInput
sRet += rNewToken.GetString();
@@ -3272,8 +3272,8 @@ bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
const Control *pCtrl = *it;
const SwFormToken &rNewToken = pCtrl->GetType() == WINDOW_EDIT
- ? ((SwTOXEdit*)pCtrl)->GetFormToken()
- : ((SwTOXButton*)pCtrl)->GetFormToken();
+ ? const_cast<SwTOXEdit*>(static_cast<const SwTOXEdit*>(pCtrl))->GetFormToken()
+ : static_cast<const SwTOXButton*>(pCtrl)->GetFormToken();
if (eSearchFor == rNewToken.eTokenType)
{
@@ -3326,7 +3326,7 @@ bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit)
{
- ((SwTOXEdit*)pEdit)->AdjustSize();
+ static_cast<SwTOXEdit*>(pEdit)->AdjustSize();
AdjustPositions();
if(aModifyHdl.IsSet())
aModifyHdl.Call(0);
@@ -3468,8 +3468,8 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const
{
const Control* pControl = *it;
const SwFormToken& rNewToken = WINDOW_EDIT == pControl->GetType()
- ? ((SwTOXEdit*)pControl)->GetFormToken()
- : ((SwTOXButton*)pControl)->GetFormToken();
+ ? const_cast<SwTOXEdit*>(static_cast<const SwTOXEdit*>(pControl))->GetFormToken()
+ : static_cast<const SwTOXButton*>(pControl)->GetFormToken();
if(eType == rNewToken.eTokenType)
{
@@ -3565,7 +3565,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
// initialise templates
const SwTxtFmtColl *pColl;
- SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
+ SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
const sal_uInt16 nSz = rSh.GetTxtFmtCollCount();
for( sal_uInt16 i = 0; i < nSz; ++i )
@@ -3604,7 +3604,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA);
vcl::Window* pDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pBtn );
- SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
+ SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(
SID_STYLE_EDIT, SfxCallMode::SYNCHRON|SfxCallMode::MODAL,
&aStyle, &aFamily, 0L);
@@ -3654,7 +3654,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl)
IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl)
{
const OUString aTmpName( m_pParaLayLB->GetSelectEntry() );
- SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
+ SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
if(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
(m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)))
@@ -3668,7 +3668,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl)
{
m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND);
- SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
+ SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
const OUString aTmpName(m_pParaLayLB->GetSelectEntry());
m_pAssignBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectEntryPos() &&
@@ -3679,7 +3679,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl)
void SwTOXStylesTabPage::Modify()
{
- SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+ SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
if (pTOXDlg)
{
GetForm() = *m_pCurrentForm;
@@ -3860,12 +3860,12 @@ bool SwEntryBrowseBox::SaveModified()
if(nCol < ITEM_CASE)
{
pController = xController;
- sNew = ((::svt::EditCellController*)pController)->GetEditImplementation()->GetText( LINEEND_LF );
+ sNew = static_cast< ::svt::EditCellController*>(pController)->GetEditImplementation()->GetText( LINEEND_LF );
}
else
{
pController = xCheckController;
- bVal = ((::svt::CheckBoxCellController*)pController)->GetCheckBox().IsChecked();
+ bVal = static_cast< ::svt::CheckBoxCellController*>(pController)->GetCheckBox().IsChecked();
}
AutoMarkEntry* pEntry = nRow >= aEntryArr.size() ? new AutoMarkEntry
: &aEntryArr[nRow];
@@ -3900,13 +3900,13 @@ void SwEntryBrowseBox::InitController(
{
rController = xController;
::svt::CellController* pController = xController;
- ((::svt::EditCellController*)pController)->GetEditImplementation()->SetText( rTxt );
+ static_cast< ::svt::EditCellController*>(pController)->GetEditImplementation()->SetText( rTxt );
}
else
{
rController = xCheckController;
::svt::CellController* pController = xCheckController;
- ((::svt::CheckBoxCellController*)pController)->GetCheckBox().Check(
+ static_cast< ::svt::CheckBoxCellController*>(pController)->GetCheckBox().Check(
rTxt == sYes );
}
}
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 26a4389..e70c697 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1166,8 +1166,8 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox)
{
if(!sEntry.isEmpty())
{
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- pSh->GetFldType(RES_AUTHORITY, OUString());
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ pSh->GetFldType(RES_AUTHORITY, OUString()));
const SwAuthEntry* pEntry = pFType ? pFType->GetEntryByIdentifier(sEntry) : 0;
for(int i = 0; i < AUTH_FIELD_END; i++)
m_sFields[i] = pEntry ?
@@ -1193,8 +1193,8 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl)
OSL_ENSURE(!m_sFields[AUTH_FIELD_IDENTIFIER].isEmpty() , "No Id is set!");
OSL_ENSURE(!m_sFields[AUTH_FIELD_AUTHORITY_TYPE].isEmpty() , "No authority type is set!");
//check if the entry already exists with different content
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- pSh->GetFldType(RES_AUTHORITY, OUString());
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ pSh->GetFldType(RES_AUTHORITY, OUString()));
const SwAuthEntry* pEntry = pFType ?
pFType->GetEntryByIdentifier( m_sFields[AUTH_FIELD_IDENTIFIER])
: 0;
@@ -1328,8 +1328,8 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton)
}
else
{
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- pSh->GetFldType(RES_AUTHORITY, OUString());
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ pSh->GetFldType(RES_AUTHORITY, OUString()));
if(pFType)
{
std::vector<OUString> aIds;
@@ -1369,8 +1369,8 @@ IMPL_LINK(SwAuthorMarkPane, IsEntryAllowedHdl, Edit*, pEdit)
return 0;
else if(bIsFromComponent)
{
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- pSh->GetFldType(RES_AUTHORITY, OUString());
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ pSh->GetFldType(RES_AUTHORITY, OUString()));
bAllowed = !pFType || !pFType->GetEntryByIdentifier(sEntry);
}
else
@@ -1473,8 +1473,8 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
pIdentifierBox->SetSelectHdl(LINK(this,
SwCreateAuthEntryDlg_Impl, IdentifierHdl));
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- rSh.GetFldType(RES_AUTHORITY, OUString());
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ rSh.GetFldType(RES_AUTHORITY, OUString()));
if(pFType)
{
std::vector<OUString> aIds;
@@ -1560,8 +1560,8 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons
IMPL_LINK(SwCreateAuthEntryDlg_Impl, IdentifierHdl, ComboBox*, pBox)
{
- const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
- rWrtSh.GetFldType(RES_AUTHORITY, OUString());
+ const SwAuthorityFieldType* pFType = static_cast<const SwAuthorityFieldType*>(
+ rWrtSh.GetFldType(RES_AUTHORITY, OUString()));
if(pFType)
{
const SwAuthEntry* pEntry = pFType->GetEntryByIdentifier(
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index f5f1d18..2b9a3d5 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -768,7 +768,7 @@ IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl)
IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
{
OUString aName(m_pNewName->GetText());
- SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent();
+ SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent());
if (pBox == m_pNewName)
m_pNewShort->SetText( lcl_GetValidShortCut( aName ) );
@@ -781,7 +781,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename)
{
- SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent();
+ SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent());
OUString sNew = GetAppCharClass().uppercase(m_pNewShort->GetText());
if( pDlg->pGlossaryHdl->HasShortName(m_pNewShort->GetText())
&& sNew != m_pOldShort->GetText() )
@@ -896,7 +896,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
eRet = SV_DRAGDROP_NONE;
else
{
- SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
+ SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParentDialog());
SvTreeListEntry* pParent = GetParent(pEntry);
GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData();
@@ -961,7 +961,7 @@ TriState SwGlTreeListBox::NotifyCopyingOrMoving(
bool bRet = false;
if(pDestParent != pSrcParent)
{
- SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
+ SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParentDialog());
SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), true );
GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 50d720f..2d6ba9e 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -62,7 +62,7 @@ void SwInsFootNoteDlg::Apply()
rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
rSh.GetCurAttr( aSet );
- SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
+ const SvxFontItem &rFont = static_cast<const SvxFontItem &>( aSet.Get( RES_CHRATR_FONT ));
SvxFontItem aFont( rFont.GetFamily(), m_aFontName,
rFont.GetStyleName(), rFont.GetPitch(),
eCharSet, RES_CHRATR_FONT );
@@ -112,7 +112,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl)
SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
rSh.GetCurAttr( aSet );
- const SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
+ const SvxFontItem &rFont = static_cast<const SvxFontItem &>( aSet.Get( RES_CHRATR_FONT ) );
SfxAllItemSet aAllSet( rSh.GetAttrPool() );
aAllSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
@@ -228,7 +228,7 @@ void SwInsFootNoteDlg::Init()
rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
rSh.GetCurAttr( aSet );
- const SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
+ const SvxFontItem &rFont = static_cast<const SvxFontItem &>( aSet.Get( RES_CHRATR_FONT ) );
aFont = m_pNumberCharEdit->GetFont();
m_aFontName = rFont.GetFamilyName();
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index e4f86d4d..5eb3e4e 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -43,7 +43,7 @@ static rtl::Reference<SwDocStyleSheet> lcl_getDocStyleSheet(const OUString& rNam
SAL_WARN_IF( !pStyle, "linenumbering.ui", "Style not found" );
if(!pStyle)
return NULL;
- return new SwDocStyleSheet(*(SwDocStyleSheet*)pStyle);
+ return new SwDocStyleSheet(*static_cast<SwDocStyleSheet*>(pStyle));
}
static void lcl_setLineNumbering(const OUString& rName, SwWrtShell* pSh, bool bLineNumber)
@@ -150,7 +150,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
if(xStyleSheet.is())
{
SfxItemSet& rSet = xStyleSheet->GetItemSet();
- SwFmtLineNumber &aFmt = (SwFmtLineNumber&)(rSet.Get(RES_LINENUMBER));
+ const SwFmtLineNumber &aFmt = static_cast<const SwFmtLineNumber&>(rSet.Get(RES_LINENUMBER));
if(aFmt.IsCount())
m_pNumberingOnFooterHeader->SetState(TRISTATE_TRUE);
else
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 459c038..ae35a00 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -429,7 +429,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet* rSet )
m_pLevelLB->EnableMultiSelection(false);
}
else if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_ACT_NUMBER, false, &pItem))
- pSaveNum = ((SwUINumRuleItem*)pItem)->GetNumRule();
+ pSaveNum = const_cast<SwUINumRuleItem*>(static_cast<const SwUINumRuleItem*>(pItem))->GetNumRule();
nActNumLvl = SwOutlineTabDialog::GetActNumLevel();
sal_uInt16 nMask = 1;
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 0076090..0042d67 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -191,7 +191,7 @@ void SwTextGridPage::Reset(const SfxItemSet *rSet)
{
if(SfxItemState::DEFAULT <= rSet->GetItemState(RES_TEXTGRID, true))
{
- const SwTextGridItem& rGridItem = (const SwTextGridItem&)rSet->Get(RES_TEXTGRID);
+ const SwTextGridItem& rGridItem = static_cast<const SwTextGridItem&>(rSet->Get(RES_TEXTGRID));
RadioButton* pButton = 0;
switch(rGridItem.GetGridType())
{
@@ -281,20 +281,20 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
if( SfxItemState::UNKNOWN != rSet.GetItemState( RES_FRAMEDIR, true ))
{
const SvxFrameDirectionItem& rDirItem =
- (const SvxFrameDirectionItem&)rSet.Get(RES_FRAMEDIR);
+ static_cast<const SvxFrameDirectionItem&>(rSet.Get(RES_FRAMEDIR));
m_bVertical = rDirItem.GetValue() == FRMDIR_VERT_TOP_RIGHT||
rDirItem.GetValue() == FRMDIR_VERT_TOP_LEFT;
}
if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_PAGE_SIZE ))
{
- const SvxSizeItem& rSize = (const SvxSizeItem&)rSet.Get(
- SID_ATTR_PAGE_SIZE);
- const SvxLRSpaceItem& rLRSpace = (const SvxLRSpaceItem&)rSet.Get(
- RES_LR_SPACE );
- const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)rSet.Get(
- RES_UL_SPACE );
- const SvxBoxItem& rBox = (const SvxBoxItem&) rSet.Get(RES_BOX);
+ const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(rSet.Get(
+ SID_ATTR_PAGE_SIZE));
+ const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rSet.Get(
+ RES_LR_SPACE ));
+ const SvxULSpaceItem& rULSpace = static_cast<const SvxULSpaceItem&>(rSet.Get(
+ RES_UL_SPACE ));
+ const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>( rSet.Get(RES_BOX));
sal_Int32 nDistanceLR = rLRSpace.GetLeft() + rLRSpace.GetRight();
sal_Int32 nDistanceUL = rULSpace.GetUpper() + rULSpace.GetLower();
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index d29f24c..2dbd5ec 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -42,7 +42,7 @@ namespace
if (oNumOffset)
rPageNo = oNumOffset.get();
if (ppPageFmtDesc)
- (*ppPageFmtDesc) = (const SwFmtPageDesc *)(pItem->Clone());
+ (*ppPageFmtDesc) = static_cast<const SwFmtPageDesc *>(pItem->Clone());
bRet = true;
}
}
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 2d0ff78..2c11c22 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -414,7 +414,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
if ( m_pTextDirectionLB->IsValueChangedFromSaved() )
{
const sal_uInt32 nDirection =
- (sal_uInt32)(sal_uIntPtr)m_pTextDirectionLB->GetEntryData( nPos );
+ (sal_uInt32)reinterpret_cast<sal_uIntPtr>(m_pTextDirectionLB->GetEntryData( nPos ));
rCoreSet->Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR));
bModified = true;
}
@@ -556,7 +556,7 @@ void SwFormatTablePage::Reset( const SfxItemSet* )
if( SfxItemState::SET == rSet.GetItemState( RES_FRAMEDIR, true, &pItem ) )
{
sal_uIntPtr nVal = static_cast<const SvxFrameDirectionItem*>(pItem)->GetValue();
- const sal_Int32 nPos = m_pTextDirectionLB->GetEntryPos( (void*) nVal );
+ const sal_Int32 nPos = m_pTextDirectionLB->GetEntryPos( reinterpret_cast<void*>(nVal) );
m_pTextDirectionLB->SelectEntryPos( nPos );
m_pTextDirectionLB->SaveValue();
}
@@ -1341,8 +1341,8 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
if(m_pSplitRowCB->IsValueChangedFromSaved())
bModified |= 0 != rSet->Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked()));
- const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( *rSet, RES_BREAK );
- const SwFmtPageDesc* pDesc = (const SwFmtPageDesc*) GetOldItem( *rSet, RES_PAGEDESC );
+ const SvxFmtBreakItem* pBreak = static_cast<const SvxFmtBreakItem*>(GetOldItem( *rSet, RES_BREAK ));
+ const SwFmtPageDesc* pDesc = static_cast<const SwFmtPageDesc*>(GetOldItem( *rSet, RES_PAGEDESC ));
bool bState = m_pPageCollCB->IsChecked();
@@ -1378,7 +1378,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
m_pPgBrkRB->IsValueChangedFromSaved() ))
{
SvxFmtBreakItem aBreak(
- (const SvxFmtBreakItem&)GetItemSet().Get( RES_BREAK ) );
+ static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( RES_BREAK )) );
if(bIsChecked)
{
@@ -1414,7 +1414,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
{
bModified |= 0 != rSet->Put(
SvxFrameDirectionItem(
- (SvxFrameDirection)(sal_uLong)m_pTextDirectionLB->GetEntryData(m_pTextDirectionLB->GetSelectEntryPos())
+ (SvxFrameDirection)reinterpret_cast<sal_uLong>(m_pTextDirectionLB->GetEntryData(m_pTextDirectionLB->GetSelectEntryPos()))
, FN_TABLE_BOX_TEXTORIENTATION));
}
@@ -1524,7 +1524,7 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
if(SfxItemState::SET == rSet->GetItemState( RES_BREAK, false, &pItem ))
{
- const SvxFmtBreakItem* pPageBreak = (const SvxFmtBreakItem*)pItem;
+ const SvxFmtBreakItem* pPageBreak = static_cast<const SvxFmtBreakItem*>(pItem);
SvxBreak eBreak = (SvxBreak)pPageBreak->GetValue();
if ( eBreak != SVX_BREAK_NONE )
@@ -1597,7 +1597,7 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
if ( rSet->GetItemState(FN_TABLE_BOX_TEXTORIENTATION) > SfxItemState::DEFAULT )
{
sal_uLong nDirection = static_cast<const SvxFrameDirectionItem&>(rSet->Get(FN_TABLE_BOX_TEXTORIENTATION)).GetValue();
- m_pTextDirectionLB->SelectEntryPos(m_pTextDirectionLB->GetEntryPos( (const void*)nDirection ));
+ m_pTextDirectionLB->SelectEntryPos(m_pTextDirectionLB->GetEntryPos( reinterpret_cast<void*>(nDirection) ));
}
if ( rSet->GetItemState(FN_TABLE_SET_VERT_ALIGN) > SfxItemState::DEFAULT )
diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx
index 232a00f..54fd8f2 100644
--- a/sw/source/ui/vba/vbawindow.cxx
+++ b/sw/source/ui/vba/vbawindow.cxx
@@ -80,7 +80,7 @@ SwVbaWindow::getWindowState() throw (uno::RuntimeException, std::exception)
sal_Int32 nwindowState = word::WdWindowState::wdWindowStateNormal;
SwView* pView = word::getView( m_xModel );
SfxViewFrame* pViewFrame = pView -> GetViewFrame();
- WorkWindow* pWork = (WorkWindow*) pViewFrame->GetFrame().GetSystemWindow();
+ WorkWindow* pWork = static_cast<WorkWindow*>( pViewFrame->GetFrame().GetSystemWindow() );
if ( pWork )
{
if ( pWork -> IsMaximized())
@@ -98,7 +98,7 @@ SwVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE
_windowstate >>= nwindowState;
SwView* pView = word::getView( m_xModel );
SfxViewFrame* pViewFrame = pView -> GetViewFrame();
- WorkWindow* pWork = (WorkWindow*) pViewFrame->GetFrame().GetSystemWindow();
+ WorkWindow* pWork = static_cast<WorkWindow*>( pViewFrame->GetFrame().GetSystemWindow() );
if ( pWork )
{
if ( nwindowState == word::WdWindowState::wdWindowStateMaximize )
More information about the Libreoffice-commits
mailing list