renaissance1: resolved merge conflicts, cleanup.

65 files changed, 0 insertions, 0 deletions

diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx
index e8b658ebe1d3..e8b658ebe1d3 100644..100755
--- a/sd/inc/CustomAnimationCloner.hxx
+++ b/sd/inc/CustomAnimationCloner.hxx
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 0ad2e855261e..0ad2e855261e 100644..100755
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index fb605f5415d8..fb605f5415d8 100644..100755
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index eb173f495de2..eb173f495de2 100644..100755
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx
index 66477a1faf67..66477a1faf67 100644..100755
--- a/sd/inc/FactoryIds.hxx
+++ b/sd/inc/FactoryIds.hxx
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index dfc7e3e3bf88..dfc7e3e3bf88 100644..100755
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 92301f06289c..92301f06289c 100644..100755
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index c582be79abfe..c582be79abfe 100644..100755
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 7cee414710b6..7cee414710b6 100644..100755
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx
index a0f5008e4dad..a0f5008e4dad 100644..100755
--- a/sd/inc/animations.hxx
+++ b/sd/inc/animations.hxx
diff --git a/sd/inc/anmdef.hxx b/sd/inc/anmdef.hxx
index 530fd4c4c146..530fd4c4c146 100644..100755
--- a/sd/inc/anmdef.hxx
+++ b/sd/inc/anmdef.hxx
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 5788e0f32ce5..5788e0f32ce5 100644..100755
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 65aec562f084..65aec562f084 100644..100755
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
diff --git a/sd/inc/app.hxx b/sd/inc/app.hxx
index d3bb871f7a29..d3bb871f7a29 100644..100755
--- a/sd/inc/app.hxx
+++ b/sd/inc/app.hxx
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index e2aae99cf673..e2aae99cf673 100644..100755
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h
index 9c128e48f3cf..9c128e48f3cf 100644..100755
--- a/sd/inc/diadef.h
+++ b/sd/inc/diadef.h
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 7cdee6a4efa5..7cdee6a4efa5 100644..100755
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
diff --git a/sd/inc/eetext.hxx b/sd/inc/eetext.hxx
index 1bae1de6c1e9..1bae1de6c1e9 100644..100755
--- a/sd/inc/eetext.hxx
+++ b/sd/inc/eetext.hxx
diff --git a/sd/inc/fadedef.h b/sd/inc/fadedef.h
index 9a9fdf709344..9a9fdf709344 100644..100755
--- a/sd/inc/fadedef.h
+++ b/sd/inc/fadedef.h
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 89b2b670adf9..89b2b670adf9 100644..100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 278aef490fdb..278aef490fdb 100644..100755
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 115457286663..115457286663 100644..100755
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index b693ebe6fd2c..b693ebe6fd2c 100644..100755
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx
index f5c8e916fd4d..f5c8e916fd4d 100644..100755
--- a/sd/inc/imapinfo.hxx
+++ b/sd/inc/imapinfo.hxx
diff --git a/sd/inc/makefile.mk b/sd/inc/makefile.mk
index 1101f31d8025..1101f31d8025 100644..100755
--- a/sd/inc/makefile.mk
+++ b/sd/inc/makefile.mk
diff --git a/sd/inc/misc.hxx b/sd/inc/misc.hxx
index ca8592723e90..ca8592723e90 100644..100755
--- a/sd/inc/misc.hxx
+++ b/sd/inc/misc.hxx
diff --git a/sd/inc/misc/scopelock.hxx b/sd/inc/misc/scopelock.hxx
index 93773b1211fd..93773b1211fd 100644..100755
--- a/sd/inc/misc/scopelock.hxx
+++ b/sd/inc/misc/scopelock.hxx
diff --git a/sd/inc/movedef.hxx b/sd/inc/movedef.hxx
index 895e0390d07c..895e0390d07c 100644..100755
--- a/sd/inc/movedef.hxx
+++ b/sd/inc/movedef.hxx
diff --git a/sd/inc/pch/precompiled_sd.cxx b/sd/inc/pch/precompiled_sd.cxx
index d90ffd20fe98..d90ffd20fe98 100644..100755
--- a/sd/inc/pch/precompiled_sd.cxx
+++ b/sd/inc/pch/precompiled_sd.cxx
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 7e92020eb88f..7e92020eb88f 100644..100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx
index 8f8eff565d42..8f8eff565d42 100644..100755
--- a/sd/inc/pglink.hxx
+++ b/sd/inc/pglink.hxx
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index a51083133185..a51083133185 100644..100755
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx
index 87bce53b1c8c..87bce53b1c8c 100644..100755
--- a/sd/inc/prlayout.hxx
+++ b/sd/inc/prlayout.hxx
diff --git a/sd/inc/resltn.hxx b/sd/inc/resltn.hxx
index bfd04a864175..bfd04a864175 100644..100755
--- a/sd/inc/resltn.hxx
+++ b/sd/inc/resltn.hxx
diff --git a/sd/inc/sd_primitivetypes2d.hxx b/sd/inc/sd_primitivetypes2d.hxx
index fab81717c5c5..fab81717c5c5 100644..100755
--- a/sd/inc/sd_primitivetypes2d.hxx
+++ b/sd/inc/sd_primitivetypes2d.hxx
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index f265314fa6e9..f265314fa6e9 100644..100755
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 29ef8f128248..29ef8f128248 100644..100755
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 85e231f0a357..85e231f0a357 100644..100755
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index f6f2c633ae64..f6f2c633ae64 100644..100755
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 20d09179553e..20d09179553e 100644..100755
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h
index b6c3a4be17e9..b6c3a4be17e9 100644..100755
--- a/sd/inc/sddllapi.h
+++ b/sd/inc/sddllapi.h
diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx
index edabe4d6df18..edabe4d6df18 100644..100755
--- a/sd/inc/sdenumdef.hxx
+++ b/sd/inc/sdenumdef.hxx
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index 2564584cb3eb..2564584cb3eb 100644..100755
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index ad32cd3466ea..ad32cd3466ea 100644..100755
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 7d4ef3ab9a3b..7d4ef3ab9a3b 100644..100755
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 9b1a11d839a3..9b1a11d839a3 100644..100755
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index d2724b99ec75..d2724b99ec75 100644..100755
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index f0d5cc64a3c4..f0d5cc64a3c4 100644..100755
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx
index b533fe8844de..b533fe8844de 100644..100755
--- a/sd/inc/sdobjfac.hxx
+++ b/sd/inc/sdobjfac.hxx
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index e4125051c526..e4125051c526 100644..100755
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index f9dde9946f2c..f9dde9946f2c 100644..100755
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx
index db41ccdb689c..db41ccdb689c 100644..100755
--- a/sd/inc/sdresid.hxx
+++ b/sd/inc/sdresid.hxx
diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc
index 6904cc2999d1..6904cc2999d1 100644..100755
--- a/sd/inc/sduiks.hrc
+++ b/sd/inc/sduiks.hrc
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 60045b701d57..60045b701d57 100644..100755
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index 00532c1a142d..00532c1a142d 100644..100755
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index 1b87a6a9e10f..1b87a6a9e10f 100644..100755
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index ecb3f6996a28..ecb3f6996a28 100644..100755
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index fd9dbeae5977..fd9dbeae5977 100644..100755
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 138b06ae077d..138b06ae077d 100644..100755
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 0d4823aeffce..0d4823aeffce 100644..100755
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 6fa186596fba..6fa186596fba 100644..100755
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx
index 64f57b67cabd..64f57b67cabd 100644..100755
--- a/sd/inc/undo/undofactory.hxx
+++ b/sd/inc/undo/undofactory.hxx
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index b2e40c1e7442..b2e40c1e7442 100644..100755
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 78c922d8414e..78c922d8414e 100644..100755
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 0d36a9ec01c9..0d36a9ec01c9 100644..100755
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx