diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-03 14:31:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 07:17:38 +0100 |
| commit | 31b5c9b9bce461c2a9a9de99bbae2480788c19ca (patch) | |
| tree | a6a855bd55c8ad5acb728606801922266ae07ef5 /sfx2/source/view/frame.cxx | |
| parent | 21e0d8162a0e683558c4d042ce688fc9a6833809 (diff) | |
remove SfxUsrAnyItem typedef
and rename SfxUsrAnyItem class to SfxUnoAnyItem, the choice being made
by leaving the most popular one behind
Change-Id: If3818ee0966a50e3036d7e2db951910b6282c91f
Reviewed-on: https://gerrit.libreoffice.org/47313
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/view/frame.cxx')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index b772c62534dc..ab0f73e38434 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::container; -SfxPoolItem* SfxUsrAnyItem::CreateDefault() { SAL_WARN( "sfx", "No SfxUsrAnyItem factory available"); return nullptr; } +SfxPoolItem* SfxUnoAnyItem::CreateDefault() { SAL_WARN( "sfx", "No SfxUnoAnyItem factory available"); return nullptr; } SfxPoolItem* SfxUnoFrameItem::CreateDefault() { @@ -300,7 +300,7 @@ void SfxFrame::GetViewData_Impl() if ( GetController().is() && pSet->GetItemState( SID_VIEW_DATA ) != SfxItemState::SET ) { css::uno::Any aData = GetController()->getViewData(); - pSet->Put( SfxUsrAnyItem( SID_VIEW_DATA, aData ) ); + pSet->Put( SfxUnoAnyItem( SID_VIEW_DATA, aData ) ); } if ( pViewFrame->GetCurViewId() ) @@ -460,29 +460,29 @@ bool SfxFrameItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) } -SfxUsrAnyItem::SfxUsrAnyItem( sal_uInt16 nWhichId, const css::uno::Any& rAny ) +SfxUnoAnyItem::SfxUnoAnyItem( sal_uInt16 nWhichId, const css::uno::Any& rAny ) : SfxPoolItem( nWhichId ) { aValue = rAny; } -bool SfxUsrAnyItem::operator==( const SfxPoolItem& /*rItem*/ ) const +bool SfxUnoAnyItem::operator==( const SfxPoolItem& /*rItem*/ ) const { return false; } -SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const +SfxPoolItem* SfxUnoAnyItem::Clone( SfxItemPool *) const { - return new SfxUsrAnyItem( *this ); + return new SfxUnoAnyItem( *this ); } -bool SfxUsrAnyItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SfxUnoAnyItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal = aValue; return true; } -bool SfxUsrAnyItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SfxUnoAnyItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { aValue = rVal; return true; |