Added check for Embeeded objects

This commit is contained in:
Georgy Litvinov 2019-10-18 18:56:22 +03:00
parent 2038c92784
commit ad7febac11
4 changed files with 26 additions and 12 deletions

View file

@ -6,6 +6,13 @@
<node oor:name="AddonUI"> <node oor:name="AddonUI">
<node oor:name="OfficeToolBar"> <node oor:name="OfficeToolBar">
<node oor:name="pro.litvinovg.IPHRedaction.panel" oor:op="replace"> <node oor:name="pro.litvinovg.IPHRedaction.panel" oor:op="replace">
<prop oor:name="Title" oor:type="xs:string" oor:localized="true">
<value xml:lang="en-US">Redactor's panel</value>
<value xml:lang="ru-RU">Панель редактора</value>
</prop>
<prop oor:name="Docked" oor:op="fuse"><value>true</value></prop>
<prop oor:name="HideFromToolbarMenu" oor:op="fuse"><value>false</value></prop>
<prop oor:name="Locked" oor:op="fuse"><value>false</value></prop>
<node oor:name="ToolBarItems"> <node oor:name="ToolBarItems">
<node oor:name="buttonValidate" oor:op="replace"> <node oor:name="buttonValidate" oor:op="replace">
<prop oor:name="Context" oor:type="xs:string"> <prop oor:name="Context" oor:type="xs:string">

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Validation" script:language="StarBasic">Sub markZ <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Validation" script:language="StarBasic">Sub markZZZ
End Sub End Sub
@ -51,7 +51,7 @@ Sub validateButton
MsgBox graphicsReport MsgBox graphicsReport
EndIf EndIf
If badText OR badNumberings OR badFootnoteSigns OR badGraphics Then If badText OR badNumberings OR badFootnoteSigns OR badGraphics Then
MsgBox &quot;Отошлите данную статью в отдел подготовки рукописей к изданию для получения дополнительной информации.&quot; MsgBox &quot;Перед публикацией документа следует исправить все найденные замечания.&quot;
If badText Then If badText Then
MsgBox &quot;В тексте обнаружены неподходящие для публикции символы.&quot; &amp; chr(10) &amp; &quot; Далее будет представлен список отрывков текста с подобными символами.&quot; MsgBox &quot;В тексте обнаружены неподходящие для публикции символы.&quot; &amp; chr(10) &amp; &quot; Далее будет представлен список отрывков текста с подобными символами.&quot;
removeBadCharacters removeBadCharacters
@ -71,15 +71,11 @@ Private Function checkGraphics
Dim count as Integer Dim count as Integer
Dim draw As Object Dim draw As Object
Dim result As String Dim result As String
result = &quot;&quot;
Dim shapeType As String Dim shapeType As String
Dim oleN As Long Dim embeededObject As Object
oleN = 0 Dim badFrame As Long
Dim graphicN As Long badFrame = 0
graphicN = 0
Dim formulaN As Long
formulaN = 0
Dim frameShapeN As Long
frameShapeN = 0
Dim drawingN As Long Dim drawingN As Long
drawingN = 0 drawingN = 0
drawPages = ThisComponent.DrawPage drawPages = ThisComponent.DrawPage
@ -92,9 +88,20 @@ Private Function checkGraphics
If InStr(shapeType,&quot;com.sun.star.drawing&quot;) = 1 Then If InStr(shapeType,&quot;com.sun.star.drawing&quot;) = 1 Then
drawingN = drawingN + 1 drawingN = drawingN + 1
EndIf EndIf
If InStr(shapeType,&quot;FrameShape&quot;) = 1 Then
embeededObject = draw.getEmbeddedObject()
If Not embeededObject.supportsService(&quot;com.sun.star.formula.FormulaProperties&quot;) Then
badFrame = badFrame + 1
Else
&apos;Formula
EndIf
EndIf
Next i Next i
If drawingN &lt;&gt; 0 Then If drawingN &lt;&gt; 0 Then
result = &quot;В документе найдены рисунки (&quot; &amp; drawingN &amp; &quot;), неподходящие для публикации.&quot; result = result &amp;&quot;В документе найдены рисунки (&quot; &amp; drawingN &amp; &quot;), неподходящие для публикации.&quot; &amp; chr(10)
EndIf
If badFrame &lt;&gt; 0 Then
result = result &amp;&quot;В документе найдены встроенные объекты (&quot; &amp; badFrame &amp; &quot;), неподходящие для публикации.&quot; &amp; chr(10)
EndIf EndIf
checkGraphics = result checkGraphics = result
End Function End Function

View file

@ -3,7 +3,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"> xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="pro.litvinovg.Redaction" /> <identifier value="pro.litvinovg.Redaction" />
<version value="0.1.0" /> <version value="0.2.1" />
<platform value="all" /> <platform value="all" />
<display-name> <display-name>
<name lang="en">Redaction for publishing in Institute of philosophy</name> <name lang="en">Redaction for publishing in Institute of philosophy</name>

Binary file not shown.