avmedia/source/framework/mediatoolbox.cxx | 2
basctl/source/basicide/basicbox.cxx | 4
cui/source/dialogs/cuihyperdlg.cxx | 2
cui/source/dialogs/postdlg.cxx | 6
cui/source/options/treeopt.cxx | 10
cui/source/tabpages/backgrnd.cxx | 20 -
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/page.cxx | 12 -
cui/source/tabpages/paragrph.cxx | 34 +--
editeng/source/editeng/editdbg.cxx | 6
editeng/source/editeng/editdoc.cxx | 56 ++---
editeng/source/editeng/editobj.cxx | 10
editeng/source/editeng/impedit4.cxx | 6
editeng/source/editeng/impedit5.cxx | 18 -
editeng/source/outliner/outliner.cxx | 4
editeng/source/uno/unofored.cxx | 2
forms/source/richtext/rtattributehandler.cxx | 2
include/svl/poolitem.hxx | 5
reportdesign/source/ui/misc/statusbarcontroller.cxx | 4
reportdesign/source/ui/misc/toolboxcontroller.cxx | 2
sc/source/core/data/patattr.cxx | 2
sc/source/filter/html/htmlexp.cxx | 2
sc/source/ui/cctrl/tbinsert.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2
sc/source/ui/drawfunc/drawsh2.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 4
sc/source/ui/optdlg/tpview.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 6
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 4
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 4
sc/source/ui/view/formatsh.cxx | 2
sd/source/core/sdpage.cxx | 10
sd/source/filter/html/htmlex.cxx | 14 -
sd/source/ui/annotations/annotationmanager.cxx | 8
sd/source/ui/app/sdmod1.cxx | 10
sd/source/ui/app/tbxww.cxx | 2
sd/source/ui/app/tmplctrl.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/diactrl.cxx | 2
sd/source/ui/dlg/dlgolbul.cxx | 4
sd/source/ui/dlg/gluectrl.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/dlg/paragr.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 6
sd/source/ui/func/fubullet.cxx | 16 -
sd/source/ui/func/fuolbull.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 2
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 10
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 52 ++--
sd/source/ui/view/drawview.cxx | 8
sd/source/ui/view/drtxtob1.cxx | 4
sd/source/ui/view/drviews2.cxx | 4
sd/source/ui/view/drviews3.cxx | 8
sd/source/ui/view/drviews6.cxx | 16 -
sd/source/ui/view/drviews7.cxx | 112 +++++-----
sd/source/ui/view/drviewsa.cxx | 8
sd/source/ui/view/drviewsf.cxx | 16 -
sd/source/ui/view/drviewsj.cxx | 98 ++++----
sd/source/ui/view/outlnvsh.cxx | 34 +--
sd/source/ui/view/outlview.cxx | 2
sd/source/ui/view/viewshe3.cxx | 10
sd/source/ui/view/viewshel.cxx | 2
sfx2/source/control/bindings.cxx | 18 -
sfx2/source/control/ctrlitem.cxx | 4
sfx2/source/control/dispatch.cxx | 4
sfx2/source/control/querystatus.cxx | 2
sfx2/source/control/request.cxx | 2
sfx2/source/control/sfxstatuslistener.cxx | 2
sfx2/source/control/shell.cxx | 2
sfx2/source/control/statcach.cxx | 4
sfx2/source/control/unoctitm.cxx | 4
sfx2/source/dialog/securitypage.cxx | 4
sfx2/source/dialog/tplcitem.cxx | 4
sfx2/source/dialog/versdlg.cxx | 2
sfx2/source/inet/inettbc.cxx | 2
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/statbar/stbitem.cxx | 6
sfx2/source/toolbox/tbxitem.cxx | 10
starmath/source/accessibility.cxx | 2
svl/source/items/itemset.cxx | 2
svx/source/dialog/grfflt.cxx | 24 +-
svx/source/dialog/hdft.cxx | 4
svx/source/dialog/rlrcitem.cxx | 2
svx/source/dialog/rubydialog.cxx | 2
svx/source/dialog/srchctrl.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/fmPropBrw.cxx | 2
svx/source/form/fmexpl.cxx | 2
svx/source/form/tabwin.cxx | 2
svx/source/form/tbxform.cxx | 2
svx/source/mnuctrls/SmartTagCtl.cxx | 2
svx/source/mnuctrls/clipboardctl.cxx | 2
svx/source/mnuctrls/fntctl.cxx | 2
svx/source/mnuctrls/fntszctl.cxx | 2
svx/source/sidebar/area/AreaPropertyPanel.cxx | 30 +-
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 16 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 6
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 22 -
svx/source/sidebar/text/TextPropertyPanel.cxx | 2
svx/source/stbctrls/insctrl.cxx | 2
svx/source/stbctrls/modctrl.cxx | 2
svx/source/stbctrls/pszctrl.cxx | 4
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 2
svx/source/stbctrls/zoomsliderctrl.cxx | 2
svx/source/table/cell.cxx | 2
svx/source/table/tablecontroller.cxx | 2
svx/source/tbxctrls/fillctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 20 -
svx/source/tbxctrls/linectrl.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 6
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 4
sw/source/filter/ww8/wrtw8nds.cxx | 4
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 4
sw/source/filter/ww8/wrtww8gr.cxx | 4
sw/source/ui/chrdlg/numpara.cxx | 10
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/config/optload.cxx | 2
sw/source/ui/config/optpage.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 2
sw/source/ui/misc/pggrid.cxx | 2
sw/source/ui/table/tabledlg.cxx | 4
sw/source/uibase/docvw/romenu.cxx | 4
sw/source/uibase/frmdlg/colex.cxx | 4
sw/source/uibase/misc/glshell.cxx | 2
sw/source/uibase/ribbar/tbxanchr.cxx | 2
sw/source/uibase/ribbar/workctrl.cxx | 4
sw/source/uibase/shells/annotsh.cxx | 2
sw/source/uibase/shells/drwtxtex.cxx | 2
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 10
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 2
sw/source/uibase/uiview/viewtab.cxx | 4
sw/source/uibase/utlui/bookctrl.cxx | 2
sw/source/uibase/utlui/tmplctrl.cxx | 2
sw/source/uibase/utlui/uitool.cxx | 2
sw/source/uibase/utlui/viewlayoutctrl.cxx | 2
sw/source/uibase/utlui/zoomctrl.cxx | 2
148 files changed, 536 insertions(+), 541 deletions(-)
New commits:
commit 39e91c585d55b99a2b73ed2a58312a387763a4bc
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Sep 10 15:21:44 2014 +0200
Replace uses of old SFX_ITEM_AVAILABLE alias with SFX_ITEM_DEFAULT
Change-Id: I88eeac06413fc3935cbbdb357ff8bf9acaa383a8
diff --git a/avmedia/source/framework/mediatoolbox.cxx
b/avmedia/source/framework/mediatoolbox.cxx
index 40c270e..0a1499b 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -122,7 +122,7 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID
*/, SfxItemState eSta
const MediaItem* pMediaItem = PTR_CAST( MediaItem, pState );
- if( pMediaItem && ( SFX_ITEM_AVAILABLE == eState ) )
+ if( pMediaItem && ( SFX_ITEM_DEFAULT == eState ) )
pCtrl->setState( *pMediaItem );
}
}
diff --git a/basctl/source/basicide/basicbox.cxx
b/basctl/source/basicide/basicbox.cxx
index 545f07b..9b9e045 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -67,7 +67,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState
eState, const SfxPool
if ( !pBox )
return;
- if ( eState != SFX_ITEM_AVAILABLE )
+ if ( eState != SFX_ITEM_DEFAULT )
pBox->Disable();
else
{
@@ -357,7 +357,7 @@ void LanguageBoxControl::StateChanged( sal_uInt16 nID,
SfxItemState eState, cons
(void)nID;
if (LanguageBox* pBox =
static_cast<LanguageBox*>(GetToolBox().GetItemWindow(GetId())))
{
- if (eState != SFX_ITEM_AVAILABLE)
+ if (eState != SFX_ITEM_DEFAULT)
pBox->Disable();
else
{
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index ede512f..9b1a65f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -45,7 +45,7 @@ SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings &
rBindings, SvxHpLinkD
void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
- if ( eState == SFX_ITEM_AVAILABLE )
+ if ( eState == SFX_ITEM_DEFAULT )
{
switch ( nSID )
{
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 724ca7c..acfd02d 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -73,7 +73,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const
SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
OUString aAuthorStr, aDateStr;
- if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
bNew = false;
const SvxPostItAuthorItem& rAuthor =
@@ -85,7 +85,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const
SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
- if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
const SvxPostItDateItem& rDate =
(const SvxPostItDateItem&)rSet.Get( nWhich );
@@ -100,7 +100,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const
SfxItemSet& rCoreSet,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT );
OUString aTextStr;
- if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
const SvxPostItTextItem& rText =
(const SvxPostItTextItem&)rSet.Get( nWhich );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 6776974..d5cf0e3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1198,7 +1198,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet(
sal_uInt16 nId )
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
// miscellaneous - Year2000
- if( SFX_ITEM_AVAILABLE <= pDispatch->QueryState(
SID_ATTR_YEAR2000, pItem ) )
+ if( SFX_ITEM_DEFAULT <= pDispatch->QueryState(
SID_ATTR_YEAR2000, pItem ) )
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const
SfxUInt16Item*)pItem)->GetValue() ) );
else
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000,
(sal_uInt16)aMisc.GetYear2000() ) );
@@ -1247,15 +1247,15 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet(
sal_uInt16 nId )
if ( pViewFrame )
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
- if(SFX_ITEM_AVAILABLE <=
pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
+ if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_LANGUAGE, ((const
SvxLanguageItem*)pItem)->GetLanguage()));
- if(SFX_ITEM_AVAILABLE <=
pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
+ if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CJK_LANGUAGE,
((const SvxLanguageItem*)pItem)->GetLanguage()));
- if(SFX_ITEM_AVAILABLE <=
pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
+ if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CTL_LANGUAGE,
((const SvxLanguageItem*)pItem)->GetLanguage()));
pRet->Put(aHyphen);
- if(SFX_ITEM_AVAILABLE <=
pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem))
+ if(SFX_ITEM_DEFAULT <=
pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem))
{
pClone = pItem->Clone();
pRet->Put(*pClone);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 6c65cfc..2885744 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -476,7 +476,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
// but it must be existing in the rSet!
// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC),
false))
+ if(SFX_ITEM_DEFAULT <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC),
false))
{
ResetFromWallpaperItem( *rSet );
return;
@@ -543,7 +543,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
nDestValue = 0;
sal_uInt16 nWhich = GetWhich( nSlot );
- if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
m_pBtnTile->Check();
@@ -584,21 +584,21 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
pTableBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nCellWhich = nWhich;
- if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >=
SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >=
SFX_ITEM_DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get(
SID_ATTR_BRUSH_ROW ) );
pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr);
}
pTableBck_Impl->nRowWhich = SID_ATTR_BRUSH_ROW;
- if ( rSet->GetItemState( SID_ATTR_BRUSH_TABLE, false ) >=
SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( SID_ATTR_BRUSH_TABLE, false ) >=
SFX_ITEM_DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get(
SID_ATTR_BRUSH_TABLE ) );
pTableBck_Impl->pTableBrush = new SvxBrushItem(*pBgdAttr);
@@ -623,7 +623,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
pParaBck_Impl->nActPos = nValue;
nWhich = GetWhich( SID_ATTR_BRUSH );
- if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr);
@@ -632,7 +632,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
nWhich = GetWhich( SID_ATTR_BRUSH_CHAR );
rSet->GetItemState( nWhich, true );
rSet->GetItemState( nWhich, false );
- if ( rSet->GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState( nWhich, true ) > SFX_ITEM_DEFAULT )
{
pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) );
pParaBck_Impl->pCharBrush = new SvxBrushItem(*pBgdAttr);
@@ -660,7 +660,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const
SfxItemSet& rSet )
sal_uInt16 nWhich = GetWhich( nSlot );
boost::scoped_ptr<SvxBrushItem> pTemp;
- if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_DEFAULT )
{
const CntWallpaperItem* pItem = (const CntWallpaperItem*)&rSet.Get(
nWhich );
pTemp.reset(new SvxBrushItem( *pItem, nWhich ));
@@ -729,7 +729,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <=
rCoreSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
+ if(SFX_ITEM_DEFAULT <= rCoreSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC),
false))
return FillItemSetWithWallpaperItem( *rCoreSet, SID_VIEW_FLD_PIC );
bool bModified = false;
@@ -790,7 +790,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
{
// Brush-treatment:
if ( rOldItem.GetColor() != aBgdColor ||
- (SFX_ITEM_AVAILABLE >= eOldItemState &&
!m_pBackgroundColorSet->IsNoSelection()))
+ (SFX_ITEM_DEFAULT >= eOldItemState &&
!m_pBackgroundColorSet->IsNoSelection()))
{
bModified = true;
rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index f83eeaa..4ddeea5 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -217,7 +217,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const
SfxItemSet& rCoreAttrs
sal_uInt16 nWhich = GetWhich( SID_ATTR_BORDER_INNER, false );
bool bIsDontCare = true;
- if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreAttrs.GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
// paragraph or table
const SvxBoxInfoItem* pBoxInfo =
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 6c02b90..9f93183 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1361,7 +1361,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
{
const sal_uInt16 nWhich(GetWhich(SID_ATTR_BRUSH));
- if(rHeaderSet.GetItemState(nWhich) >= SFX_ITEM_AVAILABLE)
+ if(rHeaderSet.GetItemState(nWhich) >= SFX_ITEM_DEFAULT)
{
//UUUU aBspWin.SetHdColor(rItem.GetColor());
const SvxBrushItem& rItem = static_cast< const SvxBrushItem&
>(rHeaderSet.Get(nWhich));
@@ -1375,7 +1375,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes);
const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER));
- if ( rHeaderSet.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
+ if ( rHeaderSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
{
const SvxBoxItem& rItem =
(const SvxBoxItem&)rHeaderSet.Get( nWhich );
@@ -1423,7 +1423,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
{
const sal_uInt16 nWhich(GetWhich(SID_ATTR_BRUSH));
- if(rFooterSet.GetItemState(nWhich) >= SFX_ITEM_AVAILABLE)
+ if(rFooterSet.GetItemState(nWhich) >= SFX_ITEM_DEFAULT)
{
//UUUU aBspWin.SetFtColor(rItem.GetColor());
const SvxBrushItem& rItem = (const
SvxBrushItem&)rFooterSet.Get(nWhich);
@@ -1437,7 +1437,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
m_pBspWin->setFooterFillAttributes(aFooterFillAttributes);
const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER));
- if ( rFooterSet.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
+ if ( rFooterSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
{
const SvxBoxItem& rItem =
(const SvxBoxItem&)rFooterSet.Get( nWhich );
@@ -1535,9 +1535,9 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
Size aBorder;
if ( _pSet->GetItemState( GetWhich(SID_ATTR_BORDER_SHADOW) ) >=
- SFX_ITEM_AVAILABLE &&
+ SFX_ITEM_DEFAULT &&
_pSet->GetItemState( GetWhich(SID_ATTR_BORDER_OUTER) ) >=
- SFX_ITEM_AVAILABLE )
+ SFX_ITEM_DEFAULT )
{
aBorder = ( GetMinBorderSpace_Impl(
(const SvxShadowItem&)_pSet->Get(GetWhich(SID_ATTR_BORDER_SHADOW)),
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index db62e93..9f17b54 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -367,7 +367,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet*
rOutSet )
sal_uInt16 _nWhich = GetWhich( SID_ATTR_TABSTOP );
const SfxItemSet& rInSet = GetItemSet();
- if ( rInSet.GetItemState( _nWhich ) >= SFX_ITEM_AVAILABLE )
+ if ( rInSet.GetItemState( _nWhich ) >= SFX_ITEM_DEFAULT )
{
const SvxTabStopItem& rTabItem =
(const SvxTabStopItem&)rInSet.Get( _nWhich );
@@ -434,7 +434,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE );
SfxItemState eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
SfxMapUnit eUnit = pPool->GetMetric( _nWhich );
@@ -504,7 +504,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
_nWhich = GetWhich( SID_ATTR_ULSPACE );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
SfxMapUnit eUnit = pPool->GetMetric( _nWhich );
@@ -559,7 +559,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
_nWhich = GetWhich( SID_ATTR_PARA_LINESPACE );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
SetLineSpacing_Impl( (const SvxLineSpacingItem &)rSet->Get( _nWhich )
);
else
m_pLineDist->SetNoSelection();
@@ -567,7 +567,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
_nWhich = GetWhich( SID_ATTR_PARA_REGISTER );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
m_pRegisterCB->Check( ((const SfxBoolItem &)rSet->Get( _nWhich
)).GetValue());
m_pRegisterCB->SaveValue();
sal_uInt16 nHtmlMode = GetHtmlMode_Impl(*rSet);
@@ -1153,7 +1153,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
SfxItemState eItemState = rSet->GetItemState( _nWhich );
sal_Int32 nLBSelect = 0;
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet->Get( _nWhich );
@@ -1205,7 +1205,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
}
_nWhich = GetWhich(SID_ATTR_PARA_SNAPTOGRID);
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
const SvxParaGridItem& rSnap = (const SvxParaGridItem&)rSet->Get(
_nWhich );
m_pSnapToGridCB->Check(rSnap.GetValue());
@@ -1214,7 +1214,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
_nWhich = GetWhich( SID_PARA_VERTALIGN );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
m_pVertAlignFL->Show();
@@ -1225,7 +1225,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
_nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION );
//text direction
- if( SFX_ITEM_AVAILABLE <= rSet->GetItemState( _nWhich ) )
+ if( SFX_ITEM_DEFAULT <= rSet->GetItemState( _nWhich ) )
{
const SvxFrameDirectionItem& rFrameDirItem = ( const
SvxFrameDirectionItem& ) rSet->Get( _nWhich );
m_pTextDirectionLB->SelectEntryValue(
(SvxFrameDirection)rFrameDirItem.GetValue() );
@@ -1537,7 +1537,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE );
SfxItemState eItemState = rSet->GetItemState( _nWhich );
- bool bItemAvailable = eItemState >= SFX_ITEM_AVAILABLE;
+ bool bItemAvailable = eItemState >= SFX_ITEM_DEFAULT;
bool bIsHyphen = false;
if( !bHtmlMode && bItemAvailable )
{
@@ -1566,7 +1566,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_PAGENUM );
- if ( rSet->GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE )
+ if ( rSet->GetItemState(_nWhich) >= SFX_ITEM_DEFAULT )
{
const sal_uInt16 nPageNum =
( (const SfxUInt16Item&)rSet->Get( _nWhich ) ).GetValue();
@@ -1634,7 +1634,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_PAGEBREAK );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
const SvxFmtBreakItem& rPageBreak =
(const SvxFmtBreakItem&)rSet->Get( _nWhich );
@@ -1705,7 +1705,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_KEEP );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
m_pKeepParaBox->EnableTriState( false );
const SvxFmtKeepItem& rKeep =
@@ -1724,7 +1724,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_SPLIT );
eItemState = rSet->GetItemState( _nWhich );
- if ( eItemState >= SFX_ITEM_AVAILABLE )
+ if ( eItemState >= SFX_ITEM_DEFAULT )
{
const SvxFmtSplitItem& rSplit =
(const SvxFmtSplitItem&)rSet->Get( _nWhich );
@@ -1741,7 +1741,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_WIDOWS );
SfxItemState eTmpState = rSet->GetItemState( _nWhich );
- if ( eTmpState >= SFX_ITEM_AVAILABLE )
+ if ( eTmpState >= SFX_ITEM_DEFAULT )
{
const SvxWidowsItem& rWidow =
(const SvxWidowsItem&)rSet->Get( _nWhich );
@@ -1764,7 +1764,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet*
rSet )
_nWhich = GetWhich( SID_ATTR_PARA_ORPHANS );
eTmpState = rSet->GetItemState( _nWhich );
- if ( eTmpState >= SFX_ITEM_AVAILABLE )
+ if ( eTmpState >= SFX_ITEM_DEFAULT )
{
const SvxOrphansItem& rOrphan =
(const SvxOrphansItem&)rSet->Get( _nWhich );
@@ -2190,7 +2190,7 @@ static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16
nSlotId, CheckBox& rBo
SfxItemState eState = rSet.GetItemState(_nWhich, true);
if( eState == SFX_ITEM_UNKNOWN || eState == SFX_ITEM_DISABLED )
rBox.Enable(false);
- else if(eState >= SFX_ITEM_AVAILABLE)
+ else if(eState >= SFX_ITEM_DEFAULT)
{
rBox.EnableTriState( false );
rBox.Check(((const SfxBoolItem&)rSet.Get(_nWhich)).GetValue());
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 614a0a4..ee1a88b 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -135,9 +135,6 @@ enum SfxItemState {
SFX_ITEM_SET = 0x0030
};
-// old stuff - dont use!!!
-#define SFX_ITEM_AVAILABLE SFX_ITEM_DEFAULT
-
class SvXMLUnitConverter;
class SfxItemPool;
class SfxItemSet;
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx
b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 5c116e9..6f9d1ab 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -139,7 +139,7 @@ void SAL_CALL OStatusbarController::statusChanged( const
FeatureStateEvent& _aEv
{
SvxZoomSliderItem aZoomSlider(100,20,400);
aZoomSlider.PutValue(_aEvent.State);
-
static_cast<SvxZoomSliderControl*>(m_rController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider);
+
static_cast<SvxZoomSliderControl*>(m_rController.get())->StateChanged(m_nSlotId,SFX_ITEM_DEFAULT,&aZoomSlider);
}
}
else if ( m_aCommandURL == ".uno:Zoom" )
@@ -149,7 +149,7 @@ void SAL_CALL OStatusbarController::statusChanged( const
FeatureStateEvent& _aEv
{
SvxZoomItem aZoom;
aZoom.PutValue(_aEvent.State);
-
static_cast<SvxZoomStatusBarControl*>(m_rController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoom);
+
static_cast<SvxZoomStatusBarControl*>(m_rController.get())->StateChanged(m_nSlotId,SFX_ITEM_DEFAULT,&aZoom);
}
}
}
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx
b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 18588de..5146903 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -255,7 +255,7 @@ void SAL_CALL OToolboxController::statusChanged( const
FeatureStateEvent& Event
{
SvxFontItem aItem(ITEMID_FONT);
aItem.PutValue(Event.State);
-
static_cast<SvxFontNameToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled
? SFX_ITEM_AVAILABLE : SFX_ITEM_DISABLED,&aItem);
+
static_cast<SvxFontNameToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled
? SFX_ITEM_DEFAULT : SFX_ITEM_DISABLED,&aItem);
}
break;
}
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 4332cc2..7f017f7 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -53,7 +53,7 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */,
SfxItemState eState,
{
GetToolBox().EnableItem( GetId(), (GetItemState(pState) !=
SFX_ITEM_DISABLED) );
- if( eState == SFX_ITEM_AVAILABLE )
+ if( eState == SFX_ITEM_DEFAULT )
{
const SfxUInt16Item* pItem = PTR_CAST( SfxUInt16Item, pState );
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 9cd2783..817cf4f 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -61,7 +61,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/,
SfxItemState eState
ScZoomSliderWnd* pBox = (ScZoomSliderWnd*)(rTbx.GetItemWindow( nId
));
OSL_ENSURE( pBox ,"Control not found!" );
- if ( SFX_ITEM_AVAILABLE != eState || pState->ISA( SfxVoidItem ) )
+ if ( SFX_ITEM_DEFAULT != eState || pState->ISA( SfxVoidItem ) )
{
SvxZoomSliderItem aZoomSliderItem( 100 );
pBox->Disable();
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx
b/sc/source/ui/drawfunc/drawsh2.cxx
index 294e630..eeaa2fb 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -266,7 +266,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )
// Funktionen disabl
{
SfxItemSet aAttrs( pView->GetModel()->GetItemPool() );
pView->GetAttributes( aAttrs );
- if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE )
+ if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT )
{
bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE
) ).GetValue();
rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) );
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index 9403a4f..e34680e 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -442,7 +442,7 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
SdrView* pView = pViewData->GetScDrawView();
SfxItemSet aAttrs( pView->GetModel()->GetItemPool() );
pView->GetAttributes( aAttrs );
- if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE )
+ if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_DEFAULT )
{
bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE
) ).GetValue();
rSet.Put( SfxBoolItem( SID_ENABLE_HYPHENATION, bValue ) );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 3293770..2e42029 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -525,7 +525,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet*
rCoreSet )
void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
{
m_pUnitLB->SetNoSelection();
- if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet->Get(
SID_ATTR_METRIC );
FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index fa74838..71dd44e 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -164,7 +164,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
// scaling:
nWhich = GetWhich(SID_SCATTR_PAGE_SCALE);
- if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
sal_uInt16 nScale = ((const
SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue();
if( nScale > 0 )
@@ -173,7 +173,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
}
nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO);
- if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem&
>( rCoreSet->Get( nWhich ) );
sal_uInt16 nWidth = rItem.GetWidth();
@@ -189,7 +189,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
}
nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES);
- if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+ if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_DEFAULT )
{
sal_uInt16 nPages = ((const
SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue();
if( nPages > 0 )
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 649fdf4..462a69c 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -311,7 +311,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
}
break;
case SID_ATTR_ALIGN_DEGREES:
- if (eState >= SFX_ITEM_AVAILABLE)
+ if (eState >= SFX_ITEM_DEFAULT)
{
long nTmp = ((const SfxInt32Item*)pState)->GetValue();
mpMtrAngle->SetValue( nTmp / 100); //wj
@@ -350,7 +350,7 @@ void AlignmentPropertyPanel::NotifyItemUpdate(
}
break;
case SID_ATTR_ALIGN_STACKED:
- if (eState >= SFX_ITEM_AVAILABLE)
+ if (eState >= SFX_ITEM_DEFAULT)
{
mpCbStacked->EnableTriState(false);
const SfxBoolItem* aStackItem = (const SfxBoolItem*)pState;
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 3a162f9..51bc433 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -216,7 +216,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
{
case SID_NUMBER_TYPE_FORMAT:
{
- if( eState >= SFX_ITEM_AVAILABLE)
+ if( eState >= SFX_ITEM_DEFAULT)
{
const SfxInt16Item* pItem = (const SfxInt16Item*)pState;
sal_uInt16 nVal = pItem->GetValue();
@@ -254,7 +254,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
bool bNegRed = false;
sal_uInt16 nPrecision = 0;
sal_uInt16 nLeadZeroes = 0;
- if( eState >= SFX_ITEM_AVAILABLE)
+ if( eState >= SFX_ITEM_DEFAULT)
{
const SfxStringItem* pItem = (const SfxStringItem*)pState;
OUString aCode = pItem->GetValue();
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 2bdb132..cb376c5 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2456,7 +2456,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
{
sal_Int16 aFormatCode = -1;
const SfxItemSet& rAttrSet =
pTabViewShell->GetSelectionPattern()->GetItemSet();
- if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >=
SFX_ITEM_AVAILABLE ) //Modify for more robust
+ if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >=
SFX_ITEM_DEFAULT ) //Modify for more robust
{
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nNumberFormat =
pTabViewShell->GetSelectionPattern()->GetNumberFormat( pFormatter );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 7d875f7..ee75b7d 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1905,7 +1905,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
nFontHeight = long(nFontHeight * (double)
aFractY);
rSet.Put(SvxFontHeightItem(nFontHeight, 100,
EE_CHAR_FONTHEIGHT));
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState(
EE_CHAR_FONTHEIGHT_CJK ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState(
EE_CHAR_FONTHEIGHT_CJK ) )
{
rOldHgt = (SvxFontHeightItem&)
rSet.Get(EE_CHAR_FONTHEIGHT_CJK);
nFontHeight = rOldHgt.GetHeight();
@@ -1913,7 +1913,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
rSet.Put(SvxFontHeightItem(nFontHeight,
100, EE_CHAR_FONTHEIGHT_CJK));
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState(
EE_CHAR_FONTHEIGHT_CTL ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState(
EE_CHAR_FONTHEIGHT_CTL ) )
{
rOldHgt = (SvxFontHeightItem&)
rSet.Get(EE_CHAR_FONTHEIGHT_CTL);
nFontHeight = rOldHgt.GetHeight();
@@ -1944,7 +1944,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
nFontHeight = long(nFontHeight * (double)
aFractY);
aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT));
- if( SFX_ITEM_AVAILABLE ==
aTempSet.GetItemState( EE_CHAR_FONTHEIGHT_CJK ) )
+ if( SFX_ITEM_DEFAULT ==
aTempSet.GetItemState( EE_CHAR_FONTHEIGHT_CJK ) )
{
rOldHgt = (SvxFontHeightItem&)
aTempSet.Get(EE_CHAR_FONTHEIGHT_CJK);
nFontHeight = rOldHgt.GetHeight();
@@ -1952,7 +1952,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CJK));
}
- if( SFX_ITEM_AVAILABLE ==
aTempSet.GetItemState( EE_CHAR_FONTHEIGHT_CTL ) )
+ if( SFX_ITEM_DEFAULT ==
aTempSet.GetItemState( EE_CHAR_FONTHEIGHT_CTL ) )
{
rOldHgt = (SvxFontHeightItem&)
aTempSet.Get(EE_CHAR_FONTHEIGHT_CTL);
nFontHeight = rOldHgt.GetHeight();
@@ -1972,7 +1972,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
// Special treatment: only the valid parts
// of the BulletItems
- if (aTempSet.GetItemState(EE_PARA_BULLET)
== SFX_ITEM_AVAILABLE)
+ if (aTempSet.GetItemState(EE_PARA_BULLET)
== SFX_ITEM_DEFAULT)
{
SvxBulletItem
aOldBulItem((SvxBulletItem&) pOutlineSheet->GetItemSet().Get(EE_PARA_BULLET));
SvxBulletItem& rNewBulItem =
(SvxBulletItem&) aTempSet.Get(EE_PARA_BULLET);
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index c588a2c..ccaafc5 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -343,7 +343,7 @@ void SdModule::GetState(SfxItemSet& rItemSet)
}
}
- if( SFX_ITEM_AVAILABLE == rItemSet.GetItemState( SID_ATTR_METRIC ) )
+ if( SFX_ITEM_DEFAULT == rItemSet.GetItemState( SID_ATTR_METRIC ) )
{
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell,
SfxObjectShell::Current() );
if(pDocSh)
@@ -371,7 +371,7 @@ void SdModule::GetState(SfxItemSet& rItemSet)
rItemSet.Put(*pItem);
}
- if( SFX_ITEM_AVAILABLE == rItemSet.GetItemState( SID_AUTOSPELL_CHECK ) )
+ if( SFX_ITEM_DEFAULT == rItemSet.GetItemState( SID_AUTOSPELL_CHECK ) )
{
::sd::DrawDocShell* pDocSh =
PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current());
@@ -382,21 +382,21 @@ void SdModule::GetState(SfxItemSet& rItemSet)
}
}
- if( SFX_ITEM_AVAILABLE == rItemSet.GetItemState( SID_ATTR_LANGUAGE ) )
+ if( SFX_ITEM_DEFAULT == rItemSet.GetItemState( SID_ATTR_LANGUAGE ) )
{
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell,
SfxObjectShell::Current());
if( pDocSh )
rItemSet.Put( SvxLanguageItem( pDocSh->GetDoc()->GetLanguage(
EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ) );
}
- if( SFX_ITEM_AVAILABLE == rItemSet.GetItemState(
SID_ATTR_CHAR_CJK_LANGUAGE ) )
+ if( SFX_ITEM_DEFAULT == rItemSet.GetItemState( SID_ATTR_CHAR_CJK_LANGUAGE
) )
{
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell,
SfxObjectShell::Current());
if( pDocSh )
rItemSet.Put( SvxLanguageItem( pDocSh->GetDoc()->GetLanguage(
EE_CHAR_LANGUAGE_CJK ), SID_ATTR_CHAR_CJK_LANGUAGE ) );
}
- if( SFX_ITEM_AVAILABLE == rItemSet.GetItemState(
SID_ATTR_CHAR_CTL_LANGUAGE ) )
+ if( SFX_ITEM_DEFAULT == rItemSet.GetItemState( SID_ATTR_CHAR_CTL_LANGUAGE
) )
{
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell,
SfxObjectShell::Current());
if( pDocSh )
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 5a7b12e..7341128 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -132,7 +132,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
{
SfxToolBoxControl::StateChanged( nSId, eState, pState );
- if( eState == SFX_ITEM_AVAILABLE )
+ if( eState == SFX_ITEM_DEFAULT )
{
TbxImageItem* pItem = PTR_CAST( TbxImageItem, pState );
// StarDesktop can also receive another item,
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 984a875..4f6380d 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -73,7 +73,7 @@ SdTemplateControl::~SdTemplateControl()
void SdTemplateControl::StateChanged(
sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
- if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) )
+ if( eState != SFX_ITEM_DEFAULT || pState->ISA( SfxVoidItem ) )
GetStatusBar().SetItemText( GetId(), OUString() );
else if ( pState->ISA( SfxStringItem ) )
{
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 0fa83e4..89dabc6 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -1220,7 +1220,7 @@ AnimationControllerItem::AnimationControllerItem(
void AnimationControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
{
- if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_ANIMATOR_STATE )
+ if( eState >= SFX_ITEM_DEFAULT && nSId == SID_ANIMATOR_STATE )
{
const SfxUInt16Item* pStateItem = PTR_CAST( SfxUInt16Item, pItem );
assert(pStateItem); //SfxUInt16Item expected
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index c093b95..09da8ea 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -122,7 +122,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16,
pFld->Enable();
const SfxUInt16Item* pItem = 0;
- if ( eState == SFX_ITEM_AVAILABLE )
+ if ( eState == SFX_ITEM_DEFAULT )
{
pItem = dynamic_cast< const SfxUInt16Item* >( pState );
DBG_ASSERT( pItem, "sd::SdTbxCtlDiaPages::StateChanged(), wrong
item type!" );
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index fbffc08..f3d7da4 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -130,7 +130,7 @@ SdTbxCtlGlueEscDir::SdTbxCtlGlueEscDir(
void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pState )
{
- if( eState == SFX_ITEM_AVAILABLE )
+ if( eState == SFX_ITEM_DEFAULT )
{
GlueEscDirLB* pGlueEscDirLB = (GlueEscDirLB*) ( GetToolBox().
GetItemWindow( GetId() ) );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index be7b2cd..e9f9bc2 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -863,7 +863,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem(
void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
{
- if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_STATE )
+ if( eState >= SFX_ITEM_DEFAULT && nSId == SID_NAVIGATOR_STATE )
{
const SfxUInt32Item* pStateItem = PTR_CAST( SfxUInt32Item, pItem );
DBG_ASSERT( pStateItem, "SfxUInt16Item expected");
@@ -946,7 +946,7 @@ SdPageNameControllerItem::SdPageNameControllerItem(
void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
SfxItemState eState, const SfxPoolItem* pItem )
{
- if( eState >= SFX_ITEM_AVAILABLE && nSId == SID_NAVIGATOR_PAGENAME )
+ if( eState >= SFX_ITEM_DEFAULT && nSId == SID_NAVIGATOR_PAGENAME )
{
// only if doc in LB is the active
NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 069fb40..bfecb92 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -111,7 +111,7 @@ bool SdParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
{
SfxItemState eItemState = rSet->GetItemState( ATTR_NUMBER_NEWSTART );
- if(eItemState > SFX_ITEM_AVAILABLE )
+ if(eItemState > SFX_ITEM_DEFAULT )
{
const SfxBoolItem& rStart = (const
SfxBoolItem&)rSet->Get(ATTR_NUMBER_NEWSTART);
m_pNewStartCB->SetState( rStart.GetValue() ? TRISTATE_TRUE :
TRISTATE_FALSE );
@@ -125,7 +125,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
m_pNewStartCB->SaveValue();
eItemState = rSet->GetItemState( ATTR_NUMBER_NEWSTART_AT);
- if( eItemState > SFX_ITEM_AVAILABLE )
+ if( eItemState > SFX_ITEM_DEFAULT )
{
sal_Int16 nNewStart = ((const
SfxInt16Item&)rSet->Get(ATTR_NUMBER_NEWSTART_AT)).GetValue();
m_pNewStartNumberCB->Check(-1 != nNewStart);
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 273816f..fc123fa 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -217,7 +217,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const
SfxItemSet& rInAttrs)
FieldUnit eFUnit;
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
- if ( rInAttrs.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
+ if ( rInAttrs.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rInAttrs.Get( nWhich );
eFUnit = (FieldUnit)rItem.GetValue();
@@ -441,7 +441,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
m_pLbMetric->SetNoSelection();
- if ( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
+ if ( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
{
const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich );
long nFieldUnit = (long)rItem.GetValue();
@@ -458,7 +458,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
// tabulator space
nWhich = GetWhich( SID_ATTR_DEFTABSTOP );
- if( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
+ if( rAttrs->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT )
{
SfxMapUnit eUnit = rAttrs->GetPool()->GetMetric( nWhich );
const SfxUInt16Item& rItem = (SfxUInt16Item&)rAttrs->Get( nWhich );
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index aae5978..7409c4c 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -290,14 +290,14 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell,
SfxViewFrame* pViewFrame )
{
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHARMAP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( FN_INSERT_HARDHYPHEN ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( FN_INSERT_HARD_SPACE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_RLM ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_LRM ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_ZWNBSP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_INSERT_ZWSP ))
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CHARMAP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( FN_INSERT_SOFT_HYPHEN ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( FN_INSERT_HARDHYPHEN ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( FN_INSERT_HARD_SPACE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_INSERT_RLM ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_INSERT_LRM ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_INSERT_ZWNBSP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_INSERT_ZWSP ))
{
::sd::View* pView = pViewShell ? pViewShell->GetView() : 0;
OutlinerView* pOLV = pView ? pView->GetTextEditOutlinerView() : 0;
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 9d1d71e..3423c23 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -186,7 +186,7 @@ void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet)
{
// MasterPagesSelector::GetState(rItemSet);
- if (rItemSet.GetItemState(SID_TP_EDIT_MASTER) == SFX_ITEM_AVAILABLE)
+ if (rItemSet.GetItemState(SID_TP_EDIT_MASTER) == SFX_ITEM_DEFAULT)
rItemSet.DisableItem(SID_TP_EDIT_MASTER);
}
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a22be58..ea1df06 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -628,10 +628,10 @@ void SlideSorterController::GetCtrlState (SfxItemSet&
rSet)
}
// Output quality.
- if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE
- ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE
- ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE
- ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_DEFAULT
+ ||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_DEFAULT
+ ||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_DEFAULT
+ ||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_DEFAULT)
{
if (mrSlideSorter.GetContentWindow())
{
@@ -661,7 +661,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet)
}
}
- if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_DEFAULT)
{
rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true));
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a11e20a..f357268 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -550,7 +550,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
rSet.DisableItem(SID_SEARCH_DLG);
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_EXPAND_PAGE))
{
bool bDisable = true;
if (eEditMode == EM_PAGE)
@@ -593,7 +593,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
rSet.DisableItem (SID_EXPAND_PAGE);
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_SUMMARY_PAGE))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_SUMMARY_PAGE))
{
bool bDisable = true;
if (eEditMode == EM_PAGE)
@@ -618,8 +618,8 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
}
// starting of presentation possible?
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PRESENTATION ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
{
bool bDisable = true;
model::PageEnumeration aAllPages (
@@ -641,9 +641,9 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
// Disable the rename slots when there are no or more than one
slides/master
// pages selected; disable the duplicate slot when there are no slides
// selected:
- if (rSet.GetItemState(SID_RENAMEPAGE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_RENAME_MASTER_PAGE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_DUPLICATE_PAGE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_RENAMEPAGE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_RENAME_MASTER_PAGE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_DUPLICATE_PAGE) == SFX_ITEM_DEFAULT)
{
int n = mrSlideSorter.GetController().GetPageSelector()
.GetSelectedPageCount();
@@ -658,8 +658,8 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
}
}
- if (rSet.GetItemState(SID_HIDE_SLIDE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_SHOW_SLIDE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_HIDE_SLIDE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_SHOW_SLIDE) == SFX_ITEM_DEFAULT)
{
model::PageEnumeration aSelectedPages (
model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
@@ -700,9 +700,9 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
// Disable some slots when in master page mode.
if (eEditMode == EM_MASTERPAGE)
{
- if (rSet.GetItemState(SID_INSERTPAGE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_INSERTPAGE) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_INSERTPAGE);
- if (rSet.GetItemState(SID_DUPLICATE_PAGE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_DUPLICATE_PAGE) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_DUPLICATE_PAGE);
}
}
@@ -711,8 +711,8 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
{
SdTransferable* pTransferClip = SD_MOD()->pTransferClip;
- if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_DEFAULT)
{
// no own clipboard data?
if ( !pTransferClip || !pTransferClip->GetDocShell() )
@@ -755,30 +755,30 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
}
// Cut, copy and paste of master pages is not yet implemented properly
- if (rSet.GetItemState(SID_COPY) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_CUT) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_COPY) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_PASTE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_CUT) == SFX_ITEM_DEFAULT)
{
if (mrSlideSorter.GetModel().GetEditMode() == EM_MASTERPAGE)
{
- if (rSet.GetItemState(SID_CUT) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_CUT) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_CUT);
- if (rSet.GetItemState(SID_COPY) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_COPY) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_COPY);
- if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_PASTE) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_PASTE);
- if (rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_PASTE_SPECIAL) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_PASTE_SPECIAL);
}
}
// Cut, copy, and delete page are disabled when there is no selection.
- if (rSet.GetItemState(SID_CUT) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_COPY) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_DELETE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_DELETE_PAGE) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_DELETE_MASTER_PAGE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_CUT) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_COPY) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_DELETE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_DELETE_PAGE) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_DELETE_MASTER_PAGE) == SFX_ITEM_DEFAULT)
{
model::PageEnumeration aSelectedPages (
model::PageEnumerationProvider::CreateSelectedPagesEnumeration(
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 8b5b396..37f5de8 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -191,7 +191,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// gets enabled, through it doesn't really work (see above)
SfxItemSet aEditAttr( mpView->GetDoc().GetPool() );
mpView->GetAttributes( aEditAttr );
- if( aEditAttr.GetItemState( EE_PARA_ULSPACE ) >=
SFX_ITEM_AVAILABLE )
+ if( aEditAttr.GetItemState( EE_PARA_ULSPACE ) >=
SFX_ITEM_DEFAULT )
{
SfxItemSet aNewAttrs(*(aEditAttr.GetPool()),
aEditAttr.GetRanges());
const SvxULSpaceItem& rItem = (const SvxULSpaceItem&)
aEditAttr.Get( EE_PARA_ULSPACE );
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 67df3b2..59a05ed 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -904,7 +904,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
{
SfxItemSet aEditAttr( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aEditAttr );
- if( aEditAttr.GetItemState( EE_PARA_TABS ) >=
SFX_ITEM_AVAILABLE )
+ if( aEditAttr.GetItemState( EE_PARA_TABS ) >= SFX_ITEM_DEFAULT
)
{
const SvxTabStopItem& rItem = (const SvxTabStopItem&)
aEditAttr.Get( EE_PARA_TABS );
rSet.Put( rItem );
@@ -963,7 +963,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
aProtect.SetPosProtect( true );
}
- if( aEditAttr.GetItemState( EE_PARA_WRITINGDIR ) >=
SFX_ITEM_AVAILABLE )
+ if( aEditAttr.GetItemState( EE_PARA_WRITINGDIR ) >=
SFX_ITEM_DEFAULT )
{
const SvxFrameDirectionItem& rItem = (const
SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR );
rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT,
rItem.GetValue() == ::com::sun::star::text::WritingMode_RL_TB));
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 2f8aa8e..cf76318 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -217,42 +217,42 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet&
rSet )
void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
{
// State of SfxChild-Windows (Animator, Fontwork etc.)
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_FONTWORK ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_FONTWORK ) )
{
sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
rSet.Put(SfxBoolItem(SID_FONTWORK,
GetViewFrame()->HasChildWindow(nId)));
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COLOR_CONTROL ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_COLOR_CONTROL ) )
{
sal_uInt16 nId = SvxColorChildWindow::GetChildWindowId();
rSet.Put(SfxBoolItem(SID_COLOR_CONTROL,
GetViewFrame()->HasChildWindow(nId)));
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ANIMATION_OBJECTS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ANIMATION_OBJECTS ) )
{
sal_uInt16 nId = AnimationChildWindow::GetChildWindowId();
rSet.Put( SfxBoolItem( SID_ANIMATION_OBJECTS,
GetViewFrame()->HasChildWindow( nId ) ) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_NAVIGATOR ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_NAVIGATOR ) )
{
sal_uInt16 nId = SID_NAVIGATOR;
rSet.Put( SfxBoolItem( SID_NAVIGATOR, GetViewFrame()->HasChildWindow(
nId ) ) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BMPMASK ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_BMPMASK ) )
{
sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId();
rSet.Put( SfxBoolItem( SID_BMPMASK, GetViewFrame()->HasChildWindow(
nId ) ) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_IMAP ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_IMAP ) )
{
sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
rSet.Put( SfxBoolItem( SID_IMAP, GetViewFrame()->HasChildWindow( nId )
) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_3D_WIN ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_3D_WIN ) )
{
sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId();
rSet.Put( SfxBoolItem( SID_3D_WIN, GetViewFrame()->HasChildWindow( nId
) ) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_AVMEDIA_PLAYER ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_AVMEDIA_PLAYER ) )
{
sal_uInt16 nId = ::avmedia::MediaPlayer::GetChildWindowId();
rSet.Put( SfxBoolItem( SID_AVMEDIA_PLAYER,
GetViewFrame()->HasChildWindow( nId ) ) );
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 6c179c8..86353ff 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -317,7 +317,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
GetMenuStateSel(rSet);
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ASSIGN_LAYOUT))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_ASSIGN_LAYOUT))
{
bool bDisable = true;
if( pPageView )
@@ -337,7 +337,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_EXPAND_PAGE))
{
bool bDisable = true;
if( pPageView )
@@ -378,7 +378,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_SUMMARY_PAGE))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_SUMMARY_PAGE))
{
bool bDisable = true;
if( pPageView )
@@ -402,7 +402,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ASSIGN_LAYOUT))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_ASSIGN_LAYOUT))
{
bool bDisable = true;
if( pPageView )
@@ -423,8 +423,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
// is it possible to start the presentation?
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PRESENTATION ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
{
bool bDisable = true;
sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD );
@@ -445,20 +445,20 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
// glue points
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_EDITMODE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_INSERT_POINT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_PERCENT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_ESCDIR ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_ESCDIR_LEFT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_ESCDIR_RIGHT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_ESCDIR_TOP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_ESCDIR_BOTTOM ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_HORZALIGN_CENTER ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_HORZALIGN_LEFT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_HORZALIGN_RIGHT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_CENTER ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_TOP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_EDITMODE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_INSERT_POINT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_PERCENT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_ESCDIR ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_ESCDIR_LEFT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_ESCDIR_RIGHT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_ESCDIR_TOP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_ESCDIR_BOTTOM ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_HORZALIGN_CENTER ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_HORZALIGN_LEFT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_HORZALIGN_RIGHT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_CENTER ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_TOP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) )
{
// percent
TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
@@ -521,8 +521,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_BOTTOM, eState ==
TRISTATE_TRUE ) );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GRID_FRONT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_HELPLINES_FRONT ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_GRID_FRONT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_HELPLINES_FRONT ) )
{
rSet.Put( SfxBoolItem( SID_GRID_FRONT, mpDrawView->IsGridFront() ) );
rSet.Put( SfxBoolItem( SID_HELPLINES_FRONT, mpDrawView->IsHlplFront()
) );
@@ -597,7 +597,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
else
rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, true ) );
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_THESAURUS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_THESAURUS ) )
{
if ( !mpDrawView->IsTextEdit() )
{
@@ -618,8 +618,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_THESAURUS );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SELECTALL ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SIZE_ALL ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_SELECTALL ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_SIZE_ALL ) )
{
if( pPageView && pPageView->GetObjList()->GetObjCount() == 0 )
{
@@ -629,14 +629,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONTEXT ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONTEXT ) )
rSet.Put( SfxStringItem( SID_CONTEXT, mpDrawView->GetStatusText() ) );
// clipboard (paste)
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE_SPECIAL ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE_UNFORMATTED ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PASTE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PASTE_SPECIAL ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PASTE_UNFORMATTED ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) )
{
if ( !mpClipEvtLstnr )
{
@@ -665,7 +665,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_PASTE_UNFORMATTED );
rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
}
- else if( SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CLIPBOARD_FORMAT_ITEMS ) )
+ else if( SFX_ITEM_DEFAULT == rSet.GetItemState(
SID_CLIPBOARD_FORMAT_ITEMS ) )
{
if (mpCurrentClipboardFormats.get() != NULL)
rSet.Put(*mpCurrentClipboardFormats);
@@ -701,7 +701,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_CONVERT_TO_3D_LATHE_FAST);
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MANAGE_LINKS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_MANAGE_LINKS ) )
{
if ( GetDoc()->GetLinkCount() == 0 )
{
@@ -784,7 +784,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false));
if (mePageKind == PK_STANDARD &&
- rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE)
+ rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_DEFAULT)
{
// Is there a page with the AutoLayout "Title"?
bool bDisable = true;
@@ -836,7 +836,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false));
rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false));
- if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_DEFAULT)
{
bool bCheck = false;
bool bDisable = true;
@@ -904,12 +904,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
// set state of the ruler
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_RULER ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_RULER ) )
rSet.Put( SfxBoolItem( SID_RULER, HasRuler() ) );
// do not delete the last page or a master page
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_PAGE )
- || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DELETE_PAGE )
+ || SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) )
{
if (maTabControl.GetPageCount() == 1 ||
meEditMode == EM_MASTERPAGE ||
@@ -917,15 +917,15 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
mePageKind == PK_HANDOUT ||
(GetShellType()!=ST_DRAW&&IsLayerModeActive()))
{
- if (rSet.GetItemState(SID_DELETE_PAGE) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_DELETE_PAGE) == SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_DELETE_PAGE);
- if (rSet.GetItemState(SID_DELETE_MASTER_PAGE)==SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_DELETE_MASTER_PAGE)==SFX_ITEM_DEFAULT)
rSet.DisableItem(SID_DELETE_MASTER_PAGE);
}
}
// is it allowed to delete the current layer?
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DELETE_LAYER ) )
{
if(GetLayerTabControl()) // #i87182#
{
@@ -951,9 +951,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CUT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COPY ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTLINE_BULLET ))
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CUT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_COPY ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OUTLINE_BULLET ))
{
OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView();
@@ -1017,9 +1017,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
// Zoom-State
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_IN ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_OUT )||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_PANNING ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ZOOM_IN ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ZOOM_OUT )||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ZOOM_PANNING ) )
{
if( GetActiveWindow()->GetZoom() <= GetActiveWindow()->GetMinZoom() ||
GetDocSh()->IsUIActive() )
{
@@ -1039,7 +1039,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_ZOOM_PREV);
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REMOTE_DLG ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_REMOTE_DLG ) )
{
bool bDisableSdremoteForGood = false;
@@ -1573,17 +1573,17 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if(HasCurrentFunction())
nCurrentSId = GetCurrentFunction()->GetSlotID();
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DRAWTBX_CS_BASIC ) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DRAWTBX_CS_BASIC ) )
rSet.Put(SfxBoolItem(SID_DRAWTBX_CS_BASIC, SID_DRAWTBX_CS_BASIC ==
nCurrentSId ));
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DRAWTBX_CS_SYMBOL ) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DRAWTBX_CS_SYMBOL ) )
rSet.Put(SfxBoolItem(SID_DRAWTBX_CS_SYMBOL, SID_DRAWTBX_CS_SYMBOL
== nCurrentSId ));
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DRAWTBX_CS_ARROW ) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DRAWTBX_CS_ARROW ) )
rSet.Put(SfxBoolItem(SID_DRAWTBX_CS_ARROW, SID_DRAWTBX_CS_ARROW ==
nCurrentSId ));
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DRAWTBX_CS_FLOWCHART
) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DRAWTBX_CS_FLOWCHART )
)
rSet.Put(SfxBoolItem(SID_DRAWTBX_CS_FLOWCHART,
SID_DRAWTBX_CS_FLOWCHART == nCurrentSId ));
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DRAWTBX_CS_CALLOUT )
)
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DRAWTBX_CS_CALLOUT ) )
rSet.Put(SfxBoolItem(SID_DRAWTBX_CS_CALLOUT,SID_DRAWTBX_CS_CALLOUT
== nCurrentSId ));
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DRAWTBX_CS_STAR ) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DRAWTBX_CS_STAR ) )
rSet.Put(SfxBoolItem(SID_DRAWTBX_CS_STAR, SID_DRAWTBX_CS_STAR ==
nCurrentSId ));
}
@@ -1639,8 +1639,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
// Set the state of two entries in the 'Slide' context sub-menu
// concerning the visibility of master page background and master page
// shapes.
- if (rSet.GetItemState(SID_DISPLAY_MASTER_BACKGROUND) == SFX_ITEM_AVAILABLE
- || rSet.GetItemState(SID_DISPLAY_MASTER_OBJECTS) == SFX_ITEM_AVAILABLE)
+ if (rSet.GetItemState(SID_DISPLAY_MASTER_BACKGROUND) == SFX_ITEM_DEFAULT
+ || rSet.GetItemState(SID_DISPLAY_MASTER_OBJECTS) == SFX_ITEM_DEFAULT)
{
SdPage* pPage = GetActualPage();
if (pPage != NULL
@@ -1658,7 +1658,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
#if !HAVE_FEATURE_GLTF
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_INSERT_3DMODEL))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_INSERT_3DMODEL))
{
rSet.DisableItem(SID_INSERT_3DMODEL);
rSet.Put(SfxVisibilityItem(SID_INSERT_3DMODEL, false));
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 110289a..094ee9f 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -574,7 +574,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
/* Zoom-Item
Here we should propagate the corresponding value (Optimal ?, page width
or page) with the help of the ZoomItems !!! */
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOM ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ATTR_ZOOM ) )
{
if (GetDocSh()->IsUIActive() ||
(SlideShow::IsRunning(GetViewShellBase())) )
{
@@ -604,7 +604,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
rSet.Put( *pZoomItem );
}
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
{
rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow(
GetDoc() ) );
if (GetDocSh()->IsUIActive() || (xSlideshow.is() &&
xSlideshow->isRunning()) || !GetActiveWindow() )
@@ -696,7 +696,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
}
// Display of current page and layer.
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_STATUS_PAGE ) )
{
sal_Int32 nPageCount = sal_Int32(GetDoc()->GetSdPageCount(mePageKind));
sal_Int32 nActivePageCount =
sal_Int32(GetDoc()->GetActiveSdPageCount());
@@ -758,7 +758,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
rSet.Put (SfxStringItem (SID_STATUS_PAGE, aOUString));
}
// Layout
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_STATUS_LAYOUT ) )
{
OUString aString = mpActualPage->GetLayoutName();
sal_Int32 nPos = aString.indexOf(SD_LT_SEPARATOR);
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 0391bd3..b9015ba 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -81,7 +81,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
GetViewFrame()->GetSlotState (SID_RELOAD, NULL, &rSet);
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_HYPERLINK_GETLINK))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_HYPERLINK_GETLINK))
{
SvxHyperlinkItem aHLinkItem;
@@ -187,10 +187,10 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
rSet.Put( SfxBoolItem( SID_READONLY_MODE, mbReadOnly ) );
// output quality
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_COLOR ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_GRAYSCALE
) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_BLACKWHITE
) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTPUT_QUALITY_CONTRAST )
)
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OUTPUT_QUALITY_COLOR ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OUTPUT_QUALITY_GRAYSCALE )
||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OUTPUT_QUALITY_BLACKWHITE )
||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OUTPUT_QUALITY_CONTRAST ) )
{
const sal_uLong nMode = (sal_Int32)GetActiveWindow()->GetDrawMode();
rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_COLOR,
(sal_uLong)OUTPUT_DRAWMODE_COLOR == nMode ) );
@@ -199,12 +199,12 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
rSet.Put( SfxBoolItem( SID_OUTPUT_QUALITY_CONTRAST,
(sal_uLong)OUTPUT_DRAWMODE_CONTRAST == nMode ) );
}
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN)
)
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) )
{
rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true ) );
}
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ATTR_YEAR2000) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState(SID_ATTR_YEAR2000) )
{
FmFormShell* pFormShell =
GetViewShellBase().GetFormShellManager()->GetFormShell();
if (pFormShell != NULL)
@@ -420,7 +420,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
{
SfxItemSet aAttrs( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttrs );
- if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >=
SFX_ITEM_AVAILABLE )
+ if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >=
SFX_ITEM_DEFAULT )
{
bool bValue = ( (const SfxBoolItem&) aAttrs.Get(
EE_PARA_HYPHENATE ) ).GetValue();
rSet.Put( SfxBoolItem( SID_HYPHENATION, bValue ) );
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 99f1d16..e03d97d 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -65,50 +65,50 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
if ( nMarkCount == 1 )
{
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEZIER_EDIT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ENTER_GROUP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_NAME_GROUP ) ||
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_BEZIER_EDIT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_UNGROUP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ENTER_GROUP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_NAME_GROUP ) ||
// #i68101#
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_OBJECT_TITLE_DESCRIPTION ) ||
-
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_ATTR_FILL_TRANSPARENCE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_ATTR_FILL_FLOATTRANSPARENCE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEBEZIER ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEPOLYGON ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LINEEND_POLYGON ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( OBJ_TITLETEXT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONNECTION_NEW_ROUTING ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_1BIT_THRESHOLD ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_1BIT_MATRIX ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_4BIT_GRAYS
) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_4BIT_COLORS ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_8BIT_GRAYS
) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(
SID_CONVERT_TO_8BIT_COLORS ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_24BIT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER )
||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT )
||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE )
||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_FRAME_TO_TOP ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MOREFRONT ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MOREBACK ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_FRAME_TO_BOTTOM ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEFORE_OBJ ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEHIND_OBJ ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REVERSE_ORDER ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ORIGINAL_SIZE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SAVE_GRAPHIC ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMPRESS_GRAPHIC ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) )
+ SFX_ITEM_DEFAULT == rSet.GetItemState(
SID_OBJECT_TITLE_DESCRIPTION ) ||
+
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ATTR_FILL_STYLE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ATTR_FILL_TRANSPARENCE
) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState(
SID_ATTR_FILL_FLOATTRANSPARENCE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CHANGEBEZIER ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CHANGEPOLYGON ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_LINEEND_POLYGON ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( OBJ_TITLETEXT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_MEASURE_DLG ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONNECTION_DLG ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING
) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_SHEAR ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState(
SID_CONVERT_TO_1BIT_THRESHOLD ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONVERT_TO_1BIT_MATRIX
) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONVERT_TO_4BIT_GRAYS )
||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONVERT_TO_4BIT_COLORS
) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONVERT_TO_8BIT_GRAYS )
||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONVERT_TO_8BIT_COLORS
) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_CONVERT_TO_24BIT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_FRAME_TO_TOP ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_MOREFRONT ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_MOREBACK ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_FRAME_TO_BOTTOM ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_BEFORE_OBJ ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_BEHIND_OBJ ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_REVERSE_ORDER ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ORIGINAL_SIZE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_SAVE_GRAPHIC ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_COMPRESS_GRAPHIC ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_TEXTATTR_DLG ) )
{
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj*
>(pObj);
@@ -201,9 +201,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SfxItemSet aAttrSet( GetDoc()->GetPool() );
GetView()->GetAttributes( aAttrSet );
- if( aAttrSet.GetItemState( SDRATTR_EDGELINE1DELTA ) >=
SFX_ITEM_AVAILABLE &&
- aAttrSet.GetItemState( SDRATTR_EDGELINE2DELTA ) >=
SFX_ITEM_AVAILABLE &&
- aAttrSet.GetItemState( SDRATTR_EDGELINE3DELTA ) >=
SFX_ITEM_AVAILABLE )
+ if( aAttrSet.GetItemState( SDRATTR_EDGELINE1DELTA ) >=
SFX_ITEM_DEFAULT &&
+ aAttrSet.GetItemState( SDRATTR_EDGELINE2DELTA ) >=
SFX_ITEM_DEFAULT &&
+ aAttrSet.GetItemState( SDRATTR_EDGELINE3DELTA ) >=
SFX_ITEM_DEFAULT )
{
long nVal1 = ( ( const SdrMetricItem& ) aAttrSet.Get(
SDRATTR_EDGELINE1DELTA ) ).GetValue();
long nVal2 = ( ( const SdrMetricItem& ) aAttrSet.Get(
SDRATTR_EDGELINE2DELTA ) ).GetValue();
@@ -243,8 +243,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
}
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DISMANTLE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BREAK ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_DISMANTLE ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_BREAK ) )
{
if ( !mpDrawView->IsDismantlePossible(false) )
{
@@ -258,7 +258,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_BREAK );
}
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MODIFY_FIELD ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_MODIFY_FIELD ) )
{
OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView();
@@ -277,7 +277,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
else
rSet.DisableItem( SID_MODIFY_FIELD );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT
) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT ) )
{
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
const bool bSet = ((const
SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue()
!= SDRTEXTFIT_NONE;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 8e8b35e..83f4405 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -373,7 +373,7 @@ void OutlineViewShell::Deactivate( bool bIsMDIActivate )
*/
void OutlineViewShell::GetCtrlState(SfxItemSet &rSet)
{
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_HYPERLINK_GETLINK))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_HYPERLINK_GETLINK))
{
SvxHyperlinkItem aHLinkItem;
@@ -400,13 +400,13 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet)
}
rSet.Put( SfxBoolItem( SID_READONLY_MODE, GetDocSh()->IsReadOnly() ) );
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN)
)
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) )
rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true ) );
- if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_HALFWIDTH)
||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_FULLWIDTH)
||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_HIRAGANA) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_KATAGANA) )
+ if ( SFX_ITEM_DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_HALFWIDTH) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_FULLWIDTH) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_HIRAGANA) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_KATAGANA) )
{
SvtCJKOptions aCJKOptions;
if( !aCJKOptions.IsChangeCaseMapEnabled() )
@@ -762,8 +762,8 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_ZOOM_PREV);
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_IN ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_OUT ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ZOOM_IN ) ||
+ SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ZOOM_OUT ) )
{
if( GetActiveWindow()->GetZoom() <= GetActiveWindow()->GetMinZoom() ||
GetDocSh()->IsUIActive() )
rSet.DisableItem( SID_ZOOM_IN );
@@ -774,7 +774,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
::Outliner& rOutl = pOlView->GetOutliner();
// allow 'Select All'?
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SELECTALL ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_SELECTALL ) )
{
sal_Int32 nParaCount = rOutl.GetParagraphCount();
bool bDisable = nParaCount == 0;
@@ -900,7 +900,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if (bDisableCollapseAll)
rSet.DisableItem(SID_OUTLINE_COLLAPSE_ALL);
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PASTE ) )
{
if ( !pClipEvtLstnr )
{
@@ -957,7 +957,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
// field commands
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MODIFY_FIELD ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_MODIFY_FIELD ) )
{
const SvxFieldItem* pFldItem = pOutlinerView->GetFieldAtSelection();
@@ -970,7 +970,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_EXPAND_PAGE))
{
bool bDisable = true;
sal_uInt16 i = 0;
@@ -1017,7 +1017,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_SUMMARY_PAGE))
+ if (SFX_ITEM_DEFAULT == rSet.GetItemState(SID_SUMMARY_PAGE))
{
bool bDisable = true;
sal_uInt16 i = 0;
@@ -1047,7 +1047,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_THESAURUS ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_THESAURUS ) )
{
if ( !pOlView->IsTextEdit() )
{
@@ -1064,7 +1064,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
// is starting the presentation possible?
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_PRESENTATION ) )
{
bool bDisable = true;
sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD );
@@ -1291,7 +1291,7 @@ void OutlineViewShell::ExecStatusBar(SfxRequest&)
void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
{
// Zoom-Item
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOM ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ATTR_ZOOM ) )
{
sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
@@ -1307,7 +1307,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
rSet.Put( *pZoomItem );
}
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
{
if (GetDocSh()->IsUIActive() || !GetActiveWindow() )
{
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 07e2e56..72448da 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -86,7 +86,7 @@ namespace sd {
*/
void ViewShell::GetMenuState( SfxItemSet &rSet )
{
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STYLE_FAMILY ) )
+ if( SFX_ITEM_DEFAULT == rSet.GetItemState( SID_STYLE_FAMILY ) )
{
sal_uInt16 nFamily = (sal_uInt16)GetDocSh()->GetStyleFamily();
@@ -112,17 +112,17 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put(SfxUInt16Item(SID_STYLE_FAMILY, nFamily ));
}
- if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_GETUNDOSTRINGS))
+ if(SFX_ITEM_DEFAULT == rSet.GetItemState(SID_GETUNDOSTRINGS))
{
ImpGetUndoStrings(rSet);
}
- if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_GETREDOSTRINGS))
+ if(SFX_ITEM_DEFAULT == rSet.GetItemState(SID_GETREDOSTRINGS))
{
ImpGetRedoStrings(rSet);
}
- if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_UNDO))
+ if(SFX_ITEM_DEFAULT == rSet.GetItemState(SID_UNDO))
{
::svl::IUndoManager* pUndoManager = ImpGetUndoManager();
bool bActivate(false);
@@ -149,7 +149,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_REDO))
+ if(SFX_ITEM_DEFAULT == rSet.GetItemState(SID_REDO))
{
::svl::IUndoManager* pUndoManager = ImpGetUndoManager();
bool bActivate(false);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ad43c5b..0b95c9b 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -549,7 +549,7 @@ void SfxBindings::SetState
// Update status
if ( !pCache->IsControllerDirty() )
pCache->Invalidate(false);
- pCache->SetState( SFX_ITEM_AVAILABLE, pItem );
+ pCache->SetState( SFX_ITEM_DEFAULT, pItem );
//! Not implemented: Updates from EnumSlots via master slots
}
@@ -583,7 +583,7 @@ void SfxBindings::SetState
// Update Status
if ( !pCache->IsControllerDirty() )
pCache->Invalidate(false);
- pCache->SetState( SFX_ITEM_AVAILABLE, &rItem );
+ pCache->SetState( SFX_ITEM_DEFAULT, &rItem );
//! Not implemented: Updates from EnumSlots via master slots
}
@@ -1171,11 +1171,11 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const
SfxSlot* pSlot, SfxShell
if ( eState == SFX_ITEM_DISABLED )
return;
- if ( SFX_ITEM_AVAILABLE == eState && SfxItemPool::IsWhich(nWhich) )
+ if ( SFX_ITEM_DEFAULT == eState && SfxItemPool::IsWhich(nWhich) )
pOldItem = &aSet.Get(nWhich);
if ( SFX_ITEM_SET == eState ||
- ( SFX_ITEM_AVAILABLE == eState &&
+ ( SFX_ITEM_DEFAULT == eState &&
SfxItemPool::IsWhich(nWhich) &&
pOldItem ) )
{
@@ -1438,7 +1438,7 @@ void SfxBindings::UpdateControllers_Impl
else if ( SFX_ITEM_DISABLED == eState )
pCache->SetState(SFX_ITEM_DISABLED, 0);
else
- pCache->SetState(SFX_ITEM_AVAILABLE, pItem);
+ pCache->SetState(SFX_ITEM_DEFAULT, pItem);
}
// Update the slots for so far available and bound Controllers for
@@ -1452,7 +1452,7 @@ void SfxBindings::UpdateControllers_Impl
// Items cast on EnumItem
const SfxEnumItemInterface *pEnumItem =
PTR_CAST(SfxEnumItemInterface,pItem);
- if ( eState == SFX_ITEM_AVAILABLE && !pEnumItem )
+ if ( eState == SFX_ITEM_DEFAULT && !pEnumItem )
eState = SFX_ITEM_DONTCARE;
else
eState = SfxControllerItem::GetItemState( pEnumItem );
@@ -1487,12 +1487,12 @@ void SfxBindings::UpdateControllers_Impl
// disabled
pEnumCache->SetState(SFX_ITEM_DISABLED, 0);
}
- else if ( SFX_ITEM_AVAILABLE == eState && pEnumItem )
+ else if ( SFX_ITEM_DEFAULT == eState && pEnumItem )
{
// Determine enum value
sal_uInt16 nValue = pEnumItem->GetEnumValue();
SfxBoolItem aBool( pFound->nWhichId, pSlave->GetValue() ==
nValue );
- pEnumCache->SetState(SFX_ITEM_AVAILABLE, &aBool);
+ pEnumCache->SetState(SFX_ITEM_DEFAULT, &aBool);
}
else
{
@@ -1944,7 +1944,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot,
SfxPoolItem* &rpState )
if ( pItem )
rpState = pItem->Clone();
}
- else if ( eState == SFX_ITEM_AVAILABLE && pItem )
+ else if ( eState == SFX_ITEM_DEFAULT && pItem )
{
rpState = pItem->Clone();
}
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 067c938..f28ba98 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -316,7 +316,7 @@ SfxItemState SfxControllerItem::GetItemState
Enabled but there were only ambiguous values available
(i.e. non that can be queried).
- SFX_ITEM_AVAILABLE
+ SFX_ITEM_DEFAULT
Enabled and with available values, which are queried
by 'pState'. The Type is thus clearly defined in the
entire Program and specified through the Slot.
@@ -329,7 +329,7 @@ SfxItemState SfxControllerItem::GetItemState
? SFX_ITEM_DONTCARE
: pState->ISA(SfxVoidItem) && !pState->Which()
? SFX_ITEM_UNKNOWN
- : SFX_ITEM_AVAILABLE;
+ : SFX_ITEM_DEFAULT;
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 6fdb0f67..d04075e 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2058,7 +2058,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot,
const SfxPoolItem* &rp
if ( !rpState )
return SFX_ITEM_DISABLED;
else
- return SFX_ITEM_AVAILABLE;
+ return SFX_ITEM_DEFAULT;
}
return SFX_ITEM_DISABLED;
@@ -2089,7 +2089,7 @@ SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSID,
::com::sun::star::uno::
}
rAny = aState;
- return SFX_ITEM_AVAILABLE;
+ return SFX_ITEM_DEFAULT;
}
}
diff --git a/sfx2/source/control/querystatus.cxx
b/sfx2/source/control/querystatus.cxx
index ba45538..e97616a 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -108,7 +108,7 @@ throw( RuntimeException, std::exception )
if ( rEvent.IsEnabled )
{
- m_eState = SFX_ITEM_AVAILABLE;
+ m_eState = SFX_ITEM_DEFAULT;
::com::sun::star::uno::Type pType = rEvent.State.getValueType();
if ( pType == ::getBooleanCppuType() )
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 47031aa..fed4e2973 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -489,7 +489,7 @@ const SfxPoolItem* SfxRequest::GetItem
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
