summaryrefslogtreecommitdiff
path: root/desktop/win32/source/setup/setup_main.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:13:28 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:13:28 +0200
commita8c197ef9bab44a8cc8c79de5d646e6e603e4e42 (patch)
treebf1a2eed724d4449edbc6187df1b91959d213080 /desktop/win32/source/setup/setup_main.hxx
parent185575042240290a791eb23e3508aafa34c5a065 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a965c703f270a1ce8e1b00e26d7c60d4daebec99 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:44 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 7e065099543a70ab6866f8301a25100b63f6b479 Author: bjoern.michaelsen@canonical.com <Bjoern Michaelsen> Date: Tue Feb 8 00:07:47 2011 +0100 lp#696527: enable human icon theme in LibreOffice Signed-off-by: bjoern.michaelsen@canonical.com <Bjoern Michaelsen> (cherry picked from commit f6a16194d1348cb1c679acec5cd9e014ca3f3104) Signed-off-by: Thorsten Behrens <tbehrens@novell.com> (cherry picked from commit d18c9a17f33c100fa38e65209f4353cad63ba0af) Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Petr Mladek <pmladek@suse.cz> .../schema/org/openoffice/Office/Common.xcs | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 3792811e4a4fbef556c9a4d3abcb17ad246e0576 Author: David Tardon <dtardon@redhat.com> Date: Wed Jan 12 07:21:06 2011 +0100 handle css::table::BorderLine in addition to css::table::BorderLine2 That means that table cell properties are correctly set on OpenXML import again, whoo! Signed-off-by: Cédric Bosdonnat <cedricbosdo@openoffice.org> (cherry picked from commit 27a82c54cbd78486ca876e0e8668d4943852967f) Signed-off-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Noel Power <nopower@novell.com> editeng/inc/editeng/boxitem.hxx | 1 + editeng/source/items/frmitems.cxx | 161 ++++++++++++++++++++---------------- 2 files changed, 90 insertions(+), 72 deletions(-) commit f334fe0d0687e317b23743d422abcaf489d99267 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:27 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 73474b4bae74c3f6f6aac146db198ca958cef70c Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 19:56:28 2011 +0100 wikihelp: Improve the check for existence of the localized help, fdo#33258. This fixes commit 44eaa36c4ce25a7c861455e9dbe6c2c959adecb4 that introduced an infinite recursion. Signed-off-by: Petr Mladek <pmladek@suse.cz> sfx2/source/appl/newhelp.cxx | 10 ++++------ sfx2/source/appl/newhelp.hxx | 3 +++ sfx2/source/appl/sfxhelp.cxx | 33 ++++++++++++++++++++------------- 3 files changed, 27 insertions(+), 19 deletions(-) commit ed87a79ebafce971f91017ffb3adff55d9f34b42 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Mon Feb 7 18:52:27 2011 +0100 fdo#33994: Fixed several crashes around config UNO API cherry picked from 21427f17e1f6901ac9a7148d5d8ac13e0aad958e Signed-off-by: Noel Power <noel.power@novell.com> configmgr/source/access.cxx | 10 ++++------ configmgr/source/rootaccess.cxx | 8 ++++++++ configmgr/source/rootaccess.hxx | 5 +++++ 3 files changed, 17 insertions(+), 6 deletions(-) commit ac044cb591a40e688e61bea24db63258e826cd78 Author: Noel Power <noel.power@novell.com> Date: Fri Feb 4 16:17:16 2011 +0000 fix for #30879 cherry picked from 6eb4e55b0a61f793f635a8038895cb2e452dc280 Signed-off-by: Muthu Subramanian K <sumuthu@novell.com> desktop/source/app/dispatchwatcher.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4c00e2b2d1f4c1b9aaa049ee3bd99bab99d5b3e5 Author: Tor Lillqvist <tlillqvist@novell.com> Date: Thu Jan 27 02:36:52 2011 +0200 We don't need ddraw.lib which doesn't even exist in the current DX SDK (cherry picked from commit 7bc42b864b22fd8e0b159dfec212abaf989ff9aa) Signed-off-by: Noel Power <nopower@novell.com> avmedia/source/win/makefile.mk | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 59c15b76481894696127b547294ffe24407b22f5 Author: Thorsten Behrens <tbehrens@novell.com> Date: Thu Feb 3 17:27:48 2011 +0100 New mimetype icons for LibreOffice Update from design team, source svg is http://wiki.documentfoundation.org/cgi_img_auth.php/d/d4/LibreOffice_Initial_Icons-pre_final.svg sysui/desktop/icons/database.icns | Bin 48416 -> 45789 bytes sysui/desktop/icons/database.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/drawing-template.icns | Bin 10935 -> 46225 bytes sysui/desktop/icons/drawing-template.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/drawing.icns | Bin 11290 -> 43334 bytes sysui/desktop/icons/drawing.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/empty-document.icns | Bin 50465 -> 35005 bytes sysui/desktop/icons/empty-document.ico | Bin 25214 -> 26918 bytes sysui/desktop/icons/empty-template.icns | Bin 47059 -> 35005 bytes sysui/desktop/icons/empty-template.ico | Bin 25214 -> 26918 bytes sysui/desktop/icons/formula.icns | Bin 10380 -> 43893 bytes sysui/desktop/icons/formula.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/hicolor/128x128/apps/base.png | Bin 16745 -> 8446 bytes sysui/desktop/icons/hicolor/128x128/apps/calc.png | Bin 12968 -> 7002 bytes sysui/desktop/icons/hicolor/128x128/apps/draw.png | Bin 16732 -> 8228 bytes .../desktop/icons/hicolor/128x128/apps/impress.png | Bin 14614 -> 6617 bytes sysui/desktop/icons/hicolor/128x128/apps/main.png | Bin 12442 -> 2271 bytes sysui/desktop/icons/hicolor/128x128/apps/math.png | Bin 12934 -> 7538 bytes .../icons/hicolor/128x128/apps/startcenter.png | Bin 11073 -> 2271 bytes .../desktop/icons/hicolor/128x128/apps/writer.png | Bin 11861 -> 6723 bytes .../hicolor/128x128/mimetypes/oasis-database.png | Bin 15854 -> 8446 bytes .../128x128/mimetypes/oasis-drawing-template.png | Bin 16120 -> 12658 bytes .../hicolor/128x128/mimetypes/oasis-drawing.png | Bin 16063 -> 8228 bytes .../hicolor/128x128/mimetypes/oasis-formula.png | Bin 12936 -> 7538 bytes .../128x128/mimetypes/oasis-master-document.png | Bin 11992 -> 4218 bytes .../mimetypes/oasis-presentation-template.png | Bin 13955 -> 11408 bytes .../128x128/mimetypes/oasis-presentation.png | Bin 13654 -> 6617 bytes .../mimetypes/oasis-spreadsheet-template.png | Bin 12792 -> 11620 bytes .../128x128/mimetypes/oasis-spreadsheet.png | Bin 12338 -> 7002 bytes .../128x128/mimetypes/oasis-text-template.png | Bin 12100 -> 11171 bytes .../icons/hicolor/128x128/mimetypes/oasis-text.png | Bin 11770 -> 6723 bytes .../128x128/mimetypes/oasis-web-template.png | Bin 17754 -> 7817 bytes sysui/desktop/icons/hicolor/16x16/apps/base.png | Bin 3618 -> 632 bytes sysui/desktop/icons/hicolor/16x16/apps/calc.png | Bin 3629 -> 539 bytes sysui/desktop/icons/hicolor/16x16/apps/draw.png | Bin 3606 -> 653 bytes sysui/desktop/icons/hicolor/16x16/apps/impress.png | Bin 3608 -> 577 bytes sysui/desktop/icons/hicolor/16x16/apps/main.png | Bin 0 -> 434 bytes sysui/desktop/icons/hicolor/16x16/apps/math.png | Bin 3607 -> 395 bytes .../icons/hicolor/16x16/apps/startcenter.png | Bin 1043 -> 434 bytes sysui/desktop/icons/hicolor/16x16/apps/writer.png | Bin 3586 -> 532 bytes .../hicolor/16x16/mimetypes/oasis-database.png | Bin 1009 -> 632 bytes .../16x16/mimetypes/oasis-drawing-template.png | Bin 1094 -> 707 bytes .../hicolor/16x16/mimetypes/oasis-drawing.png | Bin 1082 -> 653 bytes .../hicolor/16x16/mimetypes/oasis-formula.png | Bin 1014 -> 395 bytes .../16x16/mimetypes/oasis-master-document.png | Bin 929 -> 487 bytes .../mimetypes/oasis-presentation-template.png | Bin 1025 -> 626 bytes .../hicolor/16x16/mimetypes/oasis-presentation.png | Bin 960 -> 577 bytes .../16x16/mimetypes/oasis-spreadsheet-template.png | Bin 1018 -> 567 bytes .../hicolor/16x16/mimetypes/oasis-spreadsheet.png | Bin 961 -> 539 bytes .../16x16/mimetypes/oasis-text-template.png | Bin 986 -> 562 bytes .../icons/hicolor/16x16/mimetypes/oasis-text.png | Bin 923 -> 532 bytes .../hicolor/16x16/mimetypes/oasis-web-template.png | Bin 1023 -> 593 bytes sysui/desktop/icons/hicolor/32x32/apps/base.png | Bin 3153 -> 1329 bytes sysui/desktop/icons/hicolor/32x32/apps/calc.png | Bin 2731 -> 1015 bytes sysui/desktop/icons/hicolor/32x32/apps/draw.png | Bin 3147 -> 1271 bytes sysui/desktop/icons/hicolor/32x32/apps/impress.png | Bin 2903 -> 1042 bytes sysui/desktop/icons/hicolor/32x32/apps/main.png | Bin 0 -> 698 bytes sysui/desktop/icons/hicolor/32x32/apps/math.png | Bin 2715 -> 1128 bytes .../icons/hicolor/32x32/apps/startcenter.png | Bin 2375 -> 698 bytes sysui/desktop/icons/hicolor/32x32/apps/writer.png | Bin 2485 -> 987 bytes .../hicolor/32x32/mimetypes/oasis-database.png | Bin 2922 -> 1329 bytes .../32x32/mimetypes/oasis-drawing-template.png | Bin 2957 -> 1352 bytes .../hicolor/32x32/mimetypes/oasis-drawing.png | Bin 2828 -> 1271 bytes .../hicolor/32x32/mimetypes/oasis-formula.png | Bin 2622 -> 1128 bytes .../32x32/mimetypes/oasis-master-document.png | Bin 2338 -> 867 bytes .../mimetypes/oasis-presentation-template.png | Bin 2812 -> 1390 bytes .../hicolor/32x32/mimetypes/oasis-presentation.png | Bin 2623 -> 1042 bytes .../32x32/mimetypes/oasis-spreadsheet-template.png | Bin 2856 -> 1281 bytes .../hicolor/32x32/mimetypes/oasis-spreadsheet.png | Bin 2618 -> 1015 bytes .../32x32/mimetypes/oasis-text-template.png | Bin 2575 -> 1328 bytes .../icons/hicolor/32x32/mimetypes/oasis-text.png | Bin 2311 -> 987 bytes .../hicolor/32x32/mimetypes/oasis-web-template.png | Bin 2908 -> 1127 bytes sysui/desktop/icons/hicolor/48x48/apps/base.png | Bin 5196 -> 2135 bytes sysui/desktop/icons/hicolor/48x48/apps/calc.png | Bin 4319 -> 1465 bytes sysui/desktop/icons/hicolor/48x48/apps/draw.png | Bin 5207 -> 1690 bytes sysui/desktop/icons/hicolor/48x48/apps/impress.png | Bin 4974 -> 1560 bytes sysui/desktop/icons/hicolor/48x48/apps/main.png | Bin 0 -> 990 bytes sysui/desktop/icons/hicolor/48x48/apps/math.png | Bin 4489 -> 1588 bytes .../icons/hicolor/48x48/apps/startcenter.png | Bin 3615 -> 990 bytes sysui/desktop/icons/hicolor/48x48/apps/writer.png | Bin 3938 -> 1332 bytes .../hicolor/48x48/mimetypes/oasis-database.png | Bin 5032 -> 2135 bytes .../48x48/mimetypes/oasis-drawing-template.png | Bin 4919 -> 2087 bytes .../hicolor/48x48/mimetypes/oasis-drawing.png | Bin 4935 -> 1690 bytes .../hicolor/48x48/mimetypes/oasis-formula.png | Bin 4422 -> 1588 bytes .../48x48/mimetypes/oasis-master-document.png | Bin 3808 -> 1399 bytes .../mimetypes/oasis-presentation-template.png | Bin 4650 -> 1979 bytes .../hicolor/48x48/mimetypes/oasis-presentation.png | Bin 4611 -> 1560 bytes .../48x48/mimetypes/oasis-spreadsheet-template.png | Bin 4409 -> 1644 bytes .../hicolor/48x48/mimetypes/oasis-spreadsheet.png | Bin 4211 -> 1465 bytes .../48x48/mimetypes/oasis-text-template.png | Bin 4023 -> 1653 bytes .../icons/hicolor/48x48/mimetypes/oasis-text.png | Bin 3785 -> 1332 bytes .../hicolor/48x48/mimetypes/oasis-web-template.png | Bin 4854 -> 1577 bytes sysui/desktop/icons/main.icns | Bin 45712 -> 35005 bytes sysui/desktop/icons/main.ico | Bin 0 -> 26918 bytes sysui/desktop/icons/master-document.icns | Bin 11003 -> 40262 bytes sysui/desktop/icons/master-document.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/oasis-database.icns | Bin 53983 -> 45789 bytes sysui/desktop/icons/oasis-database.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-drawing-template.icns | Bin 53400 -> 46225 bytes sysui/desktop/icons/oasis-drawing-template.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-drawing.icns | Bin 52603 -> 43334 bytes sysui/desktop/icons/oasis-drawing.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-empty-document.icns | Bin 40589 -> 35005 bytes sysui/desktop/icons/oasis-empty-document.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-empty-template.icns | Bin 42146 -> 35005 bytes sysui/desktop/icons/oasis-empty-template.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-formula.icns | Bin 50335 -> 43893 bytes sysui/desktop/icons/oasis-formula.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-master-document.icns | Bin 48904 -> 40262 bytes sysui/desktop/icons/oasis-master-document.ico | Bin 295606 -> 26918 bytes .../desktop/icons/oasis-presentation-template.icns | Bin 51890 -> 44901 bytes .../desktop/icons/oasis-presentation-template.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-presentation.icns | Bin 51073 -> 41919 bytes sysui/desktop/icons/oasis-presentation.ico | Bin 295606 -> 26918 bytes .../desktop/icons/oasis-spreadsheet-template.icns | Bin 51919 -> 46239 bytes sysui/desktop/icons/oasis-spreadsheet-template.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-spreadsheet.icns | Bin 50953 -> 43146 bytes sysui/desktop/icons/oasis-spreadsheet.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-text-template.icns | Bin 49196 -> 43403 bytes sysui/desktop/icons/oasis-text-template.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-text.icns | Bin 47545 -> 40399 bytes sysui/desktop/icons/oasis-text.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/oasis-web-template.icns | Bin 55853 -> 42359 bytes sysui/desktop/icons/oasis-web-template.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_base_app.icns | Bin 0 -> 45789 bytes sysui/desktop/icons/ooo3_base_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_calc_app.icns | Bin 0 -> 43146 bytes sysui/desktop/icons/ooo3_calc_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_draw_app.icns | Bin 0 -> 43334 bytes sysui/desktop/icons/ooo3_draw_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_impress_app.icns | Bin 0 -> 41919 bytes sysui/desktop/icons/ooo3_impress_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_main_app.icns | Bin 0 -> 35005 bytes sysui/desktop/icons/ooo3_main_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_math_app.icns | Bin 0 -> 43893 bytes sysui/desktop/icons/ooo3_math_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/ooo3_open.icns | Bin 0 -> 35005 bytes sysui/desktop/icons/ooo3_open.ico | Bin 25214 -> 26918 bytes sysui/desktop/icons/ooo3_writer_app.icns | Bin 0 -> 40399 bytes sysui/desktop/icons/ooo3_writer_app.ico | Bin 295606 -> 26918 bytes sysui/desktop/icons/presentation-template.icns | Bin 10690 -> 44901 bytes sysui/desktop/icons/presentation-template.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/presentation.icns | Bin 10947 -> 41919 bytes sysui/desktop/icons/presentation.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/spreadsheet-template.icns | Bin 10085 -> 46239 bytes sysui/desktop/icons/spreadsheet-template.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/spreadsheet.icns | Bin 10457 -> 43146 bytes sysui/desktop/icons/spreadsheet.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/text-template.icns | Bin 10095 -> 43403 bytes sysui/desktop/icons/text-template.ico | Bin 10638 -> 26918 bytes sysui/desktop/icons/text.icns | Bin 10401 -> 40399 bytes sysui/desktop/icons/text.ico | Bin 10638 -> 26918 bytes 152 files changed, 0 insertions(+), 0 deletions(-) commit b65fa5f769aea6673ea41fdc329df2fd00fb06e8 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Fri Feb 4 10:42:47 2011 +0100 fdo#32872: Implementation names weren't matching with xcu. Signed-off-by: Jan Holesovsky <kendy@suse.cz> svx/source/tbxctrls/fontworkgallery.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit a0f63a4c3a5430b6b81318f2dc380ca8975d4d65 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 18 12:11:52 2011 +0000 don't pushback and process a corrupt extension Signed-off-by: David Tardon <dtardon@redhat.com> .../deployment/registry/package/dp_package.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 76681cbb779c60cdfc2a4df3a6dd0ff2f874f6cb Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Jan 27 12:14:17 2011 +0000 Related: rhbz#610103 more woes on rpm upgrade vs rpm erase Signed-off-by: David Tardon <dtardon@redhat.com> sfx2/source/appl/shutdowniconunx.cxx | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) commit 44eaa36c4ce25a7c861455e9dbe6c2c959adecb4 Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Feb 1 22:39:43 2011 +0100 wikihelp: Do not check for existence of the localized help. In case we do not have the help installed, it is up to the online service to decide the fallback in case a language version is not available. Signed-off-by: Thorsten Behrens <tbehrens@novell.com> sfx2/source/appl/sfxhelp.cxx | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit 7922cf1235dac54df4c15533aaa01973e27c0652 Author: Andras Timar <timar@fsf.hu> Date: Tue Feb 1 18:42:50 2011 +0100 s/su urpmi/sudo urpmi/ in Mandriva section of README readlicense_oo/docs/readme/readme.xrm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 4972faf4bb4cbb15d4ff0408f38ff020a26a4c42 Author: Andras Timar <timar@fsf.hu> Date: Tue Jan 18 23:05:50 2011 +0100 readme formatting - fdo#32741 * using CRLF instead of LF on WIN platform * word wrap at column 75 for better readability readlicense_oo/util/makefile.pmk | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit d06c295137b3d787d2d930dc10ef98f984ced72a Author: Luboš Luňák <l.lunak@suse.cz> Date: Fri Jan 21 20:49:43 2011 +0100 fix KDE3 library search order (fdo#32797) Use LINKFLAGS instead of STDLIBS, as the latter comes way too late in the link command and may result in some stray -L/usr/lib getting before -L$KDEDIR/lib. Since KDE4 libs often tend to be installed under /usr while KDE3 libs are often somewhere else such as /opt/kde3/lib, this could cause using wrong libraries. (cherry picked from commit b13f9e3374f8f605e6bf6f7be8819142060c37e9) Signed-off-by: Thorsten Behrens <tbehrens@novell.com> fpicker/source/unx/kde/makefile.mk | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit 9e6b1553e04ed17d9f1481364c672f609a9b12e3 Author: Kalman Szalai - KAMI <kami911@gmail.com> Date: Sat Jan 22 17:21:18 2011 +0100 Start using technical.dic instead of oracle.dic (fdo#31798) Signed-off-by: Petr Mladek <pmladek@suse.cz> .../schema/org/openoffice/Office/Linguistic.xcs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cb7d7138b943042f11eec3211d7a913c9b85908c Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Tue Jan 18 10:43:05 2011 +0100 calc65: #i116371# fix backgrounds for polypolygons in metafile Signed-off-by: Thorsten Behrens <tbehrens@novell.com> .../source/processor2d/vclmetafileprocessor2d.cxx | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) commit 36a8e6738169e678d7539aba6d8dde962dae9d78 Author: Andras Timar <timar@fsf.hu> Date: Sun Jan 16 21:08:02 2011 +0100 Sun Microsystems -> The Document Foundation in desktop file fdo#31191 sysui/desktop/menus/startcenter.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2c2774f3a20f35f9f5320efa9e7d1f37bb860266 Author: Petr Mladek <pmladek@suse.cz> Date: Thu Jan 13 21:13:19 2011 +0100 unopkg crasher on SLED11-SP1 (bnc#655912) activateExtension call broke memory if dp_misc::getIdentifier and xNewExtension were called inline; the problem was visible only with gcc-4.3.4 and did not appear with older or newer gcc versions valgrind got happy and unopkg stopped crashing after the values were passed via the extra variables it looks like a miscompilation; IMHO, it does not make sense to report it because it does not happen with last gcc version this code is not critical for the performance, so the workaround with extra variables is fine; they might even be optimized out by the compiler Signed off by Michael, Noel, Tor .../deployment/manager/dp_extensionmanager.cxx | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 8539854f9af2c423d69ab9a89c79d3dbb8c6abd3 Author: Michael Meeks <michael.meeks@novell.com> Date: Fri Jan 14 13:59:23 2011 +0000 fix FMR crasher bug#33099 xmlhelp/source/cxxhelp/provider/databases.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 4f81b94b7cee00c88e31612dc26800199c570ba6 Author: Tor Lillqvist <tlillqvist@novell.com> Date: Fri Jan 14 12:23:56 2011 +0200 Be slightly more paranoid defensive (cherry picked from commit f8bfab1f464d0f26accb6d28b31b4749306bbfda) Signed-off-by: Thorsten Behrens <thb@documentfoundation.org> desktop/win32/source/setup/setup.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit c13ec5fbad1bbdc5a40a70b3d0b4ca86c01708fb Author: Tor Lillqvist <tlillqvist@novell.com> Date: Thu Jan 13 23:49:18 2011 +0200 Fix buffer size problem that broke MSI installer localization (cherry picked from commit 5b7719a49fd57a9f446201fabc02bf1787dbbeee) Signed-off-by: Thorsten Behrens <thb@documentfoundation.org> desktop/win32/source/setup/setup.cpp | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) commit accd51f069a80bfe944d1c83f0d4320a223b5113 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:57 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit d1c7535dbe2839c9435ec9bd944ca353aa40dc6b Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:08 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit fe9114f836076dbbda2143d57af5dc585677292e Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 09:06:36 2011 +0000 Resolves: fdo#32953 add preferred Malayalam fonts (cherry picked from commit 2f70074be979ca4a58e653a561a45d8d75b52f19) officecfg/registry/data/org/openoffice/VCL.xcu | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
Notes
split repo tag: libs-core_libreoffice-3.3.1.1
Diffstat (limited to 'desktop/win32/source/setup/setup_main.hxx')
-rw-r--r--desktop/win32/source/setup/setup_main.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index dfcb201e3cd3..f966e6ae0348 100644
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite