Kaydet (Commit) 6414389f authored tarafından Caolán McNamara's avatar Caolán McNamara

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/38561Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c1f9292b
...@@ -311,8 +311,6 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# ...@@ -311,8 +311,6 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
nPoolId = STR_POOLCOLL_TOX_CNTNT6; nPoolId = STR_POOLCOLL_TOX_CNTNT6;
else if( TOX_USER == m_eType && 6 == i ) else if( TOX_USER == m_eType && 6 == i )
nPoolId = STR_POOLCOLL_TOX_USER6; nPoolId = STR_POOLCOLL_TOX_USER6;
else if( TOX_AUTHORITIES == m_eType )
nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1;
SetTemplate( i, SwResId( nPoolId ) ); SetTemplate( i, SwResId( nPoolId ) );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment