Code cleaning

description.xml

@@ -3,7 +3,7 @@
              xmlns:dep="http://openoffice.org/extensions/description/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
   <identifier value="pro.litvinovg.epublishing" />
-  <version value="0.2.5" />
+  <version value="0.2.6" />
   <platform value="all" />
   <display-name>
     <name lang="ru">Инструменты для создания электронных изданий</name>

ePublishing/Album.xba

@@ -79,6 +79,7 @@ Sub replacePageStyleByPortrait(pageStyleName As String)
 	Dim oldPageStyle As Object
 	Dim textEnumeration As Object
 	Dim enumerationElement As Object
+	Dim i As Integer
 	pageStyles = ThisComponent.StyleFamilies.getByName("PageStyles")
 	oldPageStyle = pageStyles.getByName(pageStyleName)
 	For i = 0 To pageStyles.getCount() - 1 

ePublishing/Archive.xba

@@ -5,12 +5,17 @@
 End Sub
 
 Sub resetNotesStyle
-	Dim oDescriptor 'The search descriptor
-	dim dispatcher as Object
+	Dim oDescriptor As Object
+	Dim dispatcher As Object
+	Dim x As Integer
+	Dim oViewCursor As Object
+	Dim document As Object
+	Dim allNotes As Object
+	Dim aNote As Object
+	Dim oEnum As Object
+	Dim oCurPar As Object
 	dispatcher = createUnoService("com.sun.star.frame.DispatchHelper")
-	dim document   as Object
 	document = ThisComponent.CurrentController.Frame
-	Dim oViewCursor As Object 'View cursor
 	oViewCursor = ThisComponent.CurrentController.getViewCursor()
 	allNotes = thisComponent.FootNotes
 	for x = 0 to allNotes.Count -1
@@ -100,14 +105,15 @@ Function RND_String
 	OutputString=""
 	randomize
 	
-	for i = 1 to 20
-	
+	For i = 1 to 20
 	  Select Case i
 	    Case 5, 8, 11, 14
 		  OutputString=OutputString+"-"
 		Case Else
 		  TempString=Hex(int(rnd*256))
-				if len(TempString)<2 then TempString=TempString+"0"
+		  If len(TempString) < 2 Then 
+		    TempString=TempString+"0"
+		  EndIf
 		  OutputString=OutputString+TempString
 		End Select
 	next i
@@ -312,10 +318,10 @@ Sub convertBookmarksToFootnotes()
 	Dim backward As Object
 	linkPrefix = "footnote-"
 	backLinkSuffix = "-backlink"
+	Dim i As Integer
 
 	bookmarkName = ThisComponent.Links.ElementNames(6)
 	bookmarks = ThisComponent.Links.getByName(bookmarkName)
-'	Mri bookmarks
 	bookmarkNames = bookmarks.getElementNames()
 	For i = LBound(bookmarkNames) To Ubound(bookmarkNames)
 		bookmarkName = bookmarkNames(i)
@@ -423,7 +429,7 @@ Sub replaceParaStyle
     Dim oViewCursor As Object
     Dim enum1 As Object
     Dim oTextCursor As Object
-
+	Dim i As Integer
     oStyles = ThisComponent.StyleFamilies
     paraStyles = oStyles.getByName(oStyles.elementNames(1))
     oViewCursor = ThisComponent.CurrentController.getViewCursor()
@@ -484,7 +490,10 @@ Sub replaceParaStyle
 
 End Sub
 
-function getIndex(a, v)
+Function getIndex(a, v)
+	Dim id As Integer
+	Dim nRight As Integer
+	Dim nLen As Integer
 	id = 0
 	nRight = uBound(a)
 	nLen = len(v)
@@ -497,34 +506,42 @@ function getIndex(a, v)
        end if
 	wend
 	getIndex = -1
-end function
+End Function
 
-sub subShellSort(mArray)
+Sub subShellSort(mArray)
  
-	dim n as integer, h as integer, i as integer, j as integer, t as string, Ub as integer, LB as Integer
+	Dim n As Integer
+	Dim h As Integer
+	Dim i As Integer
+	Dim j As Integer
+	Dim t As String
+	Dim Ub As Integer
+	Dim LB As Integer
 	Lb = lBound(mArray)
 	Ub = uBound(mArray)
 	 
 	' compute largest increment
 	n = Ub - Lb + 1
 	h = 1
-	if n > 14 then
+	If n > 14 then
 	  do while h < n
 	    h = 3 * h + 1
 	  loop
 	  h = h \ 3
 	  h = h \ 3
-	end if
-	do while h > 0
-	        for i = Lb + h to Ub
+	End If
+	Do While h > 0
+	  For i = Lb + h to Ub
 	    t = mArray(i)
-	                for j = i - h to Lb step -h
-	                        if strComp(mArray(j), t, 0) < 1 then exit for
+	    For j = i - h to Lb step -h
+	      If strComp(mArray(j), t, 0) < 1 then
+	        Exit For
+	      EndIf
 	      mArray(j + h) = mArray(j)
-	                next j
+	    Next j
 	    mArray(j + h) = t
-	        next i
+	  Next i
 	  h = h \ 3
-	loop
-end sub
+	Loop
+End Sub
 </script:module>

ePublishing/Footnotes.xba

@@ -130,6 +130,8 @@ Sub setFootnotesNumberingLevel(level)
 End Sub
 
 Private Sub doNotTrack
+	Dim dispatcher As Object
+	Dim document As Object
 	dispatcher = createUnoService("com.sun.star.frame.DispatchHelper")
 	document   = ThisComponent.CurrentController.Frame
 	dim trackProperties(0) as new com.sun.star.beans.PropertyValue

ePublishing/TOCLinks.xba

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="TOCLinks" script:language="StarBasic" script:moduleType="normal">Sub markTOC2
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="TOCLinks" script:language="StarBasic" script:moduleType="normal">Sub markTOC4
 End Sub
 
 Sub makeOutlineLinks
+	Dim i As Integer
 	For i = 1 To 10
 		makeLinksWithLevel(i)
 	Next i
@@ -100,6 +101,7 @@ Function getOutlineWithLevel(curNum)
 	Dim cellEnum2 As Object
 	Dim par() As Object
 	Dim parName As String
+	Dim cellEnumElement As Object
 	parName = &quot;Contents &quot; + curNum
 	enum1 = ThisComponent.Text.createEnumeration
 	While enum1.hasMoreElements
@@ -132,7 +134,8 @@ Function getOutlineWithLevel(curNum)
 End Function
 
 Sub addToArray(xArray(),vNextElement)
-	Dim iUB%,iLB%
+	Dim iUB As Integer
+	Dim iLB As Integer
 	iLB = lBound(xArray())
 	iUB = uBound(xArray())
 	If iLB &gt; iUB then

ePublishing/journals.xba

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="journals" script:language="StarBasic">Private sub journalsMark5
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="journals" script:language="StarBasic">Private sub journalsMark7
 End sub
 
 Dim templateName As String
@@ -15,6 +15,16 @@ Dim sectionName As String
 Private Sub makeUpIssue
     turnOffTracking
 	Dim description As String
+	Dim i As Integer
+	Dim statusIndicator as Object
+	Dim oViewCursor As Object
+	Dim oTextCursor As Object
+	Dim articleEndPosition As Object
+	Dim page As String
+	Dim firstPage As String
+	Dim tmp As String
+	Dim nSections As Long 
+		
 	description = &quot;Вы уверены, что хотите запустить сборку выпуска ?&quot;
 	If NOT confirm(description) Then
 		Exit Sub
@@ -25,20 +35,9 @@ Private Sub makeUpIssue
 	PQ = &quot;ВФ&quot;
 	imagesRelativePath = &quot;/Links/Header/&quot;
 	allImagesRelativePath = &quot;/Links/Header-icons/&quot;
-	
-	Dim statusIndicator as Object
 	statusIndicator = ThisComponent.getCurrentController.StatusIndicator
-	Dim oViewCursor As Object
-	Dim oTextCursor As Object
-	Dim articleEndPosition As Object
 	oViewCursor = ThisComponent.CurrentController.getViewCursor()
-	Dim page As String
-	Dim firstPage As String
-
-	Dim tmp As String
-
 	sectionName = &quot;&quot;
-	Dim nSections As Long 
 	oFilename = ThisComponent.Location
 	
 	&apos;Exit if no sections in document or document not saved
@@ -166,14 +165,14 @@ Private Sub setPageNumbersDeprecated()
 	
 End Sub
 
-Private Sub setAtricleVars(i)
+Private Sub setAtricleVars(i As Integer)
 	&apos;updateUserField(&quot;article&quot; + i + &quot;LastPage&quot;, CStr(getArticleLastPage()) )
 	updateUserField(&quot;article&quot; + i + &quot;UDK&quot;, getUDK())
 	updateUserField(&quot;author&quot; + i + &quot;Copyright&quot;, getCopyright() )
 	&apos;updateUserField(&quot;rightHeader&quot; + i , getTitleHeader() )
 End Sub
 
-Private Function lastPageNum(i)
+Private Function lastPageNum(i As Integer)
 	Dim docLastPage As Integer
 	Dim curPageNum As Integer
 	Dim oViewCursor As Object
@@ -301,7 +300,7 @@ Private Function getArticleHeader()
 	oViewCursor.goToRange(oSavePosition, false)
 End Function
 
-Private Function getSectionX(section)
+Private Function getSectionX(section As String)
 	Dim oViewCursor As Object
 	Dim oSavePosition As Object
 	Dim startPage As String
@@ -341,7 +340,7 @@ End Function
 
 
 
-Private Sub setArticlePageStyles(i)
+Private Sub setArticlePageStyles(i As Integer)
 	Dim oViewCursor As Object
 	Dim oTextCursor As Object
 	Dim oText As Object
@@ -387,7 +386,7 @@ Private Sub setArticlePageStyles(i)
 		
 End Sub
 
-Private Sub setFirstPageMetadata(curStyle,i)
+Private Sub setFirstPageMetadata(curStyle As Object,i As Integer)
 	Dim oViewCursor As Object
 	Dim oSavePosition As Object
 	Dim savePageName As String
@@ -414,7 +413,7 @@ Private Sub setFirstPageMetadata(curStyle,i)
 	sendRM()
 End Sub
 
-Private Sub setDefaultFirstPageMetadata(curStyle,i)
+Private Sub setDefaultFirstPageMetadata(curStyle As Object,i As Integer)
 	Dim oViewCursor As Object
 	Dim oHeaderTable As Object
 	Dim oFooterTable As Object
@@ -453,7 +452,7 @@ Private Sub setDefaultFirstPageMetadata(curStyle,i)
 
 End Sub
 
-Private Sub setPHAFirstPageMetadata(curStyle,i)
+Private Sub setPHAFirstPageMetadata(curStyle As Object,i As Integer)
 	Dim oViewCursor As Object
 	Dim oHeader As Object
 	Dim oFooterTable As Object
@@ -1018,7 +1017,7 @@ Private Sub updateLastPageFields
 	Dim strPos As Integer	
 	Dim articleNum As Integer
 	Dim curNum As Integer
-	Dim pageNum As Integer
+	Dim pageNum As String
 	Dim textCursor As Object
 	Dim lastPages%( 100 )
 	For i = 0 to 100
@@ -1061,7 +1060,6 @@ Private Sub updateLastPageFields
 					EndIf
 				EndIf
 			EndIf
-			
 		EndIf
 		&apos;TODO:
 		&apos;OR enum1Element.supportsService(&quot;com.sun.star.text.TextTable&quot;)
@@ -1608,8 +1606,9 @@ Function getPageStyleNameFromEnum(enumElement)
 	EndIf
 End Function
 
-Function getPageNumber(cursor)
-  Dim oField  &apos;Field to insert
+Function getPageNumber(cursor As Object) As String
+  Dim oField As Object
+  Dim oTextCursor As Object
   oTextCursor =  cursor.Text.createTextCursorByRange(cursor.Start)
   oField = ThisComponent.createInstance(&quot;com.sun.star.text.textfield.PageNumber&quot;)
   oField.NumberingType = 4