[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 d467214ac24e22818ff933d76148f3f0987c65ca
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Nov 6 21:57:59 2018 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu Nov 8 07:10:28 2018 +0100

    Fix some layout values
    
    Cases indicated here correspond to portrait layout
    so use else cases from sd/source/core/sdpage.cxx:3013 switch:
    
    case 24/AUTOLAYOUT_HANDOUT3
    nColCnt = 2; nRowCnt = 3;
    
    case 26/AUTOLAYOUT_HANDOUT6
    nColCnt = 2; nRowCnt = 3; break;
    
    and so avoid some negative values for param given to
    setHeight in xmloff/source/draw/sdxmlexp.cxx during sd tests
    
    Change-Id: I5ffd9581c19f31b648775f57e270ab55f330dad5
    Reviewed-on: https://gerrit.libreoffice.org/62978
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 3f09010adfd0..86ecf33a43f7 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 = 1; nRowCnt = 3; break;
+                            case 24 : nColCnt = 2; nRowCnt = 3; break;
                             case 25 : nColCnt = 2; nRowCnt = 2; break;
-                            case 26 : nColCnt = 3; nRowCnt = 2; break;
+                            case 26 : nColCnt = 2; nRowCnt = 3; break;
                             case 31 : nColCnt = 3; nRowCnt = 3; break;
                             default:  nColCnt = 0; nRowCnt = 0; break;  // FIXME - What is correct values?
                         }