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, 7 insertions, 7 deletions

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index e06f17bd4695..6db3054a7cf6 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -4240,7 +4240,7 @@ SfxUInt16Item RowHeight FID_ROW_HEIGHT
 
 
 SfxVoidItem SbaImport SID_SBA_IMPORT
-(SfxUsrAnyItem Query SID_SBA_IMPORT,SfxStringItem Target FN_PARAM_1)
+(SfxUnoAnyItem Query SID_SBA_IMPORT,SfxStringItem Target FN_PARAM_1)
 [
     AutoUpdate = FALSE,
     FastCall = FALSE,
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 309179b69b6a..d03f59b323ca 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -252,7 +252,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportXLS(SvStream& rStream)
     ScDLL::Init();
     SfxMedium aMedium;
     css::uno::Reference<css::io::XInputStream> xStm(new utl::OInputStreamWrapper(rStream));
-    aMedium.GetItemSet()->Put(SfxUsrAnyItem(SID_INPUTSTREAM, css::uno::makeAny(xStm)));
+    aMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_INPUTSTREAM, css::uno::makeAny(xStm)));
 
     ScDocShellRef xDocShell = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT |
                                              SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
@@ -286,7 +286,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportWKS(SvStream& rStream)
     ScDLL::Init();
     SfxMedium aMedium;
     css::uno::Reference<css::io::XInputStream> xStm(new utl::OInputStreamWrapper(rStream));
-    aMedium.GetItemSet()->Put(SfxUsrAnyItem(SID_INPUTSTREAM, css::uno::makeAny(xStm)));
+    aMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_INPUTSTREAM, css::uno::makeAny(xStm)));
     ScDocument aDocument;
     ScDocOptions aDocOpt = aDocument.GetDocOptions();
     aDocOpt.SetLookUpColRowNames(false);
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 8683749fdd7c..3205949dadfd 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -48,7 +48,7 @@ uno::Reference<task::XStatusIndicator> getStatusIndicator(const SfxMedium& rMedi
     SfxItemSet* pSet = rMedium.GetItemSet();
     if (pSet)
     {
-        const SfxUnoAnyItem* pItem = pSet->GetItem<SfxUsrAnyItem>(SID_PROGRESS_STATUSBAR_CONTROL);
+        const SfxUnoAnyItem* pItem = pSet->GetItem<SfxUnoAnyItem>(SID_PROGRESS_STATUSBAR_CONTROL);
         if (pItem)
             xStatusIndicator.set(pItem->GetValue(), uno::UNO_QUERY);
     }
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 4647f2675f3a..7071e42ab0e4 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -174,7 +174,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 svx::ODataAccessDescriptor aDesc;
                 if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SfxItemState::SET )
                 {
-                    uno::Any aAny = static_cast<const SfxUsrAnyItem*>(pItem)->GetValue();
+                    uno::Any aAny = static_cast<const SfxUnoAnyItem*>(pItem)->GetValue();
                     uno::Sequence<beans::PropertyValue> aProperties;
                     if ( aAny >>= aProperties )
                         aDesc.initializeFrom( aProperties );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 7e3194ab64d4..7a82ea88b9ea 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -383,7 +383,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
             uno::Any aDescAny;
             uno::Sequence<beans::PropertyValue> aProperties = aDesc.createPropertyValueSequence();
             aDescAny <<= aProperties;
-            SfxUsrAnyItem aDataDesc(SID_SBA_IMPORT, aDescAny);
+            SfxUnoAnyItem aDataDesc(SID_SBA_IMPORT, aDescAny);
 
             ScDocShell* pDocSh = GetViewData().GetDocShell();
             SCTAB nTab = GetViewData().GetTabNo();
@@ -540,7 +540,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
             pInsDoc->ResetClip( pDoc, nSrcTab );
 
             SfxMedium aMed;
-            aMed.GetItemSet()->Put( SfxUsrAnyItem( SID_INPUTSTREAM, uno::makeAny( xStm ) ) );
+            aMed.GetItemSet()->Put( SfxUnoAnyItem( SID_INPUTSTREAM, uno::makeAny( xStm ) ) );
             ErrCode eErr = ScFormatFilter::Get().ScImportExcel( aMed, pInsDoc, EIF_AUTO );
             if ( eErr == ERRCODE_NONE )
             {