diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/impviewframe.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index b4e1587a5801..1e86678c8a11 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -45,7 +45,7 @@ #include <utility> #include <vector> #include <boost/logic/tribool.hpp> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <boost/property_tree/json_parser.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 945d24a1f63b..f5689b3c3584 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1174,7 +1174,7 @@ void BookmarksBox_Impl::dispose() for ( sal_Int32 i = 0; i < nCount; ++i ) { OUString* pURL = static_cast<OUString*>(GetEntryData(i)); - aHistOpt.AppendItem(eHELPBOOKMARKS, *pURL, "", GetEntry(i), boost::none); + aHistOpt.AppendItem(eHELPBOOKMARKS, *pURL, "", GetEntry(i), o3tl::nullopt); delete pURL; } ListBox::dispose(); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 2284c8b16e16..8ec36aa20c2b 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -117,7 +117,7 @@ void SfxPickListImpl::AddDocumentToPickList( const SfxObjectShell* pDocSh ) if ( pFilter ) aFilter = pFilter->GetFilterName(); - boost::optional<OUString> aThumbnail; + o3tl::optional<OUString> aThumbnail; // generate the thumbnail //fdo#74834: only generate thumbnail for history if the corresponding option is not disabled in the configuration diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index b8f0b04818bc..b9d072d27012 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -79,7 +79,7 @@ #include <sfx2/docfile.hxx> #include <sax/tools/converter.hxx> #include <i18nlangtag/languagetag.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <utility> #include <vector> @@ -454,7 +454,7 @@ OUString getNameSpace(const char* i_qname) throw () bool textToDateOrDateTime(css::util::Date & io_rd, css::util::DateTime & io_rdt, - bool & o_rIsDateTime, boost::optional<sal_Int16> & o_rTimeZone, + bool & o_rIsDateTime, o3tl::optional<sal_Int16> & o_rTimeZone, const OUString& i_text) throw () { if (::sax::Converter::parseDateOrDateTime( @@ -1188,7 +1188,7 @@ void SfxDocumentMetaData::init( bool isDateTime; css::util::Date d; css::util::DateTime dt; - boost::optional<sal_Int16> nTimeZone; + o3tl::optional<sal_Int16> nTimeZone; if (textToDateOrDateTime(d, dt, isDateTime, nTimeZone, text)) { if (isDateTime) { if (nTimeZone) { diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index 60c8c5b575f8..568c2796ff51 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -26,7 +26,7 @@ #include <tools/svborder.hxx> #include <vcl/window.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> struct SfxViewFrame_Impl { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 6c0ee872eaf6..5e81262fda4f 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -94,7 +94,7 @@ #include <framework/framelistanalyzer.hxx> #include <shellimpl.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <unotools/configmgr.hxx> @@ -468,7 +468,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) bool bOK = false; bool bRetryIgnoringLock = false; bool bOpenTemplate = false; - boost::optional<bool> aOrigROVal; + o3tl::optional<bool> aOrigROVal; if (!pVersionItem) { auto pRO = pMed->GetItemSet()->GetItem<SfxBoolItem>(SID_DOC_READONLY, false); @@ -2354,7 +2354,7 @@ void SfxViewFrame::ExecView_Impl static bool impl_maxOpenDocCountReached() { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - boost::optional<sal_Int32> x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext)); + o3tl::optional<sal_Int32> x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext)); // NIL means: count of allowed documents = infinite ! if (!x) return false; |