diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-24 16:13:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:40 +0200 |
commit | 468446b7fd4c547ee3f090366e886c212657bcd1 (patch) | |
tree | 66ccc254fcd223fe250ad23cface336ba0664c05 /cui | |
parent | convert SDRMOUSE constants to scoped enum (diff) | |
download | core-468446b7fd4c547ee3f090366e886c212657bcd1.tar.gz core-468446b7fd4c547ee3f090366e886c212657bcd1.zip |
convert CT_ constants to scoped enum
Change-Id: Icd1f009e879965feb936c6268688cdcd1edbd231
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/cuitabline.hxx | 1 | ||||
-rw-r--r-- | cui/source/tabpages/tabarea.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/tabline.cxx | 12 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 26 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 24 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 22 | ||||
-rw-r--r-- | cui/source/tabpages/tphatch.cxx | 22 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 18 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/tpshadow.cxx | 6 |
13 files changed, 101 insertions, 100 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index baa67bc85d4c..956ddb88f917 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -771,14 +771,14 @@ public: bool IsModified() { - return *pnColorListState & CT_MODIFIED; + return bool(*pnColorListState & ChangeType::MODIFIED); } void SetModified(bool bIsModified) { if (bIsModified) - *pnColorListState |= CT_MODIFIED; + *pnColorListState |= ChangeType::MODIFIED; else - *pnColorListState &= ~CT_MODIFIED; + *pnColorListState &= ~ChangeType::MODIFIED; } void AddState(ChangeType nState) { diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 3bb1f2b414ea..a55dd130193e 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -22,6 +22,7 @@ #include <vector> #include <svx/tabline.hxx> +#include <svx/tabarea.hxx> class SvxLineTabDialog : public SfxTabDialog { diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 56e54c8bc07c..53835ac1b200 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -65,10 +65,10 @@ SvxAreaTabDialog::SvxAreaTabDialog mpNewBitmapList ( pModel->GetBitmapList() ), mrOutAttrs ( *pAttr ), - mnColorListState ( CT_NONE ), - mnBitmapListState ( CT_NONE ), - mnGradientListState ( CT_NONE ), - mnHatchingListState ( CT_NONE ), + mnColorListState ( ChangeType::NONE ), + mnBitmapListState ( ChangeType::NONE ), + mnGradientListState ( ChangeType::NONE ), + mnHatchingListState ( ChangeType::NONE ), mnPageType( PT_AREA ), mnPos( 0 ), mbAreaTP( false ) @@ -144,7 +144,7 @@ void SvxAreaTabDialog::SavePalettes() const OUString aPath( SvtPathOptions().GetPalettePath() ); - if( mnHatchingListState & CT_MODIFIED ) + if( mnHatchingListState & ChangeType::MODIFIED ) { mpHatchingList->SetPath( aPath ); mpHatchingList->Save(); @@ -157,7 +157,7 @@ void SvxAreaTabDialog::SavePalettes() mpDrawModel->GetItemPool().Put(aItem); } - if( mnBitmapListState & CT_MODIFIED ) + if( mnBitmapListState & ChangeType::MODIFIED ) { mpBitmapList->SetPath( aPath ); mpBitmapList->Save(); @@ -172,7 +172,7 @@ void SvxAreaTabDialog::SavePalettes() } } - if( mnGradientListState & CT_MODIFIED ) + if( mnGradientListState & ChangeType::MODIFIED ) { mpGradientList->SetPath( aPath ); mpGradientList->Save(); @@ -187,7 +187,7 @@ void SvxAreaTabDialog::SavePalettes() } } - if (mnColorListState & CT_MODIFIED && mpColorList.is()) + if (mnColorListState & ChangeType::MODIFIED && mpColorList.is()) { mpColorList->SetPath( aPath ); mpColorList->Save(); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index f9ee914225b9..71a7a5617a1c 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -60,9 +60,9 @@ SvxLineTabDialog::SvxLineTabDialog pLineEndList ( pModel->GetLineEndList() ), pNewLineEndList ( pModel->GetLineEndList() ), bObjSelected ( bHasObj ), - nLineEndListState( CT_NONE ), - nDashListState( CT_NONE ), - mnColorListState( CT_NONE ), + nLineEndListState( ChangeType::NONE ), + nDashListState( ChangeType::NONE ), + mnColorListState( ChangeType::NONE ), nPageType( 0 ), // We use it here primarily to get the right attributes with FillItemSet nPosDashLb( 0 ), nPosLineEndLb( 0 ), @@ -133,7 +133,7 @@ void SvxLineTabDialog::SavePalettes() const OUString aPath( SvtPathOptions().GetPalettePath() ); - if( nDashListState & CT_MODIFIED ) + if( nDashListState & ChangeType::MODIFIED ) { pDashList->SetPath( aPath ); pDashList->Save(); @@ -143,7 +143,7 @@ void SvxLineTabDialog::SavePalettes() pShell->PutItem( SvxDashListItem( pDashList, SID_DASH_LIST ) ); } - if( nLineEndListState & CT_MODIFIED ) + if( nLineEndListState & ChangeType::MODIFIED ) { pLineEndList->SetPath( aPath ); pLineEndList->Save(); @@ -153,7 +153,7 @@ void SvxLineTabDialog::SavePalettes() pShell->PutItem( SvxLineEndListItem( pLineEndList, SID_LINEEND_LIST ) ); } - if( mnColorListState & CT_MODIFIED ) + if( mnColorListState & ChangeType::MODIFIED ) { pColorList->SetPath( aPath ); pColorList->Save(); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 7cd0685cb031..1b73f2c0dcad 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -614,7 +614,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs pBitmapList( NULL ), // local fixed not o be changed values for local pointers - maFixed_ChangeType(CT_NONE), + maFixed_ChangeType(ChangeType::NONE), maFixed_sal_Bool(false), // init with pointers to fixed ChangeType @@ -874,9 +874,9 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) // switching TabPages in dialogs using this TabPage sal_Int32 _nPos(nPos); - if( *pnBitmapListState ) + if( *pnBitmapListState != ChangeType::NONE ) { - if( *pnBitmapListState & CT_CHANGED ) + if( *pnBitmapListState & ChangeType::CHANGED ) pBitmapList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewBitmapList(); _nPos = m_pLbBitmap->GetSelectEntryPos(); @@ -893,9 +893,9 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ModifyBitmapHdl_Impl( this ); } - if( *pnHatchingListState ) + if( *pnHatchingListState != ChangeType::NONE ) { - if( *pnHatchingListState & CT_CHANGED ) + if( *pnHatchingListState & ChangeType::CHANGED ) pHatchingList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewHatchingList(); _nPos = m_pLbHatching->GetSelectEntryPos(); @@ -914,9 +914,9 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ModifyHatchBckgrdColorHdl_Impl( this ); } - if( *pnGradientListState ) + if( *pnGradientListState != ChangeType::NONE ) { - if( *pnGradientListState & CT_CHANGED ) + if( *pnGradientListState & ChangeType::CHANGED ) pGradientList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewGradientList(); _nPos = m_pLbGradient->GetSelectEntryPos(); @@ -933,9 +933,9 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) ModifyGradientHdl_Impl( this ); } - if( *pnColorListState ) + if( *pnColorListState != ChangeType::NONE ) { - if( *pnColorListState & CT_CHANGED ) + if( *pnColorListState & ChangeType::CHANGED ) pColorList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewColorList(); // aLbColor _nPos = m_pLbColor->GetSelectEntryPos(); @@ -1017,7 +1017,7 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) nPageType = PT_GRADIENT; nPos = m_pLbGradient->GetSelectEntryPos(); if( nPosOrig != nPos ) - *pnGradientListState |= CT_MODIFIED; + *pnGradientListState |= ChangeType::MODIFIED; } break; case drawing::FillStyle_HATCH: @@ -1025,7 +1025,7 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) nPageType = PT_HATCH; nPos = m_pLbHatching->GetSelectEntryPos(); if( nPosOrig != nPos ) - *pnHatchingListState |= CT_MODIFIED; + *pnHatchingListState |= ChangeType::MODIFIED; } break; case drawing::FillStyle_BITMAP: @@ -1033,7 +1033,7 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) nPageType = PT_BITMAP; nPos = m_pLbBitmap->GetSelectEntryPos(); if( nPosOrig != nPos ) - *pnBitmapListState |= CT_MODIFIED; + *pnBitmapListState |= ChangeType::MODIFIED; } break; case drawing::FillStyle_SOLID: @@ -1041,7 +1041,7 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) nPageType = PT_COLOR; nPos = m_pLbColor->GetSelectEntryPos(); if( nPosOrig != nPos ) - *pnColorListState |= CT_MODIFIED; + *pnColorListState |= ChangeType::MODIFIED; } break; default: ;//prevent warning diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index e75afb7d1a29..77f2c6265941 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -167,10 +167,10 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) if( pColorList.is() ) { // ColorList - if( *pnColorListState & CT_CHANGED || - *pnColorListState & CT_MODIFIED ) + if( *pnColorListState & ChangeType::CHANGED || + *pnColorListState & ChangeType::MODIFIED ) { - if( *pnColorListState & CT_CHANGED ) + if( *pnColorListState & ChangeType::CHANGED ) pColorList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewColorList(); // LbColor @@ -570,7 +570,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) m_pLbBitmaps->Append(rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry ); m_pLbBitmaps->SelectEntryPos( m_pLbBitmaps->GetEntryCount() - 1 ); - *pnBitmapListState |= CT_MODIFIED; + *pnBitmapListState |= ChangeType::MODIFIED; ChangeBitmapHdl_Impl( this ); } @@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) m_pLbBitmaps->Append(rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry ); m_pLbBitmaps->SelectEntryPos( m_pLbBitmaps->GetEntryCount() - 1 ); - *pnBitmapListState |= CT_MODIFIED; + *pnBitmapListState |= ChangeType::MODIFIED; ChangeBitmapHdl_Impl( this ); } @@ -722,7 +722,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) m_pLbBitmaps->Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos ); m_pLbBitmaps->SelectEntryPos( nPos ); - *pnBitmapListState |= CT_MODIFIED; + *pnBitmapListState |= ChangeType::MODIFIED; bBmpChanged = false; } @@ -760,7 +760,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) ChangeBitmapHdl_Impl( this ); - *pnBitmapListState |= CT_MODIFIED; + *pnBitmapListState |= ChangeType::MODIFIED; } } // determine button state @@ -780,7 +780,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) sal_uInt16 nReturn = RET_YES; ResMgr& rMgr = CUI_MGR(); - if ( *pnBitmapListState & CT_MODIFIED ) + if ( *pnBitmapListState & ChangeType::MODIFIED ) { nReturn = MessageDialog( GetParentDialog() ,"AskSaveList" @@ -837,8 +837,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) else aString += aURL.getBase(); - *pnBitmapListState |= CT_CHANGED; - *pnBitmapListState &= ~CT_MODIFIED; + *pnBitmapListState |= ChangeType::CHANGED; + *pnBitmapListState &= ~ChangeType::MODIFIED; LeaveWait(); } else @@ -913,8 +913,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) else aString += aURL.getBase(); - *pnBitmapListState |= CT_SAVED; - *pnBitmapListState &= ~CT_MODIFIED; + *pnBitmapListState |= ChangeType::SAVED; + *pnBitmapListState &= ~ChangeType::MODIFIED; } else { diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index b96b0d64e51c..4347ab3d623a 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -174,7 +174,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl) bLoaded = true; UpdateTableName(); - AddState( CT_CHANGED ); + AddState( ChangeType::CHANGED ); SetModified( false ); SetEmbed( true ); } @@ -237,7 +237,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl) if( pList->Save() ) { UpdateTableName(); - AddState( CT_SAVED ); + AddState( ChangeType::SAVED ); SetModified( false ); } else @@ -288,12 +288,12 @@ struct SvxColorTabPageShadow sal_uInt16 nUnknownType; sal_Int32 nUnknownPos; bool bIsAreaTP; - sal_uInt16 nChangeType; + ChangeType nChangeType; SvxColorTabPageShadow() : nUnknownType( COLORPAGE_UNKNOWN ) , nUnknownPos( LISTBOX_ENTRY_NOTFOUND ) , bIsAreaTP( false ) - , nChangeType( 0 ) + , nChangeType( ChangeType::NONE ) { } }; @@ -745,7 +745,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) m_pLbColor->SelectEntryPos( m_pLbColor->GetEntryCount() - 1 ); - *pnColorListState |= CT_MODIFIED; + *pnColorListState |= ChangeType::MODIFIED; SelectColorLBHdl_Impl( this ); } @@ -817,7 +817,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) m_pCtlPreviewOld->Invalidate(); - *pnColorListState |= CT_MODIFIED; + *pnColorListState |= ChangeType::MODIFIED; } } return 0; @@ -893,7 +893,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) m_pCtlPreviewOld->Invalidate(); - *pnColorListState |= CT_MODIFIED; + *pnColorListState |= ChangeType::MODIFIED; } } UpdateModified(); @@ -1160,7 +1160,7 @@ void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame ) SetDlgType( COLORPAGE_UNKNOWN ); SetPos( &pShadow->nUnknownPos ); SetAreaTP( &pShadow->bIsAreaTP ); - SetColorChgd( (ChangeType*)&pShadow->nChangeType ); + SetColorChgd( &pShadow->nChangeType ); Construct(); } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 55c81296f638..6b832a263057 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -191,10 +191,10 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) if( pColorList.is() ) { // ColorList - if( *pnColorListState & CT_CHANGED || - *pnColorListState & CT_MODIFIED ) + if( *pnColorListState & ChangeType::CHANGED || + *pnColorListState & ChangeType::MODIFIED ) { - if( *pnColorListState & CT_CHANGED ) + if( *pnColorListState & ChangeType::CHANGED ) pColorList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewColorList(); // LbColorFrom @@ -517,7 +517,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) } #endif - *pnGradientListState |= CT_MODIFIED; + *pnGradientListState |= ChangeType::MODIFIED; ChangeGradientHdl_Impl( this ); } @@ -585,7 +585,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) m_pLbGradients->SelectEntryPos( nPos ); - *pnGradientListState |= CT_MODIFIED; + *pnGradientListState |= ChangeType::MODIFIED; } else { @@ -620,7 +620,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) ChangeGradientHdl_Impl( this ); - *pnGradientListState |= CT_MODIFIED; + *pnGradientListState |= ChangeType::MODIFIED; } } // determine button state @@ -640,7 +640,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; - if ( *pnGradientListState & CT_MODIFIED ) + if ( *pnGradientListState & ChangeType::MODIFIED ) { nReturn = MessageDialog( GetParentDialog() ,"AskSaveList" @@ -700,8 +700,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) else aString += aURL.getBase(); - *pnGradientListState |= CT_CHANGED; - *pnGradientListState &= ~CT_MODIFIED; + *pnGradientListState |= ChangeType::CHANGED; + *pnGradientListState &= ~ChangeType::MODIFIED; LeaveWait(); } else @@ -777,8 +777,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) else aString += aURL.getBase(); - *pnGradientListState |= CT_SAVED; - *pnGradientListState &= ~CT_MODIFIED; + *pnGradientListState |= ChangeType::SAVED; + *pnGradientListState &= ~ChangeType::MODIFIED; } else { diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 3e839505e0cc..4e1200e963ad 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -180,10 +180,10 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) if( pColorList.is() ) { // ColorList - if( *pnColorListState & CT_CHANGED || - *pnColorListState & CT_MODIFIED ) + if( *pnColorListState & ChangeType::CHANGED || + *pnColorListState & ChangeType::MODIFIED ) { - if( *pnColorListState & CT_CHANGED ) + if( *pnColorListState & ChangeType::CHANGED ) pColorList = static_cast<SvxAreaTabDialog*>( GetParentDialog() )->GetNewColorList(); // LbLineColor @@ -554,7 +554,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) } #endif - *pnHatchingListState |= CT_MODIFIED; + *pnHatchingListState |= ChangeType::MODIFIED; ChangeHatchHdl_Impl( this ); } @@ -623,7 +623,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) m_pLbLineColor->SaveValue(); m_pLbHatchings->SaveValue(); - *pnHatchingListState |= CT_MODIFIED; + *pnHatchingListState |= ChangeType::MODIFIED; } else { @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) ChangeHatchHdl_Impl( this ); - *pnHatchingListState |= CT_MODIFIED; + *pnHatchingListState |= ChangeType::MODIFIED; } } // determine button state @@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; - if ( *pnHatchingListState & CT_MODIFIED ) + if ( *pnHatchingListState & ChangeType::MODIFIED ) { nReturn = MessageDialog( GetParentDialog() ,"AskSaveList" @@ -731,8 +731,8 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) else aString += aURL.getBase(); - *pnHatchingListState |= CT_CHANGED; - *pnHatchingListState &= ~CT_MODIFIED; + *pnHatchingListState |= ChangeType::CHANGED; + *pnHatchingListState &= ~ChangeType::MODIFIED; } else MessageDialog( GetParentDialog() @@ -803,8 +803,8 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) else aString += aURL.getBase(); - *pnHatchingListState |= CT_SAVED; - *pnHatchingListState &= ~CT_MODIFIED; + *pnHatchingListState |= ChangeType::SAVED; + *pnHatchingListState &= ~ChangeType::MODIFIED; } else { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 300db7422607..f6a6b3f7de54 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -574,13 +574,13 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) sal_Int32 nCount; // Dash list - if( ( *pnDashListState & CT_MODIFIED ) || - ( *pnDashListState & CT_CHANGED ) ) + if( ( *pnDashListState & ChangeType::MODIFIED ) || + ( *pnDashListState & ChangeType::CHANGED ) ) { - if( *pnDashListState & CT_CHANGED ) + if( *pnDashListState & ChangeType::CHANGED ) pDashList = static_cast<SvxLineTabDialog*>( GetParentDialog() )->GetNewDashList(); - *pnDashListState = CT_NONE; + *pnDashListState = ChangeType::NONE; // Style list nPos = m_pLbLineStyle->GetSelectEntryPos(); @@ -605,12 +605,12 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aDashURL.Append( pDashList->GetName() ); DBG_ASSERT( aDashURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); // LineEnd list - if( ( *pnLineEndListState & CT_MODIFIED ) || ( *pnLineEndListState & CT_CHANGED ) ) + if( ( *pnLineEndListState & ChangeType::MODIFIED ) || ( *pnLineEndListState & ChangeType::CHANGED ) ) { - if( *pnLineEndListState & CT_CHANGED ) + if( *pnLineEndListState & ChangeType::CHANGED ) pLineEndList = static_cast<SvxLineTabDialog*>( GetParentDialog() )->GetNewLineEndList(); - *pnLineEndListState = CT_NONE; + *pnLineEndListState = ChangeType::NONE; nPos = m_pLbLineStyle->GetSelectEntryPos(); OUString sNone( SVX_RES( RID_SVXSTR_NONE ) ); @@ -660,9 +660,9 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) } // ColorList - if( *pnColorListState ) + if( *pnColorListState != ChangeType::NONE ) { - if( *pnColorListState & CT_CHANGED ) + if( *pnColorListState & ChangeType::CHANGED ) pColorList = static_cast<SvxLineTabDialog*>( GetParentDialog() )->GetNewColorList(); // aLbColor sal_Int32 nColorPos = m_pLbColor->GetSelectEntryPos(); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 0e68ad35c932..32309ac1269e 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -603,7 +603,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) m_pLbLineStyles->SelectEntryPos( m_pLbLineStyles->GetEntryCount() - 1 ); - *pnDashListState |= CT_MODIFIED; + *pnDashListState |= ChangeType::MODIFIED; *pPageType = 2; @@ -681,7 +681,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) m_pLbLineStyles->SelectEntryPos( nPos ); - *pnDashListState |= CT_MODIFIED; + *pnDashListState |= ChangeType::MODIFIED; *pPageType = 2; @@ -727,7 +727,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) SelectLinestyleHdl_Impl( this ); *pPageType = 0; // style should not be taken - *pnDashListState |= CT_MODIFIED; + *pnDashListState |= ChangeType::MODIFIED; ChangePreviewHdl_Impl( this ); } @@ -749,7 +749,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) { sal_uInt16 nReturn = RET_YES; - if ( *pnDashListState & CT_MODIFIED ) + if ( *pnDashListState & ChangeType::MODIFIED ) { nReturn = MessageDialog( GetParentDialog() ,"AskSaveList" @@ -789,8 +789,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) pDashList->SetName( aURL.getName() ); - *pnDashListState |= CT_CHANGED; - *pnDashListState &= ~CT_MODIFIED; + *pnDashListState |= ChangeType::CHANGED; + *pnDashListState &= ~ChangeType::MODIFIED; } else //aIStream.Close(); @@ -849,8 +849,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) if( pDashList->Save() ) { - *pnDashListState |= CT_SAVED; - *pnDashListState &= ~CT_MODIFIED; + *pnDashListState |= ChangeType::SAVED; + *pnDashListState &= ~ChangeType::MODIFIED; } else { diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e33cd057f4ed..21f946c1e741 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -388,7 +388,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) m_pLbLineEnds->SelectEntryPos( nPos ); // Flag fuer modifiziert setzen - *pnLineEndListState |= CT_MODIFIED; + *pnLineEndListState |= ChangeType::MODIFIED; *pPageType = 3; } @@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) m_pLbLineEnds->Append( *pEntry, pLineEndList->GetUiBitmap( nLineEndCount ) ); m_pLbLineEnds->SelectEntryPos( m_pLbLineEnds->GetEntryCount() - 1 ); - *pnLineEndListState |= CT_MODIFIED; + *pnLineEndListState |= ChangeType::MODIFIED; SelectLineEndHdl_Impl( this ); } @@ -537,7 +537,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) SelectLineEndHdl_Impl( this ); *pPageType = 0; // LineEnd shall not be taken over - *pnLineEndListState |= CT_MODIFIED; + *pnLineEndListState |= ChangeType::MODIFIED; ChangePreviewHdl_Impl( this ); } @@ -558,7 +558,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) { sal_uInt16 nReturn = RET_YES; - if ( *pnLineEndListState & CT_MODIFIED ) + if ( *pnLineEndListState & ChangeType::MODIFIED ) { nReturn = MessageDialog( GetParentDialog() ,"AskSaveList" @@ -599,8 +599,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) pLineEndList->SetName( aURL.getName() ); - *pnLineEndListState |= CT_CHANGED; - *pnLineEndListState &= ~CT_MODIFIED; + *pnLineEndListState |= ChangeType::CHANGED; + *pnLineEndListState &= ~ChangeType::MODIFIED; } else MessageDialog( GetParentDialog() @@ -658,8 +658,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) if( pLineEndList->Save() ) { - *pnLineEndListState |= CT_SAVED; - *pnLineEndListState &= ~CT_MODIFIED; + *pnLineEndListState |= ChangeType::SAVED; + *pnLineEndListState &= ~ChangeType::MODIFIED; } else { diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 9c18dc3240f7..55d66b3b75ab 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -209,10 +209,10 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) if( pColorList.is() ) { // ColorList - if( *pnColorListState & CT_CHANGED || - *pnColorListState & CT_MODIFIED ) + if( *pnColorListState & ChangeType::CHANGED || + *pnColorListState & ChangeType::MODIFIED ) { - if( *pnColorListState & CT_CHANGED ) + if( *pnColorListState & ChangeType::CHANGED ) { SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( GetParentDialog() ); if( pArea ) |