diff options
| -rw-r--r-- | ucb/workben/ucb/ucbdemo.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx | 8 | ||||
| -rw-r--r-- | ucbhelper/source/client/fileidentifierconverter.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/localfilehelper.cxx | 4 |
4 files changed, 5 insertions, 13 deletions
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 7ebc94a821ba..0a61f75fabda 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -2346,7 +2346,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) DBG_ASSERT(xManager.is(), "MyWin::ToolBarHandler(): Service lacks interface"); - rtl::OUString aURL(getLocalFileURL(xManager)); + rtl::OUString aURL(getLocalFileURL()); String aText(RTL_CONSTASCII_USTRINGPARAM("Local file URL: ")); aText += String(aURL); diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx index 14bfb177545f..262d32a507d6 100644 --- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx +++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx @@ -48,17 +48,11 @@ namespace ucbhelper { The result can be used as the rBaseURL parameter of ucb::getFileURLFromSystemPath(). - @param rManager - A content provider manager. Must not be null. - @returns either a 'root' URL for the most 'local' file content provider, or an empty string, if no such URL can meaningfully be constructed. */ -UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL( - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProviderManager > const & - rManager) +UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL() SAL_THROW((com::sun::star::uno::RuntimeException)); //============================================================================ diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx index a4428e5b28af..1abfedd85b51 100644 --- a/ucbhelper/source/client/fileidentifierconverter.cxx +++ b/ucbhelper/source/client/fileidentifierconverter.cxx @@ -47,9 +47,7 @@ namespace ucbhelper { //============================================================================ rtl::OUString -getLocalFileURL( - uno::Reference< ucb::XContentProviderManager > const &) - SAL_THROW((uno::RuntimeException)) +getLocalFileURL() SAL_THROW((uno::RuntimeException)) { // If there were more file systems than just "file:///" (e.g., the obsolete // "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index 2d28dac1adc8..caa19f54675b 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -117,7 +117,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl:: try { - rtl::OUString aBase( ::ucbhelper::getLocalFileURL( xManager ) ); + rtl::OUString aBase( ::ucbhelper::getLocalFileURL() ); rReturn = ::ucbhelper::getFileURLFromSystemPath( xManager, aBase, rName ); } catch (const ::com::sun::star::uno::RuntimeException&) @@ -145,7 +145,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl:: try { INetURLObject aObj( rName ); - INetURLObject aLocal( ::ucbhelper::getLocalFileURL( xManager ) ); + INetURLObject aLocal( ::ucbhelper::getLocalFileURL() ); if ( aObj.GetProtocol() == aLocal.GetProtocol() ) rReturn = ::ucbhelper::getSystemPathFromFileURL( xManager, rName ); } |