diff options
Diffstat (limited to 'fpicker/source/office/fpsmartcontent.hxx')
| -rw-r--r-- | fpicker/source/office/fpsmartcontent.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index becb689a1078..ef3329320b85 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX +#pragma once #include "fpinteraction.hxx" @@ -26,6 +25,7 @@ #include <ucbhelper/content.hxx> #include <rtl/ref.hxx> #include <memory> +#include <optional> namespace svt @@ -50,7 +50,7 @@ namespace svt private: OUString m_sURL; - std::unique_ptr<::ucbhelper::Content> m_pContent; + std::optional<::ucbhelper::Content> m_oContent; State m_eState; css::uno::Reference < css::ucb::XCommandEnvironment > m_xCmdEnv; rtl::Reference<::svt::OFilePickerInteractionHandler> m_xOwnInteraction; @@ -130,7 +130,7 @@ namespace svt /** returns the URL of the content */ - OUString const & getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; } + OUString const & getURL() const { return m_oContent ? m_oContent->getURL() : m_sURL; } /** (re)creates the content for the given URL @@ -193,6 +193,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |