[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - officecfg/registry svtools/source

[Miklos Vajna (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    8 ++++----
 svtools/source/config/optionsdrawinglayer.cxx              |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a6f0806bf1f05a0310a55baa2ca3a8c3a48ba4b4
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Mar 25 13:57:47 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Mar 25 17:45:34 2019 +0100

    svtools: double the limit of max drawing page size
    
    When I load an ODG document page, which is 5080 mm wide, then the UI
    told me that it's 300 cm wide, which was misleading.
    
    There is no real reason why the limit can't be higher, the draw page
    size is sal_Int32 and the unit is either twips or mm100s: in both cases
    sal_Int32 is more than enough to store the new limit still.
    
    Change-Id: Ifb501eed4e288281bcc73dce71bdb03ac213b0c1
    Reviewed-on: https://gerrit.libreoffice.org/69673
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 9eb111333b7440fd166057a1c62840187aaf35a8)

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b3998b6eb52d..990b9f007073 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1052,20 +1052,20 @@
       <prop oor:name="MaximumPaperWidth" oor:type="xs:int" oor:nillable="false">
         <info>
           <desc>Specifies the maximum allowed Paper Width for page definitions
-          in cm. Default is 3m, i.e. 300 cm. When this is changed to higher
+          in cm. Default is 6m, i.e. 600 cm. When this is changed to higher
           values, it is done on own risk.</desc>
           <label>Maximum allowed Paper Width for page definitions</label>
         </info>
-        <value>300</value>
+        <value>600</value>
       </prop>
       <prop oor:name="MaximumPaperHeight" oor:type="xs:int" oor:nillable="false">
         <info>
           <desc>Specifies the maximum allowed Paper Height for page definitions
-          in cm. Default is 3m, i.e. 300 cm. When this is changed to higher
+          in cm. Default is 6m, i.e. 600 cm. When this is changed to higher
           values, it is done on own risk.</desc>
           <label>Maximum allowed Paper Height for page definitions</label>
         </info>
-        <value>300</value>
+        <value>600</value>
       </prop>
       <prop oor:name="MaximumPaperLeftMargin" oor:type="xs:int" oor:nillable="false">
         <info>
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 418ae34c7596..d1fcfae2ec17 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -53,8 +53,8 @@ using namespace ::com::sun::star::uno   ;
 #define DEFAULT_PAINTBUFFER_DRAWIMPRESS     true
 
 // #i4219#
-#define DEFAULT_MAXIMUMPAPERWIDTH           300
-#define DEFAULT_MAXIMUMPAPERHEIGHT          300
+#define DEFAULT_MAXIMUMPAPERWIDTH           600
+#define DEFAULT_MAXIMUMPAPERHEIGHT          600
 #define DEFAULT_MAXIMUMPAPERLEFTMARGIN      9999
 #define DEFAULT_MAXIMUMPAPERRIGHTMARGIN     9999
 #define DEFAULT_MAXIMUMPAPERTOPMARGIN       9999