mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
327,038 Commits 1 Branch 0 Tags
a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Meeks
837e2808f7 re-base on ALv2 code. Includes: 
Patches contributed by Armin Le-Grand
    #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles...
    http://svn.apache.org/viewvc?view=revision&revision=1293316
    #118485# - Styles for OLEs are not saved.
    http://svn.apache.org/viewvc?view=revision&revision=1182166

    Patches contributed by Andre Fischer
    http://svn.apache.org/viewvc?view=revision&revision=1172128
    http://svn.apache.org/viewvc?view=revision&revision=1172133

    Patch contributed by Ariel Constenla-Haile
    i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress
    contextmenu  - CWS contextmenu1
    http://svn.apache.org/viewvc?view=revision&revision=1182915

    Patch contributed by Zhang Jian Fang
    #118876#, Add check if the OutlinerParaObject is created successfully
    http://svn.apache.org/viewvc?view=revision&revision=1243381

restore a re-based rdbedit.
 2012-11-28 12:48:36 +00:00
Philipp Lohmann [pl]
5c3614639c impress211: fix a warning 2012-11-28 12:48:33 +00:00
Andre Fische
cbb599f657 impress211: #i88880# Fixed dragging of slides from navigator to slide sorter. 
Conflicts:
	sd/source/ui/app/sdxfer.cxx
	sd/source/ui/dlg/sdtreelb.cxx
	sd/source/ui/slidesorter/controller/SlsClipboard.cxx
	sd/source/ui/slidesorter/controller/makefile.mk
	sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
 2012-11-28 12:48:32 +00:00