From 0a324c8a2b9b2c4dbcff197568fd569e0d9510bb Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 11 Mar 2020 08:11:06 +0100 Subject: [PATCH] Rename libreoffice digalogs --- .../da/comp/writer2xhtml/ConfigurationDialog.java | 2 +- .../da/comp/writer2xhtml/EpubMetadataDialog.java | 14 +++++++------- .../da/comp/writer2xhtml/EpubOptionsDialog.java | 2 +- .../da/comp/writer2xhtml/XhtmlOptionsDialog.java | 2 +- src/main/java/w2phtml/project.properties | 6 +++--- src/main/oxt/writer2xhtml/META-INF/manifest.xml | 4 ++-- src/main/oxt/writer2xhtml/OptionPages.xcu | 14 +++++++------- src/main/oxt/writer2xhtml/ToolbarOptionPages.xcu | 4 ++-- src/main/oxt/writer2xhtml/description.xml | 2 +- .../DialogStrings_ca.properties | 0 .../DialogStrings_cs_CZ.properties | 0 .../DialogStrings_da_DK.properties | 0 .../DialogStrings_de_DE.properties | 0 .../DialogStrings_en_US.default | 0 .../DialogStrings_en_US.properties | 0 .../DialogStrings_es_ES.properties | 0 .../DialogStrings_fa_IR.properties | 0 .../DialogStrings_fi_FI.properties | 0 .../DialogStrings_fr_FR.properties | 0 .../DialogStrings_it_IT.properties | 0 .../DialogStrings_nl_NL.properties | 0 .../DialogStrings_nn_NO.properties | 0 .../DialogStrings_pl_PL.properties | 0 .../DialogStrings_pt_BR.properties | 0 .../DialogStrings_ru_RU.properties | 0 .../DialogStrings_tr_TR.properties | 0 .../DialogStrings_uk_UA.properties | 0 .../Module1.xba | 0 .../XhtmlOptions.xdl | 0 .../{W2PaginatedHTMLDialogs => w2phtml}/dialog.xlb | 2 +- .../{W2PaginatedHTMLDialogs => w2phtml}/script.xlb | 2 +- .../AuthorDialog.xdl | 0 .../ConfigurationRoot.xdl | 0 .../Content.xdl | 0 .../DateDialog.xdl | 0 .../DeleteDialog.xdl | 0 .../EpubMetadata.xdl | 0 .../EpubOptions.xdl | 0 .../Formatting.xdl | 0 .../General.xdl | 0 .../LoadDefaults.xdl | 0 .../Module1.xba | 0 .../NewDialog.xdl | 0 .../Styles1.xdl | 0 .../Styles2.xdl | 0 .../Stylesheets.xdl | 0 .../Template.xdl | 0 .../ToolbarConfigurationRoot.xdl | 0 .../ToolbarSettings.xdl | 0 .../dialog.xlb | 2 +- .../script.xlb | 2 +- 51 files changed, 29 insertions(+), 29 deletions(-) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_ca.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_cs_CZ.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_da_DK.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_de_DE.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_en_US.default (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_en_US.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_es_ES.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_fa_IR.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_fi_FI.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_fr_FR.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_it_IT.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_nl_NL.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_nn_NO.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_pl_PL.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_pt_BR.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_ru_RU.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_tr_TR.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/DialogStrings_uk_UA.properties (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/Module1.xba (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/XhtmlOptions.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/dialog.xlb (72%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs => w2phtml}/script.xlb (71%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/AuthorDialog.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/ConfigurationRoot.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Content.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/DateDialog.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/DeleteDialog.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/EpubMetadata.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/EpubOptions.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Formatting.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/General.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/LoadDefaults.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Module1.xba (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/NewDialog.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Styles1.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Styles2.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Stylesheets.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/Template.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/ToolbarConfigurationRoot.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/ToolbarSettings.xdl (100%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/dialog.xlb (90%) rename src/main/oxt/writer2xhtml/{W2PaginatedHTMLDialogs2 => w2phtml2}/script.xlb (71%) diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java index f6201c0..c06ae52 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java @@ -70,7 +70,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer // Configure the base class @Override protected String getMIMEType() { return "text/html"; } - @Override protected String getDialogLibraryName() { return "W2PaginatedHTMLDialogs2"; } + @Override protected String getDialogLibraryName() { return "w2phtml2"; } @Override protected String getConfigFileName() { return "writer2xhtml.xml"; } diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java index a53f9dc..621cf06 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubMetadataDialog.java @@ -133,7 +133,7 @@ public class EpubMetadataDialog extends DialogBase { // -------------------------------------------------- // Ensure that the super can find us :-) @Override public String getDialogLibraryName() { - return "W2PaginatedHTMLDialogs2"; + return "w2phtml2"; } @Override public String getDialogName() { @@ -196,7 +196,7 @@ public class EpubMetadataDialog extends DialogBase { } private boolean authorAddclick() { - SimpleDialog dialog = new SimpleDialog(xContext,"W2PaginatedHTMLDialogs2.AuthorDialog"); + SimpleDialog dialog = new SimpleDialog(xContext,"w2phtml2.AuthorDialog"); if (dialog.getDialog()!=null) { dialog.getControls().setListBoxSelectedItem("Type", (short) 0); dialog.getControls().setListBoxSelectedItem("Role", (short) 0); @@ -216,7 +216,7 @@ public class EpubMetadataDialog extends DialogBase { private boolean authorModifyclick() { short nIndex = getListBoxSelectedItem("Authors"); AuthorInfo author = authors.get(nIndex); - SimpleDialog dialog = new SimpleDialog(xContext,"W2PaginatedHTMLDialogs2.AuthorDialog"); + SimpleDialog dialog = new SimpleDialog(xContext,"w2phtml2.AuthorDialog"); if (dialog.getDialog()!=null) { dialog.getControls().setTextFieldText("Author", author.sName); dialog.getControls().setListBoxSelectedItem("Type", author.isCreator ? (short)0 : (short) 1); @@ -234,7 +234,7 @@ public class EpubMetadataDialog extends DialogBase { private boolean authorDeleteclick() { if (authors.size()>0) { - SimpleDialog dialog = new SimpleDialog(xContext,"W2PaginatedHTMLDialogs2.DeleteDialog"); + SimpleDialog dialog = new SimpleDialog(xContext,"w2phtml2.DeleteDialog"); if (dialog.getDialog()!=null) { short nIndex = getListBoxSelectedItem("Authors"); String sLabel = dialog.getControls().getLabelText("DeleteLabel"); @@ -272,7 +272,7 @@ public class EpubMetadataDialog extends DialogBase { } private boolean dateAddClick() { - SimpleDialog dialog = new SimpleDialog(xContext,"W2PaginatedHTMLDialogs2.DateDialog"); + SimpleDialog dialog = new SimpleDialog(xContext,"w2phtml2.DateDialog"); if (dialog.getDialog()!=null) { dialog.getControls().setDateFieldValue("Date", datetime2int(xDocumentProperties.getModificationDate())); if (dialog.getDialog().execute()==ExecutableDialogResults.OK) { @@ -290,7 +290,7 @@ public class EpubMetadataDialog extends DialogBase { private boolean dateModifyClick() { short nIndex = getListBoxSelectedItem("Dates"); DateInfo date = dates.get(nIndex); - SimpleDialog dialog = new SimpleDialog(xContext,"W2PaginatedHTMLDialogs2.DateDialog"); + SimpleDialog dialog = new SimpleDialog(xContext,"w2phtml2.DateDialog"); if (dialog.getDialog()!=null) { dialog.getControls().setDateFieldValue("Date", date.nDate); dialog.getControls().setTextFieldText("Event", date.sEvent); @@ -306,7 +306,7 @@ public class EpubMetadataDialog extends DialogBase { private boolean dateDeleteClick() { if (dates.size()>0) { - SimpleDialog dialog = new SimpleDialog(xContext,"W2PaginatedHTMLDialogs2.DeleteDialog"); + SimpleDialog dialog = new SimpleDialog(xContext,"w2phtml2.DeleteDialog"); if (dialog.getDialog()!=null) { short nIndex = getListBoxSelectedItem("Dates"); String sLabel = dialog.getControls().getLabelText("DeleteLabel"); diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java index 206eb08..ed2beeb 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/EpubOptionsDialog.java @@ -51,7 +51,7 @@ public class EpubOptionsDialog extends OptionsDialogBase { */ public static String __implementationName = "org.openoffice.da.comp.writer2xhtml.EpubOptionsDialog"; - @Override public String getDialogLibraryName() { return "W2PaginatedHTMLDialogs2"; } + @Override public String getDialogLibraryName() { return "w2phtml2"; } /** Return the name of the dialog within the library */ diff --git a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java index 1977faf..2388ab6 100644 --- a/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java +++ b/src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java @@ -45,7 +45,7 @@ public class XhtmlOptionsDialog extends OptionsDialogBase { */ public static String __implementationName = "org.openoffice.da.comp.writer2xhtml.XhtmlOptionsDialog"; - public String getDialogLibraryName() { return "W2PaginatedHTMLDialogs"; } + public String getDialogLibraryName() { return "w2phtml"; } /** Return the name of the dialog within the library */ diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties index 6d16e13..a108489 100644 --- a/src/main/java/w2phtml/project.properties +++ b/src/main/java/w2phtml/project.properties @@ -1,3 +1,3 @@ -#Tue Mar 10 14:37:23 CET 2020 -releaseVersion=0.5.4 -releaseDate=14\:37\:23 10-03-2020 +#Wed Mar 11 07:03:57 CET 2020 +releaseVersion=0.5.5 +releaseDate=07\:03\:57 11-03-2020 diff --git a/src/main/oxt/writer2xhtml/META-INF/manifest.xml b/src/main/oxt/writer2xhtml/META-INF/manifest.xml index f91e956..f28e318 100644 --- a/src/main/oxt/writer2xhtml/META-INF/manifest.xml +++ b/src/main/oxt/writer2xhtml/META-INF/manifest.xml @@ -54,11 +54,11 @@ manifest:media-type="application/vnd.sun.star.configuration-data"/> Writer2xhtml - %origin%/W2PaginatedHTMLDialogs2/ConfigurationRoot.xdl + %origin%/w2phtml2/ConfigurationRoot.xdl @@ -52,7 +52,7 @@ General - %origin%/W2PaginatedHTMLDialogs2/General.xdl + %origin%/w2phtml2/General.xdl org.openoffice.da.writer2xhtml.ConfigurationDialog @@ -74,7 +74,7 @@ Template - %origin%/W2PaginatedHTMLDialogs2/Template.xdl + %origin%/w2phtml2/Template.xdl org.openoffice.da.writer2xhtml.ConfigurationDialog @@ -96,7 +96,7 @@ Master styles - %origin%/W2PaginatedHTMLDialogs2/Styles1.xdl + %origin%/w2phtml2/Styles1.xdl org.openoffice.da.writer2xhtml.ConfigurationDialog @@ -118,7 +118,7 @@ Other styles - %origin%/W2PaginatedHTMLDialogs2/Styles2.xdl + %origin%/w2phtml2/Styles2.xdl org.openoffice.da.writer2xhtml.ConfigurationDialog @@ -140,7 +140,7 @@ Formatting - %origin%/W2PaginatedHTMLDialogs2/Formatting.xdl + %origin%/w2phtml2/Formatting.xdl org.openoffice.da.writer2xhtml.ConfigurationDialog @@ -162,7 +162,7 @@ Content - %origin%/W2PaginatedHTMLDialogs2/Content.xdl + %origin%/w2phtml2/Content.xdl org.openoffice.da.writer2xhtml.ConfigurationDialog diff --git a/src/main/oxt/writer2xhtml/ToolbarOptionPages.xcu b/src/main/oxt/writer2xhtml/ToolbarOptionPages.xcu index 0e0a158..85eb634 100644 --- a/src/main/oxt/writer2xhtml/ToolbarOptionPages.xcu +++ b/src/main/oxt/writer2xhtml/ToolbarOptionPages.xcu @@ -28,7 +28,7 @@ Writer2xhtml toolbar - %origin%/W2PaginatedHTMLDialogs2/ToolbarConfigurationRoot.xdl + %origin%/w2phtml2/ToolbarConfigurationRoot.xdl @@ -45,7 +45,7 @@ Settings - %origin%/W2PaginatedHTMLDialogs2/ToolbarSettings.xdl + %origin%/w2phtml2/ToolbarSettings.xdl org.openoffice.da.writer2xhtml.ToolbarSettingsDialog diff --git a/src/main/oxt/writer2xhtml/description.xml b/src/main/oxt/writer2xhtml/description.xml index 75db304..bff61da 100644 --- a/src/main/oxt/writer2xhtml/description.xml +++ b/src/main/oxt/writer2xhtml/description.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ca.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_ca.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ca.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_ca.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_cs_CZ.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_cs_CZ.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_cs_CZ.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_cs_CZ.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_da_DK.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_da_DK.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_da_DK.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_da_DK.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_de_DE.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_de_DE.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_de_DE.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_de_DE.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.default b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_en_US.default similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.default rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_en_US.default diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_en_US.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_en_US.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_en_US.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_es_ES.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_es_ES.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_es_ES.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_es_ES.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_fa_IR.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_fa_IR.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_fa_IR.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_fa_IR.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_fi_FI.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_fi_FI.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_fi_FI.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_fi_FI.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_fr_FR.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_fr_FR.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_fr_FR.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_fr_FR.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_it_IT.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_it_IT.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_it_IT.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_it_IT.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_nl_NL.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_nl_NL.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_nl_NL.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_nl_NL.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_nn_NO.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_nn_NO.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_nn_NO.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_nn_NO.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_pl_PL.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_pl_PL.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_pl_PL.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_pl_PL.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_pt_BR.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_pt_BR.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_pt_BR.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_pt_BR.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_ru_RU.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_ru_RU.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_ru_RU.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_tr_TR.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_tr_TR.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_tr_TR.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_tr_TR.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_uk_UA.properties b/src/main/oxt/writer2xhtml/w2phtml/DialogStrings_uk_UA.properties similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/DialogStrings_uk_UA.properties rename to src/main/oxt/writer2xhtml/w2phtml/DialogStrings_uk_UA.properties diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/Module1.xba b/src/main/oxt/writer2xhtml/w2phtml/Module1.xba similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/Module1.xba rename to src/main/oxt/writer2xhtml/w2phtml/Module1.xba diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl b/src/main/oxt/writer2xhtml/w2phtml/XhtmlOptions.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/XhtmlOptions.xdl rename to src/main/oxt/writer2xhtml/w2phtml/XhtmlOptions.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/dialog.xlb b/src/main/oxt/writer2xhtml/w2phtml/dialog.xlb similarity index 72% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/dialog.xlb rename to src/main/oxt/writer2xhtml/w2phtml/dialog.xlb index 706e867..77d3071 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/dialog.xlb +++ b/src/main/oxt/writer2xhtml/w2phtml/dialog.xlb @@ -1,5 +1,5 @@ - + diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/script.xlb b/src/main/oxt/writer2xhtml/w2phtml/script.xlb similarity index 71% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/script.xlb rename to src/main/oxt/writer2xhtml/w2phtml/script.xlb index 207d428..bd417fe 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs/script.xlb +++ b/src/main/oxt/writer2xhtml/w2phtml/script.xlb @@ -1,5 +1,5 @@ - + diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/AuthorDialog.xdl b/src/main/oxt/writer2xhtml/w2phtml2/AuthorDialog.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/AuthorDialog.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/AuthorDialog.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/ConfigurationRoot.xdl b/src/main/oxt/writer2xhtml/w2phtml2/ConfigurationRoot.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/ConfigurationRoot.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/ConfigurationRoot.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Content.xdl b/src/main/oxt/writer2xhtml/w2phtml2/Content.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Content.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/Content.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/DateDialog.xdl b/src/main/oxt/writer2xhtml/w2phtml2/DateDialog.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/DateDialog.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/DateDialog.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/DeleteDialog.xdl b/src/main/oxt/writer2xhtml/w2phtml2/DeleteDialog.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/DeleteDialog.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/DeleteDialog.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubMetadata.xdl b/src/main/oxt/writer2xhtml/w2phtml2/EpubMetadata.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubMetadata.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/EpubMetadata.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl b/src/main/oxt/writer2xhtml/w2phtml2/EpubOptions.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/EpubOptions.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/EpubOptions.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Formatting.xdl b/src/main/oxt/writer2xhtml/w2phtml2/Formatting.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Formatting.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/Formatting.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/General.xdl b/src/main/oxt/writer2xhtml/w2phtml2/General.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/General.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/General.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/LoadDefaults.xdl b/src/main/oxt/writer2xhtml/w2phtml2/LoadDefaults.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/LoadDefaults.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/LoadDefaults.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Module1.xba b/src/main/oxt/writer2xhtml/w2phtml2/Module1.xba similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Module1.xba rename to src/main/oxt/writer2xhtml/w2phtml2/Module1.xba diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/NewDialog.xdl b/src/main/oxt/writer2xhtml/w2phtml2/NewDialog.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/NewDialog.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/NewDialog.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Styles1.xdl b/src/main/oxt/writer2xhtml/w2phtml2/Styles1.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Styles1.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/Styles1.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Styles2.xdl b/src/main/oxt/writer2xhtml/w2phtml2/Styles2.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Styles2.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/Styles2.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Stylesheets.xdl b/src/main/oxt/writer2xhtml/w2phtml2/Stylesheets.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Stylesheets.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/Stylesheets.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Template.xdl b/src/main/oxt/writer2xhtml/w2phtml2/Template.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/Template.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/Template.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/ToolbarConfigurationRoot.xdl b/src/main/oxt/writer2xhtml/w2phtml2/ToolbarConfigurationRoot.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/ToolbarConfigurationRoot.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/ToolbarConfigurationRoot.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/ToolbarSettings.xdl b/src/main/oxt/writer2xhtml/w2phtml2/ToolbarSettings.xdl similarity index 100% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/ToolbarSettings.xdl rename to src/main/oxt/writer2xhtml/w2phtml2/ToolbarSettings.xdl diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/dialog.xlb b/src/main/oxt/writer2xhtml/w2phtml2/dialog.xlb similarity index 90% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/dialog.xlb rename to src/main/oxt/writer2xhtml/w2phtml2/dialog.xlb index 359986f..582aa01 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/dialog.xlb +++ b/src/main/oxt/writer2xhtml/w2phtml2/dialog.xlb @@ -1,6 +1,6 @@ - + diff --git a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/script.xlb b/src/main/oxt/writer2xhtml/w2phtml2/script.xlb similarity index 71% rename from src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/script.xlb rename to src/main/oxt/writer2xhtml/w2phtml2/script.xlb index e18f6c4..7cf5aee 100644 --- a/src/main/oxt/writer2xhtml/W2PaginatedHTMLDialogs2/script.xlb +++ b/src/main/oxt/writer2xhtml/w2phtml2/script.xlb @@ -1,5 +1,5 @@ - +