diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-10 17:53:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 06:08:32 +0000 |
| commit | ea733ab5b632109d28bb8f1dc37116340b26229b (patch) | |
| tree | 78a5c4d6cad5d6f2c58a89745ba0af130ef0e188 /svx | |
| parent | cc3294e127a6aedb8f6da5741ac9063da1cc2135 (diff) | |
Turn SfxItemState into a C++11 scoped enumeration
...to gain further confidence in the claim "that none of the existing
code tries to uses combinations of these enum values"
(d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState")
Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13
Reviewed-on: https://gerrit.libreoffice.org/11384
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
81 files changed, 463 insertions, 463 deletions
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 113989791779..d1ba00a6e504 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -53,7 +53,7 @@ namespace sdr // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state - // SFX_ITEM_DONTCARE which means there were several such items with different + // SfxItemState::DONTCARE which means there were several such items with different // values. virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index f5c026baa6b5..032110694d59 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -65,7 +65,7 @@ namespace sdr // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state - // SFX_ITEM_DONTCARE which means there were several such items with different + // SfxItemState::DONTCARE which means there were several such items with different // values. virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 043718365ae8..2f3f8629c5ca 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -107,8 +107,8 @@ namespace accessibility void RemoveAttribs( const ESelection& /*rSelection*/, bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ) SAL_OVERRIDE {} void GetPortions( sal_Int32 /*nPara*/, std::vector<sal_Int32>& /*rList*/ ) const SAL_OVERRIDE {} - SfxItemState GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const SAL_OVERRIDE { return SFX_ITEM_UNKNOWN; } - SfxItemState GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const SAL_OVERRIDE { return SFX_ITEM_UNKNOWN; } + SfxItemState GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const SAL_OVERRIDE { return SfxItemState::UNKNOWN; } + SfxItemState GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const SAL_OVERRIDE { return SfxItemState::UNKNOWN; } SfxItemPool* GetPool() const SAL_OVERRIDE { return NULL; } diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index bcf20610d1ad..3e7c0ab7866a 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -246,7 +246,7 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz() const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); - if(SFX_ITEM_DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTAANZ)) + if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTAANZ)) nCount = ((const SdrEdgeLineDeltaAnzItem&)rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); return nCount; diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 7f2aa04ce3ce..0bf0012f7bdf 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -32,7 +32,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, false, &pItem ) ) + if ( SfxItemState::SET == rSet.GetItemState( SID_ATTR_METRIC, false, &pItem ) ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue(); else { @@ -46,7 +46,7 @@ bool GetApplyCharUnit( const SfxItemSet& rSet ) { bool bUseCharUnit = false; const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, false, &pItem ) ) + if ( SfxItemState::SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, false, &pItem ) ) bUseCharUnit = ((const SfxBoolItem*)pItem )->GetValue(); else { diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 5f4a53da0dde..88e101bb4303 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -71,7 +71,7 @@ //TODO: remove this and calculate off the actual size of text, not //an arbitrary number of characters #define TEXT_WIDTH 80 -#define ISITEMSET rSet.GetItemState(nWhich)>=SFX_ITEM_DEFAULT +#define ISITEMSET rSet.GetItemState(nWhich)>=SfxItemState::DEFAULT using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -857,7 +857,7 @@ void SvxFontPrevWindow::AutoCorrectFontColor( void ) static bool GetWhich (const SfxItemSet &rSet, sal_uInt16 nSlot, sal_uInt16 &rWhich) { rWhich = rSet.GetPool()->GetWhich( nSlot, true ); - return rSet.GetItemState(rWhich) >= SFX_ITEM_DEFAULT; + return rSet.GetItemState(rWhich) >= SfxItemState::DEFAULT; } static void SetPrevFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont ) diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index d7f167c6bdb6..0deaeb51f97c 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -279,40 +279,40 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) { - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER ) ) rSet.DisableItem( SID_GRFFILTER ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_INVERT ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_INVERT ) ) rSet.DisableItem( SID_GRFFILTER_INVERT ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SMOOTH ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SMOOTH ) ) rSet.DisableItem( SID_GRFFILTER_SMOOTH ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SHARPEN ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SHARPEN ) ) rSet.DisableItem( SID_GRFFILTER_SHARPEN ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_REMOVENOISE ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_REMOVENOISE ) ) rSet.DisableItem( SID_GRFFILTER_REMOVENOISE ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SOBEL ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SOBEL ) ) rSet.DisableItem( SID_GRFFILTER_SOBEL ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_MOSAIC ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_MOSAIC ) ) rSet.DisableItem( SID_GRFFILTER_MOSAIC ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_EMBOSS ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_EMBOSS ) ) rSet.DisableItem( SID_GRFFILTER_EMBOSS ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_POSTER ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_POSTER ) ) rSet.DisableItem( SID_GRFFILTER_POSTER ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_POPART ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_POPART ) ) rSet.DisableItem( SID_GRFFILTER_POPART ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SEPIA ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SEPIA ) ) rSet.DisableItem( SID_GRFFILTER_SEPIA ); - if( SFX_ITEM_DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) + if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER_SOLARIZE ) ) rSet.DisableItem( SID_GRFFILTER_SOLARIZE ); }; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 3b9c05d887e2..3051c57ab536 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -318,26 +318,26 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) { const SfxPoolItem* pItem; - if(SFX_ITEM_SET == GetItemSet().GetItemState(GetWhich(nId), false, &pItem)) + if(SfxItemState::SET == GetItemSet().GetItemState(GetWhich(nId), false, &pItem)) { const SfxItemSet* _pSet = &(static_cast< const SvxSetItem* >(pItem)->GetItemSet()); - if(_pSet->GetItemState(nWBrush) == SFX_ITEM_SET) + if(_pSet->GetItemState(nWBrush) == SfxItemState::SET) { aSet.Put(_pSet->Get(nWBrush)); } - if(_pSet->GetItemState(nWBoxInfo) == SFX_ITEM_SET) + if(_pSet->GetItemState(nWBoxInfo) == SfxItemState::SET) { aSet.Put(_pSet->Get(nWBoxInfo)); } - if(_pSet->GetItemState(nWBox) == SFX_ITEM_SET) + if(_pSet->GetItemState(nWBox) == SfxItemState::SET) { aSet.Put(_pSet->Get(nWBox)); } - if(_pSet->GetItemState(nWShadow) == SFX_ITEM_SET) + if(_pSet->GetItemState(nWShadow) == SfxItemState::SET) { aSet.Put(_pSet->Get(nWShadow)); } @@ -345,7 +345,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) //UUUU take care of [XATTR_XATTR_FILL_FIRST .. XATTR_FILL_LAST] for(sal_uInt16 nFillStyleId(XATTR_FILL_FIRST); nFillStyleId <= XATTR_FILL_LAST; nFillStyleId++) { - if(_pSet->GetItemState(nFillStyleId) == SFX_ITEM_SET) + if(_pSet->GetItemState(nFillStyleId) == SfxItemState::SET) { aSet.Put(_pSet->Get(nFillStyleId)); } @@ -381,7 +381,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) // Evaluate header-/footer- attributes const SvxSetItem* pSetItem = 0; - if ( SFX_ITEM_SET == rSet->GetItemState( GetWhich(nId), false, + if ( SfxItemState::SET == rSet->GetItemState( GetWhich(nId), false, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); @@ -465,7 +465,7 @@ void SvxHFPage::Reset( const SfxItemSet* rSet ) const SfxPoolItem* pItem = 0; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || + if(SfxItemState::SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { @@ -642,7 +642,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) const SfxPoolItem* pItem; - if(SFX_ITEM_SET == GetItemSet().GetItemState(GetWhich(nId), false, &pItem)) + if(SfxItemState::SET == GetItemSet().GetItemState(GetWhich(nId), false, &pItem)) { // If a SfxItemSet from the SetItem for SID_ATTR_PAGE_HEADERSET or // SID_ATTR_PAGE_FOOTERSET exists, use it's content @@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) } } - if(SFX_ITEM_SET == GetItemSet().GetItemState(nInner, false, &pItem)) + if(SfxItemState::SET == GetItemSet().GetItemState(nInner, false, &pItem)) { // The set InfoItem is always required pBBSet->Put(*pItem); @@ -706,7 +706,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) { const sal_uInt16 nWhich = GetWhich(SID_ATTR_BRUSH); - if(pBBSet->GetItemState(nWhich) == SFX_ITEM_SET) + if(pBBSet->GetItemState(nWhich) == SfxItemState::SET) { //UUUU create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(pBBSet->Get(nWhich)); @@ -732,7 +732,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) { const sal_uInt16 nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - if(pBBSet->GetItemState(nWhich) == SFX_ITEM_SET) + if(pBBSet->GetItemState(nWhich) == SfxItemState::SET) { const SvxBoxItem& rItem = (const SvxBoxItem&)pBBSet->Get(nWhich); @@ -776,7 +776,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { sal_uInt16 nWhich(GetWhich(SID_ATTR_PAGE_HEADERSET)); - if (SFX_ITEM_SET == rSet.GetItemState(nWhich, false)) + if (SfxItemState::SET == rSet.GetItemState(nWhich, false)) { const SvxSetItem& rSetItem = static_cast< const SvxSetItem& >(rSet.Get(nWhich, false)); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); @@ -795,7 +795,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { nWhich = GetWhich(SID_ATTR_BRUSH); - if(SFX_ITEM_SET == rTmpSet.GetItemState(nWhich)) + if(SfxItemState::SET == rTmpSet.GetItemState(nWhich)) { //UUUU create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich)); @@ -809,7 +809,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes); nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - if(rTmpSet.GetItemState(nWhich) == SFX_ITEM_SET) + if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET) { const SvxBoxItem& rItem = (const SvxBoxItem&)rTmpSet.Get(nWhich); @@ -820,7 +820,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) nWhich = GetWhich(SID_ATTR_PAGE_FOOTERSET); - if (SFX_ITEM_SET == rSet.GetItemState(nWhich, false)) + if (SfxItemState::SET == rSet.GetItemState(nWhich, false)) { const SvxSetItem& rSetItem = static_cast< const SvxSetItem& >(rSet.Get(nWhich, false)); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); @@ -839,7 +839,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { nWhich = GetWhich(SID_ATTR_BRUSH); - if(SFX_ITEM_SET == rTmpSet.GetItemState(nWhich)) + if(SfxItemState::SET == rTmpSet.GetItemState(nWhich)) { //UUUU create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich)); @@ -853,7 +853,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) m_pBspWin->setFooterFillAttributes(aFooterFillAttributes); nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - if(rTmpSet.GetItemState(nWhich) == SFX_ITEM_SET) + if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET) { const SvxBoxItem& rItem = static_cast< const SvxBoxItem& >(rTmpSet.Get(nWhich)); m_pBspWin->SetFtBorder(rItem); @@ -872,7 +872,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { nWhich = GetWhich(SID_ATTR_BRUSH); - if(rSet.GetItemState(nWhich) >= SFX_ITEM_DEFAULT) + if(rSet.GetItemState(nWhich) >= SfxItemState::DEFAULT) { //UUUU create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rSet.Get(nWhich)); @@ -886,7 +886,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) m_pBspWin->setPageFillAttributes(aPageFillAttributes); nWhich = GetWhich(SID_ATTR_BORDER_OUTER); - if(rSet.GetItemState(nWhich) >= SFX_ITEM_DEFAULT) + if(rSet.GetItemState(nWhich) >= SfxItemState::DEFAULT) { const SvxBoxItem& rItem = static_cast< const SvxBoxItem& >(rSet.Get(nWhich)); m_pBspWin->SetBorder(rItem); @@ -955,7 +955,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) // Evaluate Header attribute const SvxSetItem* pSetItem = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), + if ( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), false, (const SfxPoolItem**)&pSetItem ) ) { @@ -995,7 +995,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) } pSetItem = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ), + if ( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ), false, (const SfxPoolItem**)&pSetItem ) ) { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 61f800447146..81b4d502e720 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -211,7 +211,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pAttr = 0; - if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_GRID_OPTIONS , false, + if( SfxItemState::SET == rSet->GetItemState( SID_ATTR_GRID_OPTIONS , false, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr; @@ -237,7 +237,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false, + if( SfxItemState::SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , false, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr; @@ -248,7 +248,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) // Metric Change if necessary (as TabPage is in the dialog, where the // metric can be set - 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; diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 4133eaea288b..d87ddabb5826 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -46,8 +46,8 @@ SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindin void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { - // SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff - if ( eState != SFX_ITEM_DEFAULT ) + // SfxItemState::DONTCARE => pState == -1 => PTR_CAST buff + if ( eState != SfxItemState::DEFAULT ) pState = 0; switch(nSID) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 804b11ee74fa..0d35871225d0 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -291,7 +291,7 @@ void SvxRubyDialog::Activate() SfxModelessDialog::Activate(); SfxPoolItem* pState = 0; SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState ); - bool bEnable = (eState < SFX_ITEM_DEFAULT) || !pState || !((SfxBoolItem*)pState)->GetValue(); + bool bEnable = (eState < SfxItemState::DEFAULT) || !pState || !((SfxBoolItem*)pState)->GetValue(); delete pState; m_pStylistPB->Enable(bEnable); //get selection from current view frame @@ -565,7 +565,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl) { SfxPoolItem* pState = 0; SfxItemState eState = pBindings->QueryState( SID_STYLE_DESIGNER, pState ); - if(eState <= SFX_ITEM_SET || !pState || !((SfxBoolItem*)pState)->GetValue()) + if(eState <= SfxItemState::SET || !pState || !((SfxBoolItem*)pState)->GetValue()) { pBindings->GetDispatcher()->Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 8b11d6d5ed82..16f76437a265 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -43,7 +43,7 @@ SvxSearchController::SvxSearchController void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { if ( SID_STYLE_FAMILY1 <= nSID && nSID <= SID_STYLE_FAMILY4 ) { diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 0a5ca73116d6..a78060580bcb 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1905,7 +1905,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) const SfxPoolItem* pItem; for( sal_uInt16 n = 0; n < pList->Count(); ++n ) if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) && - SFX_ITEM_SET == aOutSet.GetItemState( + SfxItemState::SET == aOutSet.GetItemState( pAItem->pItem->Which(), false, &pItem ) ) { delete pAItem->pItem; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index febf4d025dc2..d28b3cded20b 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -495,9 +495,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) while(nWhich) { SfxItemState eState = rAttrs.GetItemState(nWhich, false); - if(SFX_ITEM_DONTCARE == eState) + if(SfxItemState::DONTCARE == eState) mpRemember2DAttributes->InvalidateItem(nWhich); - else if(SFX_ITEM_SET == eState) + else if(SfxItemState::SET == eState) mpRemember2DAttributes->Put(rAttrs.Get(nWhich, false)); nWhich = aIter.NextWhich(); @@ -518,7 +518,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Segment Number Can be changed? and other states SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, false, &pItem ); - if( SFX_ITEM_SET == eState ) + if( SfxItemState::SET == eState ) { sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue(); bool bExtrude = ( nState & 2 ); @@ -599,7 +599,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Bitmap fill ? -> Status bool bBitmap(false); eState = rAttrs.GetItemState(XATTR_FILLSTYLE); - if(eState != SFX_ITEM_DONTCARE) + if(eState != SfxItemState::DONTCARE) { drawing::FillStyle eXFS = (drawing::FillStyle)((const XFillStyleItem&)rAttrs.Get(XATTR_FILLSTYLE)).GetValue(); bBitmap = (eXFS == drawing::FillStyle_BITMAP || eXFS == drawing::FillStyle_GRADIENT || eXFS == drawing::FillStyle_HATCH); @@ -630,7 +630,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aNumHorizontal.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_HORZ_SEGS); - if(eState != SFX_ITEM_DONTCARE) + if(eState != SfxItemState::DONTCARE) { sal_uInt32 nValue = ((const SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_HORZ_SEGS)).GetValue(); if(nValue != (sal_uInt32 )aNumHorizontal.GetValue()) @@ -655,7 +655,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aNumVertical.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = ((const SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); if( nValue != (sal_uInt32) aNumVertical.GetValue() ) @@ -680,7 +680,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aMtrDepth.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = ((const SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue(); sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit ); @@ -707,7 +707,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Double walled / Double sided eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bValue = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); if( bValue != aBtnDoubleSided.IsChecked() ) @@ -731,7 +731,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aMtrPercentDiagonal.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const SfxUInt16Item&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue(); if( nValue != aMtrPercentDiagonal.GetValue() ) @@ -756,7 +756,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aMtrBackscale.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const SfxUInt16Item&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue(); if( nValue != aMtrBackscale.GetValue() ) @@ -781,7 +781,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aMtrEndAngle.IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_Int32 nValue = ((const SfxUInt32Item&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue(); if( nValue != aMtrEndAngle.GetValue() ) @@ -802,7 +802,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Normal type eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); @@ -831,7 +831,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Normal inverted eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bValue = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); if( bValue != aBtnNormalsInvert.IsChecked() ) @@ -853,7 +853,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // 2-sided lighting eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bValue = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); if( bValue != aBtnTwoSidedLighting.IsChecked() ) @@ -876,7 +876,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Representation // Shademode eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); if( nValue != aLbShademode.GetSelectEntryPos() ) @@ -896,7 +896,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // 3D-Shadow eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bValue = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); if( bValue != aBtnShadow3d.IsChecked() ) @@ -920,7 +920,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Inclination (Shadow) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const SfxUInt16Item&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue(); if( nValue != aMtrSlant.GetValue() ) @@ -940,7 +940,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Distance eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = ((const SfxUInt32Item&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue(); sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); @@ -964,7 +964,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Focal length eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = ((const SfxUInt32Item&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); @@ -991,7 +991,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) basegfx::B3DVector aVector; // Light 1 (Color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_1); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue(); ColorLB* pLb = &aLbLight1; @@ -1011,7 +1011,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 1 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_1); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight1 )) || @@ -1033,14 +1033,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 1 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } //Light 2 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_2); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue(); ColorLB* pLb = &aLbLight2; @@ -1060,7 +1060,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 2 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_2); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight2 )) || @@ -1082,14 +1082,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } //Light 2 (Direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } //Light 3 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_3); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue(); ColorLB* pLb = &aLbLight3; @@ -1109,7 +1109,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Ligh 3 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_3); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight3)) || @@ -1131,14 +1131,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 3 (Direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } // Light 4 (Color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_4); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue(); ColorLB* pLb = &aLbLight4; @@ -1158,7 +1158,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 4 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_4); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight4 )) || @@ -1180,14 +1180,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 4 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } // Light 5 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_5); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue(); ColorLB* pLb = &aLbLight5; @@ -1207,7 +1207,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 5 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_5); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight5 )) || @@ -1229,14 +1229,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 5 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } // Light 6 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_6); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue(); ColorLB* pLb = &aLbLight6; @@ -1256,7 +1256,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 6 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_6); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight6 )) || @@ -1278,14 +1278,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 6 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } // Light 7 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_7); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue(); ColorLB* pLb = &aLbLight7; @@ -1305,7 +1305,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 7 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_7); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight7 )) || @@ -1327,14 +1327,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 7 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } // Light 8 (color) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTCOLOR_8); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue(); ColorLB* pLb = &aLbLight8; @@ -1354,7 +1354,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 8 (on/off) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTON_8); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bOn = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); if( ( bOn && !GetUILightState( aBtnLight8 )) || @@ -1376,14 +1376,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } // Light 8 (direction) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bUpdate = true; } // Ambient light eState = rAttrs.GetItemState(SDRATTR_3DSCENE_AMBIENTCOLOR); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); ColorLB* pLb = &aLbAmbientlight; @@ -1408,7 +1408,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( bBitmap ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue(); @@ -1433,7 +1433,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Mode eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue(); @@ -1458,7 +1458,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Projection X eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); @@ -1487,7 +1487,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Projection Y eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); @@ -1516,7 +1516,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Filter eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { bool bValue = ((const SfxBoolItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); if( bValue != aBtnTexFilter.IsChecked() ) @@ -1543,7 +1543,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Object color eState = rAttrs.GetItemState(XATTR_FILLCOLOR); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const XFillColorItem&)rAttrs.Get(XATTR_FILLCOLOR)).GetColorValue(); ColorLB* pLb = &aLbMatColor; @@ -1564,7 +1564,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Self-luminous color eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_EMISSION); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_EMISSION)).GetValue(); ColorLB* pLb = &aLbMatEmission; @@ -1585,7 +1585,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Specular eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { aColor = ((const SvxColorItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR)).GetValue(); ColorLB* pLb = &aLbMatSpecular; @@ -1606,7 +1606,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Specular Intensity eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = ((const SfxUInt16Item&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); if( nValue != aMtrMatSpecularIntensity.GetValue() ) @@ -1628,7 +1628,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Other // Perspective eState = rAttrs.GetItemState(SDRATTR_3DSCENE_PERSPECTIVE); - if( eState != SFX_ITEM_DONTCARE ) + if( eState != SfxItemState::DONTCARE ) { ProjectionType ePT = (ProjectionType)((const Svx3DPerspectiveItem&)rAttrs.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue(); if( ( !aBtnPerspective.IsChecked() && ePT == PR_PERSPECTIVE ) || @@ -1663,12 +1663,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // set LineStyle hard to XLINE_NONE when it's not set so that // the default (XLINE_SOLID) is not used for 3d preview - if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, false)) + if(SfxItemState::SET != aSet.GetItemState(XATTR_LINESTYLE, false)) aSet.Put(XLineStyleItem(XLINE_NONE)); - // set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that + // set FillColor hard to WHITE when it's SfxItemState::DONTCARE so that // the default (Blue7) is not used for 3d preview - if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false)) + if(SfxItemState::DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false)) aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE))); aCtlPreview.Set3DAttributes(aSet); @@ -1717,9 +1717,9 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) while(nWhich) { SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, false); - if(SFX_ITEM_DONTCARE == eState) + if(SfxItemState::DONTCARE == eState) rAttrs.InvalidateItem(nWhich); - else if(SFX_ITEM_SET == eState) + else if(SfxItemState::SET == eState) rAttrs.Put(mpRemember2DAttributes->Get(nWhich, false)); nWhich = aIter.NextWhich(); @@ -3267,7 +3267,7 @@ SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings) void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/) { - bool bNewState = (eState != SFX_ITEM_DISABLED); + bool bNewState = (eState != SfxItemState::DISABLED); if(bNewState != bState) { bState = bNewState; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index fbb3b368d721..56d5a8320822 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -752,14 +752,14 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe { SfxViewFrame* pCurrentFrame = SfxViewFrame::Current(); - SfxItemState eState = SFX_ITEM_UNKNOWN; + SfxItemState eState = SfxItemState::UNKNOWN; // ask the bindings of the current view frame (which should be the one we're residing in) for the state if (pCurrentFrame) { SfxPoolItem* pItem = NULL; eState = pCurrentFrame->GetBindings().QueryState(SID_FM_CTL_PROPERTIES, pItem); - if (eState >= SFX_ITEM_DEFAULT && pItem ) + if (eState >= SfxItemState::DEFAULT && pItem ) { bChecked = pItem->ISA(SfxBoolItem) && ((SfxBoolItem*)pItem)->GetValue(); rMenu.CheckItem(SID_FM_SHOW_PROPERTY_BROWSER,bChecked); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 0d746437043c..bfc357101e1f 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2162,7 +2162,7 @@ namespace svxform if ( !pState || SID_FM_DATANAVIGATOR_CONTROL != nSID ) return; - if ( eState >= SFX_ITEM_DEFAULT ) + if ( eState >= SfxItemState::DEFAULT ) { FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() ); Update( pShell ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index efd0890eb4a5..ea6fa56e03c9 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1910,7 +1910,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c if( !pState || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID ) return; - if( eState >= SFX_ITEM_DEFAULT ) + if( eState >= SfxItemState::DEFAULT ) { FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() ); UpdateContent( pShell ); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 86964972ba5c..6eefc8108c18 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -627,7 +627,7 @@ void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPool m_bInStateChange = true; try { - if (eState >= SFX_ITEM_DEFAULT) + if (eState >= SfxItemState::DEFAULT) { FmFormShell* pShell = PTR_CAST(FmFormShell,((SfxObjectItem*)pState)->GetShell()); InterfaceBag aSelection; diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index aae32a4fc7b0..e49e4dab2de8 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -529,7 +529,7 @@ namespace svxform if( !pState || SID_FM_FMEXPLORER_CONTROL != nSID ) return; - if( eState >= SFX_ITEM_DEFAULT ) + if( eState >= SfxItemState::DEFAULT ) { FmFormShell* pShell = PTR_CAST( FmFormShell,((SfxObjectItem*)pState)->GetShell() ); UpdateContent( pShell ); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 36671195d898..69d232a590ae 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -739,7 +739,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( pArgs ) { const SfxPoolItem* pItem; - if ( ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) ) == SFX_ITEM_SET ) + if ( ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) ) == SfxItemState::SET ) { const SfxInt32Item* pTypedItem = PTR_CAST( SfxInt32Item, pItem ); if ( pTypedItem ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index b555eb8c7942..379188c3f769 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -4083,11 +4083,11 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState SfxMenuControl::StateChanged(nSID, eState, pState); else if (FmXFormShell::isControlConversionSlot(nSID)) { - if ((m_pConversionMenu->GetItemPos(nSID) != MENU_ITEM_NOTFOUND) && (eState == SFX_ITEM_DISABLED)) + if ((m_pConversionMenu->GetItemPos(nSID) != MENU_ITEM_NOTFOUND) && (eState == SfxItemState::DISABLED)) { m_pConversionMenu->RemoveItem(m_pConversionMenu->GetItemPos(nSID)); } - else if ((m_pConversionMenu->GetItemPos(nSID) == MENU_ITEM_NOTFOUND) && (eState != SFX_ITEM_DISABLED)) + else if ((m_pConversionMenu->GetItemPos(nSID) == MENU_ITEM_NOTFOUND) && (eState != SfxItemState::DISABLED)) { // We can't simply re-insert the item because we have a clear order for all the our items. // So first we have to determine the position of the item to insert. diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 2a7c71e59018..a1c5702c858b 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -663,7 +663,7 @@ namespace svx const SfxItemSet& rModifiedItems = *xDialog->GetOutputItemSet(); for ( WhichId nWhich = pPool->GetFirstWhich(); nWhich <= pPool->GetLastWhich(); ++nWhich ) { - if ( rModifiedItems.GetItemState( nWhich ) == SFX_ITEM_SET ) + if ( rModifiedItems.GetItemState( nWhich ) == SfxItemState::SET ) { SfxSlotId nSlotForItemSet = pPool->GetSlotId( nWhich ); const SfxPoolItem* pModifiedItem = rModifiedItems.GetItem( nWhich ); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b4e8a960975a..b5da823bbc3a 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -123,7 +123,7 @@ void FmFormView::Init() if ( pObjShell && pObjShell->GetMedium() ) { const SfxPoolItem *pItem=0; - if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, false, &pItem ) == SFX_ITEM_SET ) + if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, false, &pItem ) == SfxItemState::SET ) { ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() ); bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode ); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 58b357b31f14..6de6ee7ab443 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -280,7 +280,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo if (!pState || SID_FM_FIELDS_CONTROL != nSID) return; - if (eState >= SFX_ITEM_DEFAULT) + if (eState >= SfxItemState::DEFAULT) { FmFormShell* pShell = PTR_CAST(FmFormShell,((SfxObjectItem*)pState)->GetShell()); UpdateContent(pShell); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 6405cf53afbc..f519dd462b19 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -156,7 +156,7 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const if (nSID == SID_FM_CONFIG) { sal_uInt16 nSlot = 0; - if (eState >= SFX_ITEM_DEFAULT) + if (eState >= SfxItemState::DEFAULT) nSlot = ((SfxUInt16Item*)pState)->GetValue(); switch( nSlot ) @@ -264,7 +264,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons pWin->SetValue( pItem ? pItem->GetValue() : -1 ); } - bool bEnable = SFX_ITEM_DISABLED != eState && pState; + bool bEnable = SfxItemState::DISABLED != eState && pState; if (!bEnable) pWin->SetText(OUString()); diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 78a2ffb9999c..5dc91c703b07 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -138,9 +138,9 @@ void SvxSmartTagsControl::FillMenu() void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - mrParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); + mrParent.EnableItem( GetId(), SfxItemState::DISABLED != eState ); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { const SvxSmartTagItem* pSmartTagItem = PTR_CAST( SvxSmartTagItem, pState ); if ( 0 != pSmartTagItem ) diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index ecd4c5303c41..fec5d11d2aed 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -119,7 +119,7 @@ void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID ) { DELETEZ( pClipboardFmtItem ); - if ( eState >= SFX_ITEM_DEFAULT ) + if ( eState >= SfxItemState::DEFAULT ) { pClipboardFmtItem = pState->Clone(); GetToolBox().SetItemBits( GetId(), GetToolBox().GetItemBits( GetId() ) | TIB_DROPDOWN ); @@ -131,8 +131,8 @@ void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co else { // enable the item as a whole - bDisabled = (GetItemState(pState) == SFX_ITEM_DISABLED); - GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) ); + bDisabled = (GetItemState(pState) == SfxItemState::DISABLED); + GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) ); } } diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 8a36eb685a1c..6ef5157b5cbf 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -93,9 +93,9 @@ void SvxFontMenuControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); + rParent.EnableItem( GetId(), SfxItemState::DISABLED != eState ); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { if ( !pMenu->GetItemCount() ) FillMenu(); diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 1b17c56ebb68..dae879db0e1f 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -80,9 +80,9 @@ void SvxFontSizeMenuControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); + rParent.EnableItem( GetId(), SfxItemState::DISABLED != eState ); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { if ( pState->ISA(SvxFontHeightItem) ) { diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 116b7e8cec4d..637e5405b4e9 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -397,7 +397,7 @@ namespace drawinglayer // need to check XFillFloatTransparence, object fill may still be completely transparent const SfxPoolItem* pGradientItem; - if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem) + if(SfxItemState::SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem) && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()) { const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue(); @@ -590,7 +590,7 @@ namespace drawinglayer { const SfxPoolItem* pGradientItem; - if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem) + if(SfxItemState::SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem) && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()) { // test if float transparence is completely transparent diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 5ad4d9e0b956..78c6895208f0 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -75,7 +75,7 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_SET == rStyle.GetItemState(nWhich)) + if(SfxItemState::SET == rStyle.GetItemState(nWhich)) { mpItemSet->ClearItem(nWhich); } @@ -435,7 +435,7 @@ namespace sdr while(nWhich) { - if(mpItemSet->GetItemState(nWhich, false) == SFX_ITEM_SET) + if(mpItemSet->GetItemState(nWhich, false) == SfxItemState::SET) { pNewSet->Put(mpItemSet->Get(nWhich)); } @@ -498,7 +498,7 @@ namespace sdr { // #i61284# use mpItemSet with parents, makes things easier and reduces to // one loop - if(SFX_ITEM_SET == mpItemSet->GetItemState(nWhich, true, &pItem)) + if(SfxItemState::SET == mpItemSet->GetItemState(nWhich, true, &pItem)) { pDestItemSet->Put(*pItem); } diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index a7d60a499c75..c6f09bd5bb7f 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -152,7 +152,7 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false, &pPoolItem)) + if(SfxItemState::SET == rSet.GetItemState(nWhich, false, &pPoolItem)) { if(AllowItemChange(nWhich, pPoolItem)) { diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 9005d4842390..cb4799927d8f 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -92,7 +92,7 @@ namespace sdr // and always equal. if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false)) + if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false)) { mpItemSet->InvalidateItem(nWhich); } diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 0ce6be8028b0..f49eb5fb408f 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -92,7 +92,7 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false)) + if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false)) { mpItemSet->InvalidateItem(nWhich); } diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index dac8ac2e26d8..835f23552c64 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -109,7 +109,7 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false, &pItem)) + if(SfxItemState::SET == rSet.GetItemState(nWhich, false, &pItem)) { if(pItem->HasMetrics()) { diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index a950b4a6f012..16af145d4946 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -162,9 +162,9 @@ namespace sdr void CleanupFillProperties( SfxItemSet& rItemSet ) { - const bool bFillBitmap = rItemSet.GetItemState(XATTR_FILLBITMAP, false) == SFX_ITEM_SET; - const bool bFillGradient = rItemSet.GetItemState(XATTR_FILLGRADIENT, false) == SFX_ITEM_SET; - const bool bFillHatch = rItemSet.GetItemState(XATTR_FILLHATCH, false) == SFX_ITEM_SET; + const bool bFillBitmap = rItemSet.GetItemState(XATTR_FILLBITMAP, false) == SfxItemState::SET; + const bool bFillGradient = rItemSet.GetItemState(XATTR_FILLGRADIENT, false) == SfxItemState::SET; + const bool bFillHatch = rItemSet.GetItemState(XATTR_FILLHATCH, false) == SfxItemState::SET; if( bFillBitmap || bFillGradient || bFillHatch ) { const XFillStyleItem* pFillStyleItem = dynamic_cast< const XFillStyleItem* >( rItemSet.GetItem(XATTR_FILLSTYLE) ); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 0196faa3b44d..bd857b6ff19f 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -137,7 +137,7 @@ namespace sdr } // Extra-Repaint for radical layout changes (#43139#) - if(SFX_ITEM_SET == rSet.GetItemState(SDRATTR_TEXT_CONTOURFRAME)) + if(SfxItemState::SET == rSet.GetItemState(SDRATTR_TEXT_CONTOURFRAME)) { // Here only repaint wanted rObj.ActionChanged(); @@ -453,7 +453,7 @@ namespace sdr bool bHasURL(false); - if(aSet.GetItemState(EE_CHAR_COLOR) == SFX_ITEM_SET) + if(aSet.GetItemState(EE_CHAR_COLOR) == SfxItemState::SET) { EditEngine* pEditEngine = const_cast<EditEngine*>(&(pOutliner->GetEditEngine())); std::vector<EECharAttrib> aAttribs; diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index c43e09c47f9b..ee9eca71f4b2 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -736,7 +736,7 @@ void AreaPropertyPanel::NotifyItemUpdate( const bool bIsEnabled) { (void)bIsEnabled; - const bool bDisabled(SFX_ITEM_DISABLED == eState); + const bool bDisabled(SfxItemState::DISABLED == eState); switch(nSID) { @@ -749,7 +749,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { bFillTransparenceChanged = true; - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState); @@ -771,7 +771,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { bFillTransparenceChanged = true; - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XFillFloatTransparenceItem* pItem = dynamic_cast< const XFillFloatTransparenceItem* >(pState); @@ -812,7 +812,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpStyleItem.reset(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XFillStyleItem* pItem = dynamic_cast< const XFillStyleItem* >(pState); @@ -847,7 +847,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_ATTR_FILL_COLOR: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpColorItem.reset(pState ? (XFillColorItem*)pState->Clone() : 0); } @@ -857,14 +857,14 @@ void AreaPropertyPanel::NotifyItemUpdate( mpLbFillAttr->Hide(); mpToolBoxColor->Show(); - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpToolBoxColor->Enable(); mbColorAvail = true; // maLastColor = mpColorItem->GetColorValue(); Update(); } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpToolBoxColor->Disable(); mbColorAvail = false; @@ -880,7 +880,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_ATTR_FILL_GRADIENT: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpFillGradientItem.reset(pState ? (XFillGradientItem*)pState->Clone() : 0); } @@ -890,12 +890,12 @@ void AreaPropertyPanel::NotifyItemUpdate( mpLbFillAttr->Show(); mpToolBoxColor->Hide(); - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpLbFillAttr->Enable(); Update(); } - else if(SFX_ITEM_DISABLED == eState ) + else if(SfxItemState::DISABLED == eState ) { mpLbFillAttr->Disable(); mpLbFillAttr->SetNoSelection(); @@ -909,7 +909,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_ATTR_FILL_HATCH: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpHatchItem.reset(pState ? (XFillHatchItem*)pState->Clone() : 0); } @@ -919,12 +919,12 @@ void AreaPropertyPanel::NotifyItemUpdate( mpLbFillAttr->Show(); mpToolBoxColor->Hide(); - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpLbFillAttr->Enable(); Update(); } - else if(SFX_ITEM_DISABLED == eState ) + else if(SfxItemState::DISABLED == eState ) { mpLbFillAttr->Disable(); mpLbFillAttr->SetNoSelection(); @@ -938,7 +938,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_ATTR_FILL_BITMAP: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpBitmapItem.reset(pState ? (XFillBitmapItem*)pState->Clone() : 0); } @@ -948,12 +948,12 @@ void AreaPropertyPanel::NotifyItemUpdate( mpLbFillAttr->Show(); mpToolBoxColor->Hide(); - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { mpLbFillAttr->Enable(); Update(); } - else if(SFX_ITEM_DISABLED == eState ) + else if(SfxItemState::DISABLED == eState ) { mpLbFillAttr->Disable(); mpLbFillAttr->SetNoSelection(); @@ -967,7 +967,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_COLOR_TABLE: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue()) { @@ -992,7 +992,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_GRADIENT_LIST: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue()) { @@ -1017,7 +1017,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_HATCH_LIST: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue()) { @@ -1042,7 +1042,7 @@ void AreaPropertyPanel::NotifyItemUpdate( } case SID_BITMAP_LIST: { - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue()) { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 506894c72f22..235f622bab26 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -263,7 +263,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( { case SID_ATTR_GRAF_LUMINANCE: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrBrightness->Enable(); const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState); @@ -274,7 +274,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrBrightness->SetValue(nBright); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrBrightness->Disable(); } @@ -287,7 +287,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_CONTRAST: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrContrast->Enable(); const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState); @@ -298,7 +298,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrContrast->SetValue(nContrast); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrContrast->Disable(); } @@ -311,7 +311,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_TRANSPARENCE: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrTrans->Enable(); const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState); @@ -322,7 +322,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrTrans->SetValue(nTrans); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrTrans->Disable(); } @@ -335,7 +335,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_MODE: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpLBColorMode->Enable(); const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState); @@ -346,7 +346,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpLBColorMode->SelectEntryPos(nTrans); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpLBColorMode->Disable(); } @@ -359,7 +359,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_RED: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrRed->Enable(); const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState); @@ -370,7 +370,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrRed->SetValue( nRed ); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrRed->Disable(); } @@ -383,7 +383,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_GREEN: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrGreen->Enable(); const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState); @@ -394,7 +394,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrGreen->SetValue( nGreen ); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrGreen->Disable(); } @@ -407,7 +407,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_BLUE: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrBlue->Enable(); const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState); @@ -418,7 +418,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrBlue->SetValue( nBlue ); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrBlue->Disable(); } @@ -431,7 +431,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( } case SID_ATTR_GRAF_GAMMA: { - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { mpMtrGamma->Enable(); const SfxUInt32Item* pItem = dynamic_cast< const SfxUInt32Item* >(pState); @@ -442,7 +442,7 @@ void GraphicPropertyPanel::NotifyItemUpdate( mpMtrGamma->SetValue( nGamma ); } } - else if(SFX_ITEM_DISABLED == eState) + else if(SfxItemState::DISABLED == eState) { mpMtrGamma->Disable(); } diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index a85875e518b4..ff171deb07ee 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -338,7 +338,7 @@ void LinePropertyPanel::NotifyItemUpdate( const bool bIsEnabled) { (void)bIsEnabled; - const bool bDisabled(SFX_ITEM_DISABLED == eState); + const bool bDisabled(SfxItemState::DISABLED == eState); // By default, fill and show the color of existing line-color mpColorUpdater->Update( maColor ); @@ -358,7 +358,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpTBColor->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineColorItem* pItem = dynamic_cast< const XLineColorItem* >(pState); if(pItem) @@ -388,7 +388,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpLBStyle->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { if(nSID == SID_ATTR_LINE_STYLE) { @@ -437,7 +437,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpMFTransparent->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineTransparenceItem* pItem = dynamic_cast< const XLineTransparenceItem* >(pState); @@ -466,7 +466,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpFTWidth->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineWidthItem* pItem = dynamic_cast< const XLineWidthItem* >(pState); @@ -496,7 +496,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpLBStart->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineStartItem* pItem = dynamic_cast< const XLineStartItem* >(pState); @@ -525,7 +525,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpLBEnd->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineEndItem* pItem = dynamic_cast< const XLineEndItem* >(pState); @@ -567,7 +567,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpFTEdgeStyle->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineJointItem* pItem = dynamic_cast< const XLineJointItem* >(pState); @@ -627,7 +627,7 @@ void LinePropertyPanel::NotifyItemUpdate( mpLBCapStyle->Enable(); } - if(eState >= SFX_ITEM_DEFAULT) + if(eState >= SfxItemState::DEFAULT) { const XLineCapItem* pItem = dynamic_cast< const XLineCapItem* >(pState); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index d5915090c415..37c274e630be 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -237,13 +237,13 @@ void NBOTypeMgrBase::StoreMapUnit_impl() { { const SfxPoolItem* pItem; SfxItemState eState = pSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); - if(eState == SFX_ITEM_SET) + if(eState == SfxItemState::SET) { eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); } else { //sd use different sid for numbering rule eState = pSet->GetItemState(EE_PARA_NUMBULLET, false, &pItem); - if(eState == SFX_ITEM_SET) + if(eState == SfxItemState::SET) { eCoreUnit = pSet->GetPool()->GetMetric(pSet->GetPool()->GetWhich(EE_PARA_NUMBULLET)); } diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index e844acb2efa3..08892b9828c8 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -264,7 +264,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe pActLineDistFld->SetText( "" ); //bool bValueSetFocus = sal_False; //wj - if( eState >= SFX_ITEM_DEFAULT ) + if( eState >= SfxItemState::DEFAULT ) { // SfxMapUnit eUnit = maLNSpaceControl.GetCoreMetric(); SfxMapUnit eUnit = SFX_MAPUNIT_100TH_MM; @@ -450,7 +450,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe break; } } - else if( eState == SFX_ITEM_DISABLED ) + else if( eState == SfxItemState::DISABLED ) { aLineDist.Disable(); pActLineDistFld->Enable(false); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index e57252c4487f..52b1100fbcf2 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -430,7 +430,7 @@ IMPL_LINK(ParaPropertyPanel, ToolBoxBackColorDDHandler,ToolBox*, pToolBox) void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState) { - if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxColorItem)) + if( eState >= SfxItemState::DEFAULT && pState->ISA(SvxColorItem)) { const SvxColorItem* pItem = (const SvxColorItem*)pState; maColor = pItem->GetValue(); @@ -761,7 +761,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat const sal_uInt16 nIdHangingIndent = mpTbxIndent_IncDec->GetItemId(UNO_HANGINGINDENT); const sal_uInt16 nIdHangingIndent2 = mpTbxIndent_IncDec->GetItemId(UNO_HANGINGINDENT2); - if( pState && eState >= SFX_ITEM_DEFAULT ) + if( pState && eState >= SfxItemState::DEFAULT ) { SvxLRSpaceItem* pSpace = ( SvxLRSpaceItem*)pState; maTxtLeft = pSpace->GetTxtLeft(); @@ -836,7 +836,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat mpTbxProDemote->EnableItem(nIdHangingIndent2, true); } - else if( eState == SFX_ITEM_DISABLED ) + else if( eState == SfxItemState::DISABLED ) { mpLeftIndent-> Disable(); mpRightIndent->Disable(); @@ -871,7 +871,7 @@ void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /*nSID*/, SfxItemState { meLnSpState = eState; - if( pState && eState >= SFX_ITEM_DEFAULT ) + if( pState && eState >= SfxItemState::DEFAULT ) { if(mpLnSPItem) delete mpLnSPItem; @@ -884,7 +884,7 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS mpTopDist->SetMax( mpTopDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); mpBottomDist->SetMax( mpBottomDist->Normalize( MAX_DURCH ), MapToFieldUnit(m_eULSpaceUnit) ); - if( pState && eState >= SFX_ITEM_DEFAULT ) + if( pState && eState >= SfxItemState::DEFAULT ) { SvxULSpaceItem* pOldItem = (SvxULSpaceItem*)pState; @@ -905,7 +905,7 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS mpBottomDist->SetValue( nVal, FUNIT_100TH_MM ); mpTbxUL_IncDec->Enable(); } - else if(eState == SFX_ITEM_DISABLED ) + else if(eState == SfxItemState::DISABLED ) { mpTopDist->Disable(); mpBottomDist->Disable(); @@ -923,14 +923,14 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS { if (nSID==SID_OUTLINE_LEFT) { - if( pState && eState == SFX_ITEM_UNKNOWN ) + if( pState && eState == SfxItemState::UNKNOWN ) mbOutLineLeft = true; else mbOutLineLeft = false; } if (nSID==SID_OUTLINE_RIGHT) { - if( pState && eState == SFX_ITEM_UNKNOWN ) + if( pState && eState == SfxItemState::UNKNOWN ) mbOutLineRight = true; else mbOutLineRight = false; @@ -958,13 +958,13 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt && ( nSID == SID_INC_INDENT || nSID == SID_DEC_INDENT ) ) { // Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT - // - namely SFX_ITEM_UNKNOWN and SFX_ITEM_DISABLED + // - namely SfxItemState::UNKNOWN and SfxItemState::DISABLED const sal_uInt16 nIdIncrIndent = mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT); const sal_uInt16 nIdDecrIndent = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT); mpTbxIndent_IncDec->EnableItem( nSID == SID_INC_INDENT ? nIdIncrIndent : nIdDecrIndent, - ( pState && eState == SFX_ITEM_UNKNOWN ) ? sal_True : sal_False ); + ( pState && eState == SfxItemState::UNKNOWN ) ? sal_True : sal_False ); } } @@ -972,7 +972,7 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt // Add toggle state for numbering and bullet icons void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)) ) + if ( (eState >= SfxItemState::DEFAULT) && (pState->ISA(SfxBoolItem)) ) { const SfxBoolItem* pItem= (const SfxBoolItem*)pState; const bool aBool = pItem->GetValue(); @@ -998,7 +998,7 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState void ParaPropertyPanel::StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if ( eState >= SFX_ITEM_DEFAULT && pState->ISA(SfxUInt16Item) ) + if ( eState >= SfxItemState::DEFAULT && pState->ISA(SfxUInt16Item) ) { sal_uInt16 nValue = (sal_uInt16)0xFFFF; { @@ -1023,7 +1023,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI { FieldUnit eUnit = FUNIT_NONE; - if ( pState && eState >= SFX_ITEM_DEFAULT ) + if ( pState && eState >= SfxItemState::DEFAULT ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pState )->GetValue(); else { @@ -1103,7 +1103,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent, maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)), maTxtLeft (0), mpLnSPItem (NULL), - meLnSpState (SFX_ITEM_DONTCARE), + meLnSpState (SfxItemState::DONTCARE), mbOutLineLeft (false), mbOutLineRight (false), maUpper (0), diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index d218e0a5222e..f4e4acb29933 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -599,7 +599,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( switch (nSID) { case SID_ATTR_TRANSFORM_WIDTH: - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { pWidthItem = dynamic_cast< const SfxUInt32Item* >(pState); @@ -619,7 +619,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_HEIGHT: - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { pHeightItem = dynamic_cast< const SfxUInt32Item* >(pState); @@ -639,7 +639,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_POS_X: - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { const SfxInt32Item* pItem = dynamic_cast< const SfxInt32Item* >(pState); @@ -657,7 +657,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_POS_Y: - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { const SfxInt32Item* pItem = dynamic_cast< const SfxInt32Item* >(pState); @@ -675,7 +675,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_ROT_X: - if (SFX_ITEM_DEFAULT == eState) + if (SfxItemState::DEFAULT == eState) { const SfxInt32Item* pItem = dynamic_cast< const SfxInt32Item* >(pState); @@ -688,7 +688,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_ROT_Y: - if (SFX_ITEM_DEFAULT == eState) + if (SfxItemState::DEFAULT == eState) { const SfxInt32Item* pItem = dynamic_cast< const SfxInt32Item* >(pState); @@ -701,7 +701,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_PROTECT_POS: - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { const SfxBoolItem* pItem = dynamic_cast< const SfxBoolItem* >(pState); @@ -717,7 +717,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_PROTECT_SIZE: - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { const SfxBoolItem* pItem = dynamic_cast< const SfxBoolItem* >(pState); @@ -733,7 +733,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_AUTOWIDTH: - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { const SfxBoolItem* pItem = dynamic_cast< const SfxBoolItem* >(pState); @@ -745,7 +745,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_AUTOHEIGHT: - if(SFX_ITEM_DEFAULT == eState) + if(SfxItemState::DEFAULT == eState) { const SfxBoolItem* pItem = dynamic_cast< const SfxBoolItem* >(pState); @@ -757,7 +757,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( break; case SID_ATTR_TRANSFORM_ANGLE: - if (eState >= SFX_ITEM_DEFAULT) + if (eState >= SfxItemState::DEFAULT) { const SfxInt32Item* pItem = dynamic_cast< const SfxInt32Item* >(pState); @@ -1041,7 +1041,7 @@ FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPo { FieldUnit eUnit = FUNIT_NONE; - if ( pState && eState >= SFX_ITEM_DEFAULT ) + if ( pState && eState >= SfxItemState::DEFAULT ) { eUnit = (FieldUnit)( (const SfxUInt16Item*)pState )->GetValue(); } diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index f8a1f716c05a..68d65c0a53ca 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -240,7 +240,7 @@ void TextPropertyPanel::NotifyItemUpdate ( { case SID_ATTR_CHAR_FONTHEIGHT: { - if ( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxFontHeightItem) ) + if ( eState >= SfxItemState::DEFAULT && pState->ISA(SvxFontHeightItem) ) mpHeightItem = (SvxFontHeightItem*)pState; else mpHeightItem = NULL; @@ -248,7 +248,7 @@ void TextPropertyPanel::NotifyItemUpdate ( break; case SID_ATTR_CHAR_UNDERLINE: { - if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxUnderlineItem) ) + if( eState >= SfxItemState::DEFAULT && pState->ISA(SvxUnderlineItem) ) { const SvxUnderlineItem* pItem = (const SvxUnderlineItem*)pState; meUnderline = (FontUnderline)pItem->GetValue(); @@ -260,7 +260,7 @@ void TextPropertyPanel::NotifyItemUpdate ( break; case SID_ATTR_CHAR_KERNING: { - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { mbKernLBAvailable = true; @@ -276,7 +276,7 @@ void TextPropertyPanel::NotifyItemUpdate ( mbKernAvailable =false; } } - else if (SFX_ITEM_DISABLED == eState) + else if (SfxItemState::DISABLED == eState) { mbKernLBAvailable = false; mbKernAvailable = false; diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index a3076e2c2fda..32f328e12792 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -49,7 +49,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl() void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { - if ( SFX_ITEM_DEFAULT != eState ) + if ( SfxItemState::DEFAULT != eState ) GetStatusBar().SetItemText( GetId(), "" ); else { diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index f1bf93424434..8ee08e46e9d6 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -90,7 +90,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - if ( SFX_ITEM_DEFAULT != eState ) + if ( SfxItemState::DEFAULT != eState ) return; DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" ); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index cd4f6020a21b..47502c02b9c3 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -235,7 +235,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt if ( nSID == SID_PSZ_FUNCTION ) { - if ( eState == SFX_ITEM_DEFAULT ) + if ( eState == SfxItemState::DEFAULT ) { pImp->bHasMenu = true; if ( pState && pState->ISA(SfxUInt16Item) ) @@ -244,7 +244,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt else pImp->bHasMenu = false; } - else if ( SFX_ITEM_DEFAULT != eState ) + else if ( SfxItemState::DEFAULT != eState ) { // don't switch to empty display before an empty state was // notified for all display types diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index c7dc22af0619..878153efae97 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -93,7 +93,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { DBG_ASSERT( pState->ISA( SfxUInt16Item ), "invalid item type" ); SfxUInt16Item* pItem = (SfxUInt16Item*)pState; diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 35950a4ea4e5..cb6e953f52cb 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -85,7 +85,7 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl() void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - if( SFX_ITEM_DEFAULT != eState ) + if( SfxItemState::DEFAULT != eState ) { mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; } diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 9c7e5b50660c..e333eadce0e7 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -108,7 +108,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - if( SFX_ITEM_DEFAULT != eState ) + if( SfxItemState::DEFAULT != eState ) { GetStatusBar().SetItemText( GetId(), "" ); nValueSet = 0; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index bc03af8ae244..6f5b400ca7a7 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -185,7 +185,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl() void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { - if ( (SFX_ITEM_DEFAULT != eState) || pState->ISA( SfxVoidItem ) ) + if ( (SfxItemState::DEFAULT != eState) || pState->ISA( SfxVoidItem ) ) { GetStatusBar().SetItemText( GetId(), "" ); mpImpl->mbValuesSet = false; diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 130690d19761..fdca37d26875 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -519,7 +519,7 @@ void SdrEditView::CheckPossibilities() const SfxItemSet& rSet = pObj->GetMergedItemSet(); SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, false); - if(SFX_ITEM_DONTCARE != eState) + if(SfxItemState::DONTCARE != eState) { // If state is not DONTCARE, test the item drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index e776a7c513ba..500633aa3ca1 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -709,19 +709,19 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep // bReplaceAll has no effect here Rectangle aAllSnapRect(GetMarkedObjRect()); const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue(); SetRef1(Point(n,GetRef1().Y())); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue(); SetRef1(Point(GetRef1().X(),n)); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue(); SetRef2(Point(n,GetRef2().Y())); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); SetRef2(Point(GetRef2().X(),n)); } @@ -730,19 +730,19 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep long nAllWdt=0; bool bAllWdt=false; long nAllHgt=0; bool bAllHgt=false; bool bDoIt=false; - if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,true,&pPoolItem)==SfxItemState::SET) { nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue(); bAllPosX=true; bDoIt=true; } - if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,true,&pPoolItem)==SfxItemState::SET) { nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue(); bAllPosY=true; bDoIt=true; } - if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,true,&pPoolItem)==SfxItemState::SET) { nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue(); bAllWdt=true; bDoIt=true; } - if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,true,&pPoolItem)==SfxItemState::SET) { nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue(); bAllHgt=true; bDoIt=true; } @@ -754,23 +754,23 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep if (bAllHgt) aRect.Bottom()=aAllSnapRect.Top()+nAllHgt; SetMarkedObjRect(aRect); } - if (rAttr.GetItemState(SDRATTR_RESIZEXALL,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEXALL,true,&pPoolItem)==SfxItemState::SET) { Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue(); ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1)); } - if (rAttr.GetItemState(SDRATTR_RESIZEYALL,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEYALL,true,&pPoolItem)==SfxItemState::SET) { Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue(); ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact); } - if (rAttr.GetItemState(SDRATTR_ROTATEALL,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEALL,true,&pPoolItem)==SfxItemState::SET) { long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue(); RotateMarkedObj(aAllSnapRect.Center(),nAngle); } - if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,true,&pPoolItem)==SfxItemState::SET) { long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue(); ShearMarkedObj(aAllSnapRect.Center(),nAngle,false); } - if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,true,&pPoolItem)==SfxItemState::SET) { long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue(); ShearMarkedObj(aAllSnapRect.Center(),nAngle,true); } @@ -937,12 +937,12 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) con { if(!bOnlyHardAttr) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false)) + if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false)) rAttr.InvalidateItem(nWhich); else rAttr.MergeValue(rSet.Get(nWhich), true); } - else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false)) + else if(SfxItemState::SET == rSet.GetItemState(nWhich, false)) { const SfxPoolItem& rItem = rSet.Get(nWhich); rAttr.MergeValue(rItem, true); @@ -1008,7 +1008,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) while(!bPossibleGeomChange && nWhich) { SfxItemState eState = rAttr.GetItemState(nWhich); - if(eState == SFX_ITEM_SET) + if(eState == SfxItemState::SET) { if((nWhich >= SDRATTR_TEXT_MINFRAMEHEIGHT && nWhich <= SDRATTR_TEXT_CONTOURFRAME) || nWhich == SDRATTR_3DOBJ_PERCENT_DIAGONAL @@ -1034,7 +1034,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) const size_t nMarkAnz(GetMarkedObjectCount()); std::vector< E3DModifySceneSnapRectUpdater* > aUpdaters; - // create ItemSet without SFX_ITEM_DONTCARE. Put() + // create ItemSet without SfxItemState::DONTCARE. Put() // uses its second parameter (bInvalidAsDefault) to // remove all such items to set them to default. SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges()); @@ -1044,7 +1044,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) bool bResetAnimationTimer(false); // check if LineWidth is part of the change - const bool bLineWidthChange(SFX_ITEM_SET == aAttr.GetItemState(XATTR_LINEWIDTH)); + const bool bLineWidthChange(SfxItemState::SET == aAttr.GetItemState(XATTR_LINEWIDTH)); sal_Int32 nNewLineWidth(0); sal_Int32 nOldLineWidth(0); @@ -1111,7 +1111,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) if(nOldLineWidth != nNewLineWidth) { - if(SFX_ITEM_DONTCARE != rSet.GetItemState(XATTR_LINESTARTWIDTH)) + if(SfxItemState::DONTCARE != rSet.GetItemState(XATTR_LINESTARTWIDTH)) { const sal_Int32 nValAct(((const XLineStartWidthItem&)rSet.Get(XATTR_LINESTARTWIDTH)).GetValue()); const sal_Int32 nValNewStart(std::max((sal_Int32)0, nValAct + (((nNewLineWidth - nOldLineWidth) * 15) / 10))); @@ -1119,7 +1119,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) pObj->SetMergedItem(XLineStartWidthItem(nValNewStart)); } - if(SFX_ITEM_DONTCARE != rSet.GetItemState(XATTR_LINEENDWIDTH)) + if(SfxItemState::DONTCARE != rSet.GetItemState(XATTR_LINEENDWIDTH)) { const sal_Int32 nValAct(((const XLineEndWidthItem&)rSet.Get(XATTR_LINEENDWIDTH)).GetValue()); const sal_Int32 nValNewEnd(std::max((sal_Int32)0, nValAct + (((nNewLineWidth - nOldLineWidth) * 15) / 10))); @@ -1371,25 +1371,25 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH); bool bAutoGrow=((SdrOnOffItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); - if (eState==SFX_ITEM_DONTCARE) { + if (eState==SfxItemState::DONTCARE) { aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH); - } else if (eState==SFX_ITEM_SET) { + } else if (eState==SfxItemState::SET) { aRetSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_AUTOWIDTH,bAutoGrow)); } eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWHEIGHT); bAutoGrow=((SdrOnOffItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); - if (eState==SFX_ITEM_DONTCARE) { + if (eState==SfxItemState::DONTCARE) { aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOHEIGHT); - } else if (eState==SFX_ITEM_SET) { + } else if (eState==SfxItemState::SET) { aRetSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_AUTOHEIGHT,bAutoGrow)); } eState=aMarkAttr.GetItemState(SDRATTR_ECKENRADIUS); long nRadius=((SdrMetricItem&)(aMarkAttr.Get(SDRATTR_ECKENRADIUS))).GetValue(); - if (eState==SFX_ITEM_DONTCARE) { + if (eState==SfxItemState::DONTCARE) { aRetSet.InvalidateItem(SDRATTR_ECKENRADIUS); - } else if (eState==SFX_ITEM_SET) { + } else if (eState==SfxItemState::SET) { aRetSet.Put(makeSdrEckenradiusItem(nRadius)); } @@ -1512,21 +1512,21 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) const SfxPoolItem* pPoolItem=NULL; // position - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,true,&pPoolItem)) { nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left(); bChgPos=true; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,true,&pPoolItem)){ + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,true,&pPoolItem)){ nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top(); bChgPos=true; } // size - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,true,&pPoolItem)) { nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue(); bChgSiz=true; bChgWdh=true; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,true,&pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue(); bChgSiz=true; bChgHgt=true; @@ -1536,21 +1536,21 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // rotation - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,true,&pPoolItem)) { nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle; bRotate = (nRotateAngle != 0); } // position rotation point x - if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, true ,&pPoolItem)) + if(bRotate || SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, true ,&pPoolItem)) nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue(); // position rotation point y - if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, true ,&pPoolItem)) + if(bRotate || SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, true ,&pPoolItem)) nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue(); // shearing - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,true,&pPoolItem)) { long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR; if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR; @@ -1579,20 +1579,20 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // AutoGrow - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,true,&pPoolItem)) { bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(makeSdrTextAutoGrowWidthItem(bAutoGrow)); bSetAttr=true; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,true,&pPoolItem)) { + if (SfxItemState::SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,true,&pPoolItem)) { bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(makeSdrTextAutoGrowHeightItem(bAutoGrow)); bSetAttr=true; } // corner radius - if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,true,&pPoolItem)) { + if (bEdgeRadiusAllowed && SfxItemState::SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,true,&pPoolItem)) { long nRadius=((SdrMetricItem*)pPoolItem)->GetValue(); aSetAttr.Put(makeSdrEckenradiusItem(nRadius)); bSetAttr=true; @@ -1670,7 +1670,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // protect position - if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, true, &pPoolItem)) + if(SfxItemState::SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, true, &pPoolItem)) { const bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); @@ -1711,7 +1711,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) if(!bMoveProtect) { // protect size - if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, true, &pPoolItem)) + if(SfxItemState::SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, true, &pPoolItem)) { const bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 6945d2f66aca..ebef27daece7 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1564,7 +1564,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { const SfxPoolItem* pItem; SfxItemState eState=pSet->GetItemState(nWhich,false,&pItem); - if (eState==SFX_ITEM_SET) aSet.Put(*pItem); + if (eState==SfxItemState::SET) aSet.Put(*pItem); nWhich=aIter.NextWhich(); } diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index e5e373ea3d1e..4911c00aacd9 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -485,7 +485,7 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl // in other cases only the set items are. // Disabled and DontCare are regarded as holes in the Which range. SfxItemState eState=rSet.GetItemState(nWhich); - if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) { + if ((eState==SfxItemState::DEFAULT && bInklDefaults) || eState==SfxItemState::SET) { if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=false; else bHas=true; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 70e30e67dbfd..18f354a0f240 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -95,7 +95,7 @@ public: public: ImpItemListRow() - : eState(SFX_ITEM_UNKNOWN), + : eState(SfxItemState::UNKNOWN), nWhichId(0), pType(NULL), eItemType(ITEM_DONTKNOW), @@ -320,12 +320,12 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con { switch (pEntry->eState) { - case SFX_ITEM_UNKNOWN : sRet = "Unknown"; break; - case SFX_ITEM_DISABLED: sRet = "Disabled"; break; - case SFX_ITEM_DONTCARE: sRet = "DontCare"; break; - case SFX_ITEM_SET : sRet = "Set"; break; - case SFX_ITEM_DEFAULT : sRet = "Default"; break; - case SFX_ITEM_READONLY: sRet = "ReadOnly"; break; + case SfxItemState::UNKNOWN : sRet = "Unknown"; break; + case SfxItemState::DISABLED: sRet = "Disabled"; break; + case SfxItemState::DONTCARE: sRet = "DontCare"; break; + case SfxItemState::SET : sRet = "Set"; break; + case SfxItemState::DEFAULT : sRet = "Default"; break; + case SfxItemState::READONLY: sRet = "ReadOnly"; break; } // switch } break; case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break; @@ -589,10 +589,10 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { SfxItemState eState=rSet.GetItemState(nWhich,true,&rpItem); - if (eState==SFX_ITEM_DEFAULT) { + if (eState==SfxItemState::DEFAULT) { rpItem=&rSet.Get(nWhich); } - return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL; + return (eState==SfxItemState::DEFAULT || eState==SfxItemState::SET) && rpItem!=NULL; } bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) @@ -922,10 +922,10 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem SfxItemState eState=pSet->GetItemState(nWhich); if (p2ndSet!=NULL) { SfxItemState e2ndState=p2ndSet->GetItemState(nWhich); - if (eState==SFX_ITEM_DEFAULT) eState=SFX_ITEM_DISABLED; - else if (e2ndState==SFX_ITEM_DEFAULT) eState=SFX_ITEM_DEFAULT; + if (eState==SfxItemState::DEFAULT) eState=SfxItemState::DISABLED; + else if (e2ndState==SfxItemState::DEFAULT) eState=SfxItemState::DEFAULT; } - if (eState!=SFX_ITEM_DISABLED) { + if (eState!=SfxItemState::DISABLED) { const SfxPoolItem& rItem=pSet->Get(nWhich); sal_uInt16 nIndent=0; if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4e7d9313738a..ce465ce52fe0 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1814,7 +1814,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe while(nWhich) { - if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, false, &pPoolItem)) + if(SfxItemState::SET == pSourceSet->GetItemState(nWhich, false, &pPoolItem)) { const SfxPoolItem* pResultItem = NULL; diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 8b066f0ab6e8..890a418f6817 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -928,7 +928,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) SdrModel* pModel = GetModel(); const SfxItemSet& rSet = pObj->GetMergedItemSet(); - if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, false)) + if(SfxItemState::SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, false)) { // add this item, it's not yet there XFillFloatTransparenceItem aNewItem( diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ab285d42ddf5..76539b6f064b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2124,41 +2124,41 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) Point aRef1(rSnap.Center()); Point aRef2(aRef1); aRef2.Y()++; const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,true,&pPoolItem)==SfxItemState::SET) { aRef1.X()=((const SdrTransformRef1XItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,true,&pPoolItem)==SfxItemState::SET) { aRef1.Y()=((const SdrTransformRef1YItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,true,&pPoolItem)==SfxItemState::SET) { aRef2.X()=((const SdrTransformRef2XItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,true,&pPoolItem)==SfxItemState::SET) { aRef2.Y()=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); } Rectangle aNewSnap(rSnap); - if (rAttr.GetItemState(SDRATTR_MOVEX,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_MOVEX,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrMoveXItem*)pPoolItem)->GetValue(); aNewSnap.Move(n,0); } - if (rAttr.GetItemState(SDRATTR_MOVEY,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_MOVEY,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrMoveYItem*)pPoolItem)->GetValue(); aNewSnap.Move(0,n); } - if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrOnePositionXItem*)pPoolItem)->GetValue(); aNewSnap.Move(n-aNewSnap.Left(),0); } - if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrOnePositionYItem*)pPoolItem)->GetValue(); aNewSnap.Move(0,n-aNewSnap.Top()); } - if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrOneSizeWidthItem*)pPoolItem)->GetValue(); aNewSnap.Right()=aNewSnap.Left()+n; } - if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrOneSizeHeightItem*)pPoolItem)->GetValue(); aNewSnap.Bottom()=aNewSnap.Top()+n; } @@ -2170,7 +2170,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } } - if (rAttr.GetItemState(SDRATTR_SHEARANGLE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_SHEARANGLE,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrShearAngleItem*)pPoolItem)->GetValue(); n-=GetShearAngle(); if (n!=0) { @@ -2178,7 +2178,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcShear(aRef1,n,nTan,false); } } - if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrAngleItem*)pPoolItem)->GetValue(); n-=GetRotateAngle(); if (n!=0) { @@ -2187,28 +2187,28 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcRotate(aRef1,n,nSin,nCos); } } - if (rAttr.GetItemState(SDRATTR_ROTATEONE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEONE,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrRotateOneItem*)pPoolItem)->GetValue(); double nSin=sin(n*nPi180); double nCos=cos(n*nPi180); NbcRotate(aRef1,n,nSin,nCos); } - if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrHorzShearOneItem*)pPoolItem)->GetValue(); double nTan=tan(n*nPi180); NbcShear(aRef1,n,nTan,false); } - if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrVertShearOneItem*)pPoolItem)->GetValue(); double nTan=tan(n*nPi180); NbcShear(aRef1,n,nTan,true); } - if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,true,&pPoolItem)==SfxItemState::SET) { bool b=((const SdrYesNoItem*)pPoolItem)->GetValue(); SetMoveProtect(b); } - if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,true,&pPoolItem)==SfxItemState::SET) { bool b=((const SdrYesNoItem*)pPoolItem)->GetValue(); SetResizeProtect(b); } @@ -2217,21 +2217,21 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) if( IsMoveProtect() ) SetResizeProtect( true ); - if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,true,&pPoolItem)==SfxItemState::SET) { bool b=((const SdrObjPrintableItem*)pPoolItem)->GetValue(); SetPrintable(b); } - if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,true,&pPoolItem)==SfxItemState::SET) { bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue(); SetVisible(b); } SdrLayerID nLayer=SDRLAYER_NOTFOUND; - if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SfxItemState::SET) { nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SfxItemState::SET && pModel!=NULL) { OUString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue(); const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL; if (pLayAd!=NULL) { @@ -2246,16 +2246,16 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcSetLayer(nLayer); } - if (rAttr.GetItemState(SDRATTR_OBJECTNAME,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJECTNAME,true,&pPoolItem)==SfxItemState::SET) { OUString aName=((const SfxStringItem*)pPoolItem)->GetValue(); SetName(aName); } Rectangle aNewLogic(rLogic); - if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrLogicSizeWidthItem*)pPoolItem)->GetValue(); aNewLogic.Right()=aNewLogic.Left()+n; } - if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,true,&pPoolItem)==SfxItemState::SET) { long n=((const SdrLogicSizeHeightItem*)pPoolItem)->GetValue(); aNewLogic.Bottom()=aNewLogic.Top()+n; } @@ -2264,10 +2264,10 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } Fraction aResizeX(1,1); Fraction aResizeY(1,1); - if (rAttr.GetItemState(SDRATTR_RESIZEXONE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEXONE,true,&pPoolItem)==SfxItemState::SET) { aResizeX*=((const SdrResizeXOneItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_RESIZEYONE,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEYONE,true,&pPoolItem)==SfxItemState::SET) { aResizeY*=((const SdrResizeYOneItem*)pPoolItem)->GetValue(); } if (aResizeX!=Fraction(1,1) || aResizeY!=Fraction(1,1)) { diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index bc790703b41f..8c2070d120f1 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -1000,7 +1000,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bRep // bReplaceAll has no effect here at all. bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SfxItemState::SET) { SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue(); const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId); if (pLayer!=NULL) { @@ -1008,7 +1008,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bRep else aAktLayer=pLayer->GetName(); } } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SfxItemState::SET) { if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue(); else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue(); } @@ -1068,7 +1068,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRe SfxWhichIter aIter(pStyleSheet->GetItemSet()); sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { - if (pStyleSheet->GetItemSet().GetItemState(nWhich,true)==SFX_ITEM_SET) { + if (pStyleSheet->GetItemSet().GetItemState(nWhich,true)==SfxItemState::SET) { aDefaultAttr.ClearItem(nWhich); } nWhich=aIter.NextWhich(); diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 0dc5081a0165..ed99ae31008f 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -127,7 +127,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL) { - bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, true) == SFX_ITEM_SET; + bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, true) == SfxItemState::SET; MapUnit aOldUnit(pOldModel->GetScaleUnit()); MapUnit aNewUnit(pNewModel->GetScaleUnit()); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 05e8af3fea04..e8a84e52de82 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -391,7 +391,7 @@ void SdrUndoAttrObj::Undo() while(nWhich) { - if(SFX_ITEM_SET != pUndoSet->GetItemState(nWhich, false)) + if(SfxItemState::SET != pUndoSet->GetItemState(nWhich, false)) { pObj->ClearMergedItem(nWhich); } @@ -468,7 +468,7 @@ void SdrUndoAttrObj::Redo() while(nWhich) { - if(SFX_ITEM_SET != pRedoSet->GetItemState(nWhich, false)) + if(SfxItemState::SET != pRedoSet->GetItemState(nWhich, false)) { pObj->ClearMergedItem(nWhich); } diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 35af45be5b32..ce7a6a91ee6b 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -265,7 +265,7 @@ namespace sdr { SfxItemSet aSet(pOutliner->GetParaAttribs(nPara)); aSet.Put(rSet); - if (aSet.GetItemState(EE_CHAR_COLOR, false) == SFX_ITEM_SET) + if (aSet.GetItemState(EE_CHAR_COLOR, false) == SfxItemState::SET) pOutliner->RemoveCharAttribs( nPara, EE_CHAR_COLOR ); pOutliner->SetParaAttribs(nPara, aSet); } @@ -1111,14 +1111,14 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& if( !SvxUnoTextRangeBase::SetPropertyValueHelper( aSet, pMap, rValue, aSet )) { - if( aSet.GetItemState( pMap->nWID ) != SFX_ITEM_SET ) + if( aSet.GetItemState( pMap->nWID ) != SfxItemState::SET ) { // Default aus ItemPool holen if(SfxItemPool::IsWhich(pMap->nWID)) aSet.Put(GetModel()->GetItemPool().GetDefaultItem(pMap->nWID)); } - if( aSet.GetItemState( pMap->nWID ) == SFX_ITEM_SET ) + if( aSet.GetItemState( pMap->nWID ) == SfxItemState::SET ) { SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rValue, aSet ); } @@ -1349,8 +1349,8 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th { const SfxItemSet& rSet = mpProperties->GetMergedItemSet(); - const bool bStretch = rSet.GetItemState( XATTR_FILLBMP_STRETCH, false ) == SFX_ITEM_SET; - const bool bTile = rSet.GetItemState( XATTR_FILLBMP_TILE, false ) == SFX_ITEM_SET; + const bool bStretch = rSet.GetItemState( XATTR_FILLBMP_STRETCH, false ) == SfxItemState::SET; + const bool bTile = rSet.GetItemState( XATTR_FILLBMP_TILE, false ) == SfxItemState::SET; if( bStretch || bTile ) { eState = PropertyState_DIRECT_VALUE; @@ -1367,7 +1367,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th case OWN_ATTR_TABLEBORDER: { const SfxItemSet& rSet = mpProperties->GetMergedItemSet(); - if( (rSet.GetItemState( SDRATTR_TABLE_BORDER_INNER, false ) == SFX_ITEM_DEFAULT) && (rSet.GetItemState( SDRATTR_TABLE_BORDER, false ) == SFX_ITEM_DEFAULT) ) + if( (rSet.GetItemState( SDRATTR_TABLE_BORDER_INNER, false ) == SfxItemState::DEFAULT) && (rSet.GetItemState( SDRATTR_TABLE_BORDER, false ) == SfxItemState::DEFAULT) ) return PropertyState_DEFAULT_VALUE; return PropertyState_DIRECT_VALUE; @@ -1378,11 +1378,11 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th switch( rSet.GetItemState( pMap->nWID, false ) ) { - case SFX_ITEM_READONLY: - case SFX_ITEM_SET: + case SfxItemState::READONLY: + case SfxItemState::SET: eState = PropertyState_DIRECT_VALUE; break; - case SFX_ITEM_DEFAULT: + case SfxItemState::DEFAULT: eState = PropertyState_DEFAULT_VALUE; break; default: diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 976b4c84b967..95dd3e673ad3 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2067,11 +2067,11 @@ WritingMode SdrTableObj::GetWritingMode() const const SfxItemSet &rSet = pStyle->GetItemSet(); const SfxPoolItem *pItem; - if ( rSet.GetItemState( SDRATTR_TEXTDIRECTION, false, &pItem ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( SDRATTR_TEXTDIRECTION, false, &pItem ) == SfxItemState::SET ) eWritingMode = static_cast< WritingMode >( static_cast< const SvxWritingModeItem * >( pItem )->GetValue() ); if ( ( eWritingMode != WritingMode_TB_RL ) && - ( rSet.GetItemState( EE_PARA_WRITINGDIR, false, &pItem ) == SFX_ITEM_SET ) ) + ( rSet.GetItemState( EE_PARA_WRITINGDIR, false, &pItem ) == SfxItemState::SET ) ) { if ( static_cast< const SvxFrameDirectionItem * >( pItem )->GetValue() == FRMDIR_HORI_LEFT_TOP ) eWritingMode = WritingMode_LR_TB; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index ae36dc639a9c..514505c368d9 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -422,7 +422,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK; - if( pSet->GetItemState( SDRATTR_TEXT_VERTADJUST ) != SFX_ITEM_DONTCARE ) + if( pSet->GetItemState( SDRATTR_TEXT_VERTADJUST ) != SfxItemState::DONTCARE ) eAdj = ((SdrTextVertAdjustItem&)(pSet->Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); rSet.Put(SfxBoolItem(SID_TABLE_VERT_BOTTOM, eAdj == SDRTEXTVERTADJUST_BOTTOM)); @@ -505,7 +505,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) if (pItem) { nCount = ((const SfxInt16Item* )pItem)->GetValue(); - if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, true, &pItem)) + if(SfxItemState::SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, true, &pItem)) bInsertAfter = ((const SfxBoolItem* )pItem)->GetValue(); } } @@ -850,7 +850,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; - if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, false)) ) + if( !pTableObj || !pModel || !pArgs || (SfxItemState::SET != pArgs->GetItemState(SID_TABLE_STYLE, false)) ) return; const SfxStringItem* pArg = dynamic_cast< const SfxStringItem* >( &pArgs->Get( SID_TABLE_STYLE ) ); @@ -891,7 +891,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ ) { - if( (rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_SET) && (aSet.GetItemState( nWhich ) == SFX_ITEM_SET) ) + if( (rStyleAttribs.GetItemState( nWhich ) == SfxItemState::SET) && (aSet.GetItemState( nWhich ) == SfxItemState::SET) ) { aSet.ClearItem( nWhich ); bChanges = true; @@ -935,22 +935,22 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs ) const SfxPoolItem *pPoolItem=NULL; - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, false,&pPoolItem)) ) + if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, false,&pPoolItem)) ) aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, false,&pPoolItem)) ) + if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, false,&pPoolItem)) ) aSettings.mbUseLastRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, false,&pPoolItem)) ) + if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, false,&pPoolItem)) ) aSettings.mbUseRowBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, false,&pPoolItem)) ) + if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, false,&pPoolItem)) ) aSettings.mbUseFirstColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, false,&pPoolItem)) ) + if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, false,&pPoolItem)) ) aSettings.mbUseLastColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, false,&pPoolItem)) ) + if( (SfxItemState::SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, false,&pPoolItem)) ) aSettings.mbUseColumnBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); if( aSettings == pTableObj->getTableStyleSettings() ) @@ -1995,12 +1995,12 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl { if(!bOnlyHardAttr) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false)) + if(SfxItemState::DONTCARE == rSet.GetItemState(nWhich, false)) rAttr.InvalidateItem(nWhich); else rAttr.MergeValue(rSet.Get(nWhich), true); } - else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false)) + else if(SfxItemState::SET == rSet.GetItemState(nWhich, false)) { const SfxPoolItem& rItem = rSet.Get(nWhich); rAttr.MergeValue(rItem, true); @@ -2191,19 +2191,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) if( nRowCount && nColCount ) { const SvxBoxItem* pBoxItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, false) ) + if(SfxItemState::SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, false) ) pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) ); const SvxBoxInfoItem* pBoxInfoItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) ) + if(SfxItemState::SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) ) pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ); const SvxColorItem* pLineColorItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, false) ) + if(SfxItemState::SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, false) ) pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) ); const SvxBorderLine* pBorderLineItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, false) ) + if(SfxItemState::SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, false) ) pBorderLineItem = ((const SvxLineItem&)rAttr.Get( SID_FRAME_LINESTYLE )).GetLine(); if( pBoxInfoItem && !pBoxItem ) @@ -2300,7 +2300,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges()); aAttr.Put(rAttr, true); - const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET); + const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SfxItemState::SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SfxItemState::SET); if( bFrame ) { @@ -2507,7 +2507,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo SfxItemSet aAttr(*rFormatSet.GetPool(), rFormatSet.GetRanges()); aAttr.Put(rFormatSet, true); - const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET); + const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SfxItemState::SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SfxItemState::SET); if( bFrame ) { diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index fa7b635d7133..69c9150e8239 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -270,7 +270,7 @@ void SdrTableRTFParser::FillTable() if( xCell.is() && xCellInfo.get() ) { const SfxPoolItem *pPoolItem = 0; - if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SFX_ITEM_SET) + if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SfxItemState::SET) xCell->SetMergedItem( *pPoolItem ); boost::scoped_ptr<OutlinerParaObject> pTextObject(mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount )); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 0d8ad1a2b725..e5ff211eef23 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -403,7 +403,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) { SfxItemSet aAttrSet( pView->GetModel()->GetItemPool() ); pView->GetAttributes( aAttrSet ); - if ( aAttrSet.GetItemState( XATTR_LINESTYLE ) != SFX_ITEM_DONTCARE ) + if ( aAttrSet.GetItemState( XATTR_LINESTYLE ) != SfxItemState::DONTCARE ) { XLineStyle eXLS = (XLineStyle) ( (const XLineStyleItem&)aAttrSet.Get( XATTR_LINESTYLE ) ).GetValue(); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 5b46ff9d2311..2a5b26a0e3a2 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -92,7 +92,7 @@ void SvxFillToolBoxControl::StateChanged( SfxItemState eState, const SfxPoolItem* pState) { - if(eState == SFX_ITEM_DISABLED) + if(eState == SfxItemState::DISABLED) { // slot disable state if(nSID == SID_ATTR_FILL_STYLE) @@ -104,7 +104,7 @@ void SvxFillToolBoxControl::StateChanged( mpFillAttrLB->Disable(); mpFillAttrLB->SetNoSelection(); } - else if(SFX_ITEM_DEFAULT == eState) + else if(SfxItemState::DEFAULT == eState) { bool bEnableControls(false); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 7e5619deeffa..2bcccfa2b978 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -96,7 +96,7 @@ void FormatPaintBrushToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/) void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if( eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET ) + if( eState != SfxItemState::DEFAULT && eState != SfxItemState::SET ) m_bPersistentCopy = false; SfxToolBoxControl::StateChanged( nSID, eState, pState ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 23a0d24ce4ad..2fff9959d316 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -440,7 +440,7 @@ SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl() void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { - GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) ); + GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) ); } SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const @@ -473,7 +473,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const ImplGrafControl* pCtrl = (ImplGrafControl*) GetToolBox().GetItemWindow( GetId() ); DBG_ASSERT( pCtrl, "Control not found" ); - if( eState == SFX_ITEM_DISABLED ) + if( eState == SfxItemState::DISABLED ) { pCtrl->Disable(); pCtrl->SetText( OUString() ); @@ -482,7 +482,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const { pCtrl->Enable(); - if( eState == SFX_ITEM_DEFAULT ) + if( eState == SfxItemState::DEFAULT ) pCtrl->Update( pState ); else pCtrl->Update( NULL ); @@ -560,7 +560,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c ImplGrafModeControl* pCtrl = (ImplGrafModeControl*) GetToolBox().GetItemWindow( GetId() ); DBG_ASSERT( pCtrl, "Control not found" ); - if( eState == SFX_ITEM_DISABLED ) + if( eState == SfxItemState::DISABLED ) { pCtrl->Disable(); pCtrl->SetText( OUString() ); @@ -569,7 +569,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c { pCtrl->Enable(); - if( eState == SFX_ITEM_DEFAULT ) + if( eState == SfxItemState::DEFAULT ) pCtrl->Update( pState ); else pCtrl->Update( NULL ); @@ -598,7 +598,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) const SfxPoolItem* pItem; sal_uInt16 nSlot = rReq.GetSlot(); - if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, false, &pItem )) + if( !pArgs || SfxItemState::SET != pArgs->GetItemState( nSlot, false, &pItem )) pItem = 0; switch( nSlot ) @@ -757,7 +757,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) aUndoStr += SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP ); // set crop attributes - if( SFX_ITEM_SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) ) + if( SfxItemState::SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) ) { const SdrGrafCropItem& rNewCrop = (const SdrGrafCropItem&) pOutAttr->Get( SDRATTR_GRAFCROP ); @@ -767,7 +767,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) } // set new logic rect - if( SFX_ITEM_SET <= pOutAttr->GetItemState( SID_ATTR_GRAF_FRMSIZE ) ) + if( SfxItemState::SET <= pOutAttr->GetItemState( SID_ATTR_GRAF_FRMSIZE ) ) { Point aNewOrigin( pObj->GetLogicRect().TopLeft() ); const Size& rGrfSize = ( (const SvxSizeItem&) pOutAttr->Get( SID_ATTR_GRAF_FRMSIZE ) ).GetSize(); @@ -898,7 +898,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) { case( SID_ATTR_GRAF_MODE ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) ) { if( bEnableColors ) { @@ -915,7 +915,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_RED ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFRED ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFRED ) ) { if( bEnableColors ) { @@ -932,7 +932,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_GREEN ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFGREEN ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFGREEN ) ) { if( bEnableColors ) { @@ -949,7 +949,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_BLUE ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFBLUE ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFBLUE ) ) { if( bEnableColors ) { @@ -966,7 +966,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_LUMINANCE ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFLUMINANCE ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFLUMINANCE ) ) { if( bEnableColors ) { @@ -983,7 +983,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_CONTRAST ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFCONTRAST ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFCONTRAST ) ) { if( bEnableColors ) { @@ -1000,7 +1000,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_GAMMA ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFGAMMA ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFGAMMA ) ) { if( bEnableColors ) { @@ -1017,7 +1017,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_TRANSPARENCE ): { - if( SFX_ITEM_DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) ) + if( SfxItemState::DEFAULT <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) ) { if( bEnableTransparency ) { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 4e59d1d4df7c..4917f107f4e1 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -755,14 +755,14 @@ void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, cons bEnabled = ( nValue != 0 ); } else - bEnabled = SFX_ITEM_DISABLED != eState; + bEnabled = SfxItemState::DISABLED != eState; sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); rTbx.SetItemState( nId, - ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); + ( SfxItemState::DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) @@ -817,7 +817,7 @@ void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - bEnabled = SFX_ITEM_DISABLED != eState; + bEnabled = SfxItemState::DISABLED != eState; SfxToolBoxControl::StateChanged(nSID, eState, pState ); } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 33340d59cddf..5dea6904fca6 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -119,7 +119,7 @@ void SvxPopupWindowListBox::PopupModeEnd() void SvxPopupWindowListBox::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - rToolBox.EnableItem( nTbxId, ( SfxToolBoxControl::GetItemState( pState ) != SFX_ITEM_DISABLED) ); + rToolBox.EnableItem( nTbxId, ( SfxToolBoxControl::GetItemState( pState ) != SfxItemState::DISABLED) ); SfxPopupWindow::StateChanged( nSID, eState, pState ); } @@ -161,7 +161,7 @@ void SvxListBoxControl::StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ) { GetToolBox().EnableItem( GetId(), - SFX_ITEM_DISABLED != GetItemState(pState) ); + SfxItemState::DISABLED != GetItemState(pState) ); } @@ -241,7 +241,7 @@ void SvxUndoRedoControl::StateChanged( { if ( nSID == SID_UNDO || nSID == SID_REDO ) { - if ( eState == SFX_ITEM_DISABLED ) + if ( eState == SfxItemState::DISABLED ) { ToolBox& rBox = GetToolBox(); rBox.SetQuickHelpText( GetId(), aDefaultText ); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index a02b499abfc4..07eb01230c05 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -79,7 +79,7 @@ void SvxLineStyleToolBoxControl::StateChanged ( SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() ); DBG_ASSERT( pBox, "Window not found!" ); - if( eState == SFX_ITEM_DISABLED ) + if( eState == SfxItemState::DISABLED ) { pBox->Disable(); pBox->SetNoSelection(); @@ -88,7 +88,7 @@ void SvxLineStyleToolBoxControl::StateChanged ( { pBox->Enable(); - if ( eState == SFX_ITEM_DEFAULT ) + if ( eState == SfxItemState::DEFAULT ) { if( nSID == SID_ATTR_LINE_STYLE ) { @@ -215,7 +215,7 @@ void SvxLineWidthToolBoxControl::StateChanged( } else { - if ( eState == SFX_ITEM_DISABLED ) + if ( eState == SfxItemState::DISABLED ) { pFld->Disable(); pFld->SetText( "" ); @@ -224,7 +224,7 @@ void SvxLineWidthToolBoxControl::StateChanged( { pFld->Enable(); - if ( eState == SFX_ITEM_DEFAULT ) + if ( eState == SfxItemState::DEFAULT ) { DBG_ASSERT( pState->ISA(XLineWidthItem), "wrong ItemType" ); @@ -644,8 +644,8 @@ void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, co sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); + rTbx.SetItemState( nId, ( SfxItemState::DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 1b5972446ecb..288df13186ef 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1039,7 +1039,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SID_ATTR_AUTO_COLOR_INVALID, OUString( ".uno:AutoColorInvalid" )); SfxItemState eState = aQueryStatus.QueryState( pDummy ); - if( (SFX_ITEM_DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) ) + if( (SfxItemState::DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) ) { aColorSet.SetStyle( aColorSet.GetStyle() | WB_NONEFIELD ); aColorSet.SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) ); @@ -1145,7 +1145,7 @@ bool SvxColorWindow_Impl::Close() void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - if (( SFX_ITEM_DISABLED != eState ) && pState ) + if (( SfxItemState::DISABLED != eState ) && pState ) { if (( nSID == SID_COLOR_TABLE ) && ( pState->ISA( SvxColorListItem ))) { @@ -1159,7 +1159,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co aColorSet.Clear(); aColorSet.addEntriesForXColorList(*pColorList); } - else if ( SFX_ITEM_DEFAULT <= eState ) + else if ( SfxItemState::DEFAULT <= eState ) { aColorSet.SetNoSelection(); @@ -1598,7 +1598,7 @@ void SfxStyleControllerItem_Impl::StateChanged( { const sal_uInt16 nIdx = GetId() - SID_STYLE_FAMILY_START; - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { const SfxTemplateItem* pStateItem = PTR_CAST( SfxTemplateItem, pState ); @@ -2050,22 +2050,22 @@ void SvxStyleToolBoxControl::StateChanged( DBG_ASSERT( pBox, "Control not found!" ); - if ( SFX_ITEM_DISABLED == eState ) + if ( SfxItemState::DISABLED == eState ) pBox->Disable(); else pBox->Enable(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); switch ( eState ) { - case SFX_ITEM_DEFAULT: + case SfxItemState::DEFAULT: eTri = ((const SfxBoolItem*)pState)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE; break; - case SFX_ITEM_DONTCARE: + case SfxItemState::DONTCARE: eTri = TRISTATE_INDET; break; @@ -2075,7 +2075,7 @@ void SvxStyleToolBoxControl::StateChanged( rTbx.SetItemState( nId, eTri ); - if ( SFX_ITEM_DISABLED != eState ) + if ( SfxItemState::DISABLED != eState ) Update(); } @@ -2114,7 +2114,7 @@ void SvxFontNameToolBoxControl::StateChanged( DBG_ASSERT( pBox, "Control not found!" ); - if ( SFX_ITEM_DISABLED == eState ) + if ( SfxItemState::DISABLED == eState ) { pBox->Disable(); pBox->Update( (const SvxFontItem*)NULL ); @@ -2123,7 +2123,7 @@ void SvxFontNameToolBoxControl::StateChanged( { pBox->Enable(); - if ( SFX_ITEM_DEFAULT == eState ) + if ( SfxItemState::DEFAULT == eState ) { const SvxFontItem* pFontItem = dynamic_cast< const SvxFontItem* >( pState ); @@ -2136,7 +2136,7 @@ void SvxFontNameToolBoxControl::StateChanged( pBox->SaveValue(); } - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); } Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) @@ -2259,12 +2259,12 @@ void SvxColorToolBoxControl::StateChanged( { ToolBox& rTbx = GetToolBox(); sal_uInt16 nId = GetId(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); + rTbx.SetItemState( nId, ( SfxItemState::DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); if ( nSID == SID_ATTR_CHAR_COLOR_EXT || nSID == SID_ATTR_CHAR_COLOR_BACKGROUND_EXT ) { - if ( pState && SFX_ITEM_DONTCARE != eState ) + if ( pState && SfxItemState::DONTCARE != eState ) { const SfxBoolItem* pBool = static_cast< const SfxBoolItem* >( pState ); rTbx.CheckItem( nId, pBool && pBool->GetValue() ); @@ -2368,8 +2368,8 @@ void SvxLineColorToolBoxControl::StateChanged( { ToolBox& rTbx = GetToolBox(); sal_uInt16 nId = GetId(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); + rTbx.SetItemState( nId, ( SfxItemState::DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE ); } void SvxLineColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/) @@ -2415,8 +2415,8 @@ void SvxFrameToolBoxControl::StateChanged( sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, (SFX_ITEM_DONTCARE == eState) + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); + rTbx.SetItemState( nId, (SfxItemState::DONTCARE == eState) ? TRISTATE_INDET : TRISTATE_FALSE ); } @@ -2454,8 +2454,8 @@ void SvxFrameLineStyleToolBoxControl::StateChanged( sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); - rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); - rTbx.SetItemState( nId, (SFX_ITEM_DONTCARE == eState) + rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); + rTbx.SetItemState( nId, (SfxItemState::DONTCARE == eState) ? TRISTATE_INDET : TRISTATE_FALSE ); } @@ -2474,14 +2474,14 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, { SfxStringItem* pItem = PTR_CAST( SfxStringItem, pState ); ToolBox& rBox = GetToolBox(); - if ( pItem && eState != SFX_ITEM_DISABLED ) + if ( pItem && eState != SfxItemState::DISABLED ) { OUString aNewText( MnemonicGenerator::EraseAllMnemonicChars( pItem->GetValue() ) ); rBox.SetQuickHelpText( GetId(), aNewText ); } - if ( eState == SFX_ITEM_DISABLED ) + if ( eState == SfxItemState::DISABLED ) rBox.SetQuickHelpText( GetId(), aDefaultText ); - rBox.EnableItem( GetId(), eState != SFX_ITEM_DISABLED ); + rBox.EnableItem( GetId(), eState != SfxItemState::DISABLED ); } static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 69c36b62cd55..52d208d94c25 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -57,7 +57,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) ); + GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) ); SfxToolBoxControl::StateChanged( nSID, eState, pState ); Reference< XLayoutManager > xLayoutMgr = getLayoutManager(); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index eb37bc6e892f..c80ccbfc95c1 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -182,7 +182,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem case SID_EXTRUSION_DIRECTION: { - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_DIRECTION ) == SFX_ITEM_SET ) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_DIRECTION ) == SfxItemState::SET ) { sal_Int32 nSkew = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_DIRECTION))->GetValue(); @@ -266,7 +266,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_PROJECTION: { - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_PROJECTION ) == SFX_ITEM_SET ) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_PROJECTION ) == SfxItemState::SET ) { sal_Int32 nProjection = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_PROJECTION))->GetValue(); ProjectionMode eProjectionMode = nProjection == 1 ? ProjectionMode_PARALLEL : ProjectionMode_PERSPECTIVE; @@ -279,7 +279,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_DEPTH: { - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_DEPTH ) == SFX_ITEM_SET) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_DEPTH ) == SfxItemState::SET) { double fDepth = ((const SvxDoubleItem*)rReq.GetArgs()->GetItem(SID_EXTRUSION_DEPTH))->GetValue(); double fFraction = 0.0; @@ -300,7 +300,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem { static const OUString sExtrusionColor( "Color" ); - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SfxItemState::SET) { Color aColor( ((const SvxColorItem&)rReq.GetArgs()->Get(SID_EXTRUSION_3D_COLOR)).GetValue() ); @@ -330,7 +330,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem static const OUString sDiffusion( "Diffusion" ); static const OUString sMetal( "Metal" ); - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SFX_ITEM_SET) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SfxItemState::SET) { sal_Int32 nSurface = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_SURFACE))->GetValue(); @@ -384,7 +384,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem static const OUString sFirstLightLevel( "FirstLightLevel" ); static const OUString sSecondLightLevel( "SecondLightLevel" ); - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SfxItemState::SET) { sal_Int32 nLevel = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_LIGHTING_INTENSITY))->GetValue(); @@ -444,7 +444,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; case SID_EXTRUSION_LIGHTING_DIRECTION: { - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_DIRECTION ) == SFX_ITEM_SET) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_DIRECTION ) == SfxItemState::SET) { sal_Int32 nDirection = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_EXTRUSION_LIGHTING_DIRECTION))->GetValue(); @@ -578,8 +578,8 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB case SID_EXTRUSION_DEPTH_DIALOG: if( rReq.GetArgs() && - (rReq.GetArgs()->GetItemState( SID_EXTRUSION_DEPTH ) == SFX_ITEM_SET) && - (rReq.GetArgs()->GetItemState( SID_ATTR_METRIC ) == SFX_ITEM_SET)) + (rReq.GetArgs()->GetItemState( SID_EXTRUSION_DEPTH ) == SfxItemState::SET) && + (rReq.GetArgs()->GetItemState( SID_ATTR_METRIC ) == SfxItemState::SET)) { double fDepth = ((const SvxDoubleItem*)rReq.GetArgs()->GetItem(SID_EXTRUSION_DEPTH))->GetValue(); FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue(); @@ -1252,90 +1252,90 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) void ExtrusionBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) { - if (rSet.GetItemState(SID_EXTRUSION_DIRECTION) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_DIRECTION) != SfxItemState::UNKNOWN) { getExtrusionDirectionState( pSdrView, rSet ); } - if (rSet.GetItemState(SID_EXTRUSION_PROJECTION) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_PROJECTION) != SfxItemState::UNKNOWN) { getExtrusionProjectionState( pSdrView, rSet ); } const bool bOnlyExtrudedCustomShapes = checkForSelectedCustomShapes( pSdrView, true ); - if (rSet.GetItemState(SID_EXTRUSION_TILT_DOWN) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TILT_DOWN) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_TILT_DOWN ); } - if (rSet.GetItemState(SID_EXTRUSION_TILT_DOWN) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TILT_DOWN) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_TILT_DOWN ); } - if (rSet.GetItemState(SID_EXTRUSION_TILT_UP) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TILT_UP) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_TILT_UP ); } - if (rSet.GetItemState(SID_EXTRUSION_TILT_LEFT) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TILT_LEFT) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_TILT_LEFT ); } - if (rSet.GetItemState(SID_EXTRUSION_TILT_RIGHT) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TILT_RIGHT) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_TILT_RIGHT ); } - if (rSet.GetItemState(SID_EXTRUSION_3D_COLOR) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_3D_COLOR) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_3D_COLOR ); } - if (rSet.GetItemState(SID_EXTRUSION_DEPTH_FLOATER) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_DEPTH_FLOATER) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_DEPTH_FLOATER ); } - if (rSet.GetItemState(SID_EXTRUSION_DIRECTION_FLOATER) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_DIRECTION_FLOATER) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_DIRECTION_FLOATER ); } - if (rSet.GetItemState(SID_EXTRUSION_LIGHTING_FLOATER) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_LIGHTING_FLOATER) != SfxItemState::UNKNOWN) { if (! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_LIGHTING_FLOATER ); } - if (rSet.GetItemState(SID_EXTRUSION_SURFACE_FLOATER) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_SURFACE_FLOATER) != SfxItemState::UNKNOWN) { if(! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_SURFACE_FLOATER ); } - if (rSet.GetItemState(SID_EXTRUSION_TOOGLE) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TOOGLE) != SfxItemState::UNKNOWN) { if( !checkForSelectedCustomShapes( pSdrView, false ) ) rSet.DisableItem( SID_EXTRUSION_TOOGLE ); } - if (rSet.GetItemState(SID_EXTRUSION_DEPTH) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_DEPTH) != SfxItemState::UNKNOWN) { getExtrusionDepthState( pSdrView, rSet ); } - if (rSet.GetItemState(SID_EXTRUSION_SURFACE) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_SURFACE) != SfxItemState::UNKNOWN) { getExtrusionSurfaceState( pSdrView, rSet ); } - if (rSet.GetItemState(SID_EXTRUSION_LIGHTING_INTENSITY) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_LIGHTING_INTENSITY) != SfxItemState::UNKNOWN) { getExtrusionLightingIntensityState( pSdrView, rSet ); } - if (rSet.GetItemState(SID_EXTRUSION_LIGHTING_DIRECTION) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_LIGHTING_DIRECTION) != SfxItemState::UNKNOWN) { getExtrusionLightingDirectionState( pSdrView, rSet ); } - if (rSet.GetItemState(SID_EXTRUSION_3D_COLOR) != SFX_ITEM_UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_3D_COLOR) != SfxItemState::UNKNOWN) { getExtrusionColorState( pSdrView, rSet ); } diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 8bf103061ddc..aae587aac6d3 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -268,7 +268,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem case SID_FONTWORK_ALIGNMENT: { - if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_FONTWORK_ALIGNMENT ) == SFX_ITEM_SET ) + if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_FONTWORK_ALIGNMENT ) == SfxItemState::SET ) { sal_Int32 nValue = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_ALIGNMENT))->GetValue(); if ( ( nValue >= 0 ) && ( nValue < 5 ) ) @@ -293,7 +293,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem case SID_FONTWORK_CHARACTER_SPACING: { - if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_CHARACTER_SPACING ) == SFX_ITEM_SET ) ) + if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_CHARACTER_SPACING ) == SfxItemState::SET ) ) { sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue(); pObj->SetMergedItem( SvxCharScaleWidthItem( (sal_uInt16)nCharSpacing, EE_CHAR_FONTWIDTH ) ); @@ -304,7 +304,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem case SID_FONTWORK_KERN_CHARACTER_PAIRS: { - if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_KERN_CHARACTER_PAIRS ) == SFX_ITEM_SET ) ) + if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_KERN_CHARACTER_PAIRS ) == SfxItemState::SET ) ) { // sal_Bool bKernCharacterPairs = ((const SfxBoolItem*)rReq.GetArgs()->GetItem(SID_FONTWORK_KERN_CHARACTER_PAIRS))->GetValue(); //TODO: pObj->SetMergedItem( SvxCharScaleWidthItem( (sal_uInt16)nCharSpacing, EE_CHAR_FONTWIDTH ) ); @@ -488,7 +488,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi case SID_FONTWORK_CHARACTER_SPACING_DIALOG : { - if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_CHARACTER_SPACING ) == SFX_ITEM_SET ) ) + if( rReq.GetArgs() && ( rReq.GetArgs()->GetItemState( SID_FONTWORK_CHARACTER_SPACING ) == SfxItemState::SET ) ) { sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue(); FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing ); @@ -555,43 +555,43 @@ void FontworkBar::getState( SdrView* pSdrView, SfxItemSet& rSet ) { sal_uInt32 nCheckStatus = 0; - if ( rSet.GetItemState( SID_FONTWORK_ALIGNMENT_FLOATER ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_ALIGNMENT_FLOATER ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_ALIGNMENT_FLOATER ); } - if ( rSet.GetItemState( SID_FONTWORK_ALIGNMENT ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_ALIGNMENT ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_ALIGNMENT ); else SetAlignmentState( pSdrView, rSet ); } - if ( rSet.GetItemState( SID_FONTWORK_CHARACTER_SPACING_FLOATER ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_CHARACTER_SPACING_FLOATER ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_CHARACTER_SPACING_FLOATER ); } - if ( rSet.GetItemState( SID_FONTWORK_CHARACTER_SPACING ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_CHARACTER_SPACING ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_CHARACTER_SPACING ); else SetCharacterSpacingState( pSdrView, rSet ); } - if ( rSet.GetItemState( SID_FONTWORK_KERN_CHARACTER_PAIRS ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_KERN_CHARACTER_PAIRS ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_KERN_CHARACTER_PAIRS ); else SetKernCharacterPairsState( pSdrView, rSet ); } - if ( rSet.GetItemState( SID_FONTWORK_SAME_LETTER_HEIGHTS ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_SAME_LETTER_HEIGHTS ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_SAME_LETTER_HEIGHTS ); } - if ( rSet.GetItemState( SID_FONTWORK_SHAPE_TYPE ) != SFX_ITEM_UNKNOWN ) + if ( rSet.GetItemState( SID_FONTWORK_SHAPE_TYPE ) != SfxItemState::UNKNOWN ) { if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) ) rSet.DisableItem( SID_FONTWORK_SHAPE_TYPE ); diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index 8ba7dfd4c8db..93f2a01a0f0f 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -156,7 +156,7 @@ sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSe sal_uInt16 nFillTransparence(static_cast< const XFillTransparenceItem& >(rSourceSet.Get(XATTR_FILLTRANSPARENCE, bSearchInParents)).GetValue()); const SfxPoolItem* pGradientItem = 0; - if(SFX_ITEM_SET == rSourceSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, bSearchInParents, &pGradientItem) + if(SfxItemState::SET == rSourceSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, bSearchInParents, &pGradientItem) && static_cast< const XFillFloatTransparenceItem* >(pGradientItem)->IsEnabled()) { const XGradient& rGradient = static_cast< const XFillFloatTransparenceItem* >(pGradientItem)->GetGradientValue(); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 3c7371095033..30afdb116fc1 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1687,12 +1687,12 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const pSet = new SfxItemSet( mpModel->GetItemPool(), pMap->nWID, pMap->nWID); } - if( pSet->GetItemState( pMap->nWID ) != SFX_ITEM_SET ) + if( pSet->GetItemState( pMap->nWID ) != SfxItemState::SET ) pSet->Put(mpObj->GetMergedItem(pMap->nWID)); if( !SvxUnoTextRangeBase::SetPropertyValueHelper( *pSet, pMap, rVal, *pSet )) { - if( pSet->GetItemState( pMap->nWID ) != SFX_ITEM_SET ) + if( pSet->GetItemState( pMap->nWID ) != SfxItemState::SET ) { if(bIsNotPersist) { @@ -1701,14 +1701,14 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const } } - if( pSet->GetItemState( pMap->nWID ) != SFX_ITEM_SET ) + if( pSet->GetItemState( pMap->nWID ) != SfxItemState::SET ) { // Default aus ItemPool holen if(SfxItemPool::IsWhich(pMap->nWID)) pSet->Put(mpModel->GetItemPool().GetDefaultItem(pMap->nWID)); } - if( pSet->GetItemState( pMap->nWID ) == SFX_ITEM_SET ) + if( pSet->GetItemState( pMap->nWID ) == SfxItemState::SET ) { SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rVal, *pSet ); } @@ -1964,7 +1964,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE case SDRATTR_CIRCSTARTANGLE: { const SfxPoolItem* pPoolItem=NULL; - if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,false,&pPoolItem)==SFX_ITEM_SET) + if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,false,&pPoolItem)==SfxItemState::SET) { sal_Int32 nAngle = ((SdrCircStartAngleItem*)pPoolItem)->GetValue(); aAny <<= nAngle; @@ -1975,7 +1975,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE case SDRATTR_CIRCENDANGLE: { const SfxPoolItem* pPoolItem=NULL; - if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,false,&pPoolItem)==SFX_ITEM_SET) + if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,false,&pPoolItem)==SfxItemState::SET) { sal_Int32 nAngle = ((SdrCircEndAngleItem*)pPoolItem)->GetValue(); aAny <<= nAngle; @@ -2066,11 +2066,11 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope switch( rSet.GetItemState( pMap->nWID, false ) ) { - case SFX_ITEM_READONLY: - case SFX_ITEM_SET: + case SfxItemState::READONLY: + case SfxItemState::SET: eState = beans::PropertyState_DIRECT_VALUE; break; - case SFX_ITEM_DEFAULT: + case SfxItemState::DEFAULT: eState = beans::PropertyState_DEFAULT_VALUE; break; default: @@ -2959,8 +2959,8 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty { const SfxItemSet& rSet = mpObj->GetMergedItemSet(); - if( rSet.GetItemState( XATTR_FILLBMP_STRETCH, false ) == SFX_ITEM_SET || - rSet.GetItemState( XATTR_FILLBMP_TILE, false ) == SFX_ITEM_SET ) + if( rSet.GetItemState( XATTR_FILLBMP_STRETCH, false ) == SfxItemState::SET || + rSet.GetItemState( XATTR_FILLBMP_TILE, false ) == SfxItemState::SET ) { rState = beans::PropertyState_DIRECT_VALUE; } diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 62eb2f1798d2..af2714a6fa74 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -64,7 +64,7 @@ SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rDat while( nWhich ) { - if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, false, &pItem ) ) + if( SfxItemState::SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, false, &pItem ) ) { VersionCompat aCompat( rOStm, STREAM_WRITE ); const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() ); |