diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-15 20:01:47 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-15 20:01:47 +0100 |
| commit | 64e5b4e738e95113d1faf82b7e720e5703cfa83e (patch) | |
| tree | 98c13f31482f32b901f673f9c44a68ab86170982 | |
| parent | 38b714a8e9e568ab0404b680113887bf788c165e (diff) | |
office-cfg-linux-common-template-dir.diff should be obsolete
| -rw-r--r-- | patches/dev300/apply | 4 | ||||
| -rw-r--r-- | patches/dev300/office-cfg-linux-common-template-dir.diff | 41 |
2 files changed, 0 insertions, 45 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index d2c575dd5..37ab88656 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -334,10 +334,6 @@ calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei # it is most likely solved in the plain code another way # fpicker-kde-gcc4-visibility.diff, pmladek -# search <ooo-home>/share/template/common for language independent templates -# will not push it upstream because it will be replaced by upcomming kendy's work -office-cfg-linux-common-template-dir.diff, pmladek - system-python-ure-bootstrap.diff, deb#501028, i#90701 pyuno-ooodir.diff, i#90701 system-python-uno-path.diff, i#97629 diff --git a/patches/dev300/office-cfg-linux-common-template-dir.diff b/patches/dev300/office-cfg-linux-common-template-dir.diff deleted file mode 100644 index 34cf86b92..000000000 --- a/patches/dev300/office-cfg-linux-common-template-dir.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- - .../registry/data/org/openoffice/Office/Common.xcu | 2 ++ - .../schema/org/openoffice/Office/Common.xcs | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git officecfg/registry/data/org/openoffice/Office/Common.xcu officecfg/registry/data/org/openoffice/Office/Common.xcu -index bb3c779..642d227 100644 ---- officecfg/registry/data/org/openoffice/Office/Common.xcu -+++ officecfg/registry/data/org/openoffice/Office/Common.xcu -@@ -705,4 +705,6 @@ - "com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/> - </prop> - </node> -+ <!-- FIXME: This comment is needed to change a checksum or so. -+ Then the updated list of templates paths is read from Common.xcs--> - </oor:component-data> -diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs -index 74c65d3..4e43df8 100644 ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -1689,7 +1689,7 @@ - <author>MBA</author> - <desc>Specifies the templates originate from these folders and sub-folders.</desc> - </info> -- <value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value> -+ <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value> - </prop> - <prop oor:name="UIConfig" oor:type="oor:string-list"> - <info> -@@ -1837,8 +1837,7 @@ - <info> - <desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc> - </info> -- <value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value> -+ <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value> - </prop> - <prop oor:name="UIConfig" oor:type="oor:string-list"> - <info> --- -1.7.0.1 - |