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

Caolán McNamara caolanm at redhat.com
Fri Dec 16 09:02:44 UTC 2016


 sw/source/core/doc/docdesc.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9f8e640e782f1a76f232f1dae8c19196a9cd5850
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 15 21:00:23 2016 +0000

    these are SwTwips, currently INVALID_TWIPS == LONG_MAX, so use INVALID_TWIPS
    
    Change-Id: Icf04a8fefd74033a80294ad7e8012f22f1db47ba
    Reviewed-on: https://gerrit.libreoffice.org/32055
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 43bf4c7..5472e05 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -882,10 +882,10 @@ void SwDoc::CheckDefaultPageFormat()
         const SwFormatFrameSize& rMasterSize  = rMaster.GetFrameSize();
         const SwFormatFrameSize& rLeftSize    = rLeft.GetFrameSize();
 
-        const bool bSetSize = LONG_MAX == rMasterSize.GetWidth() ||
-                              LONG_MAX == rMasterSize.GetHeight() ||
-                              LONG_MAX == rLeftSize.GetWidth() ||
-                              LONG_MAX == rLeftSize.GetHeight();
+        const bool bSetSize = INVALID_TWIPS == rMasterSize.GetWidth() ||
+                              INVALID_TWIPS == rMasterSize.GetHeight() ||
+                              INVALID_TWIPS == rLeftSize.GetWidth() ||
+                              INVALID_TWIPS == rLeftSize.GetHeight();
 
         if ( bSetSize )
             lcl_DefaultPageFormat( rDesc.GetPoolFormatId(), rDesc.GetMaster(), rDesc.GetLeft(), rDesc.GetFirstMaster(), rDesc.GetFirstLeft() );


More information about the Libreoffice-commits mailing list