This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new fe86218 Use .ott instead of .stw for DocBook Template
fe86218 is described below
commit fe8621838a5185ff889f62aa34a43ca0873c0a90
Author: mseidel <[email protected]>
AuthorDate: Sat May 29 16:32:38 2021 +0200
Use .ott instead of .stw for DocBook Template
(cherry picked from commit 703a52b984f78cabb1072aa364a6130f4be2620c)
---
.../config/fragments/filters/DocBook_File.xcu | 10 ++++-----
main/filter/source/docbook/DocBookTemplate.ott | Bin 0 -> 10260 bytes
main/filter/source/docbook/DocBookTemplate.stw | Bin 6688 -> 0 bytes
main/filter/source/docbook/makefile.mk | 24 ++++++++++-----------
.../source/xsltdialog/xmlfilterdialogstrings.src | 2 +-
.../source/xsltdialog/xmlfiltersettingsdialog.src | 8 +++----
main/scp2/source/xsltfilter/file_xsltfilter.scp | 10 ++++-----
7 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/main/filter/source/config/fragments/filters/DocBook_File.xcu
b/main/filter/source/config/fragments/filters/DocBook_File.xcu
index 57e236c..9d59eb7 100644
--- a/main/filter/source/config/fragments/filters/DocBook_File.xcu
+++ b/main/filter/source/config/fragments/filters/DocBook_File.xcu
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<node oor:name="DocBook File" oor:op="replace">
@@ -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.stw</value></prop>
+ <prop
oor:name="TemplateName"><value>../share/xslt/docbook/DocBookTemplate.ott</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
new file mode 100644
index 0000000..62e1756
Binary files /dev/null and b/main/filter/source/docbook/DocBookTemplate.ott
differ
diff --git a/main/filter/source/docbook/DocBookTemplate.stw
b/main/filter/source/docbook/DocBookTemplate.stw
deleted file mode 100644
index ebc95f9..0000000
Binary files a/main/filter/source/docbook/DocBookTemplate.stw and /dev/null
differ
diff --git a/main/filter/source/docbook/makefile.mk
b/main/filter/source/docbook/makefile.mk
index b08de5c..f130b3a 100644
--- a/main/filter/source/docbook/makefile.mk
+++ b/main/filter/source/docbook/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -28,20 +28,20 @@ TARGET=fl_javafilter_binaries
.INCLUDE: settings.mk
all: \
- $(BIN)$/docbooktosoffheadings.xsl \
- $(BIN)$/sofftodocbookheadings.xsl \
- $(BIN)$/DocBookTemplate.stw
-
+ $(BIN)$/docbooktosoffheadings.xsl \
+ $(BIN)$/sofftodocbookheadings.xsl \
+ $(BIN)$/DocBookTemplate.ott
$(OUT)$/bin$/docbooktosoffheadings.xsl: docbooktosoffheadings.xsl
- $(COPY) docbooktosoffheadings.xsl
$(OUT)$/bin$/docbooktosoffheadings.xsl
+ $(COPY) docbooktosoffheadings.xsl $(OUT)$/bin$/docbooktosoffheadings.xsl
$(OUT)$/bin$/sofftodocbookheadings.xsl: sofftodocbookheadings.xsl
- $(COPY) sofftodocbookheadings.xsl
$(OUT)$/bin$/sofftodocbookheadings.xsl
+ $(COPY) sofftodocbookheadings.xsl $(OUT)$/bin$/sofftodocbookheadings.xsl
-$(OUT)$/bin$/DocBookTemplate.stw: DocBookTemplate.stw
- $(COPY) DocBookTemplate.stw $(OUT)$/bin$/DocBookTemplate.stw
+$(OUT)$/bin$/DocBookTemplate.ott: DocBookTemplate.ott
+ $(COPY) DocBookTemplate.ott $(OUT)$/bin$/DocBookTemplate.ott
.INCLUDE: target.mk
+# vim: set noet ts=4 sw=4:
diff --git a/main/filter/source/xsltdialog/xmlfilterdialogstrings.src
b/main/filter/source/xsltdialog/xmlfilterdialogstrings.src
index c6e3737..10bfc70 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 (.sxw)" ;
+ Text = "%PRODUCTNAME Writer (.odt)" ;
};
String STR_APPL_NAME_CALC
diff --git a/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
b/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
index 8044605..187f334 100644
--- a/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
+++ b/main/filter/source/xsltdialog/xmlfiltersettingsdialog.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/scp2/source/xsltfilter/file_xsltfilter.scp
b/main/scp2/source/xsltfilter/file_xsltfilter.scp
index 66b97e7..7d08d89 100644
--- a/main/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/main/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -34,7 +34,7 @@ File gid_File_Stw_Docbooktemplate
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Share_Xslt_Docbook;
- Name = "DocBookTemplate.stw";
+ Name = "DocBookTemplate.ott";
End
File gid_File_Xsl_Docbooktosoffheadings
