sw/source/core/layout/atrfrm.cxx | 1 - sw/source/core/layout/laycache.cxx | 4 ++-- sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- sw/source/filter/ww8/wrtww8.hxx | 2 +- sw/source/ui/chrdlg/break.cxx | 1 - 5 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 80d4770ee093531d619df65b7f8260e7a05823b5 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Oct 22 10:02:28 2013 +0200 DocxAttributeOutput: comment wanted to refer to boost::none Change-Id: Ia3ecac669f35c57467e62c777e18d176753fdb0e diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f010a7c..c5a80a4 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3911,7 +3911,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, ::boost::op FastAttributeList* pAttr = m_pSerializer->createAttrList(); - // -1 means no restart: then don't output that attribute if it is negative + // boost::none 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.get() ) ); commit 9585faa059a880111d797cfd0b0c2d32baec2ce2 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Oct 22 10:01:39 2013 +0200 rFollowDesc -> aFollowDesc, it's not a reference Change-Id: I1dd5626a1ff8d8209003a7c4e6df05d01fd7c7d9 diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 5a525763..2bb2a792 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -626,8 +626,8 @@ bool SwLayHelper::CheckInsertPage() { pDesc = rpPage->GetPageDesc()->GetFollow(); - SwFmtPageDesc rFollowDesc( pDesc ); - oPgNum = rFollowDesc.GetNumOffset(); + SwFmtPageDesc aFollowDesc( pDesc ); + oPgNum = aFollowDesc.GetNumOffset(); if ( oPgNum ) ((SwRootFrm*)rpPage->GetUpper())->SetVirtPageNum(sal_True); } commit 8b5f059ed097635758684b64decd59d8d5c499d7 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Oct 22 10:00:02 2013 +0200 boost::optional default ctor uses boost::none already Change-Id: I14b1a0987f18acab2f309ba423a4f31dd34211f5 diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e5b1ac6..8fc790c 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -559,7 +559,6 @@ SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy ) SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc ) : SfxPoolItem( RES_PAGEDESC ), SwClient( (SwPageDesc*)pDesc ), - oNumOffset( boost::none ), nDescNameIdx( 0xFFFF ), // IDX_NO_VALUE pDefinedIn( 0 ) { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 5506b4e..36892f6 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -155,7 +155,7 @@ struct WW8_SepInfo ::boost::optional<sal_uInt16> oPgRestartNo; WW8_SepInfo() - : pPageDesc(0), pSectionFmt(0), pPDNd(0), pNumNd(0), nLnNumRestartNo(0), oPgRestartNo(boost::none) + : pPageDesc(0), pSectionFmt(0), pPDNd(0), pNumNd(0), nLnNumRestartNo(0) {} diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 37fa66c..d865d57 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -133,7 +133,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) : SvxStandardDialog(pParent, "BreakDialog", "modules/swriter/ui/insertbreak.ui") , rSh(rS) , nKind(0) - , oPgNum(boost::none) , bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell())) { get(m_pLineBtn, "linerb"); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits