mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ucbhelper::GetLocalFileURL does not use its arg.

Browse Source
This commit is contained in:
Stephan Bergmann
2012-01-20 11:53:46 +01:00
parent 6cd581f240
commit b149b0433d
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ucb/workben/ucb/ucbdemo.cxx
View File

@@ -2346,7 +2346,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
DBG_ASSERT(xManager.is(), DBG_ASSERT(xManager.is(),
"MyWin::ToolBarHandler(): Service lacks interface"); "MyWin::ToolBarHandler(): Service lacks interface");
rtl::OUString aURL(getLocalFileURL(xManager)); rtl::OUString aURL(getLocalFileURL());
String aText(RTL_CONSTASCII_USTRINGPARAM("Local file URL: ")); String aText(RTL_CONSTASCII_USTRINGPARAM("Local file URL: "));
aText += String(aURL); aText += String(aURL);

8
ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
View File

@@ -48,17 +48,11 @@ namespace ucbhelper {
The result can be used as the rBaseURL parameter of The result can be used as the rBaseURL parameter of
ucb::getFileURLFromSystemPath(). ucb::getFileURLFromSystemPath().
@param rManager
A content provider manager. Must not be null.
@returns @returns
either a 'root' URL for the most 'local' file content provider, or an either a 'root' URL for the most 'local' file content provider, or an
empty string, if no such URL can meaningfully be constructed. empty string, if no such URL can meaningfully be constructed.
*/ */
UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL( UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL()
com::sun::star::uno::Reference<
com::sun::star::ucb::XContentProviderManager > const &
rManager)
SAL_THROW((com::sun::star::uno::RuntimeException)); SAL_THROW((com::sun::star::uno::RuntimeException));
//============================================================================ //============================================================================

4
ucbhelper/source/client/fileidentifierconverter.cxx
View File

@@ -47,9 +47,7 @@ namespace ucbhelper {
//============================================================================ //============================================================================
rtl::OUString rtl::OUString
getLocalFileURL( getLocalFileURL() SAL_THROW((uno::RuntimeException))
uno::Reference< ucb::XContentProviderManager > const &)
SAL_THROW((uno::RuntimeException))
{ {
// If there were more file systems than just "file:///" (e.g., the obsolete // 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 // "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for

4
unotools/source/ucbhelper/localfilehelper.cxx
View File

@@ -117,7 +117,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::
try try
{ {
rtl::OUString aBase( ::ucbhelper::getLocalFileURL( xManager ) ); rtl::OUString aBase( ::ucbhelper::getLocalFileURL() );
rReturn = ::ucbhelper::getFileURLFromSystemPath( xManager, aBase, rName ); rReturn = ::ucbhelper::getFileURLFromSystemPath( xManager, aBase, rName );
} }
catch (const ::com::sun::star::uno::RuntimeException&) catch (const ::com::sun::star::uno::RuntimeException&)
@@ -145,7 +145,7 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::
try try
{ {
INetURLObject aObj( rName ); INetURLObject aObj( rName );
INetURLObject aLocal( ::ucbhelper::getLocalFileURL( xManager ) ); INetURLObject aLocal( ::ucbhelper::getLocalFileURL() );
if ( aObj.GetProtocol() == aLocal.GetProtocol() ) if ( aObj.GetProtocol() == aLocal.GetProtocol() )
rReturn = ::ucbhelper::getSystemPathFromFileURL( xManager, rName ); rReturn = ::ucbhelper::getSystemPathFromFileURL( xManager, rName );
} }