Commit graph

1387 commits

Author SHA1 Message Date
David Tardon
ca648de248 gbuildize slideshow 2011-04-21 20:56:05 +02:00
Caolán McNamara
745469225d fix catastrophic merge to restore video playback 2011-04-01 12:00:12 +01:00
Fridrich Štrba
ab5c7e87cf Wholesale prewin.h/postwin.h removal 2011-03-25 18:50:27 +01:00
Jan Holesovsky
219458b0d7 Merge commit 'ooo/DEV300_m103'
Conflicts:
	sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
	slideshow/source/engine/debug.cxx
	slideshow/source/engine/transitions/randomwipe.cxx
2011-03-23 16:59:19 +01:00
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
Frank Schoenheit [fs]
c0e0f396a6 debuglevels: pulled and merged DEV300.m102 2011-03-14 09:47:56 +01:00
Norbert Thiebaud
d2b23dfdfc mis-merge clean-up tools types 2011-03-12 19:01:54 -06:00
Bjoern Michaelsen
c61cd1a5a2 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
Thomas Arnhold
c64a901829 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:13:33 +01:00
Ivo Hinkelmann
d8e5890399 CWS-TOOLING: integrate CWS mhu21 2011-03-02 12:10:39 +01:00
Ivo Hinkelmann
973d2ca14b CWS-TOOLING: integrate CWS impress195 2011-02-28 17:12:48 +01:00
Matthias Huetsch [mhu]
8584fcb61f Update from master repository (DEV300_m100). 2011-02-23 21:03:15 +01:00
Frank Schoenheit [fs]
fbaf896913 debuglevels: pulled and merged DEV300.m100 2011-02-14 23:26:54 +01:00
Caolán McNamara
0f12f8b23b add mode lines to new files 2011-02-14 09:28:38 +00:00
Julien Nabet
20a76c9e43 Some cppcheck cleaning 2011-02-10 14:13:16 +01:00
Fridrich Štrba
66daafdad2 Trying to remove the stlport mention from the code 2011-02-09 19:57:04 +01:00
Tor Lillqvist
05d144942d prewin.h already includes <windows.h> 2011-02-09 00:55:31 +02:00
Guillaume Poussel
cd4a86b717 Remove all bogus comments in impress. 2011-02-08 19:09:12 +01:00
Fridrich Štrba
c71de19e96 Port stuff to our private implementation of SGI extensions 2011-02-08 17:41:39 +01:00
Tor Lillqvist
28f55d0d5e Adapt to move of prewin.h and postwin.h 2011-02-08 14:00:38 +02:00
Thomas Arnhold
b643cc47ad Remove unused header 2011-02-07 16:03:28 +01:00
Fridrich Štrba
8851524e49 Migrating to boost unordered containers 2011-02-05 21:40:28 +01:00
Thomas Arnhold
6a20e92507 Remove RCS lines. 2011-01-31 19:01:32 +01:00
Thomas Arnhold
510d903016 cppcheck: remove unused variable lt. 2011-01-28 22:26:23 +01:00
Thomas Arnhold
61a81b5c12 Remove double line spacing. 2011-01-28 19:21:45 +01:00
Matthias Huetsch [mhu]
cff21146b0 Update from master repository (DEV300_m98). 2011-01-27 18:16:28 +01:00
Thomas Arnhold
fd56171a1d Remove obsolete RCS lines. 2011-01-21 20:49:26 +01:00
Carsten Driesner
6e9afe9627 removetooltypes01: Rebase to DEV300m98 2011-01-21 17:18:37 +01:00
Thomas Arnhold
37806a5199 Remove old RCS lines. 2011-01-21 14:49:25 +01:00
Thomas Arnhold
5cffde5b2d Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
2011-01-20 10:34:08 +01:00
Mikhail Voytenko
a4babcc4a0 removetooltypes01: #i112600# fix TRUE/FALSE autodoc tags 2011-01-14 11:20:36 +01:00
Mikhail Voytenko
ec8fbbb741 removetooltypes01: #i112600# remove tooltypes from slideshow and forms 2011-01-13 16:49:46 +01:00
Radek Doulik
07e5911774 fix shapes rendering order n#656934
- it was broken for master pages containing group shapes
2011-01-05 22:43:00 +01:00
Vladimir Glazunov
faf2e7ab96 CWS-TOOLING: integrate CWS impressdefaults1 2011-01-05 13:23:59 +01:00
Rene Engelhard
2cb30ad248 remove methods added by (apparently bogus) merge 2011-01-02 14:09:11 +01:00
Rene Engelhard
0d23563871 Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	slideshow/source/engine/color.cxx
2011-01-02 01:06:39 +01:00
Caolán McNamara
c5fccf60b7 cppcheck: prefer prefix variant 2010-12-24 13:34:58 +00:00
Caolán McNamara
6c06950efb add this conditional 2010-12-22 16:07:20 +00:00
Jan Holesovsky
8dda77692a Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/impress 2010-12-20 13:13:55 +01:00
Thorsten Behrens
bd9fb52d61 Remove extraneous copy ctor and assignment op 2010-12-20 10:57:43 +00:00
Caolán McNamara
24ee7af7b3 Resoves: rhbz#663857 font color missing; C++ FAQ 10.3 doomage
(cherry picked from commit 963c6b655032b4e5d0f26555f3c26a129a9efb03)
2010-12-20 10:52:36 +00:00
Jan Holesovsky
ad11d85818 Merge commit 'libreoffice-3.3.0.2' 2010-12-20 01:17:18 +01:00
Caolán McNamara
4f3f5e15f7 Resoves: rhbz#663857 font color missing; C++ FAQ 10.3 doomage 2010-12-18 18:26:18 +00:00
Caolán McNamara
36643c593c WaE: init variable 2010-12-18 14:16:44 +00:00
Hans-Joachim Lankenau
0bafb5a5e8 CWS-TOOLING: integrate CWS sb131 2010-12-17 16:18:53 +01:00
Christian Lippka ORACLE
977fa1655c impress206: #i115898# take into account new presentation shapes(cherry picked from commit c8c648474da56e2ecdbdcc11c269366716fe88c9) 2010-12-15 10:02:48 +01:00
Julien Nabet
6d7760eb3e RTL_CONSTASCII_USTRINGPARAM slideshow test 2010-12-15 07:47:09 +01:00
Hans-Joachim Lankenau
4da6458188 merge OOO330 2010-12-14 15:42:18 +01:00
Kohei Yoshida
74b49ef3af Accidental commit? We don't wanna comment these out for no reason. 2010-12-12 14:18:33 -05:00
Gert Faller
c3773ef054 cleaning of __EXPORT define 2010-12-11 19:19:18 +01:00