diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 16:50:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 17:44:34 +0100 |
| commit | 47dd2c63f649828a833543e21d4eca5866ec9ebe (patch) | |
| tree | 0b9a64485028cb9c7c0ffc52cad79033b2cb6209 /ucb | |
| parent | 6ddefb080b12f54f84a8de44347a9b1816972ad3 (diff) | |
Rewrite uses of boost::optional
...to only use functions that are also available for std::optional (in
preparation for changing from boost::optional to std::optional):
* uses of get are replaced with operator * or operator ->
* uses of is_initialized are replaced with operator bool
* uses of reset with an argument are replace with operator =
(All of the replacements are also available for boost::optional "since forever",
so this change should not break builds against old --with-system-boost. An
alternative replacement for is_initialized would have been has_value, but that
is only available since Boost 1.68.)
Change-Id: I532687b6a5ee37dab28befb8e0eb05c22cbecf0f
Reviewed-on: https://gerrit.libreoffice.org/84124
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 25e3f8aa312a..07b59b983fc7 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -600,7 +600,7 @@ namespace ucb { namespace ucp { namespace ext { DBG_UNHANDLED_EXCEPTION("ucb.ucp.ext"); } - m_aIsFolder.reset( bIsFolder ); + m_aIsFolder = bIsFolder; return *m_aIsFolder; } @@ -610,7 +610,7 @@ namespace ucb { namespace ucp { namespace ext if ( !!m_aContentType ) return; - m_aContentType.reset( ContentProvider::getArtificialNodeContentType() ); + m_aContentType = ContentProvider::getArtificialNodeContentType(); if ( m_eExtContentType == E_EXTENSION_CONTENT ) { try @@ -618,7 +618,7 @@ namespace ucb { namespace ucp { namespace ext Sequence< Property > aProps(1); aProps[0].Name = "ContentType"; Reference< XRow > xRow( getPropertyValues( aProps, nullptr ), UNO_SET_THROW ); - m_aContentType.reset( xRow->getString(1) ); + m_aContentType = xRow->getString(1); } catch( const Exception& ) { |