Kaydet (Commit) 721eb917 authored tarafından Luboš Luňák's avatar Luboš Luňák

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 4014d40c, 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
Reviewed-on: https://gerrit.libreoffice.org/3697Reviewed-by: 's avatarBosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: 's avatarBosdonnat Cedric <cedric.bosdonnat@free.fr>
üst 0a76bb5c
...@@ -2394,12 +2394,10 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId ) ...@@ -2394,12 +2394,10 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
case COLL_EXTRA_BITS: case COLL_EXTRA_BITS:
switch( nId ) switch( nId )
{ {
case RES_POOLCOLL_FRAME:
nRet = RES_POOLCOLL_TEXT; break;
case RES_POOLCOLL_TABLE_HDLN: case RES_POOLCOLL_TABLE_HDLN:
nRet = RES_POOLCOLL_TABLE; break; nRet = RES_POOLCOLL_TABLE; break;
case RES_POOLCOLL_FRAME:
case RES_POOLCOLL_TABLE: case RES_POOLCOLL_TABLE:
case RES_POOLCOLL_FOOTNOTE: case RES_POOLCOLL_FOOTNOTE:
case RES_POOLCOLL_ENDNOTE: case RES_POOLCOLL_ENDNOTE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment