diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:01:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:01:12 +0000 |
commit | c07ddc36e7161b712a11ada3bc2359934c4342fc (patch) | |
tree | 79b6835b70b902316068b80ca1eab4cfc5a21cc8 /framework/source | |
parent | 093e884f43878719fde21044259f6454f3ae37c6 (diff) |
INTEGRATION: CWS xmlfix2 (1.5.318); FILE MERGED
2008/05/15 17:20:37 mst 1.5.318.2: RESYNC: (1.5-1.6); FILE MERGED
2008/03/31 15:32:49 mst 1.5.318.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
Diffstat (limited to 'framework/source')
-rw-r--r-- | framework/source/xml/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk index e5fcab33a828..2d610ca0f3d9 100644 --- a/framework/source/xml/makefile.mk +++ b/framework/source/xml/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Generate ----------------------------------------------------- -SLOFILES= $(SLO)$/attributelist.obj \ +SLOFILES= \ $(SLO)$/eventsconfiguration.obj \ $(SLO)$/eventsdocumenthandler.obj \ $(SLO)$/imagesconfiguration.obj \ |