summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/dlg')
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx18
-rw-r--r--sd/source/ui/dlg/diactrl.cxx4
-rw-r--r--sd/source/ui/dlg/dlgfield.cxx2
-rw-r--r--sd/source/ui/dlg/dlgolbul.cxx8
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/dlg/paragr.cxx4
-rw-r--r--sd/source/ui/dlg/prltempl.cxx6
-rw-r--r--sd/source/ui/dlg/prntopts.cxx2
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/dlg/tpoption.cxx8
13 files changed, 34 insertions, 34 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 89dabc6a7a1b..d39ef489a6d7 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -1220,7 +1220,7 @@ AnimationControllerItem::AnimationControllerItem(
void AnimationControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
{
- if( eState >= SFX_ITEM_DEFAULT && nSId == SID_ANIMATOR_STATE )
+ if( eState >= SfxItemState::DEFAULT && nSId == SID_ANIMATOR_STATE )
{
const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pItem );
assert(pStateItem); //SfxUInt16Item expected
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 607678441ce4..33e41a5c8b67 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -120,37 +120,37 @@ void CopyDlg::Reset()
if (comphelper::string::getTokenCount(aStr, TOKEN) < 8)
{
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, true, &pPoolItem ) )
m_pNumFldCopies->SetValue( ( ( const SfxUInt16Item* ) pPoolItem )->GetValue() );
else
m_pNumFldCopies->SetValue( 1L );
long nMoveX = 500L;
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) )
nMoveX = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, SFX_MAPUNIT_100TH_MM);
long nMoveY = 500L;
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, true, &pPoolItem ) )
nMoveY = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, SFX_MAPUNIT_100TH_MM);
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) )
m_pMtrFldAngle->SetValue( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
else
m_pMtrFldAngle->SetValue( 0L );
long nWidth = 0L;
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) )
nWidth = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, SFX_MAPUNIT_100TH_MM);
long nHeight = 0L;
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, true, &pPoolItem ) )
nHeight = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, SFX_MAPUNIT_100TH_MM);
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
{
Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
m_pLbStartColor->SelectEntry( aColor );
@@ -256,7 +256,7 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
// sets color attribute
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
{
Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
m_pLbStartColor->SelectEntry( aColor );
@@ -283,7 +283,7 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault)
// set color attribute
const SfxPoolItem* pPoolItem = NULL;
- if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
+ if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) )
{
Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
m_pLbStartColor->SelectEntry( aColor );
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index 09da8ea9e653..674185f0305a 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -112,7 +112,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16,
SdPagesField* pFld = (SdPagesField*) GetToolBox().GetItemWindow( GetId() );
DBG_ASSERT( pFld, "Window not found" );
- if ( eState == SFX_ITEM_DISABLED )
+ if ( eState == SfxItemState::DISABLED )
{
pFld->Disable();
pFld->SetText( OUString() );
@@ -122,7 +122,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16,
pFld->Enable();
const SfxUInt16Item* pItem = 0;
- if ( eState == SFX_ITEM_DEFAULT )
+ if ( eState == SfxItemState::DEFAULT )
{
pItem = dynamic_cast< const SfxUInt16Item* >( pState );
DBG_ASSERT( pItem, "sd::SdTbxCtlDiaPages::StateChanged(), wrong item type!" );
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 48069700a855..d79043d75367 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -289,7 +289,7 @@ void SdModifyFieldDlg::FillControls()
m_pRbtVar->SaveValue();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, true, &pItem ) )
+ if( SfxItemState::SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, true, &pItem ) )
m_pLbLanguage->SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() );
m_pLbLanguage->SaveValue();
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 0bbcc57a574c..4db3a43b5ee5 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -89,7 +89,7 @@ OutlineBulletDlg::OutlineBulletDlg(
}
}
- if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET))
+ if( SfxItemState::SET != aInputSet.GetItemState(EE_PARA_NUMBULLET))
{
const SvxNumBulletItem *pItem = NULL;
if(bOutliner)
@@ -109,7 +109,7 @@ OutlineBulletDlg::OutlineBulletDlg(
aInputSet.Put(*pItem, EE_PARA_NUMBULLET);
}
- if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_SET )
+ if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,true) == SfxItemState::SET )
{
SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,true);
SvxNumRule* pRule = pItem->GetNumRule();
@@ -171,14 +171,14 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const
pOutputSet->Put( aSet );
const SfxPoolItem *pItem = NULL;
- if( SFX_ITEM_SET == pOutputSet->GetItemState(pOutputSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE), false, &pItem ))
+ if( SfxItemState::SET == pOutputSet->GetItemState(pOutputSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE), false, &pItem ))
{
SdBulletMapper::MapFontsInNumRule( *((SvxNumBulletItem*)pItem)->GetNumRule(), *pOutputSet );
// #i35937 - removed EE_PARA_BULLETSTATE setting
}
- if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,true) == SFX_ITEM_SET )
+ if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,true) == SfxItemState::SET )
{
SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)pOutputSet->GetItem(EE_PARA_NUMBULLET,true);
SvxNumRule* pRule = pBulletItem->GetNumRule();
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index f3d7da4f3172..195d5d3dce0c 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -130,7 +130,7 @@ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir(
void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pState )
{
- if( eState == SFX_ITEM_DEFAULT )
+ if( eState == SfxItemState::DEFAULT )
{
GlueEscDirLB* pGlueEscDirLB = (GlueEscDirLB*) ( GetToolBox().
GetItemWindow( GetId() ) );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index e9f9bc21c280..12cae5bbc49d 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -863,7 +863,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem(
void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
{
- if( eState >= SFX_ITEM_DEFAULT && nSId == SID_NAVIGATOR_STATE )
+ if( eState >= SfxItemState::DEFAULT && nSId == SID_NAVIGATOR_STATE )
{
const SfxUInt32Item* pStateItem = PTR_CAST( SfxUInt32Item, pItem );
DBG_ASSERT( pStateItem, "SfxUInt16Item expected");
@@ -946,7 +946,7 @@ SdPageNameControllerItem::SdPageNameControllerItem(
void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
{
- if( eState >= SFX_ITEM_DEFAULT && nSId == SID_NAVIGATOR_PAGENAME )
+ if( eState >= SfxItemState::DEFAULT && nSId == SID_NAVIGATOR_PAGENAME )
{
// only if doc in LB is the active
NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index bfecb9288bd3..b571cbbf83ff 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -111,7 +111,7 @@ bool SdParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
{
SfxItemState eItemState = rSet->GetItemState( ATTR_NUMBER_NEWSTART );
- if(eItemState > SFX_ITEM_DEFAULT )
+ if(eItemState > SfxItemState::DEFAULT )
{
const SfxBoolItem& rStart = (const SfxBoolItem&)rSet->Get(ATTR_NUMBER_NEWSTART);
m_pNewStartCB->SetState( rStart.GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -125,7 +125,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
m_pNewStartCB->SaveValue();
eItemState = rSet->GetItemState( ATTR_NUMBER_NEWSTART_AT);
- if( eItemState > SFX_ITEM_DEFAULT )
+ if( eItemState > SfxItemState::DEFAULT )
{
sal_Int16 nNewStart = ((const SfxInt16Item&)rSet->Get(ATTR_NUMBER_NEWSTART_AT)).GetValue();
m_pNewStartNumberCB->Check(-1 != nNewStart);
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 6d5542af4f71..428a98c0e494 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -97,13 +97,13 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
// If there is no bullet item in this stylesheet, we get it
// from 'Outline 1' style sheet.
- if( SFX_ITEM_SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, false, &pItem ))
+ if( SfxItemState::SET != aInputSet.GetItemState(EE_PARA_NUMBULLET, false, &pItem ))
{
OUString aStyleName(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE) + " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if(pFirstStyleSheet)
- if( SFX_ITEM_SET == pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, &pItem) )
+ if( SfxItemState::SET == pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, &pItem) )
aInputSet.Put( *pItem );
}
@@ -287,7 +287,7 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const
pOutSet->Put( *SfxTabDialog::GetOutputItemSet() );
const SvxNumBulletItem *pSvxNumBulletItem = NULL;
- if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, false, (const SfxPoolItem**)&pSvxNumBulletItem ))
+ if( SfxItemState::SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, false, (const SfxPoolItem**)&pSvxNumBulletItem ))
SdBulletMapper::MapFontsInNumRule( *pSvxNumBulletItem->GetNumRule(), *pOutSet );
return pOutSet;
}
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index e1cbbd50a23d..e886dbc83996 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -130,7 +130,7 @@ bool SdPrintOptions::FillItemSet( SfxItemSet* rAttrs )
void SdPrintOptions::Reset( const SfxItemSet* rAttrs )
{
const SdOptionsPrintItem* pPrintOpts = NULL;
- if( SFX_ITEM_SET == rAttrs->GetItemState( ATTR_OPTIONS_PRINT, false,
+ if( SfxItemState::SET == rAttrs->GetItemState( ATTR_OPTIONS_PRINT, false,
(const SfxPoolItem**) &pPrintOpts ) )
{
m_pCbxDraw->Check( pPrintOpts->GetOptionsPrint().IsDraw() );
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index d6b14c909c9d..13c92f49f622 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -66,7 +66,7 @@ void SdPresLayoutDlg::Reset()
long nName;
// replace master page
- if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, false, &pPoolItem ) == SFX_ITEM_SET )
+ if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, false, &pPoolItem ) == SfxItemState::SET )
{
bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue();
m_pCbxMasterPage->Enable( !bMasterPage );
@@ -76,7 +76,7 @@ void SdPresLayoutDlg::Reset()
// remove not used master pages
m_pCbxCheckMasters->Check(false);
- if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, true, &pPoolItem) == SFX_ITEM_SET)
+ if(mrOutAttrs.GetItemState(ATTR_PRESLAYOUT_NAME, true, &pPoolItem) == SfxItemState::SET)
maName = ((const SfxStringItem*)pPoolItem)->GetValue();
else
maName = "";
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 300bc8f9cc87..38ebfe206e44 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -305,7 +305,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
OUString aFileName;
// m_pLbAction
- if( rAttrs->GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE )
+ if( rAttrs->GetItemState( ATTR_ACTION ) != SfxItemState::DONTCARE )
{
eCA = (presentation::ClickAction) ( ( const SfxAllEnumItem& ) rAttrs->
Get( ATTR_ACTION ) ).GetValue();
@@ -315,7 +315,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
m_pLbAction->SetNoSelection();
// m_pEdtSound
- if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SFX_ITEM_DONTCARE )
+ if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SfxItemState::DONTCARE )
{
aFileName = ( ( const SfxStringItem& ) rAttrs->Get( ATTR_ACTION_FILENAME ) ).GetValue();
SetEditText( aFileName );
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index fc123faa32b2..d80266fcef0b 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -217,7 +217,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const SfxItemSet& rInAttrs)
FieldUnit eFUnit;
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
- if ( rInAttrs.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
+ if ( rInAttrs.GetItemState( nWhich ) >= SfxItemState::DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rInAttrs.Get( nWhich );
eFUnit = (FieldUnit)rItem.GetValue();
@@ -286,7 +286,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
// change metric if necessary (since TabPage is in the Dialog where
// the metric is set)
const SfxPoolItem* pAttr = NULL;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , false,
+ if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC , false,
(const SfxPoolItem**)&pAttr ))
{
const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr;
@@ -441,7 +441,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
m_pLbMetric->SetNoSelection();
- if ( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
+ if ( rAttrs->GetItemState( nWhich ) >= SfxItemState::DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich );
long nFieldUnit = (long)rItem.GetValue();
@@ -458,7 +458,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
// tabulator space
nWhich = GetWhich( SID_ATTR_DEFTABSTOP );
- if( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
+ if( rAttrs->GetItemState( nWhich ) >= SfxItemState::DEFAULT )
{
SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWhich );
const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich );
generated by cgit (git 2.34.1) at 2024-07-05 10:33:50 +0000