diff options
| -rw-r--r-- | cui/source/inc/SpellDialog.hxx | 5 | ||||
| -rw-r--r-- | cui/source/inc/autocdlg.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/page.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/transfrm.cxx | 8 |
6 files changed, 15 insertions, 12 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 5bbe67ab91de..7b8646fee38b 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -70,7 +70,7 @@ private: void CallModifyLink() {m_aModifyLink.Call(this);} - SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParentDialog();} + inline SpellDialog* GetSpellDialog() const; protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -226,6 +226,9 @@ public: void InvalidateDialog(); }; + +SpellDialog* SentenceEditWindow_Impl::GetSpellDialog() const {return static_cast<SpellDialog*>(GetParentDialog());} + } //namespace svx #endif diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5fcf733079b3..f27f2a4dd7fb 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -305,7 +305,7 @@ private: CollatorWrapper* pCompareClass; LanguageType eLang; - DECL_LINK(NewDelHdl, PushButton*); + DECL_LINK(NewDelHdl, void*); DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); /// Box filled with new language diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 2e148a5bb4f9..849faa8b8006 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1616,9 +1616,9 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) m_pAutoCapsCB->SaveValue(); } -IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn) +IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, void*, pBtn) { - if((pBtn == m_pNewAbbrevPB || pBtn == (PushButton*)m_pAbbrevED ) + if((pBtn == m_pNewAbbrevPB || pBtn == m_pAbbrevED ) && !m_pAbbrevED->GetText().isEmpty()) { m_pAbbrevLB->InsertEntry(m_pAbbrevED->GetText()); @@ -1629,7 +1629,7 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn) m_pAbbrevLB->RemoveEntry(m_pAbbrevED->GetText()); ModifyHdl(m_pAbbrevED); } - else if((pBtn == m_pNewDoublePB || pBtn == (PushButton*)m_pDoubleCapsED ) + else if((pBtn == m_pNewDoublePB || pBtn == m_pDoubleCapsED ) && !m_pDoubleCapsED->GetText().isEmpty()) { m_pDoubleCapsLB->InsertEntry(m_pDoubleCapsED->GetText()); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index bed3f4733d41..3b4241674726 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1615,7 +1615,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) bChanged = ( m_pFontColorLB->GetSavedValue() == LISTBOX_ENTRY_NOTFOUND ); if ( !bChanged && pExampleSet && - pExampleSet->GetItemState( nWhich, false, (const SfxPoolItem**)&pItem ) == SfxItemState::SET && + pExampleSet->GetItemState( nWhich, false, reinterpret_cast<const SfxPoolItem**>(&pItem) ) == SfxItemState::SET && ( (SvxColorItem*)pItem )->GetValue() != aSelectedColor ) bChanged = true; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 3c411a57cfbd..eaada850e1f9 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1327,7 +1327,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) if ( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), - false, (const SfxPoolItem**)&pSetItem ) ) + false, reinterpret_cast<const SfxPoolItem**>(&pSetItem) ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); const SfxBoolItem& rHeaderOn = @@ -1389,7 +1389,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) if ( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ), - false, (const SfxPoolItem**)&pSetItem ) ) + false, reinterpret_cast<const SfxPoolItem**>(&pSetItem) ) ) { const SfxItemSet& rFooterSet = pSetItem->GetItemSet(); const SfxBoolItem& rFooterOn = diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 310a1a135b41..9a4b72b97acb 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -563,9 +563,9 @@ const sal_uInt16* SvxSlantTabPage::GetRanges() void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) { - SfxRectangleItem* pRectItem = NULL; + SfxRectangleItem const * pRectItem = NULL; - if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, (const SfxPoolItem**) &pRectItem ) ) + if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) ) { const Rectangle aTempRect(pRectItem->GetValue()); maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom()); @@ -1002,9 +1002,9 @@ const sal_uInt16* SvxPositionSizeTabPage::GetRanges() void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) { - SfxRectangleItem* pRectItem = NULL; + SfxRectangleItem const * pRectItem = NULL; - if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, (const SfxPoolItem**) &pRectItem ) ) + if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) ) { { // #i75273# const Rectangle aTempRect(pRectItem->GetValue()); |