diff --git a/description.xml b/description.xml
index 11741b4..10a71f7 100644
--- a/description.xml
+++ b/description.xml
@@ -3,7 +3,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
-
+
Инструменты для создания электронных изданий
diff --git a/ePublishing/Archive.xba b/ePublishing/Archive.xba
index 2bcf2e3..70f1c6a 100644
--- a/ePublishing/Archive.xba
+++ b/ePublishing/Archive.xba
@@ -1,6 +1,6 @@
-Sub archMark27
+Sub archMark29
End Sub
@@ -1118,8 +1118,10 @@ End Sub
Sub replaceParaStyle
dim oldStyleName As String
+ dim oldStyleNameLocalized As String
dim oldStyle As Object
dim newStyleName As String
+ dim newStyleNameLocalized As String
dim paragraphStyles As Object
dim userInput As Integer
Dim listBox As Object
@@ -1151,11 +1153,11 @@ Sub replaceParaStyle
listBox.addItems(sortedDPSN , 0)
oDialog.Title = getTranslation("replaceParaStyleDialogTitle")
oDialog.Execute()
- newStyleName = oDialog.model.Tag
- If newStyleName="0" or newStyleName="" Then
+ newStyleNameLocalized = oDialog.model.Tag
+ If newStyleNameLocalized="0" or newStyleNameLocalized="" Then
Exit sub
EndIf
- foundIndex = getIndex(displayParaStyleNames, newStyleName)
+ foundIndex = getIndex(displayParaStyleNames, newStyleNameLocalized)
'set style system name instead of display name
newStyleName = paraStyleNames(foundIndex)
@@ -1163,11 +1165,10 @@ Sub replaceParaStyle
MsgBox getTranslation("replaceParaStyleStylesEqualsNotification")
Exit sub
EndIf
-
If oldStyleName <> "" Then
oldStyle = paraStyles.getByName(oldStyleName)
If NOT oldStyle.isUserDefined Then
- MsgBox getTranslation("replaceParaStyleCurrentStyleIsStandard")
+ replaceDefaultParaStyle(getLocalizedParaStyleName(oldStyleName), newStyleNameLocalized)
Exit sub
EndIf
oldStyle.ParentStyle = newStyleName
@@ -1185,10 +1186,70 @@ Sub replaceParaStyle
EndIf
EndIf
Wend
-
-
End Sub
+Function getLocalizedParaStyleName(styleName as String) As String
+ Dim style As Object
+ Dim styles As Object
+ styles = ThisComponent.StyleFamilies
+ style = styles.getByName(styles.elementNames(1)).getByName(styleName)
+ getLocalizedParaStyleName = style.DisplayName
+End Function
+
+sub replaceDefaultParaStyle(fromStyle As String, toStyle As String)
+
+ dim document as object
+ dim dispatcher as object
+ document = ThisComponent.CurrentController.Frame
+ dispatcher = createUnoService("com.sun.star.frame.DispatchHelper")
+ dim args1(21) as new com.sun.star.beans.PropertyValue
+ args1(0).Name = "SearchItem.StyleFamily"
+ args1(0).Value = 2
+ args1(1).Name = "SearchItem.CellType"
+ args1(1).Value = 0
+ args1(2).Name = "SearchItem.RowDirection"
+ args1(2).Value = true
+ args1(3).Name = "SearchItem.AllTables"
+ args1(3).Value = false
+ args1(4).Name = "SearchItem.SearchFiltered"
+ args1(4).Value = false
+ args1(5).Name = "SearchItem.Backward"
+ args1(5).Value = false
+ args1(6).Name = "SearchItem.Pattern"
+ args1(6).Value = true
+ args1(7).Name = "SearchItem.Content"
+ args1(7).Value = false
+ args1(8).Name = "SearchItem.AsianOptions"
+ args1(8).Value = false
+ args1(9).Name = "SearchItem.AlgorithmType"
+ args1(9).Value = 0
+ args1(10).Name = "SearchItem.SearchFlags"
+ args1(10).Value = 65536
+ args1(11).Name = "SearchItem.SearchString"
+ args1(11).Value = fromStyle
+ args1(12).Name = "SearchItem.ReplaceString"
+ args1(12).Value = toStyle
+ args1(13).Name = "SearchItem.Locale"
+ args1(13).Value = 255
+ args1(14).Name = "SearchItem.ChangedChars"
+ args1(14).Value = 2
+ args1(15).Name = "SearchItem.DeletedChars"
+ args1(15).Value = 2
+ args1(16).Name = "SearchItem.InsertedChars"
+ args1(16).Value = 2
+ args1(17).Name = "SearchItem.TransliterateFlags"
+ args1(17).Value = 1280
+ args1(18).Name = "SearchItem.Command"
+ args1(18).Value = 3
+ args1(19).Name = "SearchItem.SearchFormatted"
+ args1(19).Value = false
+ args1(20).Name = "SearchItem.AlgorithmType2"
+ args1(20).Value = 1
+ args1(21).Name = "Quiet"
+ args1(21).Value = true
+ dispatcher.executeDispatch(document, ".uno:ExecuteSearch", "", 0, args1())
+end sub
+
Function getIndex(array As variant, value As variant) As Integer
Dim id As Integer
Dim nRight As Integer
diff --git a/ePublishing/PageStyles.xba b/ePublishing/PageStyles.xba
index c45f0f3..b36956c 100644
--- a/ePublishing/PageStyles.xba
+++ b/ePublishing/PageStyles.xba
@@ -378,4 +378,4 @@ Function customReplace(Source As String, Search As String, NewPart As String) As
customReplace = Result
End Function
-
+
\ No newline at end of file
diff --git a/ePublishing/TOCLinks.xba b/ePublishing/TOCLinks.xba
index 4fd5119..e8dc25a 100644
--- a/ePublishing/TOCLinks.xba
+++ b/ePublishing/TOCLinks.xba
@@ -144,6 +144,7 @@ Sub showTOCLinksDialog(message As String, heading() As Object, outline() As Obje
Dim oGridControl As Object
Dim oColumnModel As Object
Dim oDataModel As Object
+ Dim rect As Object
Dim i As Integer
Dim j As Integer
Dim outlineCell As String
@@ -155,7 +156,7 @@ Sub showTOCLinksDialog(message As String, heading() As Object, outline() As Obje
grid = pDialog.Model.createInstance("com.sun.star.awt.grid.UnoControlGridModel")
grid.Name = "tocGrid"
grid.ShowColumnHeader = True
- grid.ShowRowHeader = false
+ grid.ShowRowHeader = True
grid.VScroll = true
grid.Sizeable = true
grid.Step = 0
@@ -206,7 +207,8 @@ Sub showTOCLinksDialog(message As String, heading() As Object, outline() As Obje
oGridControl = createUnoService("com.sun.star.awt.grid.UnoControlGrid")
oGridControl.setModel(grid)
pDialog.addControl("gridtab", oGridControl)
- oGridControl.setPosSize(10,40,850,550, 15)
+ rect = pDialog.getPosSize()
+ oGridControl.setPosSize(10,60,rect.Width - 20,rect.Height - 120, com.sun.star.awt.PosSize.POSSIZE)
@@ -237,4 +239,4 @@ Sub addToArray(xArray(),vNextElement)
xArray(iUB) = vNextElement
End Sub
-
+
\ No newline at end of file
diff --git a/epublishing.update.xml b/epublishing.update.xml
index 60fe6e2..d535c91 100644
--- a/epublishing.update.xml
+++ b/epublishing.update.xml
@@ -2,9 +2,9 @@
-
+
-
+