Fixed: Исправлен баг: неверно определялся код жанра для всех схем, кр…

…оме CoolLib.
DikBSD · Jun 7, 2021 · 60d3487 · 60d3487
1 parent 8293e1c
commit 60d3487
Show file tree

Hide file tree

Showing 12 changed files with 1,934 additions and 1,926 deletions.
diff --git a/doc/ChangeLog_Eng.txt b/doc/ChangeLog_Eng.txt
@@ -610,3 +610,7 @@ OoFBTools-3.2
 	A. Converter:
 		1. Fixed a bug of the incorrect definition of the CollLib of the library genre.
 		2. Fixed the bug of the wrong definition of the genre scheme for the CollLib library when validated after export. 
+
+OoFBTools-3.3
+	A. Converter:
+		1. Fixed the bug of incorrect definition of the Genre code of all schemes.
diff --git a/doc/ChangeLog_Rus.txt b/doc/ChangeLog_Rus.txt
@@ -1623,4 +1623,8 @@ OOoFBTools-3.1
 OOoFBTools-3.2
 	А. Конвертер:
 		1. Исправлен баг неверного определения кода Жанра CollLib библиотеки.
-		2. Исправлен баг неверного определения схемы Жанра для CollLib библиотеки при валидации после экспорта.
+		2. Исправлен баг неверного определения схемы Жанра для CollLib библиотеки при валидации после экспорта.
+
+OOoFBTools-3.3
+	А. Конвертер:
+		1. Исправлен баг неверного определения кода Жанра всех схем.
diff --git a/oxt/OOoFBTools/ExportToFB21.xba b/oxt/OOoFBTools/ExportToFB21.xba
@@ -483,7 +483,7 @@ End Sub
 Function GetWorkFB2Schema() As String
 	On Error Resume Next
 	Dim sFB21 As String, sFB2LibRusEc As String, sFB2Flibusta As String, sFBUnion As String, sFBCoolLib As String
-	sFB21 = &quot;0&quot; : sFB2LibRusEc = &quot;0&quot; : sFB2Flibusta = &quot;0&quot; : sFBUnion = &quot;0&quot;
+	sFB21 = &quot;0&quot; : sFB2LibRusEc = &quot;0&quot; : sFB2Flibusta = &quot;0&quot; : sFBUnion = &quot;0&quot; : sFBCoolLib = &quot;0&quot;
 	Dim sFileName As String : sFileName = getOOoFBToolsSettingsDir() &amp; sConstFB2PropEditorSettings
 	Dim nX As Long, nY As Long
 
@@ -520,7 +520,7 @@ Function GetWorkFB2Schema() As String
 		If sFB21 = 1 Then
 			GetWorkFB2Schema = NativeSeparator() &amp; &quot;fb2-schema&quot; &amp; NativeSeparator() &amp; &quot;FictionBook.xsd&quot;
 		ElseIf sFB2LibRusEc = 1 Then
-			GetWorkFB2Schema = NativeSeparator() &amp; &quot;fb2-librusec-schem&quot; &amp; NativeSeparator() &amp; &quot;FictionBook.xsd&quot;
+			GetWorkFB2Schema = NativeSeparator() &amp; &quot;fb2-librusec-schema&quot; &amp; NativeSeparator() &amp; &quot;FictionBook.xsd&quot;
 		ElseIf sFB2Flibusta = 1 Then
 			GetWorkFB2Schema = NativeSeparator() &amp; &quot;fb2-flibusta-schema&quot; &amp; NativeSeparator() &amp; &quot;FictionBook.xsd&quot;
 		ElseIf sFBUnion = 1 Then

diff --git a/oxt/description.xml b/oxt/description.xml
@@ -2,7 +2,7 @@
 <description xmlns="http://openoffice.org/extensions/description/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="DikBSD.OOoFBTools" />
-    <version value="3.2" />
+    <version value="3.3" />
 	<dependencies>
 		<OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
 	</dependencies>