[PATCH] make parent style for 'frame contents' be 'standard' rather ...

[Luboš Luňák (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3697

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3697/1

make parent style for 'frame contents' be 'standard' rather than 'text'

The actual reason for this change is a .docx document, which has a textframe
and a modified 'text' style. The textframe in MSO has 'normal' style
(which is like our 'standard') and so the style is not written to the docx.
LO however uses 'frame contents' for the textframe, and since it was
based on 'text', it used the modified style, unlike in MSO.

But even on its own, this change seems to make sense. It's similar
to 4014d40c96b9d70796a154f0ac48cf5b685cf187, and I see no particular
reason why contents of textframes should be the same style like the main
text of the document, while footnotes, footers, headers, tables, etc.
are different.

Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0
---
M sw/source/core/doc/poolfmt.cxx
1 file changed, 1 insertion(+), 3 deletions(-)



diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 245efdb..e15e044 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2388,12 +2388,10 @@
         case COLL_EXTRA_BITS:
             switch( nId )
             {
-            case RES_POOLCOLL_FRAME:
-                    nRet = RES_POOLCOLL_TEXT;                   break;
-
             case RES_POOLCOLL_TABLE_HDLN:
                     nRet = RES_POOLCOLL_TABLE;                  break;
 
+            case RES_POOLCOLL_FRAME:
             case RES_POOLCOLL_TABLE:
             case RES_POOLCOLL_FOOTNOTE:
             case RES_POOLCOLL_ENDNOTE:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luboš Luňák <l.lunak at suse.cz>