strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/sd/inc
History
Jan Holesovsky a0c13ffcce Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	sd/source/ui/func/fuinsfil.cxx
	sd/source/ui/func/fuprobjs.cxx
	sd/source/ui/slideshow/slideshowimpl.cxx
	sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/view/drawview.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/outlview.cxx
2011-03-18 15:40:35 +01:00
..
helper add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
misc add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
pch Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
undo Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
animations.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
anmdef.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
anminfo.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
app.hrc Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
app.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
cusshow.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
CustomAnimationCloner.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
CustomAnimationEffect.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
CustomAnimationPreset.hxx Migrating to boost unordered containers 2011-02-05 21:40:28 +01:00
diadef.h add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
drawdoc.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
eetext.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
EffectMigration.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
FactoryIds.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
fadedef.h add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
glob.hrc renaissance1: merge with DEV300_m84 2010-07-01 18:06:39 +02:00
glob.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
helpids.h Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
imapinfo.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
makefile.mk fixed unix warnings 2010-04-13 12:10:03 +02:00
movedef.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
Outliner.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
OutlinerIterator.hxx removetooltypes01: #i112600# Fix problems with autodoc TRUE/FALSE 2011-01-17 13:26:54 +01:00
pglink.hxx remove SVX_LIGHT macro 2011-03-09 16:08:38 +00:00
pres.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
prlayout.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
resltn.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sd_primitivetypes2d.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdabstdlg.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdattr.hrc fixed unix warnings 2010-04-13 12:10:03 +02:00
sdattr.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdcgmfilter.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdcommands.h fix mis-merge... qa disabled 2011-03-13 06:22:49 -05:00
sddll.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sddllapi.h add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdenumdef.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sderror.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdfilter.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdgrffilter.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdhtmlfilter.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdiocmpt.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdmod.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdobjfac.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdpage.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
sdpptwrp.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdresid.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
SdShapeTypes.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sduiks.hrc fixed unix warnings 2010-04-13 12:10:03 +02:00
sdundo.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
sdxmlwrp.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
shapelist.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
stlfamily.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
stlpool.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
stlsheet.hxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
strmname.h add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
textapi.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
TransitionPreset.hxx Migrating to boost unordered containers 2011-02-05 21:40:28 +01:00
undoanim.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00