Age | Commit message (Collapse) | Author |
|
(cherry picked from commit bea9a9501814bdbc342a2adfa57019704260a532)
Conflicts:
extras/source/gallery/gallery_system/sg10.sdg
extras/source/gallery/gallery_system/sg10.thm
extras/source/gallery/gallery_system/sg12.sdg
extras/source/gallery/gallery_system/sg12.sdv
extras/source/gallery/gallery_system/sg12.thm
extras/source/gallery/gallery_system/sg16.sdv
extras/source/gallery/gallery_system/sg17.sdg
extras/source/gallery/gallery_system/sg17.thm
extras/source/gallery/gallery_system/sg19.sdg
extras/source/gallery/gallery_system/sg19.sdv
extras/source/gallery/gallery_system/sg19.thm
extras/source/gallery/gallery_system/sg2.sdv
Change-Id: I4c2e34c470b05ddae5923e782c31d15aa4961e0d
|
|
Change-Id: I9037aa31cbb93d38a656ce463e0a73f8b39245ff
|
|
Change-Id: Ib7dffdb36d09d458e3c6089d1d0a16cd5ee63afd
|
|
Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085
|
|
Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d
|
|
Further gnumake fixups, package the files in the Gallery rules.
Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
|
|
Change-Id: Idec88df28724bcf4b3145bb169fa0fe08a8e282a
|
|
Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b
|
|
Change-Id: I9ec5192c007df6d0ce15f5e61cb53cf6ea04db08
|
|
Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611
|
|
Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15
|
|
because libreoffice inserted a bunch of extra resources since fork point.
We should get rid of these ids entirely and e.g. at least instead use the
filename number as the the id instead which would be a little less painful.
Change-Id: I5d0a3b5e60dbe448164bdff25d46171a1ed4d55e
(cherry picked from commit 8e9bcdb73adf7b544299bb57fcce5423b43cc058)
|
|
(cherry picked from commit cf417aec41decab94b5f1e82f6409e97a6c02fb5)
Conflicts:
extras/source/gallery/gallery_system/sg2.sdg
extras/source/gallery/gallery_system/sg2.thm
svx/inc/galtheme.hrc
svx/inc/svx/fontworkgallery.hxx
svx/inc/svx/gallery.hxx
svx/inc/svx/galtheme.hxx
svx/source/gallery2/galctrl.cxx
svx/source/gallery2/galexpl.cxx
svx/source/gallery2/galobj.cxx
svx/source/tbxctrls/fontworkgallery.cxx
vcl/inc/vcl/outdev.hxx
vcl/source/gdi/outdev6.cxx
Change-Id: I519a2cf4e16bb42ecfd9c4b48094e65adcc35599
(cherry picked from commit ddec662e8dc234b7196c1b3c28db5da743557ec6)
|
|
because I need to get the following patch to apply :-(
This reverts commit 2056f718b5f000bdddeb68cc17592497f6baea1a.
Change-Id: I3b005725a826d0339a6d1bb8d211959cd03c7d6e
(cherry picked from commit 58a2d079400d6a6170b512b7fa387a7152849463)
|
|
and additions of new themes
(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)
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
|
|
(cherry picked from commit fee688fd96329f628f83623ea91c32e10eeb134b)
Conflicts:
svx/inc/svx/gallery.hxx
Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
Reviewed-on: https://gerrit.libreoffice.org/3507
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
|
|
Change-Id: Ifafd8b2ffd9af90b6ac4ed2ee0ccd3c5e980731c
Conflicts:
sw/source/ui/misc/insrule.cxx
|
|
Change-Id: I190b1314a91026dcfc39df3e3e178df55d14d90a
|
|
reportbuilder, license file not needed.
Patch contributed by Armin Le Grand
http://svn.apache.org/viewvc?view=revision&revision=1305814
Adapting extras/ to our wordbook setup.
|
|
|
|
* commit 'ooo/DEV300_m101':
impressdefaults1: #i113015# #i113017# new defaults for shape filling, outline and shadows
impress202: #i35600# fixed some shape outlines (flower shape)
impress202: #i35600# fixed heart + puzzle shape..
Conflicts:
extras/source/palettes/standard.soc
|
|
|
|
Introduces:
--enable-extra-gallery - for additional galleries
--enable-extra-template - for additional templates
--enable-extra-sample - for additional samples
--enable-extra-font - for additional fonts
configure options.
|
|
|
|
|
|
|
|
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
|
|
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
|
|
2008/03/28 15:28:39 rt 1.2.106.1: #i87441# Change license header to LPGL v3.
|
|
2008/03/28 15:28:38 rt 1.2.106.1: #i87441# Change license header to LPGL v3.
|
|
2008/03/28 15:28:37 rt 1.2.106.1: #i87441# Change license header to LPGL v3.
|
|
2008/03/28 15:28:36 rt 1.2.106.1: #i87441# Change license header to LPGL v3.
|
|
2008/01/31 16:41:47 sj 1.8.74.1: #i85678# added geometry for the circle object
|
|
2008/01/31 16:41:47 sj 1.11.74.1: #i85678# added geometry for the circle object
|
|
2008/01/31 16:41:47 sj 1.9.74.1: #i85678# added geometry for the circle object
|
|
2006/02/17 12:53:21 sj 1.5.88.1: #i39006# adding more defaults to Fontwork gallery
|
|
2006/02/17 12:53:18 sj 1.5.88.1: #i39006# adding more defaults to Fontwork gallery
|
|
2006/02/17 12:53:20 sj 1.5.88.1: #i39006# adding more defaults to Fontwork gallery
|
|
2005/09/05 14:10:09 rt 1.1.1.1.272.1: #i54170# Change license header: remove SISSL
|
|
2005/09/05 14:10:08 rt 1.1.1.1.272.1: #i54170# Change license header: remove SISSL
|
|
2005/09/05 14:10:07 rt 1.1.1.1.272.1: #i54170# Change license header: remove SISSL
|
|
2005/09/05 14:10:06 rt 1.1.1.1.272.1: #i54170# Change license header: remove SISSL
|
|
2005/06/29 09:08:04 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:08:03 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:08:02 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:08:01 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:08:00 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:07:59 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:07:58 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|
|
2005/06/29 09:07:57 va 1.1.1.1.260.1: #49903# Re-saved files due to lost header information.
|