[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/uiconfig wizards/source

[Andras Timar]

 sw/uiconfig/swriter/menubar/menubar.xml |    1 
 wizards/source/tools/Misc.xba           |   35 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

New commits:
commit 2d851c2865236e12eb4240530a734b06f973fc7b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Jun 13 05:17:53 2017 -0700

    Fix Table Properties macro
    
    Change-Id: I45e5b258ba8f739e3dc0043978488ee9e4ad74b4

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index f78f75a05e97..8f3247aad1db 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -748,6 +748,7 @@
           <menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menuitem menu:id="vnd.sun.star.script:Tools.Misc.FixTableProperties?language=Basic&location=application" menu:label="Fix Table Properties"/>
       <menu:menuitem menu:id=".uno:OpenXMLFilterSettings"/>
       <menu:menuitem menu:id="service:com.sun.star.deployment.ui.PackageManagerDialog"/>
       <menu:menuitem menu:id=".uno:ConfigureDialog"/>
diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 2bf17d32e984..7a001683c9bd 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -838,4 +838,39 @@ End Sub
 Function CalIsLeapYear(ByVal iYear as Integer) as Boolean
         CalIsLeapYear = ((iYear Mod 4 = 0) And ((iYear Mod 100 <> 0) Or (iYear Mod 400 = 0)))
 End Function
+
+' Sub that fixes various issues in tables imported from DOC/DOCX
+Sub FixTableProperties
+    sumTables = 0
+    sumSplit = 0
+    sumRelativeWidth = 0
+    sumRows = 0
+    oTables = ThisComponent.TextTables
+    For i = 0 To oTables.getCount() - 1
+        oTable = oTables(i)
+        sumTables = sumTables + 1
+        If oTable.getPropertyValue("Split") = false Then
+            sumSplit = sumSplit + 1
+            oTable.setPropertyValue("Split", true)
+        End If
+        If oTable.getPropertyValue("HoriOrient") <> 6 And _
+           oTable.getPropertyValue("IsWidthRelative") = false Then
+            sumRelativeWidth = sumRelativeWidth + 1
+            oTable.setPropertyValue("RelativeWidth", 100)
+        End If
+        For j = 0 To oTable.getRows.getCount - 1
+            oRow = oTable.getRows.getByIndex(j)
+            If oRow.getPropertyValue("IsSplitAllowed") = false Then
+                sumRows = sumRows + 1
+                oRow.setPropertyValue("IsSplitAllowed", true)
+            End If
+        Next
+    Next
+
+    s = "Out of " & sumTables & " table(s)" & CHR(13) & _
+        "Relative setting was added to: " & sumRelativeWidth & CHR(13) & _
+        "Property to enable breaking across pages was enabled for: " & sumSplit & CHR(13) & CHR(13) & _
+        "No. of rows property to enable breaking across pages was enabled for: " & sumRows & CHR(13) & CHR(13) & "Save the file afterwards!"
+    MsgBox s, 0, "Result"
+End Sub
 </script:module>