summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/file/bc.cxx17
-rw-r--r--ucb/source/ucp/ftp/ftpurl.cxx3
2 files changed, 10 insertions, 10 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 752d2b6d351a..f3e37a5e0623 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -213,18 +213,17 @@ BaseContent::dispose()
aEvt.Source = static_cast< XContent* >( this );
- pDisposeEventListeners =
- m_pDisposeEventListeners, m_pDisposeEventListeners = nullptr;
+ pDisposeEventListeners = m_pDisposeEventListeners;
+ m_pDisposeEventListeners = nullptr;
- pContentEventListeners =
- m_pContentEventListeners, m_pContentEventListeners = nullptr;
+ pContentEventListeners = m_pContentEventListeners;
+ m_pContentEventListeners = nullptr;
- pPropertySetInfoChangeListeners =
- m_pPropertySetInfoChangeListeners,
- m_pPropertySetInfoChangeListeners = nullptr;
+ pPropertySetInfoChangeListeners = m_pPropertySetInfoChangeListeners;
+ m_pPropertySetInfoChangeListeners = nullptr;
- pPropertyListener =
- m_pPropertyListener, m_pPropertyListener = nullptr;
+ pPropertyListener = m_pPropertyListener;
+ m_pPropertyListener = nullptr;
}
if ( pDisposeEventListeners && pDisposeEventListeners->getLength() )
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index b415350fe7d2..cab116ce7186 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -413,7 +413,8 @@ oslFileHandle FTPURL::open()
"osl_setFilePos failed");
}
else {
- osl_closeFile(res),res = nullptr;
+ osl_closeFile(res);
+ res = nullptr;
throw curl_exception(err);
}
}