[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a5162875edbe9db58524de25a31d7b00a556b757
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 16 21:22:15 2010 +0000

    Related: rhbz#661544 Duplicate page style names being used!
    
    Which means they won't export correctly. This happened because someone
    changed the condition for generating first page styles to be unconditional
    but missed that the names were still generated conditionally

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0df3331..2a10954 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3564,7 +3564,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
         else
         {
             USHORT nPos = mrReader.rDoc.MakePageDesc(
-                ViewShell::GetShellRes()->GetPageDescName(mnDesc)
+                ViewShell::GetShellRes()->GetPageDescName(mnDesc, true)
                 , 0, false);
             rIter->mpTitlePage = &mrReader.rDoc._GetPageDesc(nPos);
         }
@@ -3583,8 +3583,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
     else
     {
         USHORT nPos = mrReader.rDoc.MakePageDesc(
-            ViewShell::GetShellRes()->GetPageDescName(mnDesc,
-                false, rIter->HasTitlePage()),
+            ViewShell::GetShellRes()->GetPageDescName(mnDesc),
                 rIter->mpTitlePage, false);
         rIter->mpPage = &mrReader.rDoc._GetPageDesc(nPos);
     }