sw/uiconfig/swriter/ui/opttablepage.ui |    4 ++--
 vcl/source/outdev/text.cxx             |   12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit b8d8df6b8aeadb662dcaae3d3b36e054568084cf
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jun 15 10:31:48 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jun 15 15:53:37 2022 +0200

    ofz#47699 Timeout
    
    Change-Id: I8445fef2a116d063c15f65ed4c8ac705a8ce7491
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135870
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index d1d50f79572b..0a1c1baf2162 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,6 +32,7 @@
 #include <sal/log.hxx>
 #include <tools/lineend.hxx>
 #include <tools/debug.hxx>
+#include <unotools/configmgr.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
@@ -1631,8 +1632,15 @@ void OutputDevice::ImplDrawText( OutputDevice& 
rTargetDevice, const tools::Recta
     tools::Long        nWidth          = rRect.GetWidth();
     tools::Long        nHeight         = rRect.GetHeight();
 
-    if ( ((nWidth <= 0) || (nHeight <= 0)) && (nStyle & DrawTextFlags::Clip) )
-        return;
+    if (nWidth <= 0 || nHeight <= 0)
+    {
+        if (nStyle & DrawTextFlags::Clip)
+            return;
+        static bool bFuzzing = utl::ConfigManager::IsFuzzing();
+        SAL_WARN_IF(bFuzzing, "vcl", "skipping negative rectangle of: " << 
nWidth << " x " << nHeight);
+        if (bFuzzing)
+            return;
+    }
 
     Point       aPos            = rRect.TopLeft();
 
commit 34293f75060061d248c178cc65b81135a01d8dba
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Jun 13 11:45:56 2022 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Jun 15 15:53:16 2022 +0200

    Add precisions to opttablepage.ui extended tip
    
    Change-Id: Ic2f07d9a4e8e8608e5a56f23d421004f6631427a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135760
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui 
b/sw/uiconfig/swriter/ui/opttablepage.ui
index fe9ec5fe3bee..e37df3987f54 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -450,7 +450,7 @@
                         <property name="digits">2</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="rowmove-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|rowmove">Specifies the value to be 
used for moving a row.</property>
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|rowmove">Specifies the step size value 
when moving a row with the keyboard.</property>
                           </object>
                         </child>
                       </object>
@@ -469,7 +469,7 @@
                         <property name="digits">2</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="colmove-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|colmove">Specifies the value to be 
used for moving a column.</property>
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|colmove">Specifies the step size value 
when moving a column with the keyboard.</property>
                           </object>
                         </child>
                       </object>

Reply via email to