• Armin Le Grand's avatar
    Resolves: #i121407# Gallery reorganizations... · fb6f2e11
    Armin Le Grand yazdı
    and additions of new themes
    
    (cherry picked from commit 8ccf0e00)
    
    Conflicts:
    	extras/prj/build.lst
    	extras/source/gallery/bullets/makefile.mk
    	extras/source/gallery/gallery_system/sg2.sdg
    	extras/source/gallery/gallery_system/sg2.sdv
    	extras/source/gallery/gallery_system/sg2.thm
    	extras/util/target.pmk
    	scp2/source/ooo/directory_ooo.scp
    	scp2/source/ooo/file_extra_ooo.scp
    	svx/inc/galtheme.hrc
    	svx/source/gallery2/gallery1.cxx
    	svx/source/gallery2/galobj.cxx
    	svx/source/gallery2/galtheme.src
    	vcl/inc/vcl/alpha.hxx
    	vcl/inc/vcl/bitmap.hxx
    	vcl/inc/vcl/bitmapex.hxx
    	vcl/source/gdi/alpha.cxx
    	vcl/source/gdi/bitmap.cxx
    	vcl/source/gdi/bitmap3.cxx
    	vcl/source/gdi/bitmapex.cxx
    
    (cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)
    
    Conflicts:
    	vcl/source/gdi/bitmap3.cxx
    
    Change-Id: If4b2397b889f914487f2135679250c175181e1df
    fb6f2e11
bitmapex.hxx 14.2 KB