diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:13:07 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:13:07 +0200 |
commit | 95920b4502a03d2d51a68626c1a562486326a38d (patch) | |
tree | 2bcd68bd250df21dd16a9c8277a78e49a313eea2 /sfx2/workben | |
parent | Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3) (diff) | |
download | core-95920b4502a03d2d51a68626c1a562486326a38d.tar.gz core-95920b4502a03d2d51a68626c1a562486326a38d.zip |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 8ae8ec3b786ca9c5bfdde8c737cc76e0178e2a65 (HEAD, tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 4772261c09d3d79d1ab8126e060d272c0de156f0
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>
(cherry picked from commit cb7d7138b943042f11eec3211d7a913c9b85908c)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Radek Doulik <rodo@novell.com>
.../source/processor2d/vclmetafileprocessor2d.cxx | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
commit 4cf8bcde1cfa948b3415ec4775671b53e290aeae
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 57746f255004ef42fc87c3ad3d30a4cb47a0111b
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 6196104011a42b17239da44fca374d3e0ba60cfd
Author: Michael Meeks <michael.meeks@novell.com>
Date: Fri Jan 14 13:59:23 2011 +0000
fix FMR crasher bug#33099, approved by Fridrich, David & Petr.
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
xmlhelp/source/cxxhelp/provider/databases.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 66586a94e673256024e3c5c7dd8d70bedd1694f0
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>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
desktop/win32/source/setup/setup.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit a8aa27383ae8570b8cd73376b54f114bd74afac6
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>
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
desktop/win32/source/setup/setup.cpp | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
commit d7b0664fa0966efc77dc2f6a93d3e68adbff00aa
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 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.
Diffstat (limited to 'sfx2/workben')
-rw-r--r-- | sfx2/workben/custompanel/ctp_factory.cxx | 10 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_factory.hxx | 2 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_panel.cxx | 2 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_panel.hxx | 2 | ||||
-rw-r--r-- | sfx2/workben/custompanel/ctp_services.cxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/workben/custompanel/ctp_factory.cxx b/sfx2/workben/custompanel/ctp_factory.cxx index 514d36e4b894..4d6f12d527a6 100644 --- a/sfx2/workben/custompanel/ctp_factory.cxx +++ b/sfx2/workben/custompanel/ctp_factory.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 @@ -115,19 +115,19 @@ namespace sd { namespace colortoolpanel Reference< XUIElement > xUIElement( new PanelUIElement( m_xContext, xParentWindow, i_rResourceURL, nPanelColor ) ); return xUIElement; } - + //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } - + //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ToolPanelFactory::getImplementationName_static( ) throw (RuntimeException) { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.example.custompanel.ToolPanelFactory" ) ); } - + //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL ToolPanelFactory::supportsService( const ::rtl::OUString& i_rServiceName ) throw (RuntimeException) { @@ -142,7 +142,7 @@ namespace sd { namespace colortoolpanel } return sal_False; } - + //------------------------------------------------------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL ToolPanelFactory::getSupportedServiceNames() throw (RuntimeException) { diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx index 471485f1e0ea..be6507d91a4a 100644 --- a/sfx2/workben/custompanel/ctp_factory.hxx +++ b/sfx2/workben/custompanel/ctp_factory.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/sfx2/workben/custompanel/ctp_panel.cxx b/sfx2/workben/custompanel/ctp_panel.cxx index e7f36edcf0ff..be82c1ceb054 100644 --- a/sfx2/workben/custompanel/ctp_panel.cxx +++ b/sfx2/workben/custompanel/ctp_panel.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/sfx2/workben/custompanel/ctp_panel.hxx b/sfx2/workben/custompanel/ctp_panel.hxx index ed844f3a3ee5..03a511c9e173 100644 --- a/sfx2/workben/custompanel/ctp_panel.hxx +++ b/sfx2/workben/custompanel/ctp_panel.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/sfx2/workben/custompanel/ctp_services.cxx b/sfx2/workben/custompanel/ctp_services.cxx index 7f4f45f4e6e7..20c65d7aa06c 100644 --- a/sfx2/workben/custompanel/ctp_services.cxx +++ b/sfx2/workben/custompanel/ctp_services.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 @@ -62,7 +62,7 @@ namespace sd { namespace colortoolpanel ToolPanelFactory::Create, ToolPanelFactory::getImplementationName_static, ToolPanelFactory::getSupportedServiceNames_static, - ::cppu::createSingleComponentFactory, NULL, 0 + ::cppu::createSingleComponentFactory, NULL, 0 }, { 0, 0, 0, 0, 0, 0 } }; |