Kaydet (Commit) 47023116 authored tarafından Eike Rathke's avatar Eike Rathke

Disambiguate Reference -> uno::Reference (tdf#107724 prep rel)

Change-Id: Ie2858e2e3c81da2041b53389bd06c87211fa8833
üst f39e1b10
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
using namespace com::sun::star; using namespace com::sun::star;
using namespace formula; using namespace formula;
using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Sequence;
using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::RuntimeException;
...@@ -1495,7 +1494,7 @@ ScExternalDocLinkObj::~ScExternalDocLinkObj() ...@@ -1495,7 +1494,7 @@ ScExternalDocLinkObj::~ScExternalDocLinkObj()
{ {
} }
Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetCache( uno::Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetCache(
const OUString& aSheetName, sal_Bool bDynamicCache ) const OUString& aSheetName, sal_Bool bDynamicCache )
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
...@@ -1505,7 +1504,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC ...@@ -1505,7 +1504,7 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC
// Set the whole table cached to prevent access to the source document. // Set the whole table cached to prevent access to the source document.
pTable->setWholeTableCached(); pTable->setWholeTableCached();
Reference< sheet::XExternalSheetCache > aSheetCache(new ScExternalSheetCacheObj(mpDocShell, pTable, nIndex)); uno::Reference< sheet::XExternalSheetCache > aSheetCache(new ScExternalSheetCacheObj(mpDocShell, pTable, nIndex));
return aSheetCache; return aSheetCache;
} }
...@@ -1517,7 +1516,7 @@ Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) ...@@ -1517,7 +1516,7 @@ Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName)
if (!pTable) if (!pTable)
throw container::NoSuchElementException(); throw container::NoSuchElementException();
Reference< sheet::XExternalSheetCache > aSheetCache(new ScExternalSheetCacheObj(mpDocShell, pTable, nIndex)); uno::Reference< sheet::XExternalSheetCache > aSheetCache(new ScExternalSheetCacheObj(mpDocShell, pTable, nIndex));
return Any(aSheetCache); return Any(aSheetCache);
} }
...@@ -1573,15 +1572,15 @@ Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex) ...@@ -1573,15 +1572,15 @@ Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex)
if (!pTable) if (!pTable)
throw lang::IndexOutOfBoundsException(); throw lang::IndexOutOfBoundsException();
Reference< sheet::XExternalSheetCache > aSheetCache(new ScExternalSheetCacheObj(mpDocShell, pTable, nIndex)); uno::Reference< sheet::XExternalSheetCache > aSheetCache(new ScExternalSheetCacheObj(mpDocShell, pTable, nIndex));
return Any(aSheetCache); return Any(aSheetCache);
} }
Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumeration() uno::Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumeration()
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
Reference< container::XEnumeration > aRef( uno::Reference< container::XEnumeration > aRef(
new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLink")); new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLink"));
return aRef; return aRef;
} }
...@@ -1615,13 +1614,13 @@ ScExternalDocLinksObj::~ScExternalDocLinksObj() ...@@ -1615,13 +1614,13 @@ ScExternalDocLinksObj::~ScExternalDocLinksObj()
{ {
} }
Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( uno::Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink(
const OUString& aDocName ) const OUString& aDocName )
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
OUString aDocUrl( ScGlobal::GetAbsDocName( aDocName, mpDocShell)); OUString aDocUrl( ScGlobal::GetAbsDocName( aDocName, mpDocShell));
sal_uInt16 nFileId = mpRefMgr->getExternalFileId(aDocUrl); sal_uInt16 nFileId = mpRefMgr->getExternalFileId(aDocUrl);
Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpDocShell, mpRefMgr, nFileId)); uno::Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpDocShell, mpRefMgr, nFileId));
return aDocLink; return aDocLink;
} }
...@@ -1633,7 +1632,7 @@ Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) ...@@ -1633,7 +1632,7 @@ Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName)
throw container::NoSuchElementException(); throw container::NoSuchElementException();
sal_uInt16 nFileId = mpRefMgr->getExternalFileId(aDocUrl); sal_uInt16 nFileId = mpRefMgr->getExternalFileId(aDocUrl);
Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpDocShell, mpRefMgr, nFileId)); uno::Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpDocShell, mpRefMgr, nFileId));
return Any(aDocLink); return Any(aDocLink);
} }
...@@ -1675,14 +1674,14 @@ Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) ...@@ -1675,14 +1674,14 @@ Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex)
if (!mpRefMgr->hasExternalFile(nFileId)) if (!mpRefMgr->hasExternalFile(nFileId))
throw lang::IndexOutOfBoundsException(); throw lang::IndexOutOfBoundsException();
Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpDocShell, mpRefMgr, nFileId)); uno::Reference< sheet::XExternalDocLink > aDocLink(new ScExternalDocLinkObj(mpDocShell, mpRefMgr, nFileId));
return Any(aDocLink); return Any(aDocLink);
} }
Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnumeration() uno::Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnumeration()
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
Reference< container::XEnumeration > aRef( uno::Reference< container::XEnumeration > aRef(
new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLinks")); new ScIndexEnumeration(this, "com.sun.star.sheet.ExternalDocLinks"));
return aRef; return aRef;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment