diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-12-27 11:10:26 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-15 23:03:45 +0100 |
| commit | 726c07a03c8d2374bba7edffce2ac2a1a2a88c3c (patch) | |
| tree | 5b100318bb6322033e0b18ef20067029ae535594 /cui | |
| parent | 04bd17ee7790e8a4af13cd3e8fb7473af332ecf2 (diff) | |
Calling ActivatePage directly is unnecessary
After this commit:
b426b026b79a342c41f6f148bf17d5df66b22927
Change-Id: I15d491d4cf63db4436ad8d3db0320cd2e26bb3ea
Reviewed-on: https://gerrit.libreoffice.org/47078
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 2b5589f4ee47ccadc625877bc970010c2abd36a9)
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/cuitabarea.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/cuitabline.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tabarea.cxx | 3 | ||||
| -rw-r--r-- | cui/source/tabpages/tabline.cxx | 3 |
4 files changed, 0 insertions, 10 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 37dcc7ac2afb..f180f133d6b3 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -113,8 +113,6 @@ class SvxAreaTabDialog final : public SfxTabDialog XPatternListRef mpPatternList; XPatternListRef mpNewPatternList; - const SfxItemSet& mrOutAttrs; - ChangeType mnColorListState; ChangeType mnBitmapListState; ChangeType mnPatternListState; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 5fabc21eada0..e80a9d30b226 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -37,8 +37,6 @@ class SvxLineTabDialog final : public SfxTabDialog SdrModel* pDrawModel; const SdrObject* pObj; - const SfxItemSet& rOutAttrs; - XColorListRef pColorList; XColorListRef mpNewColorList; XDashListRef pDashList; diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index f1dbfc6417bb..52e7d8a9e929 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -59,7 +59,6 @@ SvxAreaTabDialog::SvxAreaTabDialog mpNewBitmapList ( pModel->GetBitmapList() ), mpPatternList ( pModel->GetPatternList() ), mpNewPatternList ( pModel->GetPatternList() ), - mrOutAttrs ( *pAttr ), mnColorListState ( ChangeType::NONE ), mnBitmapListState ( ChangeType::NONE ), @@ -250,8 +249,6 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) static_cast<SvxAreaTabPage&>(rPage).SetBmpChgd( &mnBitmapListState ); static_cast<SvxAreaTabPage&>(rPage).SetPtrnChgd( &mnPatternListState ); static_cast<SvxAreaTabPage&>(rPage).SetColorChgd( &mnColorListState ); - // ActivatePge() is not called the first time - static_cast<SvxAreaTabPage&>(rPage).ActivatePage( mrOutAttrs ); } else if (nId == m_nShadowTabPage) { diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 21d64d055743..70aea5740e0e 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -49,7 +49,6 @@ SvxLineTabDialog::SvxLineTabDialog m_nEndTabPage(0), pDrawModel ( pModel ), pObj ( pSdrObj ), - rOutAttrs ( *pAttr ), pColorList ( pModel->GetColorList() ), mpNewColorList ( pModel->GetColorList() ), pDashList ( pModel->GetDashList() ), @@ -200,8 +199,6 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) static_cast<SvxLineTabPage&>(rPage).SetObjSelected( bObjSelected ); static_cast<SvxLineTabPage&>(rPage).Construct(); static_cast<SvxLineTabPage&>(rPage).SetColorChgd( &mnColorListState ); - // ActivatePage() is not called the first time - static_cast<SvxLineTabPage&>(rPage).ActivatePage( rOutAttrs ); } else if(nId == m_nStyleTabPage) { |