diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 13:02:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 13:02:22 +0000 |
| commit | 2e999a1dd2c31a69e9fdd4ba8304ef44c64bd863 (patch) | |
| tree | e9646be5e3b7ebce3903c9e50e164334d967d35b /configmgr | |
| parent | 2f7a88d89cdbad31f8ce2a7d6b3d72adb96b3b1c (diff) | |
INTEGRATION: CWS sb50 (1.7.36); FILE MERGED
2006/04/05 13:56:40 sb 1.7.36.1: #i63706# Implemented oor:op=fuse.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xml/xmlstrings.cxx | 5 | ||||
| -rw-r--r-- | configmgr/source/xml/xmlstrings.hxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configmgr/source/xml/xmlstrings.cxx b/configmgr/source/xml/xmlstrings.cxx index 57998dc66a4b..8d9bed131952 100644 --- a/configmgr/source/xml/xmlstrings.cxx +++ b/configmgr/source/xml/xmlstrings.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlstrings.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:43:58 $ + * last change: $Author: hr $ $Date: 2006-04-19 14:02:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,6 +126,7 @@ namespace configmgr // States for update actions IMPLEMENT_CONSTASCII_USTRING(OPERATION_MODIFY, "modify"); IMPLEMENT_CONSTASCII_USTRING(OPERATION_REPLACE, "replace"); + IMPLEMENT_CONSTASCII_USTRING(OPERATION_FUSE, "fuse"); IMPLEMENT_CONSTASCII_USTRING(OPERATION_REMOVE, "remove"); // the default separator for strings diff --git a/configmgr/source/xml/xmlstrings.hxx b/configmgr/source/xml/xmlstrings.hxx index 0d361fb2f467..ac772a60d428 100644 --- a/configmgr/source/xml/xmlstrings.hxx +++ b/configmgr/source/xml/xmlstrings.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlstrings.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:44:13 $ + * last change: $Author: hr $ $Date: 2006-04-19 14:02:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -125,6 +125,7 @@ namespace configmgr // States for update actions DECLARE_CONSTASCII_USTRING(OPERATION_MODIFY); DECLARE_CONSTASCII_USTRING(OPERATION_REPLACE); + DECLARE_CONSTASCII_USTRING(OPERATION_FUSE); DECLARE_CONSTASCII_USTRING(OPERATION_REMOVE); // the default separator for strings |