summaryrefslogtreecommitdiff
path: root/wizards/com
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-05-22 14:31:39 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-05-22 14:32:53 -0400
commit3f76713dbfc4adef9966ba5afd3eaf6480854064 (patch)
tree7df271fdbe9581fbffd40cab3acfef9cda8a22fd /wizards/com
parent552bebe6fa27fa58d07d87283a4b24e6052ab3d4 (diff)
Renamed writer_web_HTML to generic_HTML.
This should reflect the fact that this type was already used as a generic HTML type. Change-Id: I0a209d51ed229f07aff001075c39bfc82d4c3088
Diffstat (limited to 'wizards/com')
-rw-r--r--wizards/com/sun/star/wizards/web/data/CGDocument.java13
-rw-r--r--wizards/com/sun/star/wizards/web/data/CGDocument.py11
2 files changed, 9 insertions, 15 deletions
diff --git a/wizards/com/sun/star/wizards/web/data/CGDocument.java b/wizards/com/sun/star/wizards/web/data/CGDocument.java
index 1eed6844ae64..7f30bac648b3 100644
--- a/wizards/com/sun/star/wizards/web/data/CGDocument.java
+++ b/wizards/com/sun/star/wizards/web/data/CGDocument.java
@@ -264,16 +264,13 @@ public class CGDocument extends ConfigSetItem implements XMLProvider
{
return TypeDetection.NO_TYPE;
}
+ if (media.startsWith("generic_HTML"))
+ {
+ return TypeDetection.HTML_DOC;
+ }
if (media.startsWith("writer"))
{
- if (media.startsWith("writer_web_HTML"))
- {
- return TypeDetection.HTML_DOC;
- }
- else
- {
- return TypeDetection.WRITER_DOC;
- }
+ return TypeDetection.WRITER_DOC;
}
else if (media.startsWith("calc"))
{
diff --git a/wizards/com/sun/star/wizards/web/data/CGDocument.py b/wizards/com/sun/star/wizards/web/data/CGDocument.py
index 11f6daedabbf..a5a41631ca7f 100644
--- a/wizards/com/sun/star/wizards/web/data/CGDocument.py
+++ b/wizards/com/sun/star/wizards/web/data/CGDocument.py
@@ -153,13 +153,10 @@ class CGDocument(ConfigGroup):
def getDocType(self, media):
if media == "":
return NO_TYPE
-
- if media.startswith("writer"):
- if media.startswith("writer_web_HTML"):
- return HTML_DOC
- else:
- return WRITER_DOC
-
+ elif media.startswith("generic_HTML"):
+ return HTML_DOC
+ elif media.startswith("writer"):
+ return WRITER_DOC
elif media.startswith("calc"):
return CALC_DOC
elif media.startswith("draw"):