compilerplugins/clang/test/passstuffbyref.cxx | 2 +- sw/source/uibase/frmdlg/frmmgr.cxx | 4 ++-- sw/source/uibase/inc/frmmgr.hxx | 2 +- sw/source/uibase/inc/frmpage.hxx | 2 +- sw/source/uibase/inc/numpara.hxx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit dc1925e6f05a60935050d088d3b75b85ec6bb989 Author: Miklos Vajna <[email protected]> Date: Thu Dec 8 14:21:58 2016 +0100 sw: remove some inline version control in uibase Change-Id: I7125b6f8593cac2c33916341f5649f57044ad045 Reviewed-on: https://gerrit.libreoffice.org/31761 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins <[email protected]> diff --git a/compilerplugins/clang/test/passstuffbyref.cxx b/compilerplugins/clang/test/passstuffbyref.cxx index d19b139..d871c5b 100644 --- a/compilerplugins/clang/test/passstuffbyref.cxx +++ b/compilerplugins/clang/test/passstuffbyref.cxx @@ -12,7 +12,7 @@ struct S { OUString mv; - // request from vmiklos: make sure we ignore cases where the passed in parameter is std::move'd + // make sure we ignore cases where the passed in parameter is std::move'd S(OUString v) : mv(std::move(v)) {} }; diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx index 3961561..9f55d2d 100644 --- a/sw/source/uibase/frmdlg/frmmgr.cxx +++ b/sw/source/uibase/frmdlg/frmmgr.cxx @@ -260,7 +260,7 @@ void SwFlyFrameAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, if (bOnlyPercentRefValue) return; - // --> OD 2009-09-01 #mongolianlayout# + // #mongolianlayout# if ( m_bIsInVertical || m_bIsInVerticalL2R ) { Point aPos(aBoundRect.Pos()); @@ -458,7 +458,7 @@ void SwFlyFrameAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, rVal.nMaxVPos = -aBoundRect.Height(); } } - // --> OD 2009-09-01 #mongolianlayout# + // #mongolianlayout# if ( m_bIsInVertical || m_bIsInVerticalL2R ) { //restore width/height exchange diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index eb4ac1e..55c5490 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwFlyFrameAttrMgr bool m_bAbsPos, m_bNewFrame; bool m_bIsInVertical; - // --> OD 2009-09-01 #mongolianlayout# + // #mongolianlayout# bool m_bIsInVerticalL2R; // internal calculation for borders diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index cd49e40..6563bb3 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -99,7 +99,7 @@ class SwFramePage: public SfxTabPage bool m_bNew; bool m_bNoModifyHdl; bool m_bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged - // --> OD 2009-08-31 #mongolianlayout# + // #mongolianlayout# bool m_bIsVerticalL2R; bool m_bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged bool m_bHtmlMode; diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index a60dba1..5f0e4f3 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -47,7 +47,7 @@ class SwParagraphNumTabPage : public SfxTabPage VclPtr<VclHBox> m_pRestartBX; VclPtr<NumericField> m_pRestartNF; - // --> OD 2008-04-14 #outlinelevel# + // #outlinelevel# const OUString msOutlineNumbering; bool bModified : 1; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
