From dcf622a81cee066fb5fa4cff5b9354dec7a1e09a Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 17 Aug 2020 17:47:54 +0200
Subject: [PATCH] Fixed LO package

---
 build.gradle                                                  | 2 +-
 src/main/oxt2/description.xml                                 | 4 ++--
 src/main/oxt2/registry/org/openoffice/Office/Addons.xcu       | 2 +-
 .../registry/org/openoffice/Office/UI/WriterWindowState.xcu   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1a033cc..f3d1df2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -132,7 +132,7 @@ task xhtml2(type: Jar) {
         include 'org/**/*'
         include 'net/**/*'
         include 'logback.xml'
-        include 'ch/*'
+        include 'ch/**/*'
         include '**/*.properties'
 }
 
diff --git a/src/main/oxt2/description.xml b/src/main/oxt2/description.xml
index 4ec5768..009efc2 100644
--- a/src/main/oxt2/description.xml
+++ b/src/main/oxt2/description.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
 			 
-  <identifier value="pro.litvinovg.writer2paginatedhtml2"/>
+  <identifier value="pro.litvinovg.writer2paginatedhtml"/>
   
-  <version value="0.8.2"/>
+  <version value="0.8.4"/>
   <extension-description>
 	<src lang="en" xlink:href="description/desc_en.txt"/>
   </extension-description>
diff --git a/src/main/oxt2/registry/org/openoffice/Office/Addons.xcu b/src/main/oxt2/registry/org/openoffice/Office/Addons.xcu
index aad47c4..659f4e9 100644
--- a/src/main/oxt2/registry/org/openoffice/Office/Addons.xcu
+++ b/src/main/oxt2/registry/org/openoffice/Office/Addons.xcu
@@ -10,7 +10,7 @@
 				</prop>
 				<node oor:name="UserDefinedImages">
 						<prop oor:name="ImageBigURL">
-						<value>vnd.sun.star.extension://pro.litvinovg.writer2paginatedhtml2/images/w2phtml.png</value>
+						<value>vnd.sun.star.extension://pro.litvinovg.writer2paginatedhtml/images/w2phtml.png</value>
 					</prop>
 				</node>
 			</node>
diff --git a/src/main/oxt2/registry/org/openoffice/Office/UI/WriterWindowState.xcu b/src/main/oxt2/registry/org/openoffice/Office/UI/WriterWindowState.xcu
index c221882..8df4a34 100644
--- a/src/main/oxt2/registry/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/src/main/oxt2/registry/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -6,7 +6,7 @@
 	<node oor:name="UIElements">
 		<node oor:name="States">
 			<!-- Used to dock the toolbar in the first toolbar row (by default it's floating) -->
-			<node oor:name="private:resource/toolbar/addon_pro.litvinovg.writer2paginatedhtml2.toolbar" oor:op="replace">
+			<node oor:name="private:resource/toolbar/addon_pro.litvinovg.writer2paginatedhtml.toolbar" oor:op="replace">
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value xml:lang="en">w2phtml converter panel</value>
                     <value xml:lang="ru">Панель конвертера w2phtml</value>