diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-25 08:43:20 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-29 14:48:11 -0700 |
| commit | 22a09c25c8f56e3aab3ac1de6009461b4f063862 (patch) | |
| tree | 613c8119bf9d4ec54fd3098142961f6ae1722cf5 /ucb | |
| parent | f206f0d5b0409573f003f141c1c5d519ba7d74c8 (diff) | |
fixes for up-casting to Reference<XInterface>
Fix regressions introduced with
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking
Reference constructor to reduce code noise"
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4)
Conflicts:
framework/source/uifactory/menubarfactory.cxx
Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687
Reviewed-on: https://gerrit.libreoffice.org/9921
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@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 73f734dff0f2..f5b957620949 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -743,7 +743,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 143724ba6fb4..588730f9fdc0 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 4f456d18799d..cdf642871289 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -673,7 +673,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 ); } |