[Libreoffice-commits] core.git: sw/source

[Luboš Luňák]

 sw/source/core/doc/poolfmt.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit eea39218ca7c22e40b997b5efd0d9ea08e01090b
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Apr 30 16:22:48 2013 +0200

    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
    Reviewed-on: https://gerrit.libreoffice.org/3697
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

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 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
         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: