diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index f58e6cd18843..dd941f844e28 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -302,7 +302,7 @@ public: void SetPos( sal_uInt16 nInPos ) { m_nPos = nInPos; } void SetAreaTP( bool* pIn ) { m_pbAreaTP = pIn; } virtual void PageCreated(const SfxAllItemSet& aSet) override; - void CreatePage(sal_Int32 nId, SfxTabPage& pTab); + void CreatePage(sal_Int32 nId, SfxTabPage* pTab); void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; } void SetGrdChgd( ChangeType* pIn ) { m_pnGradientListState = pIn; } void SetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index b89ebae07c60..fdbcfc91030f 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -334,7 +334,7 @@ IMPL_LINK(SvxAreaTabPage, SelectFillTypeHdl_Impl, Button*, pButton, void) maBox.SelectButton(static_cast(pButton)); FillType eFillType = static_cast(maBox.GetCurrentButtonPos()); m_pFillTabPage.disposeAndReset( CreateFillStyleTabPage(eFillType, m_pFillTab, m_rXFSet) ); - CreatePage( eFillType , *m_pFillTabPage); + CreatePage( eFillType , m_pFillTabPage); } } @@ -362,63 +362,63 @@ void SvxAreaTabPage::PointChanged( vcl::Window* , RectPoint ) { } -void SvxAreaTabPage::CreatePage( sal_Int32 nId, SfxTabPage& pTab ) +void SvxAreaTabPage::CreatePage( sal_Int32 nId, SfxTabPage* pTab ) { if(nId == SOLID ) { - static_cast(pTab).SetColorList( m_pColorList ); - static_cast(pTab).SetPos( &m_nPos ); - static_cast(pTab).SetColorChgd( m_pnColorListState ); - static_cast(pTab).Construct(); - static_cast(pTab).ActivatePage( m_rXFSet ); - static_cast(pTab).Reset(&m_rXFSet); - static_cast(pTab).Show(); + static_cast(pTab)->SetColorList( m_pColorList ); + static_cast(pTab)->SetPos( &m_nPos ); + static_cast(pTab)->SetColorChgd( m_pnColorListState ); + static_cast(pTab)->Construct(); + static_cast(pTab)->ActivatePage( m_rXFSet ); + static_cast(pTab)->Reset(&m_rXFSet); + static_cast(pTab)->Show(); } else if(nId == GRADIENT) { - static_cast(pTab).SetColorList( m_pColorList ); - static_cast(pTab).SetGradientList( m_pGradientList ); - static_cast(pTab).SetPos( &m_nPos ); - static_cast(pTab).SetGrdChgd( m_pnGradientListState ); - static_cast(pTab).SetColorChgd( m_pnColorListState ); - static_cast(pTab).Construct(); - static_cast(pTab).ActivatePage( m_rXFSet ); - static_cast(pTab).Reset(&m_rXFSet); - static_cast(pTab).Show(); + static_cast(pTab)->SetColorList( m_pColorList ); + static_cast(pTab)->SetGradientList( m_pGradientList ); + static_cast(pTab)->SetPos( &m_nPos ); + static_cast(pTab)->SetGrdChgd( m_pnGradientListState ); + static_cast(pTab)->SetColorChgd( m_pnColorListState ); + static_cast(pTab)->Construct(); + static_cast(pTab)->ActivatePage( m_rXFSet ); + static_cast(pTab)->Reset(&m_rXFSet); + static_cast(pTab)->Show(); } else if(nId == HATCH) { - static_cast(pTab).SetColorList( m_pColorList ); - static_cast(pTab).SetHatchingList( m_pHatchingList ); - static_cast(pTab).SetPos(&m_nPos); - static_cast(pTab).SetHtchChgd( m_pnHatchingListState ); - static_cast(pTab).SetColorChgd( m_pnColorListState ); - static_cast(pTab).Construct(); - static_cast(pTab).ActivatePage( m_rXFSet ); - static_cast(pTab).Reset(&m_rXFSet); - static_cast(pTab).Show(); + static_cast(pTab)->SetColorList( m_pColorList ); + static_cast(pTab)->SetHatchingList( m_pHatchingList ); + static_cast(pTab)->SetPos(&m_nPos); + static_cast(pTab)->SetHtchChgd( m_pnHatchingListState ); + static_cast(pTab)->SetColorChgd( m_pnColorListState ); + static_cast(pTab)->Construct(); + static_cast(pTab)->ActivatePage( m_rXFSet ); + static_cast(pTab)->Reset(&m_rXFSet); + static_cast(pTab)->Show(); } else if(nId == BITMAP) { - static_cast(pTab).SetBitmapList( m_pBitmapList ); - static_cast(pTab).SetPos( &m_nPos ); - static_cast(pTab).SetBmpChgd( m_pnBitmapListState ); - static_cast(pTab).Construct(); - static_cast(pTab).ActivatePage( m_rXFSet ); - static_cast(pTab).Reset(&m_rXFSet); - static_cast(pTab).Show(); + static_cast(pTab)->SetBitmapList( m_pBitmapList ); + static_cast(pTab)->SetPos( &m_nPos ); + static_cast(pTab)->SetBmpChgd( m_pnBitmapListState ); + static_cast(pTab)->Construct(); + static_cast(pTab)->ActivatePage( m_rXFSet ); + static_cast(pTab)->Reset(&m_rXFSet); + static_cast(pTab)->Show(); } else if(nId == PATTERN) { - static_cast(pTab).SetColorList( m_pColorList ); - static_cast(pTab).SetPatternList( m_pPatternList ); - static_cast(pTab).SetPos( &m_nPos ); - static_cast(pTab).SetPtrnChgd( m_pnPatternListState ); - static_cast(pTab).SetColorChgd( m_pnColorListState ); - static_cast(pTab).Construct(); - static_cast(pTab).ActivatePage( m_rXFSet ); - static_cast(pTab).Reset( &m_rXFSet ); - static_cast(pTab).Show(); + static_cast(pTab)->SetColorList( m_pColorList ); + static_cast(pTab)->SetPatternList( m_pPatternList ); + static_cast(pTab)->SetPos( &m_nPos ); + static_cast(pTab)->SetPtrnChgd( m_pnPatternListState ); + static_cast(pTab)->SetColorChgd( m_pnColorListState ); + static_cast(pTab)->Construct(); + static_cast(pTab)->ActivatePage( m_rXFSet ); + static_cast(pTab)->Reset( &m_rXFSet ); + static_cast(pTab)->Show(); } }