diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-29 11:08:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-29 11:08:37 +0000 |
| commit | ba39158076e2174e08f36249154f036311045d4a (patch) | |
| tree | be571941a7ee5680204cba3ab452ba85b91de0b9 /svtools/source/misc | |
| parent | 4715ec0209de59515894919baf7dd78e8f94b0f5 (diff) | |
#i10000# merge problem solved
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index adfede6dc5c9..7206e77c84ae 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imagemgr.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: hr $ $Date: 2004-11-26 22:08:19 $ + * last change: $Author: obo $ $Date: 2004-11-29 12:08:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -320,13 +320,13 @@ struct SvtFactory2ExtensionMapping_Impl static SvtFactory2ExtensionMapping_Impl __READONLY_DATA Fac2ExtMap_Impl[] = { - { "swriter", "oot" }, + { "swriter", "odt" }, { "swriter/web", "html" }, - { "swriter/GlobalDocument", "oom" }, - { "scalc", "oos" }, - { "simpress", "oop" }, - { "sdraw", "ood" }, - { "smath", "oof" }, + { "swriter/GlobalDocument", "odm" }, + { "scalc", "ods" }, + { "simpress", "odp" }, + { "sdraw", "odg" }, + { "smath", "odf" }, { NULL, NULL } }; |