Related: fdo#54024 decrazy the Dialog Type for a start anyway

once set in the dialog ctors the dialog type never changes
so we don't need to pass it by pointer

Change-Id: I9d4baf2d93ca4c09e413a8fd3cd3e3367873e833

10 files changed, 57 insertions, 61 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 47d6bb417e9b..51535a2f43f8 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -63,10 +63,9 @@ private:
     ChangeType          mnGradientListState;
     ChangeType          mnHatchingListState;
 
-    sal_uInt16              mnPageType;
-    sal_uInt16              mnDlgType;
-    sal_uInt16              mnPos;
-    sal_Bool                mbAreaTP;
+    sal_uInt16          mnPageType;
+    sal_uInt16          mnPos;
+    sal_Bool            mbAreaTP;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
@@ -396,10 +395,10 @@ private:
 
     ChangeType*         pnGradientListState;
     ChangeType*         pnColorListState;
-    sal_uInt16*             pPageType;
-    sal_uInt16*             pDlgType;
-    sal_uInt16*             pPos;
-    sal_Bool*               pbAreaTP;
+    sal_uInt16*         pPageType;
+    sal_uInt16          nDlgType;
+    sal_uInt16*         pPos;
+    sal_Bool*           pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -435,7 +434,7 @@ public:
                 { pGradientList = pGrdLst; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
@@ -471,10 +470,10 @@ private:
 
     ChangeType*         pnHatchingListState;
     ChangeType*         pnColorListState;
-    sal_uInt16*             pPageType;
-    sal_uInt16*             pDlgType;
-    sal_uInt16*             pPos;
-    sal_Bool*               pbAreaTP;
+    sal_uInt16*         pPageType;
+    sal_uInt16          nDlgType;
+    sal_uInt16*         pPos;
+    sal_Bool*           pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -513,7 +512,7 @@ public:
                 { pHatchingList = pHtchLst; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
@@ -554,10 +553,10 @@ private:
 
     ChangeType*         pnBitmapListState;
     ChangeType*         pnColorListState;
-    sal_uInt16*             pPageType;
-    sal_uInt16*             pDlgType;
-    sal_uInt16*             pPos;
-    sal_Bool*               pbAreaTP;
+    sal_uInt16*         pPageType;
+    sal_uInt16          nDlgType;
+    sal_uInt16*         pPos;
+    sal_Bool*           pbAreaTP;
 
     sal_Bool                bBmpChanged;
 
@@ -598,7 +597,7 @@ public:
     void    SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
@@ -677,10 +676,10 @@ private:
     XColorListRef         pColorList;
 
     ChangeType*         pnColorListState;
-    sal_uInt16*             pPageType;
-    sal_uInt16*             pDlgType;
-    sal_uInt16*             pPos;
-    sal_Bool*               pbAreaTP;
+    sal_uInt16*         pPageType;
+    sal_uInt16          nDlgType;
+    sal_uInt16*         pPos;
+    sal_Bool*           pbAreaTP;
 
     XFillStyleItem      aXFStyleItem;
     XFillColorItem      aXFillColorItem;
@@ -736,7 +735,7 @@ public:
     void    SetupForViewFrame( SfxViewFrame *pViewFrame );
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
     void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index ed136e2b29f0..47269744d1c4 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -49,7 +49,6 @@ private:
     ChangeType          mnColorListState;
 
     sal_uInt16          nPageType;
-    sal_uInt16          nDlgType;
     sal_uInt16          nPosDashLb;
     sal_uInt16          nPosLineEndLb;
     sal_Bool            mbAreaTP;
@@ -276,7 +275,7 @@ private:
 
     ChangeType*         pnDashListState;
     sal_uInt16*         pPageType;
-    sal_uInt16*         pDlgType;
+    sal_uInt16          nDlgType;
     sal_uInt16*         pPosDashLb;
 
     SfxMapUnit          ePoolUnit;
@@ -315,7 +314,7 @@ public:
     void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
 
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -355,8 +354,8 @@ private:
 
     ChangeType*         pnLineEndListState;
     sal_uInt16*         pPageType;
-    sal_uInt16*         pDlgType;
-    sal_uInt16*             pPosLineEndLb;
+    sal_uInt16          nDlgType;
+    sal_uInt16*         pPosLineEndLb;
 
     DECL_LINK( ClickAddHdl_Impl, void * );
     DECL_LINK( ClickModifyHdl_Impl, void * );
@@ -386,7 +385,7 @@ public:
     void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
     void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
-    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
     void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 007257b6b1f4..34a1687935e6 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -70,7 +70,6 @@ SvxAreaTabDialog::SvxAreaTabDialog
     mnGradientListState ( CT_NONE ),
     mnHatchingListState ( CT_NONE ),
     mnPageType( PT_AREA ),
-    mnDlgType( 0 ),
     mbAreaTP( sal_False )
 {
     m_nAreaTabPage = AddTabPage( "RID_SVXPAGE_AREA", SvxAreaTabPage::Create, 0 );
@@ -236,7 +235,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             ( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList );
             ( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList );
             ( (SvxAreaTabPage&) rPage ).SetPageType( mnPageType );
-            ( (SvxAreaTabPage&) rPage ).SetDlgType( mnDlgType );
+            ( (SvxAreaTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxAreaTabPage&) rPage ).SetPos( mnPos );
             ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
             ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
@@ -251,7 +250,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     {
             ( (SvxShadowTabPage&) rPage ).SetColorList( mpColorList );
             ( (SvxShadowTabPage&) rPage ).SetPageType( mnPageType );
-            ( (SvxShadowTabPage&) rPage ).SetDlgType( mnDlgType );
+            ( (SvxShadowTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP );
             ( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorListState );
             ( (SvxShadowTabPage&) rPage ).Construct();
@@ -261,7 +260,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             ( (SvxGradientTabPage&) rPage ).SetColorList( mpColorList );
             ( (SvxGradientTabPage&) rPage ).SetGradientList( mpGradientList );
             ( (SvxGradientTabPage&) rPage ).SetPageType( &mnPageType );
-            ( (SvxGradientTabPage&) rPage ).SetDlgType( &mnDlgType );
+            ( (SvxGradientTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxGradientTabPage&) rPage ).SetPos( &mnPos );
             ( (SvxGradientTabPage&) rPage ).SetAreaTP( &mbAreaTP );
             ( (SvxGradientTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
@@ -273,7 +272,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             ( (SvxHatchTabPage&) rPage ).SetColorList( mpColorList );
             ( (SvxHatchTabPage&) rPage ).SetHatchingList( mpHatchingList );
             ( (SvxHatchTabPage&) rPage ).SetPageType( &mnPageType );
-            ( (SvxHatchTabPage&) rPage ).SetDlgType( &mnDlgType );
+            ( (SvxHatchTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxHatchTabPage&) rPage ).SetPos( &mnPos );
             ( (SvxHatchTabPage&) rPage ).SetAreaTP( &mbAreaTP );
             ( (SvxHatchTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
@@ -285,7 +284,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
             ( (SvxBitmapTabPage&) rPage ).SetColorList( mpColorList );
             ( (SvxBitmapTabPage&) rPage ).SetBitmapList( mpBitmapList );
             ( (SvxBitmapTabPage&) rPage ).SetPageType( &mnPageType );
-            ( (SvxBitmapTabPage&) rPage ).SetDlgType( &mnDlgType );
+            ( (SvxBitmapTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxBitmapTabPage&) rPage ).SetPos( &mnPos );
             ( (SvxBitmapTabPage&) rPage ).SetAreaTP( &mbAreaTP );
             ( (SvxBitmapTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
@@ -296,7 +295,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     {
             ( (SvxColorTabPage&) rPage ).SetColorList( mpColorList );
             ( (SvxColorTabPage&) rPage ).SetPageType( &mnPageType );
-            ( (SvxColorTabPage&) rPage ).SetDlgType( &mnDlgType );
+            ( (SvxColorTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxColorTabPage&) rPage ).SetPos( &mnPos );
             ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP );
             ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorListState );
@@ -305,7 +304,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     else if (nId == m_nTransparenceTabPage)
     {
             ( (SvxTransparenceTabPage&) rPage ).SetPageType( mnPageType );
-            ( (SvxTransparenceTabPage&) rPage ).SetDlgType( mnDlgType );
+            ( (SvxTransparenceTabPage&) rPage ).SetDlgType( 0 );
             ( (SvxTransparenceTabPage&) rPage ).Construct();
     }
 }
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index b712d27629a6..8c640fe51cc8 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -65,7 +65,6 @@ SvxLineTabDialog::SvxLineTabDialog
     nDashListState( CT_NONE ),
     mnColorListState( CT_NONE ),
     nPageType( 0 ), // We use it here primarily to get the right attributes with FillItemSet
-    nDlgType( 0 ),
     nPosDashLb( 0 ),
     nPosLineEndLb( 0 ),
     mbAreaTP( sal_False )
@@ -203,7 +202,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         ( (SvxLineTabPage&) rPage ).SetColorList( pColorList );
         ( (SvxLineTabPage&) rPage ).SetDashList( pDashList );
         ( (SvxLineTabPage&) rPage ).SetLineEndList( pLineEndList );
-        ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType );
+        ( (SvxLineTabPage&) rPage ).SetDlgType( 0 );
         ( (SvxLineTabPage&) rPage ).SetPageType( nPageType );
         ( (SvxLineTabPage&) rPage ).SetPosDashLb( &nPosDashLb );
         ( (SvxLineTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb );
@@ -218,7 +217,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     else if(nId == m_nStyleTabPage)
     {
         ( (SvxLineDefTabPage&) rPage ).SetDashList( pDashList );
-        ( (SvxLineDefTabPage&) rPage ).SetDlgType( &nDlgType );
+        ( (SvxLineDefTabPage&) rPage ).SetDlgType( 0 );
         ( (SvxLineDefTabPage&) rPage ).SetPageType( &nPageType );
         ( (SvxLineDefTabPage&) rPage ).SetPosDashLb( &nPosDashLb );
         ( (SvxLineDefTabPage&) rPage ).SetDashChgd( &nDashListState );
@@ -229,7 +228,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     {
         ( (SvxLineEndDefTabPage&) rPage ).SetLineEndList( pLineEndList );
         ( (SvxLineEndDefTabPage&) rPage ).SetPolyObj( pObj );
-        ( (SvxLineEndDefTabPage&) rPage ).SetDlgType( &nDlgType );
+        ( (SvxLineEndDefTabPage&) rPage ).SetDlgType( 0 );
         ( (SvxLineEndDefTabPage&) rPage ).SetPageType( &nPageType );
         ( (SvxLineEndDefTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb );
         ( (SvxLineEndDefTabPage&) rPage ).SetLineEndChgd( &nLineEndListState );
@@ -240,7 +239,7 @@ void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     {
         ( (SvxShadowTabPage&) rPage ).SetColorList( pColorList );
         ( (SvxShadowTabPage&) rPage ).SetPageType( nPageType );
-        ( (SvxShadowTabPage&) rPage ).SetDlgType( nDlgType );
+        ( (SvxShadowTabPage&) rPage ).SetDlgType( 0 );
         ( (SvxShadowTabPage&) rPage ).SetAreaTP( &mbAreaTP );
         ( (SvxShadowTabPage&) rPage ).SetColorChgd( &mnColorListState );
         ( (SvxShadowTabPage&) rPage ).Construct();
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 81373db63c04..ec2f06d2f298 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -58,7 +58,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(  Window* pParent, const SfxItemSet& rInAttrs
     pnBitmapListState   ( 0 ),
     pnColorListState    ( 0 ),
     pPageType           ( 0 ),
-    pDlgType            ( 0 ),
+    nDlgType            ( 0 ),
     pbAreaTP            ( 0 ),
 
     bBmpChanged         ( false ),
@@ -138,7 +138,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet&  )
     sal_uInt16 nPos;
     sal_uInt16 nCount;
 
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         *pbAreaTP = sal_False;
 
@@ -226,7 +226,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
 
 sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
 {
-    if( *pDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
+    if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
     {
         if(PT_BITMAP == *pPageType)
         {
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index b5edc2d1163d..3fd17d47f8d6 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -303,7 +303,7 @@ SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
     // All the horrific pointers we store and should not
     , pnColorListState( 0 )
     , pPageType( NULL )
-    , pDlgType( NULL )
+    , nDlgType( 0 )
     , pPos( NULL )
     , pbAreaTP( NULL )
     , aXFStyleItem( XFILL_SOLID )
@@ -420,7 +420,7 @@ void SvxColorTabPage::Construct()
 
 void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 {
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         *pbAreaTP = sal_False;
 
@@ -543,7 +543,7 @@ long SvxColorTabPage::CheckChanges_Impl()
             delete aMessDlg;
         }
     }
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         nPos = m_pLbColor->GetSelectEntryPos();
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -558,7 +558,7 @@ long SvxColorTabPage::CheckChanges_Impl()
 
 sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if( ( *pDlgType != 0 ) ||
+    if( ( nDlgType != 0 ) ||
         ( *pPageType == PT_COLOR && *pbAreaTP == sal_False ) )
     {
         OUString aString;
@@ -1170,7 +1170,7 @@ void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame )
     pColorList = pPtr ? pPtr->GetValue() : XColorList::GetStdColorList();
 
     SetPageType( &pShadow->nUnknownType );
-    SetDlgType( &pShadow->nUnknownType );
+    SetDlgType( COLORPAGE_UNKNOWN );
     SetPos( &pShadow->nUnknownPos );
     SetAreaTP( &pShadow->bIsAreaTP );
     SetColorChgd( (ChangeType*)&pShadow->nChangeType );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 10d708eace90..81bdb6806c13 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -54,7 +54,7 @@ SvxGradientTabPage::SvxGradientTabPage
     pnGradientListState ( 0 ),
     pnColorListState    ( 0 ),
     pPageType           ( 0 ),
-    pDlgType            ( 0 ),
+    nDlgType            ( 0 ),
     pPos                ( 0 ),
     pbAreaTP            ( 0 ),
 
@@ -154,7 +154,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
     sal_uInt16 nPos;
     sal_uInt16 nCount;
 
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         *pbAreaTP = sal_False;
 
@@ -308,7 +308,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
 
 sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if( *pDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False )
+    if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False )
     {
         // CheckChanges(); <-- duplicate inquiry ?
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 6ebda18f8025..fd1a854f3917 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -56,7 +56,7 @@ SvxHatchTabPage::SvxHatchTabPage
     pnHatchingListState ( 0 ),
     pnColorListState    ( 0 ),
     pPageType           ( 0 ),
-    pDlgType            ( 0 ),
+    nDlgType            ( 0 ),
     pPos                ( 0 ),
     pbAreaTP            ( 0 ),
 
@@ -149,7 +149,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
     sal_uInt16 nPos;
     sal_uInt16 nCount;
 
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         *pbAreaTP = sal_False;
 
@@ -279,7 +279,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
 
 sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if( *pDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
+    if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
     {
         if( *pPageType == PT_HATCH )
         {
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 451fcf82906a..44d1413f79ce 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -158,7 +158,7 @@ void SvxLineDefTabPage::Construct()
 
 void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
 {
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         // ActivatePage() is called before the dialog receives PageCreated() !!!
         if( pDashList.is() )
@@ -258,7 +258,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
 
 sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
-    if( *pDlgType == 0 ) // line dialog
+    if( nDlgType == 0 ) // line dialog
     {
         if( *pPageType == 2 )
         {
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index bb3a0967c913..0442da7d4341 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -144,7 +144,7 @@ void SvxLineEndDefTabPage::Construct()
 
 void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
 {
-    if( *pDlgType == 0 ) // area dialog
+    if( nDlgType == 0 ) // area dialog
     {
         // ActivatePage() is called before the dialog receives PageCreated() !!!
         if( pLineEndList.is() )
@@ -206,7 +206,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
 
 sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    if( *pDlgType == 0 ) // line dialog
+    if( nDlgType == 0 ) // line dialog
     {
         if( *pPageType == 3 )
         {