sw/source/ui/index/cnttab.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c3e7723500275d04177d366b50356807c16e9be1
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jan 16 15:58:12 2014 +0100
fdo#73043: sw: fix Index/TOC Assign Styles dialog
SvTabListBox::GetEntryText(pEntry, 0xffff) will append 10 tabs to the
returned string, so it will no longer be equal to a style name.
(regression from 77173d8954c370bcaca80b48181c330b759b9517)
Change-Id: I7d3bee47eabec9180d6352fb6cf1b2e948153d37
(cherry picked from commit 77a637fb8ddfc4b045b3453f8435822a21198b19)
Reviewed-on: https://gerrit.libreoffice.org/7468
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d38c8ee..db42723 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -728,7 +728,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
if (!aName.isEmpty())
{
SvTreeListEntry* pEntry = m_pHeaderTree->First();
- while (pEntry && m_pHeaderTree->GetEntryText(pEntry)!=aName)
+ while (pEntry && m_pHeaderTree->GetEntryText(pEntry, 0) != aName)
{
pEntry = m_pHeaderTree->Next(pEntry);
}
@@ -757,7 +757,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl)
sal_IntPtr nLevel = (sal_IntPtr)pEntry->GetUserData();
if(nLevel != USHRT_MAX)
{
- OUString sName(m_pHeaderTree->GetEntryText(pEntry));
+ OUString sName(m_pHeaderTree->GetEntryText(pEntry, 0));
if(!pStyleArr[nLevel].isEmpty())
pStyleArr[nLevel] += OUString(TOX_STYLE_DELIMITER);
pStyleArr[nLevel] += sName;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
