diff options
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/pch/precompiled_comphelper.hxx | 2 | ||||
| -rw-r--r-- | comphelper/qa/unit/variadictemplates.cxx | 12 | ||||
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index e94b3b689a01..61ff03390b45 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.hxx @@ -45,7 +45,7 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> diff --git a/comphelper/qa/unit/variadictemplates.cxx b/comphelper/qa/unit/variadictemplates.cxx index 20d47f89758a..587bded24702 100644 --- a/comphelper/qa/unit/variadictemplates.cxx +++ b/comphelper/qa/unit/variadictemplates.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <sal/types.h> #include <comphelper/unwrapargs.hxx> #include <cppunit/TestAssert.h> @@ -56,7 +56,7 @@ void extract( template <typename T> void extract( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> const& seq, - sal_Int32 nArg, ::boost::optional<T> & v, + sal_Int32 nArg, ::o3tl::optional<T> & v, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const& xErrorContext ) { @@ -104,22 +104,22 @@ void VariadicTemplatesTest::testUnwrapArgs() { ::com::sun::star::uno::Any tmp9( ::com::sun::star::uno::makeAny( tmp4 ) ); - ::boost::optional< ::com::sun::star::uno::Any > tmp10( + ::o3tl::optional< ::com::sun::star::uno::Any > tmp10( ::com::sun::star::uno::makeAny( tmp5 ) ); - ::boost::optional< ::com::sun::star::uno::Any > tmp11( + ::o3tl::optional< ::com::sun::star::uno::Any > tmp11( ::com::sun::star::uno::makeAny( tmp1 ) ); // test equality with the baseline and template specialization with - // boost::optional< T > + // o3tl::optional< T > try { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > seq1( static_cast< sal_uInt32 >( 5 ) ); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > seq2( static_cast< sal_uInt32 >( 5 ) ); - // tmp11 should be ignored as it is ::boost::optional< T > + // tmp11 should be ignored as it is ::o3tl::optional< T > ::comphelper::unwrapArgs( seq1, tmp6, tmp7, tmp8, tmp9, tmp10, tmp11 ); unwrapArgsBaseline( seq2, tmp6, tmp7, tmp8, tmp9, tmp10 ); ::com::sun::star::uno::Any* p1 = seq1.getArray(); diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index c71c2ce5f40c..256315fb2851 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XOfficeInstallationDirectories.hpp> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> namespace com::sun::star::uno { class XComponentContext; } @@ -72,8 +72,8 @@ private: void initDirs(); css::uno::Reference< css::uno::XComponentContext > m_xCtx; - boost::optional<OUString> m_xOfficeBrandDir; - boost::optional<OUString> m_xUserDir; + o3tl::optional<OUString> m_xOfficeBrandDir; + o3tl::optional<OUString> m_xUserDir; }; } // namespace comphelper |