diff options
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/hdft.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/weldeditview.cxx | 12 | ||||
-rw-r--r-- | svx/source/engine3d/view3d1.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 18 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unomod.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopool.cxx | 34 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 8 | ||||
-rw-r--r-- | svx/source/xoutdev/xpool.cxx | 4 |
10 files changed, 46 insertions, 46 deletions
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 2052a072c083..90c2f7450275 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -237,7 +237,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) aSet.Put(SfxBoolItem(nWSharedFirst, m_xCntSharedFirstBox->get_active())); if (m_xDynSpacingCB->get_visible() && SfxItemPool::IsWhich(nWDynSpacing)) { - std::unique_ptr<SfxBoolItem> pBoolItem(static_cast<SfxBoolItem*>(pPool->GetDefaultItem(nWDynSpacing).Clone())); + std::unique_ptr<SfxBoolItem> pBoolItem(static_cast<SfxBoolItem*>(pPool->GetUserOrPoolDefaultItem(nWDynSpacing).Clone())); pBoolItem->SetValue(m_xDynSpacingCB->get_active()); aSet.Put(std::move(pBoolItem)); } diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index d1b5e4b73e4a..6292bd56cb9f 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -112,21 +112,21 @@ void WeldEditView::makeEditEngine() vcl::Font aAppFont(Application::GetSettings().GetStyleSettings().GetAppFont()); - pItemPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), + pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), "", PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO)); - pItemPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), + pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), "", PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CJK)); - pItemPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), + pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(), "", PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CTL)); - pItemPool->SetPoolDefaultItem( + pItemPool->SetUserDefaultItem( SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT)); - pItemPool->SetPoolDefaultItem( + pItemPool->SetUserDefaultItem( SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT_CJK)); - pItemPool->SetPoolDefaultItem( + pItemPool->SetUserDefaultItem( SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT_CTL)); m_xEditEngine.reset(new EditEngine(pItemPool.get())); diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 47de321f581e..64f0fba1f5c8 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -166,12 +166,12 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr) double E3dView::GetDefaultCamPosZ() { - return static_cast<double>(GetModel().GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_DISTANCE).GetValue()); + return static_cast<double>(GetModel().GetItemPool().GetUserOrPoolDefaultItem(SDRATTR_3DSCENE_DISTANCE).GetValue()); } double E3dView::GetDefaultCamFocal() { - return static_cast<double>(GetModel().GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_FOCAL_LENGTH).GetValue()); + return static_cast<double>(GetModel().GetItemPool().GetUserOrPoolDefaultItem(SDRATTR_3DSCENE_FOCAL_LENGTH).GetValue()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index bf237d35ae18..ceaa80259fd9 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -374,7 +374,7 @@ SdrItemPool::SdrItemPool( mpLocalItemInfos[SDRATTR_WRITINGMODE2 - SDRATTR_START]._nItemInfoSlotID = 0 /*TODO*/; // it's my own creation level, set Defaults and ItemInfos - SetDefaults(mpLocalPoolDefaults); + SetPoolDefaults(mpLocalPoolDefaults); SetItemInfos(mpLocalItemInfos.get()); } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 47272987ec79..f429953dc28a 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -171,11 +171,11 @@ SdrModel::SdrModel(SfxItemPool* pPool, comphelper::IEmbeddedHelper* pEmbeddedHel m_pItemPool->SetDefaultMetric(m_eObjUnit); // using static SdrEngineDefaults only if default SvxFontHeight item is not available - const SfxPoolItem* pPoolItem = m_pItemPool->GetPoolDefaultItem( EE_CHAR_FONTHEIGHT ); + const SfxPoolItem* pPoolItem = m_pItemPool->GetUserDefaultItem( EE_CHAR_FONTHEIGHT ); if (pPoolItem) mnDefTextHgt = static_cast<const SvxFontHeightItem*>(pPoolItem)->GetHeight(); - m_pItemPool->SetPoolDefaultItem( makeSdrTextWordWrapItem( false ) ); + m_pItemPool->SetUserDefaultItem( makeSdrTextWordWrapItem( false ) ); SetTextDefaults(); m_pLayerAdmin->SetModel(this); @@ -638,7 +638,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt ) aSvxFontItem.SetStyleName(OUString()); aSvxFontItem.SetPitch( aFont.GetPitch()); aSvxFontItem.SetCharSet( aFont.GetCharSet() ); - pItemPool->SetPoolDefaultItem(aSvxFontItem); + pItemPool->SetUserDefaultItem(aSvxFontItem); // get DEFAULTFONT_CJK_TEXT and set at pool as dynamic default vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne)); @@ -647,7 +647,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt ) aSvxFontItemCJK.SetStyleName(OUString()); aSvxFontItemCJK.SetPitch( aFontCJK.GetPitch()); aSvxFontItemCJK.SetCharSet( aFontCJK.GetCharSet()); - pItemPool->SetPoolDefaultItem(aSvxFontItemCJK); + pItemPool->SetUserDefaultItem(aSvxFontItemCJK); // get DEFAULTFONT_CTL_TEXT and set at pool as dynamic default vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne)); @@ -656,15 +656,15 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt ) aSvxFontItemCTL.SetStyleName(OUString()); aSvxFontItemCTL.SetPitch( aFontCTL.GetPitch() ); aSvxFontItemCTL.SetCharSet( aFontCTL.GetCharSet()); - pItemPool->SetPoolDefaultItem(aSvxFontItemCTL); + pItemPool->SetUserDefaultItem(aSvxFontItemCTL); // set dynamic FontHeight defaults - pItemPool->SetPoolDefaultItem( SvxFontHeightItem(nDefTextHgt, 100, EE_CHAR_FONTHEIGHT ) ); - pItemPool->SetPoolDefaultItem( SvxFontHeightItem(nDefTextHgt, 100, EE_CHAR_FONTHEIGHT_CJK ) ); - pItemPool->SetPoolDefaultItem( SvxFontHeightItem(nDefTextHgt, 100, EE_CHAR_FONTHEIGHT_CTL ) ); + pItemPool->SetUserDefaultItem( SvxFontHeightItem(nDefTextHgt, 100, EE_CHAR_FONTHEIGHT ) ); + pItemPool->SetUserDefaultItem( SvxFontHeightItem(nDefTextHgt, 100, EE_CHAR_FONTHEIGHT_CJK ) ); + pItemPool->SetUserDefaultItem( SvxFontHeightItem(nDefTextHgt, 100, EE_CHAR_FONTHEIGHT_CTL ) ); // set FontColor defaults - pItemPool->SetPoolDefaultItem( SvxColorItem(SdrEngineDefaults::GetFontColor(), EE_CHAR_COLOR) ); + pItemPool->SetUserDefaultItem( SvxColorItem(SdrEngineDefaults::GetFontColor(), EE_CHAR_COLOR) ); } SdrOutliner& SdrModel::GetDrawOutliner(const SdrTextObj* pObj) const diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index c617129f3fd2..a7dc7397e9ad 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -1104,7 +1104,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& { // fetch the default from ItemPool if(SfxItemPool::IsWhich(pMap->nWID)) - aSet.Put(GetObject().getSdrModelFromSdrObject().GetItemPool().GetDefaultItem(pMap->nWID)); + aSet.Put(GetObject().getSdrModelFromSdrObject().GetItemPool().GetUserOrPoolDefaultItem(pMap->nWID)); } if( aSet.GetItemState( pMap->nWID ) == SfxItemState::SET ) @@ -1208,7 +1208,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) { // fetch the default from ItemPool if(SfxItemPool::IsWhich(pMap->nWID)) - aSet.Put(GetObject().getSdrModelFromSdrObject().GetItemPool().GetDefaultItem(pMap->nWID)); + aSet.Put(GetObject().getSdrModelFromSdrObject().GetItemPool().GetUserOrPoolDefaultItem(pMap->nWID)); } if( aSet.Count() ) @@ -1586,7 +1586,7 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) if( SfxItemPool::IsWhich(pMap->nWID) ) { SfxItemSet aSet(GetObject().getSdrModelFromSdrObject().GetItemPool(), pMap->nWID, pMap->nWID); - aSet.Put(GetObject().getSdrModelFromSdrObject().GetItemPool().GetDefaultItem(pMap->nWID)); + aSet.Put(GetObject().getSdrModelFromSdrObject().GetItemPool().GetUserOrPoolDefaultItem(pMap->nWID)); return GetAnyForItem( aSet, pMap ); } } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 07b9751ef048..d631ec72f4cd 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -644,7 +644,7 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(SdrModel* const SvxNumRule* pDefaultRule = nullptr; if( pModel ) { - const SvxNumBulletItem* pItem = pModel->GetItemPool().GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET); + const SvxNumBulletItem* pItem = pModel->GetItemPool().GetSecondaryPool()->GetUserDefaultItem(EE_PARA_NUMBULLET); if( pItem ) { pDefaultRule = &pItem->GetNumRule(); diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index c8d5e59bcbd0..3be3c0418ea7 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -81,11 +81,11 @@ void SvxUnoDrawPool::getAny( SfxItemPool const * pPool, const comphelper::Proper { case OWN_ATTR_FILLBMP_MODE: { - if (pPool->GetDefaultItem(XATTR_FILLBMP_TILE).GetValue()) + if (pPool->GetUserOrPoolDefaultItem(XATTR_FILLBMP_TILE).GetValue()) { rValue <<= drawing::BitmapMode_REPEAT; } - else if (pPool->GetDefaultItem(XATTR_FILLBMP_STRETCH).GetValue()) + else if (pPool->GetUserOrPoolDefaultItem(XATTR_FILLBMP_STRETCH).GetValue()) { rValue <<= drawing::BitmapMode_STRETCH; } @@ -105,7 +105,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool const * pPool, const comphelper::Proper // Assure, that ID is a Which-ID (it could be a Slot-ID.) // Thus, convert handle to Which-ID. - pPool->GetDefaultItem( pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) ) ).QueryValue( rValue, nMemberId ); + pPool->GetUserOrPoolDefaultItem( pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) ) ).QueryValue( rValue, nMemberId ); } } @@ -154,15 +154,15 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn eMode = static_cast<drawing::BitmapMode>(nMode); } - pPool->SetPoolDefaultItem( XFillBmpStretchItem( eMode == drawing::BitmapMode_STRETCH ) ); - pPool->SetPoolDefaultItem( XFillBmpTileItem( eMode == drawing::BitmapMode_REPEAT ) ); + pPool->SetUserDefaultItem( XFillBmpStretchItem( eMode == drawing::BitmapMode_STRETCH ) ); + pPool->SetUserDefaultItem( XFillBmpTileItem( eMode == drawing::BitmapMode_REPEAT ) ); return; } while(false); default: { - std::unique_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() ); + std::unique_ptr<SfxPoolItem> pNewItem( pPool->GetUserOrPoolDefaultItem( nWhich ).Clone() ); sal_uInt8 nMemberId = pEntry->mnMemberId; if( pPool->GetMetric(nWhich) == MapUnit::Map100thMM ) nMemberId &= (~CONVERT_TWIPS); @@ -170,7 +170,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn if( !pNewItem->PutValue( aValue, nMemberId ) ) throw lang::IllegalArgumentException(); - pPool->SetPoolDefaultItem( *pNewItem ); + pPool->SetUserDefaultItem( *pNewItem ); } } } @@ -223,8 +223,8 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp { // use method <IsStaticDefaultItem(..)> instead of using // probably incompatible item pool <mpDefaultPool>. - if ( IsStaticDefaultItem( &(pPool->GetDefaultItem( XATTR_FILLBMP_STRETCH )) ) || - IsStaticDefaultItem( &(pPool->GetDefaultItem( XATTR_FILLBMP_TILE )) ) ) + if ( IsStaticDefaultItem( &(pPool->GetUserOrPoolDefaultItem( XATTR_FILLBMP_STRETCH )) ) || + IsStaticDefaultItem( &(pPool->GetUserOrPoolDefaultItem( XATTR_FILLBMP_TILE )) ) ) { *pStates = beans::PropertyState_DEFAULT_VALUE; } @@ -235,8 +235,8 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp } break; case OWN_ATTR_TEXTCOLUMNS: - if (IsStaticDefaultItem(&pPool->GetDefaultItem(sal_uInt16(SDRATTR_TEXTCOLUMNS_NUMBER))) - && IsStaticDefaultItem(&pPool->GetDefaultItem(sal_uInt16(SDRATTR_TEXTCOLUMNS_SPACING)))) + if (IsStaticDefaultItem(&pPool->GetUserOrPoolDefaultItem(sal_uInt16(SDRATTR_TEXTCOLUMNS_NUMBER))) + && IsStaticDefaultItem(&pPool->GetUserOrPoolDefaultItem(sal_uInt16(SDRATTR_TEXTCOLUMNS_SPACING)))) *pStates = beans::PropertyState_DEFAULT_VALUE; else *pStates = beans::PropertyState_DIRECT_VALUE; @@ -245,8 +245,8 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp //#i18732# - correction: // use method <IsStaticDefaultItem(..)> instead of using probably // incompatible item pool <mpDefaultPool>. - const SfxPoolItem& r1 = pPool->GetDefaultItem( nWhich ); - //const SfxPoolItem& r2 = mpDefaultPool->GetDefaultItem( nWhich ); + const SfxPoolItem& r1 = pPool->GetUserOrPoolDefaultItem( nWhich ); + //const SfxPoolItem& r2 = mpDefaultPool->GetUserOrPoolDefaultItem( nWhich ); if ( IsStaticDefaultItem( &r1 ) ) { @@ -282,20 +282,20 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* const sal_uInt16 nWhich = pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) ); if ( pPool && pPool != mpDefaultsPool.get() ) { - // use method <ResetPoolDefaultItem(..)> instead of using probably incompatible item pool <mpDefaultsPool>. - pPool->ResetPoolDefaultItem( nWhich ); + // use method <ResetUserDefaultItem(..)> instead of using probably incompatible item pool <mpDefaultsPool>. + pPool->ResetUserDefaultItem( nWhich ); } } uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) { SolarMutexGuard aGuard; - //#i18732# - use method <GetPoolDefaultItem(..)> instead of + //#i18732# - use method <GetUserDefaultItem(..)> instead of // using probably incompatible item pool <mpDefaultsPool> uno::Any aAny; SfxItemPool* pPool = getModelPool( true ); const sal_uInt16 nWhich = pPool->GetWhich( static_cast<sal_uInt16>(pEntry->mnHandle) ); - const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich ); + const SfxPoolItem *pItem = pPool->GetUserDefaultItem ( nWhich ); if (pItem) { pItem->QueryValue( aAny, pEntry->mnMemberId ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 90ff0eeb4275..703b3e664638 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -530,7 +530,7 @@ static void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemProper if(SfxItemPool::IsWhich(nWID) && (nWID < OWN_ATTR_VALUE_START || nWID > OWN_ATTR_VALUE_END) && rAnys.GetUsrAnyForID(*pSrcProp)) - rSet.Put(rSet.GetPool()->GetDefaultItem(nWID)); + rSet.Put(rSet.GetPool()->GetUserOrPoolDefaultItem(nWID)); } for(const SfxItemPropertyMapEntry* pSrcProp : rSrc.getPropertyEntries()) @@ -1564,7 +1564,7 @@ void SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& { // get default from ItemPool if(SfxItemPool::IsWhich(pMap->nWID)) - pSet->Put(GetSdrObject()->getSdrModelFromSdrObject().GetItemPool().GetDefaultItem(pMap->nWID)); + pSet->Put(GetSdrObject()->getSdrModelFromSdrObject().GetItemPool().GetUserOrPoolDefaultItem(pMap->nWID)); } if( pSet->GetItemState( pMap->nWID ) == SfxItemState::SET ) @@ -1633,7 +1633,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) { // get default from ItemPool if(SfxItemPool::IsWhich(pMap->nWID)) - aSet.Put(GetSdrObject()->getSdrModelFromSdrObject().GetItemPool().GetDefaultItem(pMap->nWID)); + aSet.Put(GetSdrObject()->getSdrModelFromSdrObject().GetItemPool().GetUserOrPoolDefaultItem(pMap->nWID)); } if(aSet.Count()) @@ -3065,7 +3065,7 @@ uno::Any SvxShape::_getPropertyDefault( const OUString& aPropertyName ) throw beans::UnknownPropertyException( "No WhichID " + OUString::number(pMap->nWID) + " for " + aPropertyName, getXWeak()); SfxItemSet aSet( GetSdrObject()->getSdrModelFromSdrObject().GetItemPool(), pMap->nWID, pMap->nWID ); - aSet.Put(GetSdrObject()->getSdrModelFromSdrObject().GetItemPool().GetDefaultItem(pMap->nWID)); + aSet.Put(GetSdrObject()->getSdrModelFromSdrObject().GetItemPool().GetUserOrPoolDefaultItem(pMap->nWID)); return GetAnyForItem( aSet, pMap ); } diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index cb91553f5390..9419a5c43456 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -214,7 +214,7 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster) // if it's my own creation level, set Defaults and ItemInfos if(XATTR_START == GetFirstWhich() && XATTR_END == GetLastWhich()) { - SetDefaults(mpLocalPoolDefaults); + SetPoolDefaults(mpLocalPoolDefaults); SetItemInfos(mpLocalItemInfos.get()); } } @@ -235,7 +235,7 @@ XOutdevItemPool::~XOutdevItemPool() { Delete(); // release and delete static pool default items - ReleaseDefaults(true); + ReleasePoolDefaults(true); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |