diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:02:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:02:56 +0000 |
| commit | 46244b2a6ccb09a167637a7b15f8e16b4853bf8d (patch) | |
| tree | b3aa43c595b5df654b19eba0c8d819cbaca0c6bd /framework/util | |
| parent | 3d556b4fac439e3725c484eba1eb1bf993ae548c (diff) | |
INTEGRATION: CWS xmlfix2 (1.119.18); FILE MERGED
2008/05/15 17:21:11 mst 1.119.18.2: RESYNC: (1.119-1.121); FILE MERGED
2008/03/31 15:32:49 mst 1.119.18.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/util')
| -rw-r--r-- | framework/util/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 9507e049c991..3867ef0bf305 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.122 $ +# $Revision: 1.123 $ # # This file is part of OpenOffice.org. # @@ -68,7 +68,7 @@ LIB1OBJFILES= \ LIB2TARGET= $(SLB)$/fweobj.lib -LIB2OBJFILES= $(SLO)$/attributelist.obj \ +LIB2OBJFILES= \ $(SLO)$/bmkmenu.obj \ $(SLO)$/eventsconfiguration.obj \ $(SLO)$/eventsdocumenthandler.obj \ |