diff options
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/txtnode/txatbase.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 9816212aa690..55284ce3d275 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -124,7 +124,7 @@ void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder ) m_aSub[SwFontScript::Latin].m_nFontCacheId = m_aSub[SwFontScript::CJK].m_nFontCacheId = m_aSub[SwFontScript::CTL].m_nFontCacheId = nullptr; } -const boost::optional<editeng::SvxBorderLine>& +const o3tl::optional<editeng::SvxBorderLine>& SwFont::GetAbsTopBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const { switch (GetOrientation(bVertLayout, bVertLayoutLRBT)) @@ -148,7 +148,7 @@ SwFont::GetAbsTopBorder(const bool bVertLayout, const bool bVertLayoutLRBT) cons } } -const boost::optional<editeng::SvxBorderLine>& +const o3tl::optional<editeng::SvxBorderLine>& SwFont::GetAbsBottomBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const { switch (GetOrientation(bVertLayout, bVertLayoutLRBT)) @@ -172,7 +172,7 @@ SwFont::GetAbsBottomBorder(const bool bVertLayout, const bool bVertLayoutLRBT) c } } -const boost::optional<editeng::SvxBorderLine>& +const o3tl::optional<editeng::SvxBorderLine>& SwFont::GetAbsLeftBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const { switch (GetOrientation(bVertLayout, bVertLayoutLRBT)) @@ -196,7 +196,7 @@ SwFont::GetAbsLeftBorder(const bool bVertLayout, const bool bVertLayoutLRBT) con } } -const boost::optional<editeng::SvxBorderLine>& +const o3tl::optional<editeng::SvxBorderLine>& SwFont::GetAbsRightBorder(const bool bVertLayout, const bool bVertLayoutLRBT) const { switch (GetOrientation(bVertLayout, bVertLayoutLRBT)) diff --git a/sw/source/core/txtnode/txatbase.cxx b/sw/source/core/txtnode/txatbase.cxx index 188ec6f9a663..e0293d61d881 100644 --- a/sw/source/core/txtnode/txatbase.cxx +++ b/sw/source/core/txtnode/txatbase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <libxml/xmlwriter.h> #include <svl/itempool.hxx> #include <txatbase.hxx> @@ -96,7 +96,7 @@ void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("end"), BAD_CAST(OString::number(*End()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); const char* pWhich = nullptr; - boost::optional<OString> oValue; + o3tl::optional<OString> oValue; switch (Which()) { case RES_TXTATR_AUTOFMT: |