sw/source/core/tox/tox.cxx | 2 --
1 file changed, 2 deletions(-)
New commits:
commit 6414389f8d95e76dcdf2bd9a7c2fa6dc9acd304d
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jun 8 09:52:57 2017 +0100
nPoolId already points to STR_POOLCOLL_TOX_AUTHORITIES1 at this point
#define STR_POOLCOLL_TOX_AUTHORITIESH (RC_POOLCOLL_REGISTER_BEGIN+ 29)
#define STR_POOLCOLL_TOX_AUTHORITIES1 (RC_POOLCOLL_REGISTER_BEGIN+ 30)
in the context of
switch( m_eType )
...
case TOX_AUTHORITIES : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH; break;
SetTemplate( 0, SwResId( nPoolId++ ));
already results in a nPoolId of STR_POOLCOLL_TOX_AUTHORITIES1 when we enter
this
loop, so don't need to special case TOX_AUTHORITIES
Change-Id: Ic41596a85c48d080cd38003663b729583f08ff98
Reviewed-on: https://gerrit.libreoffice.org/38561
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index b6baa1366d96..4c584eea495a 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -311,8 +311,6 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
nPoolId = STR_POOLCOLL_TOX_CNTNT6;
else if( TOX_USER == m_eType && 6 == i )
nPoolId = STR_POOLCOLL_TOX_USER6;
- else if( TOX_AUTHORITIES == m_eType )
- nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1;
SetTemplate( i, SwResId( nPoolId ) );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
