diff options
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r-- | sw/source/filter/ww8/attributeoutputbase.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 20 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxtablestyleexport.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8attributeoutput.hxx | 2 |
10 files changed, 30 insertions, 30 deletions
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index 70509ed47806..dfcbd9162ea4 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -27,7 +27,7 @@ #include <rtl/textenc.h> #include <editeng/svxenum.hxx> #include <tools/solar.h> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <swtypes.hxx> @@ -339,7 +339,7 @@ public: /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) = 0; + virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::o3tl::optional<sal_uInt16>& oPageRestartNumber ) = 0; /// The type of breaking. virtual void SectionType( sal_uInt8 nBreakCode ) = 0; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 113d26170423..91d77e81ddbb 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2486,7 +2486,7 @@ const NameToId constNameToIdMapping[] = { OUString("styleSet"), FSNS( XML_w14, XML_styleSet ) }, }; -boost::optional<sal_Int32> lclGetElementIdForName(const OUString& rName) +o3tl::optional<sal_Int32> lclGetElementIdForName(const OUString& rName) { for (auto const & i : constNameToIdMapping) { @@ -2495,7 +2495,7 @@ boost::optional<sal_Int32> lclGetElementIdForName(const OUString& rName) return i.maId; } } - return boost::optional<sal_Int32>(); + return o3tl::optional<sal_Int32>(); } void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<css::beans::PropertyValue>& rElements, sax_fastparser::FSHelperPtr const & pSerializer) @@ -2525,7 +2525,7 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<c aValue = OUStringToOString(aAny.get<OUString>(), RTL_TEXTENCODING_ASCII_US); } - boost::optional<sal_Int32> aSubElementId = lclGetElementIdForName(rAttribute.Name); + o3tl::optional<sal_Int32> aSubElementId = lclGetElementIdForName(rAttribute.Name); if(aSubElementId) pAttributes->add(*aSubElementId, aValue.getStr()); } @@ -2538,7 +2538,7 @@ void lclProcessRecursiveGrabBag(sal_Int32 aElementId, const css::uno::Sequence<c { css::uno::Sequence<css::beans::PropertyValue> aSumElements; - boost::optional<sal_Int32> aSubElementId = lclGetElementIdForName(rElement.Name); + o3tl::optional<sal_Int32> aSubElementId = lclGetElementIdForName(rElement.Name); if(aSubElementId) { rElement.Value >>= aSumElements; @@ -2585,7 +2585,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties() for (const beans::PropertyValue & i : m_aTextEffectsGrabBag) { - boost::optional<sal_Int32> aElementId = lclGetElementIdForName(i.Name); + o3tl::optional<sal_Int32> aElementId = lclGetElementIdForName(i.Name); if(aElementId) { uno::Sequence<beans::PropertyValue> aGrabBagSeq; @@ -6320,13 +6320,13 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType , const SfxItemSet *pOut } -void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) +void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::o3tl::optional<sal_uInt16>& oPageRestartNumber ) { // FIXME Not called properly with page styles like "First Page" FastAttributeList* pAttr = FastSerializerHelper::createAttrList(); - // boost::none means no restart: then don't output that attribute if it is negative + // o3tl::nullopt means no restart: then don't output that attribute if it is negative if ( oPageRestartNumber ) pAttr->add( FSNS( XML_w, XML_start ), OString::number( *oPageRestartNumber ) ); @@ -8285,9 +8285,9 @@ void DocxAttributeOutput::FormatAnchor( const SwFormatAnchor& ) // Fly frames: anchors here aren't matching the anchors in docx } -static boost::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush) +static o3tl::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush) { - boost::optional<sal_Int32> oRet; + o3tl::optional<sal_Int32> oRet; sal_Int32 nTransparency = rBrush.GetColor().GetTransparency(); if (nTransparency) { @@ -8306,7 +8306,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) { const Color aColor = rBrush.GetColor(); OString sColor = msfilter::util::ConvertColor( aColor.GetRGBColor() ); - boost::optional<sal_Int32> oAlpha = lcl_getDmlAlpha(rBrush); + o3tl::optional<sal_Int32> oAlpha = lcl_getDmlAlpha(rBrush); if (m_rExport.SdrExporter().getTextFrameSyntax()) { // Handle 'Opacity' diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 67561087ceb3..7f3f0e6edb57 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -37,7 +37,7 @@ #include <fldbas.hxx> #include <vector> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <oox/export/vmlexport.hxx> #include <oox/export/drawingml.hxx> #include "docxtablestyleexport.hxx" @@ -299,7 +299,7 @@ public: /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) override; + virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::o3tl::optional<sal_uInt16>& oPageRestartNumber ) override; /// The type of breaking. virtual void SectionType( sal_uInt8 nBreakCode ) override; @@ -932,7 +932,7 @@ private: std::vector<sal_Int32> lastOpenCell; std::vector<sal_Int32> lastClosedCell; - boost::optional<css::drawing::FillStyle> m_oFillStyle; + o3tl::optional<css::drawing::FillStyle> m_oFillStyle; /// If FormatBox() already handled fill style / gradient. bool m_bIgnoreNextFill; diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx index 6ffa14325bf5..487ec6bb3052 100644 --- a/sw/source/filter/ww8/docxtablestyleexport.cxx +++ b/sw/source/filter/ww8/docxtablestyleexport.cxx @@ -15,7 +15,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <sax/fastattribs.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -525,8 +525,8 @@ void DocxTableStyleExport::Impl::tableStyleTablePr( uno::Sequence<beans::PropertyValue> aTableInd; uno::Sequence<beans::PropertyValue> aTableBorders; uno::Sequence<beans::PropertyValue> aTableCellMar; - boost::optional<sal_Int32> oTableStyleRowBandSize; - boost::optional<sal_Int32> oTableStyleColBandSize; + o3tl::optional<sal_Int32> oTableStyleRowBandSize; + o3tl::optional<sal_Int32> oTableStyleColBandSize; for (const auto& rProp : rTablePr) { if (rProp.Name == "tblStyleRowBandSize") diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 8306c202a311..749613fa7cff 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1292,7 +1292,7 @@ void RtfAttributeOutput::SectionBiDi(bool bBiDi) } void RtfAttributeOutput::SectionPageNumbering( - sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber) + sal_uInt16 nNumType, const ::o3tl::optional<sal_uInt16>& oPageRestartNumber) { if (oPageRestartNumber) { @@ -3214,7 +3214,7 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) { // See DocxSdrExport::startDMLAnchorInline() for SwFormatSurround -> WR / WRK mappings. sal_Int32 nWr = -1; - boost::optional<sal_Int32> oWrk; + o3tl::optional<sal_Int32> oWrk; switch (rSurround.GetValue()) { case css::text::WrapTextMode_NONE: diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index 4ea8b3845bcd..3003ec585d14 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -30,7 +30,7 @@ #include <rtl/strbuf.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> class SwGrfNode; class SwOLENode; @@ -193,7 +193,7 @@ public: /// The style of the page numbers. /// void SectionPageNumbering(sal_uInt16 nNumType, - const ::boost::optional<sal_uInt16>& oPageRestartNumber) override; + const ::o3tl::optional<sal_uInt16>& oPageRestartNumber) override; /// The type of breaking. void SectionType(sal_uInt8 nBreakCode) override; @@ -610,7 +610,7 @@ private: std::vector<std::pair<OString, OString>> m_aFlyProperties; - boost::optional<css::drawing::FillStyle> m_oFillStyle; + o3tl::optional<css::drawing::FillStyle> m_oFillStyle; /// If we're in the process of exporting a hyperlink, then its URL. OUString m_sURL; diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index db27ad412270..696172264680 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1385,7 +1385,7 @@ void RtfExport::OutPageDescription(const SwPageDesc& rPgDsc, bool bCheckForFirst // numbering type AttrOutput().SectionPageNumbering(m_pCurrentPageDesc->GetNumType().GetNumberingType(), - boost::none); + o3tl::nullopt); m_pCurrentPageDesc = pSave; SAL_INFO("sw.rtf", OSL_THIS_FUNC << " end"); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index ed4f15cde1a6..62262700e885 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1101,7 +1101,7 @@ void MSWordSections::AppendSection( const SwPageDesc* pPd, if (HeaderFooterWritten()) { return; // #i117955# prevent new sections in endnotes } - aSects.emplace_back( pPd, pSectionFormat, nLnNumRestartNo, boost::none, nullptr, bIsFirstParagraph ); + aSects.emplace_back( pPd, pSectionFormat, nLnNumRestartNo, o3tl::nullopt, nullptr, bIsFirstParagraph ); NeedsDocumentProtected( aSects.back() ); } @@ -1422,7 +1422,7 @@ void WW8AttributeOutput::SectionBiDi( bool bBiDi ) m_rWW8Export.pO->push_back( bBiDi? 1: 0 ); } -void WW8AttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) +void WW8AttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::o3tl::optional<sal_uInt16>& oPageRestartNumber ) { // sprmSNfcPgn sal_uInt8 nb = WW8Export::GetNumId( nNumType ); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 9824f52b7d84..44bf1870f2c1 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -38,7 +38,7 @@ #include <vcl/graph.hxx> -#include <boost/optional.hpp> +#include <o3tl/optional.hxx> #include <o3tl/typed_flags_set.hxx> #include <cstddef> @@ -179,11 +179,11 @@ struct WW8_SepInfo const SwSectionFormat* pSectionFormat; const SwNode* pPDNd; sal_uLong const nLnNumRestartNo; - ::boost::optional<sal_uInt16> const oPgRestartNo; + ::o3tl::optional<sal_uInt16> const oPgRestartNo; bool const bIsFirstParagraph; WW8_SepInfo( const SwPageDesc* pPD, const SwSectionFormat* pFormat, - sal_uLong nLnRestart, ::boost::optional<sal_uInt16> oPgRestart = boost::none, + sal_uLong nLnRestart, ::o3tl::optional<sal_uInt16> oPgRestart = o3tl::nullopt, const SwNode* pNd = nullptr, bool bIsFirstPara = false ) : pPageDesc( pPD ), pSectionFormat( pFormat ), pPDNd( pNd ), nLnNumRestartNo( nLnRestart ), oPgRestartNo( oPgRestart ), diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 7e3f2a31ff20..ead32361bb2d 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -180,7 +180,7 @@ public: /// The style of the page numbers. /// - virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::boost::optional<sal_uInt16>& oPageRestartNumber ) override; + virtual void SectionPageNumbering( sal_uInt16 nNumType, const ::o3tl::optional<sal_uInt16>& oPageRestartNumber ) override; /// The type of breaking. virtual void SectionType( sal_uInt8 nBreakCode ) override; |