diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-25 08:43:20 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-25 17:10:43 +0200 |
commit | 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4 (patch) | |
tree | 0575fd7acded0e19664352f44633cff93c3ab6b6 /ucb | |
parent | 96ff10449464ae9d869fe21dccf193a6eef670c1 (diff) |
fixes for up-casting to Reference<XInterface>
Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking
Reference constructor to reduce code noise"
Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filglob.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 6d7bdcb7f7bb..54760b826e5a 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -728,7 +728,7 @@ BaseContent::getParent( try { - return m_pMyShell->m_pProvider->queryContent( Identifier ); + return Reference<XInterface>( m_pMyShell->m_pProvider->queryContent( Identifier ), UNO_QUERY ); } catch (const IllegalIdentifierException&) { diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 2d074c927ac9..4f8a2c19a9d5 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -554,7 +554,7 @@ namespace fileaccess { NameClashException excep; excep.Name = getTitle(aUncPath); excep.Classification = InteractionClassification_ERROR; - excep.Context = xComProc; + excep.Context = Reference<XInterface>( xComProc, UNO_QUERY ); excep.Message = "file exists and overwrite forbidden"; aAny <<= excep; cancelCommandExecution( aAny,xEnv ); @@ -576,7 +576,7 @@ namespace fileaccess { seq[0] <<= prop; excep.Arguments = seq; excep.Classification = InteractionClassification_ERROR; - excep.Context = xComProc; + excep.Context = Reference<XInterface>( xComProc, UNO_QUERY ); excep.Message = "the name contained invalid characters"; if(isHandled) throw excep; @@ -853,7 +853,7 @@ namespace fileaccess { NameClashException excep; excep.Name = getTitle(aUncPath); excep.Classification = InteractionClassification_ERROR; - excep.Context = xComProc; + excep.Context = Reference<XInterface>( xComProc, UNO_QUERY ); excep.Message = "name clash during copy or move"; aAny <<= excep; @@ -864,7 +864,7 @@ namespace fileaccess { { UnsupportedNameClashException excep; excep.NameClash = minorCode; - excep.Context = xComProc; + excep.Context = Reference<XInterface>( xComProc, UNO_QUERY ); excep.Message = "name clash value not supported during copy or move"; aAny <<= excep; diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index fcd649daa37d..13c3fe2f9a11 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -695,7 +695,7 @@ FTPContent::getParent( ) { Reference<XContentIdentifier> xIdent(new FTPContentIdentifier(m_aFTPURL.parent(false))); - return m_xProvider->queryContent(xIdent); + return Reference<XInterface>( m_xProvider->queryContent(xIdent), UNO_QUERY ); } |