[Libreoffice-commits] core.git: cui/source

[Tamás Zolnai]

 cui/source/inc/cuitabarea.hxx   |    2 --
 cui/source/inc/cuitabline.hxx   |    2 --
 cui/source/tabpages/tabarea.cxx |    3 ---
 cui/source/tabpages/tabline.cxx |    3 ---
 4 files changed, 10 deletions(-)

New commits:
commit 2b5589f4ee47ccadc625877bc970010c2abd36a9
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Wed Dec 27 11:10:26 2017 +0100

    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 at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

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 8f6fc3fe44bf..aaefe353bfb9 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 97135d944270..44f3ec016282 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 ),
@@ -248,8 +247,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 df0938f6b79a..0dba49f80de9 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() ),
@@ -198,8 +197,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)
     {