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

[Libreoffice Gerrit user]

 xmloff/source/draw/sdxmlexp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eadba44a0c5dd12989d6b8613d6dd558c94bb4dc
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri Nov 9 12:14:04 2018 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Nov 9 13:58:11 2018 +0100

    Revert "Fix some layout values"
    Nothing proves this is ok since no feedback.
    Moreover, since it's only of the assumption that setWidth and setHeight
    should have value >= 0 or -1, let's revert this one.
    
    This reverts commit d467214ac24e22818ff933d76148f3f0987c65ca.
    
    Change-Id: Ia030706d150afaebaedc0ec201814cca80db248a
    Reviewed-on: https://gerrit.libreoffice.org/63171
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 86ecf33a43f7..3f09010adfd0 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -992,9 +992,9 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
                         {
                             case 22 : nColCnt = 1; nRowCnt = 1; break;
                             case 23 : nColCnt = 1; nRowCnt = 2; break;
-                            case 24 : nColCnt = 2; nRowCnt = 3; break;
+                            case 24 : nColCnt = 1; nRowCnt = 3; break;
                             case 25 : nColCnt = 2; nRowCnt = 2; break;
-                            case 26 : nColCnt = 2; nRowCnt = 3; break;
+                            case 26 : nColCnt = 3; nRowCnt = 2; break;
                             case 31 : nColCnt = 3; nRowCnt = 3; break;
                             default:  nColCnt = 0; nRowCnt = 0; break;  // FIXME - What is correct values?
                         }