diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
commit | aabc69e75dcde2bebc84df9242e86328de7fefd5 (patch) | |
tree | 3400a6d8c98f295be3c3bf29f70fda5b8b876d0f /framework/inc/acceleratorconst.h | |
parent | b7dc581d7ce45f9c692d942686ad0dd9ab701d90 (diff) | |
parent | 344e390b9d114b3cbdd9d1b39ea44e5cdf875788 (diff) |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'framework/inc/acceleratorconst.h')
-rw-r--r-- | framework/inc/acceleratorconst.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index de1066202576..f17f8c1e1cbb 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: acceleratorconst.h,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -48,10 +45,6 @@ namespace framework{ #define ATTRIBUTE_TYPE_CDATA DECLARE_ASCII("CDATA") -// items without any namespace value! -#define ELEMENT_ACCELERATORLIS DECLARE_ASCII("acceleratorlist") -#define ELEMENT_ITEM DECLARE_ASCII("item" ) - #define XMLNS_ACCEL DECLARE_ASCII("accel") #define XMLNS_XLINK DECLARE_ASCII("xlink") @@ -90,10 +83,6 @@ namespace framework{ #define NS_ATTRIBUTE_MOD_MOD2 DECLARE_ASCII("http://openoffice.org/2001/accel^mod2" ) #define NS_ATTRIBUTE_MOD_MOD3 DECLARE_ASCII("http://openoffice.org/2001/accel^mod3" ) -// some storage related values (pathes, names of sub storages etcpp). -#define PRESET_DEFAULT_XML DECLARE_ASCII("default.xml") -#define PRESET_CURRENT_XML DECLARE_ASCII("current.xml") - } // namespace framework #endif // _FRAMEWORK_ACCELERATORCONST_H_ |