This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new eeae881 Revert my changes regarding DocBook filter.
eeae881 is described below
commit eeae881221c3a5e38358d1bb196ec169868c1da1
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Jun 27 15:17:25 2021 +0200
Revert my changes regarding DocBook filter.
I think this is better suited for a pull request.
---
main/filter/prj/d.lst | 2 +-
.../config/fragments/filters/DocBook_File.xcu | 2 +-
main/filter/source/docbook/DocBookTemplate.ott | Bin 10260 -> 0 bytes
main/filter/source/docbook/DocBookTemplate.stw | Bin 0 -> 6688 bytes
main/filter/source/docbook/makefile.mk | 6 +-
.../source/xsltdialog/xmlfilterdialogstrings.src | 2 +-
.../source/xsltdialog/xmlfiltersettingsdialog.src | 116 ++++++++++-----------
main/scp2/source/xsltfilter/file_xsltfilter.scp | 2 +-
8 files changed, 60 insertions(+), 70 deletions(-)
diff --git a/main/filter/prj/d.lst b/main/filter/prj/d.lst
index ffa2a19..c5d30d4 100644
--- a/main/filter/prj/d.lst
+++ b/main/filter/prj/d.lst
@@ -49,7 +49,7 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
..\source\xslt\import\uof\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof\*.xsl
..\source\xslt\import\uof2\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof2\*.xsl
..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
-..\%__SRC%\bin\*.ott %_DEST%\bin%_EXT%\*.ott
+..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu
%_DEST%\xml%_EXT%\registry\spool\fcfg_*.xcu
diff --git a/main/filter/source/config/fragments/filters/DocBook_File.xcu
b/main/filter/source/config/fragments/filters/DocBook_File.xcu
index 9d59eb7..f692bcf 100644
--- a/main/filter/source/config/fragments/filters/DocBook_File.xcu
+++ b/main/filter/source/config/fragments/filters/DocBook_File.xcu
@@ -26,7 +26,7 @@
<prop oor:name="UIComponent"/>
<prop oor:name="UserData"><value
oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../share/xslt/docbook/docbooktosoffheadings.xsl,../share/xslt/docbook/sofftodocbookheadings.xsl</value></prop>
<prop
oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop
oor:name="TemplateName"><value>../share/xslt/docbook/DocBookTemplate.ott</value></prop>
+ <prop
oor:name="TemplateName"><value>../share/xslt/docbook/DocBookTemplate.stw</value></prop>
<prop oor:name="UIName">
<value>DocBook</value>
</prop>
diff --git a/main/filter/source/docbook/DocBookTemplate.ott
b/main/filter/source/docbook/DocBookTemplate.ott
deleted file mode 100644
index 62e1756..0000000
Binary files a/main/filter/source/docbook/DocBookTemplate.ott and /dev/null
differ
diff --git a/main/filter/source/docbook/DocBookTemplate.stw
b/main/filter/source/docbook/DocBookTemplate.stw
new file mode 100644
index 0000000..ebc95f9
Binary files /dev/null and b/main/filter/source/docbook/DocBookTemplate.stw
differ
diff --git a/main/filter/source/docbook/makefile.mk
b/main/filter/source/docbook/makefile.mk
index f130b3a..c317aef 100644
--- a/main/filter/source/docbook/makefile.mk
+++ b/main/filter/source/docbook/makefile.mk
@@ -30,7 +30,7 @@ TARGET=fl_javafilter_binaries
all: \
$(BIN)$/docbooktosoffheadings.xsl \
$(BIN)$/sofftodocbookheadings.xsl \
- $(BIN)$/DocBookTemplate.ott
+ $(BIN)$/DocBookTemplate.stw
$(OUT)$/bin$/docbooktosoffheadings.xsl: docbooktosoffheadings.xsl
@@ -39,8 +39,8 @@ $(OUT)$/bin$/docbooktosoffheadings.xsl:
docbooktosoffheadings.xsl
$(OUT)$/bin$/sofftodocbookheadings.xsl: sofftodocbookheadings.xsl
$(COPY) sofftodocbookheadings.xsl $(OUT)$/bin$/sofftodocbookheadings.xsl
-$(OUT)$/bin$/DocBookTemplate.ott: DocBookTemplate.ott
- $(COPY) DocBookTemplate.ott $(OUT)$/bin$/DocBookTemplate.ott
+$(OUT)$/bin$/DocBookTemplate.stw: DocBookTemplate.stw
+ $(COPY) DocBookTemplate.stw $(OUT)$/bin$/DocBookTemplate.stw
.INCLUDE: target.mk
diff --git a/main/filter/source/xsltdialog/xmlfilterdialogstrings.src
b/main/filter/source/xsltdialog/xmlfilterdialogstrings.src
index 10bfc70..c6e3737 100644
--- a/main/filter/source/xsltdialog/xmlfilterdialogstrings.src
+++ b/main/filter/source/xsltdialog/xmlfilterdialogstrings.src
@@ -56,7 +56,7 @@ String STR_EXPORT_ONLY
String STR_APPL_NAME_WRITER
{
- Text = "%PRODUCTNAME Writer (.odt)" ;
+ Text = "%PRODUCTNAME Writer (.sxw)" ;
};
String STR_APPL_NAME_CALC
diff --git a/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
b/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
index 187f334..5429c44 100644
--- a/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
+++ b/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
@@ -32,109 +32,99 @@
WorkWindow DLG_XML_FILTER_SETTINGS_DIALOG
{
- Size = MAP_APPFONT( 320, 154 );
- HelpId =
HID_XML_FILTER_SETTINGS_DIALOG;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Sizeable = FALSE;
- DialogControl = TRUE ;
- Text [ en-US ] = "XML Filter Settings" ;
+ Size = MAP_APPFONT( 320, 154 ) ;
+ HelpId = HID_XML_FILTER_SETTINGS_DIALOG ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ Sizeable = FALSE ;
+ DialogControl = TRUE ;
+ Text [ en-US ] = "XML Filter Settings" ;
Control CTRL_XML_FILTER_LIST
{
- Pos = MAP_APPFONT ( 6 , 6 )
;
- Size = MAP_APPFONT ( 235 , 142 );
- Border = TRUE ;
- TabStop = TRUE ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 235, 142 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
};
PushButton PB_XML_FILTER_NEW
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 0 * BUTTONS_HEIGHT + 0 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_NEW;
- TabStop = TRUE ;
- Text [ en-US ] = "~New...";
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 0 *
BUTTONS_HEIGHT + 0 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_NEW ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~New..." ;
};
PushButton PB_XML_FILTER_EDIT
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 1 * BUTTONS_HEIGHT + 1 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_EDIT;
- TabStop = TRUE ;
- Text [ en-US ] = "~Edit...";
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 1 *
BUTTONS_HEIGHT + 1 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_EDIT ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Edit..." ;
};
PushButton PB_XML_FILTER_TEST
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 2 * BUTTONS_HEIGHT + 2 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_TEST;
- TabStop = TRUE ;
- Text [ en-US ] = "~Test XSLTs...";
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 2 *
BUTTONS_HEIGHT + 2 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_TEST ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Test XSLTs..." ;
};
PushButton PB_XML_FILTER_DELETE
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 3 * BUTTONS_HEIGHT + 4 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_DELETE;
- TabStop = TRUE ;
- Text [ en-US ] = "~Delete...";
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 3 *
BUTTONS_HEIGHT + 4 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_DELETE ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Delete..." ;
};
PushButton PB_XML_FILTER_SAVE
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 4 * BUTTONS_HEIGHT + 6 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_SAVE;
- TabStop = TRUE ;
- Text [ en-US ] = "~Save as Package...";
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 4 *
BUTTONS_HEIGHT + 6 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_SAVE ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Save as Package..." ;
};
PushButton PB_XML_FILTER_OPEN
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 5 * BUTTONS_HEIGHT + 7 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_OPEN;
- TabStop = TRUE ;
- Text [ en-US ] = "~Open Package...";
- TabStop = TRUE ;
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 5 *
BUTTONS_HEIGHT + 7 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_OPEN ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Open Package..." ;
+ TabStop = TRUE ;
};
HelpButton BTN_XML_FILTER_HELP
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT, BUTTONS_TOP + 6 * BUTTONS_HEIGHT + 9 * BUTTONS_SPACEING );
- Size = MAP_APPFONT ( BUTTONS_WIDTH,
BUTTONS_HEIGHT );
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 6 *
BUTTONS_HEIGHT + 9 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
};
PushButton PB_XML_FILTER_CLOSE
{
- Pos = MAP_APPFONT (
BUTTONS_LEFT , BUTTONS_TOP + 7 * BUTTONS_HEIGHT + 10 * BUTTONS_SPACEING ) ;
- Size = MAP_APPFONT ( BUTTONS_WIDTH ,
BUTTONS_HEIGHT ) ;
- HelpId = HID_XML_FILTER_CLOSE;
- TabStop = TRUE ;
- Text [ en-US ] = "~Close";
+ Pos = MAP_APPFONT ( BUTTONS_LEFT, BUTTONS_TOP + 7 *
BUTTONS_HEIGHT + 10 * BUTTONS_SPACEING ) ;
+ Size = MAP_APPFONT ( BUTTONS_WIDTH, BUTTONS_HEIGHT ) ;
+ HelpId = HID_XML_FILTER_CLOSE ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Close" ;
};
};
String STR_XML_FILTER_LISTBOX
{
- Text [ en-US ] = "XML Filter List";
+ Text [ en-US ] = "XML Filter List" ;
};
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/scp2/source/xsltfilter/file_xsltfilter.scp
b/main/scp2/source/xsltfilter/file_xsltfilter.scp
index 7d08d89..949a713 100644
--- a/main/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/main/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -34,7 +34,7 @@ File gid_File_Stw_Docbooktemplate
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Share_Xslt_Docbook;
- Name = "DocBookTemplate.ott";
+ Name = "DocBookTemplate.stw";
End
File gid_File_Xsl_Docbooktosoffheadings
