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>

5 files changed, 16 insertions, 16 deletions

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 79d10caa0716..1d7aeea8bcac 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2066,7 +2066,7 @@ SfxStringItem Keywords SID_DOCINFO_KEYWORDS
 
 
 SfxStringItem LibLoaded SID_BASICIDE_LIBLOADED
-(SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
+(SfxUnoAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
@@ -2084,7 +2084,7 @@ SfxStringItem LibLoaded SID_BASICIDE_LIBLOADED
 
 
 SfxStringItem LibRemoved SID_BASICIDE_LIBREMOVED
-(SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
+(SfxUnoAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
@@ -2102,7 +2102,7 @@ SfxStringItem LibRemoved SID_BASICIDE_LIBREMOVED
 
 
 SfxStringItem LibSelect SID_BASICIDE_LIBSELECTED
-(SfxUsrAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
+(SfxUnoAnyItem Document SID_BASICIDE_ARG_DOCUMENT_MODEL,SfxStringItem LibName SID_BASICIDE_ARG_LIBNAME)
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index 3a45c573ab1e..231548e5a1e0 100644
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
@@ -32,7 +32,7 @@
     item String     SfxMacroInfoItem;       //! Dummy
     item String     SfxImageItem;           //! Dummy
     item String     SfxObjectShellItem      //! Dummy
-    item String     SfxUsrAnyItem           //! Dummy
+    item String     SfxUnoAnyItem           //! Dummy
     item String     SfxUnoFrameItem         //! Dummy
     item String     SfxWatermarkItem        //! Dummy
 
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index a5bc1ea0b959..22f173614dd5 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1400,9 +1400,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
         if ( rSet.GetItemState( SID_FILLFRAME, false, &pItem ) == SfxItemState::SET )
         {
             pValue[nActProp].Name = sFrame;
-            if ( auto pUsrAnyItem = dynamic_cast< const SfxUsrAnyItem *>( pItem ) )
+            if ( auto pUsrAnyItem = dynamic_cast< const SfxUnoAnyItem *>( pItem ) )
             {
-                OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" );
+                OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUnoAnyItem is not deprecated!" );
                 pValue[nActProp++].Value = pUsrAnyItem->GetValue();
             }
             else if ( auto pUnoFrameItem = dynamic_cast< const SfxUnoFrameItem *>( pItem ) )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 48d69a264510..27fe78208317 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2455,9 +2455,9 @@ void SfxMedium::GetMedium_Impl()
             {
                 //TODO/MBA: need support for SID_STREAM
                 if ( pImpl->xStream.is() )
-                    GetItemSet()->Put( SfxUsrAnyItem( SID_STREAM, makeAny( pImpl->xStream ) ) );
+                    GetItemSet()->Put( SfxUnoAnyItem( SID_STREAM, makeAny( pImpl->xStream ) ) );
 
-                GetItemSet()->Put( SfxUsrAnyItem( SID_INPUTSTREAM, makeAny( pImpl->xInputStream ) ) );
+                GetItemSet()->Put( SfxUnoAnyItem( SID_INPUTSTREAM, makeAny( pImpl->xInputStream ) ) );
             }
         }
 
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;