litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Remove image size option from oxt

Browse source
This commit is contained in:
Georgy Litvinov 2020-03-11 11:13:25 +01:00
parent 9df69946d7
commit 720195428f
5 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/openoffice/da/comp/writer2xhtml/XhtmlOptionsDialog.java
View file

@ -72,8 +72,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
if (nScaling<=1) { // Workaround for an obscure bug in the extension manager
setNumericFieldValue("Scaling",100);
}
loadCheckBoxOption(xProps, "OriginalImageSize");
loadTextFieldOption(xProps, "MinLetterSpacing");
loadTextFieldOption(xProps, "MaxWidth");
loadTextFieldOption(xProps, "PageBreakStyle");
@ -135,9 +133,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
saveCheckBoxOption(xProps, helper, "ConvertToPx", "convert_to_px");
saveNumericOptionAsPercentage(xProps, helper, "Scaling", "scaling");
saveCheckBoxOption(xProps, "OriginalImageSize");
// TODO: Support "relative"
helper.put("image_size", getCheckBoxStateAsBoolean("OriginalImageSize") ? "none" : "absolute");
// Special content
saveCheckBoxOption(xProps, helper, "InlineCSS", "css_inline");
@ -202,7 +197,6 @@ public class XhtmlOptionsDialog extends OptionsDialogBase {
setControlEnabled("ConvertToPx",!isLocked("convert_to_px"));
setControlEnabled("OriginalImageSize",!isLocked("image_size") && !isLocked("original_image_size"));
// Special content
setControlEnabled("InlineCSS",!isLocked("css_inline"));

4
src/main/java/w2phtml/project.properties
View file

@ -1,3 +1,3 @@
#Wed Mar 11 10:55:21 CET 2020
#Wed Mar 11 11:08:58 CET 2020
releaseVersion=0.5.5
releaseDate=10\:55\:21 11-03-2020
releaseDate=11\:08\:58 11-03-2020

1
src/main/oxt/Options.xcs
View file

@ -35,7 +35,6 @@
<prop oor:name="EmbedImg" oor:type="xs:boolean" />
<prop oor:name="Greenstone" oor:type="xs:boolean" />
<prop oor:name="Scaling" oor:type="xs:int" />
<prop oor:name="OriginalImageSize" oor:type="xs:boolean"/>
<prop oor:name="MinLetterSpacing" oor:type="xs:string" />
<prop oor:name="MaxWidth" oor:type="xs:string" />
<prop oor:name="PageBreakStyle" oor:type="xs:string" />

3
src/main/oxt/Options.xcu
View file

@ -26,9 +26,6 @@
<prop oor:name="PageBreakStyle" oor:type="xs:string">
<value>height:3em;margin-top:1em;margin-bottom:1em;background-color:#f6f6f6;</value>
</prop>
<prop oor:name="OriginalImageSize" oor:type="xs:boolean">
<value>false</value>
</prop>
<prop oor:name="Notes" oor:type="xs:boolean">
<value>true</value>
</prop>

1
src/main/oxt/w2phtml/XhtmlOptions.xdl
View file

@ -23,7 +23,6 @@
<dlg:numericfield dlg:id="Scaling" dlg:tab-index="4" dlg:left="88" dlg:top="34" dlg:width="46" dlg:height="12" dlg:help-text="&amp;19.XhtmlOptions.Scaling.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsScaling" dlg:strict-format="true" dlg:decimal-accuracy="0" dlg:value="100" dlg:value-min="1" dlg:value-max="1000" dlg:value-step="10" dlg:spin="true"/>
<dlg:text dlg:id="ScalingPercentLabel" dlg:tab-index="5" dlg:left="136" dlg:top="34" dlg:width="10" dlg:height="12" dlg:help-text="&amp;20.XhtmlOptions.ScalingPercentLabel.HelpText" dlg:value="&amp;21.XhtmlOptions.ScalingPercentLabel.Label"/>
<dlg:checkbox dlg:id="ConvertToPx" dlg:tab-index="6" dlg:left="9" dlg:top="79" dlg:width="177" dlg:height="12" dlg:help-text="&amp;27.XhtmlOptions.ConvertToPx.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsConvertToPx" dlg:value="&amp;28.XhtmlOptions.ConvertToPx.Label" dlg:checked="true"/>
<dlg:checkbox dlg:id="OriginalImageSize" dlg:tab-index="7" dlg:left="9" dlg:top="93" dlg:width="177" dlg:height="12" dlg:help-text="&amp;29.XhtmlOptions.OriginalImageSize.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsOriginalImageSize" dlg:value="&amp;30.XhtmlOptions.OriginalImageSize.Label" dlg:checked="false"/>
<dlg:text dlg:id="SpecialContentLabel" dlg:tab-index="8" dlg:left="4" dlg:top="107" dlg:width="184" dlg:height="12" dlg:help-text="&amp;31.XhtmlOptions.SpecialContentLabel.HelpText" dlg:value="&amp;32.XhtmlOptions.SpecialContentLabel.Label"/>
<dlg:checkbox dlg:id="Notes" dlg:tab-index="9" dlg:left="9" dlg:top="121" dlg:width="179" dlg:height="12" dlg:help-text="&amp;33.XhtmlOptions.Notes.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsNotes" dlg:value="&amp;34.XhtmlOptions.Notes.Label" dlg:checked="true"/>
<dlg:checkbox dlg:id="UseDublinCore" dlg:tab-index="10" dlg:left="9" dlg:top="135" dlg:width="179" dlg:height="12" dlg:help-text="&amp;35.XhtmlOptions.UseDublinCore.HelpText" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:OptionsUseDublinCore" dlg:value="&amp;36.XhtmlOptions.UseDublinCore.Label" dlg:checked="true"/>