[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/tox/tox.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f86a24c0b9d705ea0f9736969b4247736cfd69ad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 11 20:43:54 2017 +0100

    Revert "nPoolId already points to STR_POOLCOLL_TOX_AUTHORITIES1 at this point"
    
    it does on the first loop, but the same poolid is wanted on subsequent loops
    
    This reverts commit 6414389f8d95e76dcdf2bd9a7c2fa6dc9acd304d.

diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 4c584eea495a..b6baa1366d96 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -311,6 +311,8 @@ 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 ) );
         }
 }