diff options
| author | Release Engineers <releng@openoffice.org> | 2009-05-07 06:54:56 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-05-07 06:54:56 +0000 |
| commit | 37d5ad712d71a33b8dfbeec706bdd2dec9ac2bea (patch) | |
| tree | 361f9eea01018c04e81ce32a9881e82e550240a2 /filter/source/config/tools/merge | |
| parent | 107eb5cd7cea9dd9d3ebf0f79fbd81dcd493e0d5 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes58
2009-05-04 13:51:10 +0200 cmc r271450 : #i101533# latest sw warnings
2009-05-04 00:02:46 +0200 cmc r271436 : #i101517# silence new warnings
2009-05-03 23:13:53 +0200 cmc r271435 : #i101305# add that one back in
2009-05-02 16:30:42 +0200 cmc r271431 : #i101493# get it to build, and remove some warnings
2009-05-02 16:12:37 +0200 cmc r271430 : CWS-TOOLING: rebase CWS cmcfixes58 to trunk@271427 (milestone: DEV300:m47)
2009-04-23 13:19:33 +0200 cmc r271163 : #i101305# remove annoying import foo is unused warnings
2009-04-21 17:10:34 +0200 cmc r271048 : #i101246# remove AVMEDIA_MANAGER_SERVICE_NAME defines again
2009-04-21 17:07:41 +0200 cmc r271047 : #i86323# remove xml2cmp unused methods
Diffstat (limited to 'filter/source/config/tools/merge')
| -rw-r--r-- | filter/source/config/tools/merge/FCFGMerge.java | 3 | ||||
| -rw-r--r-- | filter/source/config/tools/merge/Merger.java | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/filter/source/config/tools/merge/FCFGMerge.java b/filter/source/config/tools/merge/FCFGMerge.java index 7fbfa8a0c986..1b37bab0e89a 100644 --- a/filter/source/config/tools/merge/FCFGMerge.java +++ b/filter/source/config/tools/merge/FCFGMerge.java @@ -32,9 +32,6 @@ package com.sun.star.filter.config.tools.merge; //_______________________________________________ -import java.lang.*; -import java.util.*; -import java.io.*; import com.sun.star.filter.config.tools.utils.*; //_______________________________________________ diff --git a/filter/source/config/tools/merge/Merger.java b/filter/source/config/tools/merge/Merger.java index 0bf11fc42fbf..34e27a3835da 100644 --- a/filter/source/config/tools/merge/Merger.java +++ b/filter/source/config/tools/merge/Merger.java @@ -31,8 +31,6 @@ package com.sun.star.filter.config.tools.merge; //_______________________________________________ -import java.lang.*; -import java.util.*; import java.io.*; import com.sun.star.filter.config.tools.utils.*; |