sw/source/core/layout/atrfrm.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit b570fa88adb005ce0868fdefe5d94489dcd00c93 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Mon Sep 12 20:57:21 2016 +0900 sw: Make DelHFFormat() local Change-Id: Ifcfcccfa5a7c6f8696de5c2084736fa40659998d Reviewed-on: https://gerrit.libreoffice.org/28842 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Takeshi Abe <t...@fixedpoint.jp> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 7fa9c73..1830666 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -99,7 +99,7 @@ static sal_Int16 lcl_IntToRelation(const uno::Any& rVal) return nVal; } -void DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat ) +static void lcl_DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat ) { //If the client is the last one who uses this format, then we have to delete //it - before this is done, we may need to delete the content-section. @@ -461,7 +461,7 @@ SwFormatHeader::SwFormatHeader( bool bOn ) SwFormatHeader::~SwFormatHeader() { if ( GetHeaderFormat() ) - DelHFFormat( this, GetHeaderFormat() ); + lcl_DelHFFormat( this, GetHeaderFormat() ); } bool SwFormatHeader::operator==( const SfxPoolItem& rAttr ) const @@ -506,7 +506,7 @@ SwFormatFooter::SwFormatFooter( bool bOn ) SwFormatFooter::~SwFormatFooter() { if ( GetFooterFormat() ) - DelHFFormat( this, GetFooterFormat() ); + lcl_DelHFFormat( this, GetFooterFormat() ); } void SwFormatFooter::RegisterToFormat( SwFormat& rFormat ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits