Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1968

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/1968/1

fdo#58646 fix import of RTF_PAGE in cont section when having titlepg

(cherry picked from commit 3974e9952102dbfb4f004872768b1096133bd9a5)

Conflicts:
        sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: Ia632edb24869ddfb76a029fdb460bcf24d9a2059
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c961c7d..08195da 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1803,7 +1803,9 @@
             {
                 // If we're inside a continous section, we should send a section break, not a page 
one.
                 RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc);
-                if (pBreak.get() && !pBreak->getInt())
+                // Unless we're on a title page.
+                RTFValue::Pointer_t pTitlePg = 
m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_titlePg);
+                if ((pBreak.get() && !pBreak->getInt()) && !(pTitlePg.get() && pTitlePg->getInt()))
                 {
                     if (m_bWasInFrame)
                     {

-- 
To view, visit https://gerrit.libreoffice.org/1968
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia632edb24869ddfb76a029fdb460bcf24d9a2059
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna <vmiklos@suse.cz>

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.