From 4dc71443a4face8e60f057b584bd361900c0759f Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Thu, 5 Mar 2020 18:25:42 +0100
Subject: [PATCH] Refactored a bit

---
 Addons.xcu                                 | 14 +++++++-------
 META-INF/manifest.xml                      |  2 +-
 {IPHRedaction => Redaction}/Clean.xba      |  0
 {IPHRedaction => Redaction}/Validation.xba |  0
 {IPHRedaction => Redaction}/dialog.xlb     |  2 +-
 {IPHRedaction => Redaction}/script.xlb     |  4 ++--
 WriterWindowState.xcu                      |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename {IPHRedaction => Redaction}/Clean.xba (100%)
 rename {IPHRedaction => Redaction}/Validation.xba (100%)
 rename {IPHRedaction => Redaction}/dialog.xlb (68%)
 rename {IPHRedaction => Redaction}/script.xlb (72%)

diff --git a/Addons.xcu b/Addons.xcu
index 7a43ec7..41886e0 100644
--- a/Addons.xcu
+++ b/Addons.xcu
@@ -3,7 +3,7 @@
                     oor:package="org.openoffice.Office">
 	<node oor:name="AddonUI">
 	 	<node oor:name="OfficeToolBar">
-		  <node oor:name="pro.litvinovg.IPHRedaction.panel" oor:op="replace">
+		  <node oor:name="pro.litvinovg.Redaction.panel" oor:op="replace">
 			<prop oor:name="Title" oor:type="xs:string">
 				  <value xml:lang="en-US">Redactor's panel</value>
 				  <value xml:lang="ru-RU">Панель редактора</value>
@@ -20,7 +20,7 @@
 				    <value xml:lang="ru">Панель редактора</value> 
 				   </prop>
 				  <prop oor:name="URL" oor:type="xs:string">
-			 		<value>macro:///IPHRedaction.Validation.validateButton</value>
+			 		<value>macro:///Redaction.Validation.validateButton</value>
 				  </prop>
 				  <prop oor:name="Target" oor:type="xs:string">
 				    <value>_self</value>
@@ -34,7 +34,7 @@
 				    <value xml:lang="ru">Панель редактора</value> 
 				   </prop>
 				  <prop oor:name="URL" oor:type="xs:string">
-			 		<value>macro:///IPHRedaction.Clean.cleanButton</value>
+			 		<value>macro:///Redaction.Clean.cleanButton</value>
 				  </prop>
 				  <prop oor:name="Target" oor:type="xs:string">
 				    <value>_self</value>
@@ -50,7 +50,7 @@
 		        <value xml:lang="en">Validation</value>  
 		      </prop>
 		      <prop oor:name="URL" oor:type="xs:string">
-				<value>macro:///IPHRedaction.Validation.validateButton</value>
+				<value>macro:///Redaction.Validation.validateButton</value>
 		      </prop>
 		      <prop oor:name="Target" oor:type="xs:string">
 		        <value>_self</value>
@@ -65,7 +65,7 @@
 		        <value xml:lang="en">Cleaning</value>  
 		      </prop>
 		      <prop oor:name="URL" oor:type="xs:string">
-				<value>macro:///IPHRedaction.Clean.cleanButton</value>
+				<value>macro:///Redaction.Clean.cleanButton</value>
 		      </prop>
 		      <prop oor:name="Target" oor:type="xs:string">
 		        <value>_self</value>
@@ -76,7 +76,7 @@
        <node oor:name="Images">	
          <node oor:name="image-clean-button" oor:op="replace">
            <prop oor:name="URL" oor:type="xs:string">
-             <value>macro:///IPHRedaction.Clean.cleanButton</value>
+             <value>macro:///Redaction.Clean.cleanButton</value>
            </prop>
            <node oor:name="UserDefinedImages">
              <prop oor:name="ImageBigURL">
@@ -86,7 +86,7 @@
          </node>
          <node oor:name="image-verify-button" oor:op="replace">
            <prop oor:name="URL" oor:type="xs:string">
-             <value>macro:///IPHRedaction.Validation.validateButton</value>
+             <value>macro:///Redaction.Validation.validateButton</value>
            </prop>
            <node oor:name="UserDefinedImages">
              <prop oor:name="ImageBigURL">
diff --git a/META-INF/manifest.xml b/META-INF/manifest.xml
index 16419ab..6a34d12 100644
--- a/META-INF/manifest.xml
+++ b/META-INF/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest:manifest>
- <manifest:file-entry manifest:full-path="IPHRedaction/" manifest:media-type="application/vnd.sun.star.basic-library"/>
+ <manifest:file-entry manifest:full-path="Redaction/" manifest:media-type="application/vnd.sun.star.basic-library"/>
  <manifest:file-entry manifest:full-path="Addons.xcu" manifest:media-type="application/vnd.sun.star.configuration-data"/>
  <manifest:file-entry manifest:full-path="WriterWindowState.xcu" manifest:media-type="application/vnd.sun.star.configuration-data"/>
 </manifest:manifest>
diff --git a/IPHRedaction/Clean.xba b/Redaction/Clean.xba
similarity index 100%
rename from IPHRedaction/Clean.xba
rename to Redaction/Clean.xba
diff --git a/IPHRedaction/Validation.xba b/Redaction/Validation.xba
similarity index 100%
rename from IPHRedaction/Validation.xba
rename to Redaction/Validation.xba
diff --git a/IPHRedaction/dialog.xlb b/Redaction/dialog.xlb
similarity index 68%
rename from IPHRedaction/dialog.xlb
rename to Redaction/dialog.xlb
index 72f0d1d..31106b9 100644
--- a/IPHRedaction/dialog.xlb
+++ b/Redaction/dialog.xlb
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="IPHRedaction" library:readonly="false" library:passwordprotected="false"/>
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Redaction" library:readonly="false" library:passwordprotected="false"/>
diff --git a/IPHRedaction/script.xlb b/Redaction/script.xlb
similarity index 72%
rename from IPHRedaction/script.xlb
rename to Redaction/script.xlb
index 20de646..36cd69d 100644
--- a/IPHRedaction/script.xlb
+++ b/Redaction/script.xlb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="IPHRedaction" library:readonly="false" library:passwordprotected="false">
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Redaction" library:readonly="false" library:passwordprotected="false">
  <library:element library:name="Validation"/>
  <library:element library:name="Clean"/>
-</library:library>
\ No newline at end of file
+</library:library>
diff --git a/WriterWindowState.xcu b/WriterWindowState.xcu
index ec1357d..00c87c0 100644
--- a/WriterWindowState.xcu
+++ b/WriterWindowState.xcu
@@ -2,7 +2,7 @@
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="WriterWindowState" oor:package="org.openoffice.Office.UI">
 	<node oor:name="UIElements">
 		<node oor:name="States">
-			<node oor:name="private:resource/toolbar/addon_pro.litvinovg.IPHRedaction.panel" oor:op="replace">		
+			<node oor:name="private:resource/toolbar/addon_pro.litvinovg.Redaction.panel" oor:op="replace">		
 				<prop oor:name="UIName" oor:type="xs:string">
                          <value xml:lang="en">Redactor's panel</value> 
                          <value xml:lang="ru">Панель редактора</value>