[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri May 22 01:58:08 PDT 2015
sw/source/filter/html/htmltab.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 08bb8753174464708a66c5b1e92415d406b8f257
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed May 20 14:51:31 2015 +0200
sw: fix -Werror=shadow
Change-Id: I8ad37290a2b5dab41d180799f9e5ec7d603952ba
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 0b9e7e1..d7444f3 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3301,12 +3301,12 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
if( rParser.nContextStAttrMin == GetContextStAttrMin() )
{
- _HTMLAttr** pTable = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
+ _HTMLAttr** pHTMLTable = reinterpret_cast<_HTMLAttr**>(&rParser.aAttrTab);
for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
- nCnt--; ++pTable )
+ nCnt--; ++pHTMLTable )
{
- OSL_ENSURE( !*pTable, "Die Attribut-Tabelle ist nicht leer" );
+ OSL_ENSURE( !*pHTMLTable, "Die Attribut-Tabelle ist nicht leer" );
}
}
#endif
More information about the Libreoffice-commits
mailing list