diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-06 11:02:40 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-06 11:02:40 +0000 |
commit | d65c370e9f7d7ebadfce0e9ac5c6bd86a98645d2 (patch) | |
tree | 6381d19cf8fe90cfeb12a0fa4f1ab3ff52fb1c19 | |
parent | 962e393c30bdbb7c0240856688855dc4cbf469a2 (diff) |
INTEGRATION: CWS xmlfix2 (1.5.260); FILE MERGED
2008/05/15 17:21:07 mst 1.5.260.2: RESYNC: (1.5-1.6); FILE MERGED
2008/03/31 15:32:49 mst 1.5.260.1: remove duplicated XAttributeList implementations
- framework/inc/services/attributelist.hxx,
framework/source/services/attributelist.cxx,
framework/inc/xml/attributelist.hxx,
framework/source/xml/attributelist.cxx:
+ removed
- framework/source/xml/makefile.mk, framework/util/makefile.mk:
+ remove attributelist.cxx
- framework/source/xml/{acceleratorconfigurationwriter.cxx,
eventsdocumenthandler.cxx,imagesdocumenthandler.cxx,
menudocumenthandler.cxx,saxnamespacefilter.cxx,
statusbardocumenthandler.cxx,toolboxdocumenthandler.cxx,
toolboxlayoutdocumenthandler.cxx}
+ use comphelper/attributelist.hxx
-rw-r--r-- | framework/source/xml/toolboxlayoutdocumenthandler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/source/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/xml/toolboxlayoutdocumenthandler.cxx index d43d6becfe..cbc5a35964 100644 --- a/framework/source/xml/toolboxlayoutdocumenthandler.cxx +++ b/framework/source/xml/toolboxlayoutdocumenthandler.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: toolboxlayoutdocumenthandler.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -40,7 +40,6 @@ #include <threadhelp/resetableguard.hxx> #include <xml/toolboxlayoutdocumenthandler.hxx> #include <macros/debug.hxx> -#include <xml/attributelist.hxx> #include <xml/toolboxconfigurationdefines.hxx> //_________________________________________________________________________________________________________________ |