[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.1-1-143-g97893ce
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 216cd4fe93320c0c8b4ac2e7d3dc56d2b5ea66b1
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jul 18 16:36:17 2011 +0200
remove all obsolete ptaches (either merged upstream or moved to ubuntufixes.diff)
diff --git a/patches/disable-integrated-ubuntupatches.diff b/patches/disable-integrated-ubuntupatches.diff
deleted file mode 100644
index 1a85d1d..0000000
--- a/patches/disable-integrated-ubuntupatches.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.0.orig/libreoffice-build/patches/dev300/apply 2011-06-28 16:27:43.462707013 +0200
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 16:28:05.212707013 +0200
-@@ -1037,8 +1037,8 @@
- # FIXME: update for LO
- #f11-fullscreen.diff, ccheney
-
--[ UbuntuOnly ]
--unxlngi6-notune.diff, doko
-+#[ UbuntuOnly ]
-+#unxlngi6-notune.diff, doko
-
- [ UbuntuL10nOnly ]
- human-icons-i18n.diff, mklose
diff --git a/patches/fix-jpeg.diff b/patches/fix-jpeg.diff
deleted file mode 100644
index ab21ebe..0000000
--- a/patches/fix-jpeg.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0010-fix-jepg.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0010-fix-jepg.diff 2011-06-28 16:28:10.182707012 +0200
-@@ -0,0 +1,14 @@
-+--- solenv/inc/libs.mk_old 2011-03-24 18:37:09.390730134 +0100
-++++ solenv/inc/libs.mk 2011-03-24 18:38:00.900730121 +0100
-+@@ -210,10 +210,8 @@
-+ #i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
-+ .IF "$(OS)" == "FREEBSD"
-+ JPEG3RDLIB=/usr/local/lib/libjpeg.so
-+-.ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
-+-JPEG3RDLIB=/usr/lib64/libjpeg.so
-+ .ELSE
-+-JPEG3RDLIB=/usr/lib/libjpeg.so
-++JPEG3RDLIB=/usr/lib/$(DEB_BUILD_MULTIARCH)/libjpeg.so
-+ .ENDIF
-+ .ELSE
-+ JPEG3RDLIB=-ljpeg
diff --git a/patches/lp-integration.diff b/patches/lp-integration.diff
deleted file mode 100644
index accf250..0000000
--- a/patches/lp-integration.diff
+++ /dev/null
@@ -1,542 +0,0 @@
-Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0040-lp-integration.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0040-lp-integration.diff 2011-06-28 16:29:40.152707007 +0200
-@@ -0,0 +1,537 @@
-+diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
-+index a76fda5..59ca451 100644
-+--- dbaccess/uiconfig/dbapp/menubar/menubar.xml
-++++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
-+@@ -133,6 +133,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
-+index 2d6ec8d..dcce258 100644
-+--- dbaccess/uiconfig/dbquery/menubar/menubar.xml
-++++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
-+@@ -74,6 +74,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-+index b7460a4..60047af 100644
-+--- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-++++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-+@@ -57,6 +57,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
-+index ede5eed..3730315 100644
-+--- dbaccess/uiconfig/dbtable/menubar/menubar.xml
-++++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
-+@@ -58,6 +58,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-+index 79fe68a..b907c03 100644
-+--- dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-++++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-+@@ -66,6 +66,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
-+index 9993288..05acb54 100644
-+--- reportdesign/uiconfig/dbreport/menubar/menubar.xml
-++++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
-+@@ -413,6 +413,10 @@
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:HelperDialog"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
-+index 58e460f..52e79cb 100644
-+--- sd/uiconfig/sdraw/menubar/menubar.xml
-++++ sd/uiconfig/sdraw/menubar/menubar.xml
-+@@ -323,6 +323,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
-+index 4ae1665..1c8e976 100755
-+--- sd/uiconfig/simpress/menubar/menubar.xml
-++++ sd/uiconfig/simpress/menubar/menubar.xml
-+@@ -297,6 +297,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/framework/inc/dispatch/launchpadinterceptor.hxx b/framework/inc/dispatch/launchpadinterceptor.hxx
-+new file mode 100644
-+index 0000000..3b3bf23
-+--- /dev/null
-++++ framework/inc/dispatch/launchpadinterceptor.hxx
-+@@ -0,0 +1,19 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-++
-++// Copyright LGPL/MPL 2011 Canonical, Ltd.
-++
-++// MARKER(update_precomp.py): autogen include statement, do not remove
-++#include "precompiled_framework.hxx"
-++
-++#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-++
-++#ifndef __FRAMEWORK_DISPATCH_LAUNCHPADINTERCEPTOR_HXX_
-++#define __FRAMEWORK_DISPATCH_LAUNCHPADINTERCEPTOR_HXX_
-++
-++namespace com { namespace canonical { namespace launchpadintegration {
-++ void registerLaunchpadInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception >& xInterception);
-++}}}
-++
-++#endif
-++
-++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-+diff --git a/framework/source/dispatch/launchpadinterceptor.cxx b/framework/source/dispatch/launchpadinterceptor.cxx
-+new file mode 100644
-+index 0000000..889e454
-+--- /dev/null
-++++ framework/source/dispatch/launchpadinterceptor.cxx
-+@@ -0,0 +1,188 @@
-++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-++
-++// Copyright LGPL/MPL 2011 Canonical, Ltd.
-++
-++// MARKER(update_precomp.py): autogen include statement, do not remove
-++#include "precompiled_framework.hxx"
-++
-++#include <com/sun/star/frame/XDispatch.hpp>
-++#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-++#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
-++#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-++#include <com/sun/star/system/XSystemShellExecute.hpp>
-++#include <comphelper/processfactory.hxx>
-++#include <comphelper/stlunosequence.hxx>
-++#include <cppuhelper/implbase1.hxx>
-++#include <cppuhelper/implbase2.hxx>
-++#include <dispatch/launchpadinterceptor.hxx>
-++#include <osl/diagnose.h>
-++
-++#include <algorithm>
-++
-++namespace css = com::sun::star;
-++
-++using comphelper::getProcessServiceFactory;
-++using comphelper::stl_begin;
-++using comphelper::stl_end;
-++using css::beans::PropertyValue;
-++using css::frame::DispatchDescriptor;
-++using css::frame::FeatureStateEvent;
-++using css::frame::XDispatch;
-++using css::frame::XDispatchProvider;
-++using css::frame::XDispatchProviderInterception;
-++using css::frame::XDispatchProviderInterceptor;
-++using css::frame::XStatusListener;
-++using css::system::XSystemShellExecute;
-++using css::uno::Any;
-++using css::uno::makeAny;
-++using css::uno::Reference;
-++using css::uno::RuntimeException;
-++using css::uno::Sequence;
-++using css::util::URL;
-++using rtl::OUString;
-++
-++namespace com { namespace canonical { namespace launchpadintegration
-++{
-++ class LaunchpadDispatch : public ::cppu::WeakImplHelper1< XDispatch >
-++ {
-++ public:
-++ virtual void SAL_CALL dispatch(const URL& aUrl, const Sequence< PropertyValue >& aArgs) throw (RuntimeException);
-++ virtual void SAL_CALL addStatusListener(const Reference< XStatusListener >&, const URL&) throw (RuntimeException);
-++ virtual void SAL_CALL removeStatusListener(const Reference< XStatusListener >&, const URL&) throw (RuntimeException)
-++ {};
-++ static const OUString our_sHelpOnline;
-++ static const OUString our_sHelpOnlineLabel;
-++ static const OUString our_sHelpTranslate;
-++ static const OUString our_sHelpTranslateLabel;
-++ static const OUString our_sProblemReport;
-++ static const OUString our_sProblemReportLabel;
-++ private:
-++ void execute(const OUString& sCommand, const OUString& sParams);
-++ static const OUString our_sSystemShellExecuteName;
-++ };
-++
-++ class LaunchpadInterceptor :
-++ public ::cppu::WeakImplHelper1< XDispatchProviderInterceptor >
-++ {
-++ public:
-++ virtual Reference< XDispatch > SAL_CALL queryDispatch(const URL& aUrl, const OUString& sTargetFrameName, sal_Int32 nSearchFlags) throw (RuntimeException);
-++ virtual Sequence< Reference< XDispatch > > SAL_CALL queryDispatches(const Sequence< DispatchDescriptor >& lDescriptor) throw (RuntimeException);
-++ virtual Reference< XDispatchProvider > SAL_CALL getMasterDispatchProvider() throw(RuntimeException)
-++ { return m_xMaster; };
-++ virtual Reference< XDispatchProvider > SAL_CALL getSlaveDispatchProvider() throw(RuntimeException)
-++ { return m_xSlave; };
-++ virtual void SAL_CALL setMasterDispatchProvider(const Reference< XDispatchProvider >& xMaster) throw(RuntimeException)
-++ { m_xMaster = xMaster; };
-++ virtual void SAL_CALL setSlaveDispatchProvider(const Reference< XDispatchProvider >& xSlave) throw(RuntimeException)
-++ { m_xSlave = xSlave; };
-++ private:
-++ Reference< XDispatchProvider > m_xMaster;
-++ Reference< XDispatchProvider > m_xSlave;
-++ static const OUString our_sProtocol;
-++ };
-++
-++ struct QueryTransformer
-++ {
-++ LaunchpadInterceptor* const m_pInterceptor;
-++ QueryTransformer(LaunchpadInterceptor* pInterceptor) : m_pInterceptor(pInterceptor) {};
-++ Reference< XDispatch > operator()(const DispatchDescriptor& rDescriptor)
-++ {
-++ return m_pInterceptor->queryDispatch(rDescriptor.FeatureURL, OUString(), 0);
-++ };
-++ };
-++}}}
-++
-++using namespace com::canonical::launchpadintegration;
-++
-++
-++const OUString LaunchpadDispatch::our_sHelpOnline = OUString(RTL_CONSTASCII_USTRINGPARAM(".launchpad:HelpOnline"));
-++const OUString LaunchpadDispatch::our_sHelpOnlineLabel = OUString(RTL_CONSTASCII_USTRINGPARAM("Get Help Online"));
-++const OUString LaunchpadDispatch::our_sHelpTranslate = OUString(RTL_CONSTASCII_USTRINGPARAM(".launchpad:HelpTranslate"));
-++const OUString LaunchpadDispatch::our_sHelpTranslateLabel = OUString(RTL_CONSTASCII_USTRINGPARAM("Translate This Application"));
-++const OUString LaunchpadDispatch::our_sProblemReport = OUString(RTL_CONSTASCII_USTRINGPARAM(".launchpad:HelpReportProblem"));
-++const OUString LaunchpadDispatch::our_sProblemReportLabel = OUString(RTL_CONSTASCII_USTRINGPARAM("Report a Problem"));
-++const OUString LaunchpadDispatch::our_sSystemShellExecuteName = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"));
-++
-++const OUString LaunchpadInterceptor::our_sProtocol = OUString(RTL_CONSTASCII_USTRINGPARAM(".launchpad:"));
-++
-++Reference< XDispatch > SAL_CALL LaunchpadInterceptor::queryDispatch(const URL& aUrl, const OUString& sTargetFrameName, sal_Int32 nSearchFlags)
-++ throw (RuntimeException)
-++{
-++ OSL_TRACE("queryDispatch: %s", OUStringToOString(aUrl.Complete, RTL_TEXTENCODING_UTF8).getStr());
-++ if(aUrl.Protocol.equals(our_sProtocol))
-++ {
-++ if(aUrl.Complete.equals(LaunchpadDispatch::our_sProblemReport)
-++ || aUrl.Complete.equals(LaunchpadDispatch::our_sHelpTranslate)
-++ || aUrl.Complete.equals(LaunchpadDispatch::our_sHelpOnline))
-++ return Reference< XDispatch >(new LaunchpadDispatch());
-++ }
-++ return m_xSlave->queryDispatch(aUrl, sTargetFrameName, nSearchFlags);
-++};
-++
-++Sequence< Reference< XDispatch > > LaunchpadInterceptor::queryDispatches(const Sequence< DispatchDescriptor >& lDescriptor)
-++ throw (RuntimeException)
-++{
-++ Sequence< Reference< XDispatch > > vResult(lDescriptor.getLength());
-++ ::std::transform(
-++ stl_begin(lDescriptor),
-++ stl_end(lDescriptor),
-++ stl_begin(vResult),
-++ QueryTransformer(this));
-++ return vResult;
-++}
-++
-++void LaunchpadDispatch::execute(const OUString& sCommand, const OUString& sParams)
-++{
-++ try
-++ {
-++ Reference< XSystemShellExecute > xSystemShell(getProcessServiceFactory()->createInstance(our_sSystemShellExecuteName), css::uno::UNO_QUERY);
-++ if(xSystemShell.is())
-++ xSystemShell->execute(
-++ sCommand,
-++ sParams,
-++ 42); // 42 is a very dark magic to keep the parameters unquoted
-++
-++ }
-++ catch (const ::com::sun::star::uno::Exception &)
-++ { }
-++}
-++
-++void LaunchpadDispatch::dispatch(const URL& aUrl, const Sequence< PropertyValue >&)
-++ throw (RuntimeException)
-++{
-++ if(aUrl.Complete.equals(our_sProblemReport))
-++ execute(OUString(RTL_CONSTASCII_USTRINGPARAM("/bin/sh")), OUString(RTL_CONSTASCII_USTRINGPARAM("-c \"/usr/bin/launchpad-integration -P libreoffice-core -b&\"")));
-++ else if (aUrl.Complete.equals(our_sHelpTranslate))
-++ execute(OUString(RTL_CONSTASCII_USTRINGPARAM("/bin/sh")), OUString(RTL_CONSTASCII_USTRINGPARAM("-c \"/usr/bin/launchpad-integration -P libreoffice-core -t&\"")));
-++ else if (aUrl.Complete.equals(our_sHelpOnline))
-++ execute(OUString(RTL_CONSTASCII_USTRINGPARAM("/usr/bin/gnome-open")), OUString(RTL_CONSTASCII_USTRINGPARAM("https://answers.launchpad.net/ubuntu/natty/+source/libreoffice/+gethelp";)));
-++ else
-++ throw RuntimeException();
-++}
-++
-++void LaunchpadDispatch::addStatusListener(const Reference< XStatusListener >& xListener, const URL& aUrl)
-++ throw (RuntimeException)
-++{
-++ OUString aLabel;
-++ if(aUrl.Complete.equals(our_sProblemReport))
-++ aLabel = our_sProblemReportLabel;
-++ else if(aUrl.Complete.equals(our_sHelpTranslate))
-++ aLabel = our_sHelpTranslateLabel;
-++ else if(aUrl.Complete.equals(our_sHelpOnline))
-++ aLabel = our_sHelpOnlineLabel;
-++ FeatureStateEvent aEvent(
-++ static_cast<cppu::OWeakObject*>(this),
-++ aUrl,
-++ aLabel,
-++ true,
-++ false,
-++ makeAny(aLabel));
-++ xListener->statusChanged(aEvent);
-++}
-++
-++void ::com::canonical::launchpadintegration::registerLaunchpadInterceptor(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProviderInterception> const& xInterception)
-++{
-++ xInterception->registerDispatchProviderInterceptor(Reference< XDispatchProviderInterceptor >(new LaunchpadInterceptor()));
-++}
-++
-++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-+diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk
-+index b969d71..7e7c78a 100644
-+--- framework/source/dispatch/makefile.mk
-++++ framework/source/dispatch/makefile.mk
-+@@ -48,15 +48,16 @@ SLOFILES=\
-+ $(SLO)$/helpagentdispatcher.obj \
-+ $(SLO)$/interaction.obj \
-+ $(SLO)$/interceptionhelper.obj \
-++ $(SLO)$/launchpadinterceptor.obj \
-+ $(SLO)$/loaddispatcher.obj \
-+ $(SLO)$/mailtodispatcher.obj \
-+ $(SLO)$/menudispatcher.obj \
-+ $(SLO)$/oxt_handler.obj \
-+ $(SLO)$/popupmenudispatcher.obj \
-+ $(SLO)$/servicehandler.obj \
-+- $(SLO)$/systemexec.obj \
-++ $(SLO)$/startmoduledispatcher.obj \
-++ $(SLO)$/systemexec.obj \
-+ $(SLO)$/windowcommanddispatch.obj \
-+- $(SLO)$/startmoduledispatcher.obj
-+
-+ # --- Targets ------------------------------------------------------
-+
-+diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
-+index d59b361..5660d3b 100644
-+--- framework/source/services/desktop.cxx
-++++ framework/source/services/desktop.cxx
-+@@ -97,6 +97,9 @@
-+ #endif
-+ #include <comphelper/extract.hxx>
-+
-++
-++#include <dispatch/launchpadinterceptor.hxx>
-++
-+ //_________________________________________________________________________________________________________________
-+ // namespace
-+ //_________________________________________________________________________________________________________________
-+@@ -191,6 +194,7 @@ DEFINE_INIT_SERVICE ( Desktop,
-+ // So it's easiear to destroy it.
-+ InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
-+ m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
-++ ::com::canonical::launchpadintegration::registerLaunchpadInterceptor(css::uno::Reference< css::frame::XDispatchProviderInterception>(m_xDispatchHelper, css::uno::UNO_QUERY));
-+
-+ ::rtl::OUStringBuffer sUntitledPrefix (256);
-+ sUntitledPrefix.append (::rtl::OUString( String( FwkResId( STR_UNTITLED_DOCUMENT ))));
-+diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
-+index 03f1f36..40690fd 100644
-+--- framework/source/services/frame.cxx
-++++ framework/source/services/frame.cxx
-+@@ -107,6 +107,7 @@
-+
-+ #include <vcl/menu.hxx>
-+
-++#include <dispatch/launchpadinterceptor.hxx>
-+ //_________________________________________________________________________________________________________________
-+ // namespace
-+ //_________________________________________________________________________________________________________________
-+@@ -212,6 +213,8 @@ DEFINE_INIT_SERVICE ( Frame,
-+ InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
-+ m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
-+
-++ ::com::canonical::launchpadintegration::registerLaunchpadInterceptor(css::uno::Reference<css::frame::XDispatchProviderInterception>(m_xDispatchHelper, css::uno::UNO_QUERY));
-++
-+ //-------------------------------------------------------------------------------------------------------------
-+ // Initialize a new XFrames-helper-object to handle XIndexAccess and XElementAccess.
-+ // We hold member as reference ... not as pointer too!
-+diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
-+index 5ac4c3e..10e5624 100644
-+--- framework/uiconfig/startmodule/menubar/menubar.xml
-++++ framework/uiconfig/startmodule/menubar/menubar.xml
-+@@ -74,6 +74,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
-+index 78c680f..466bbce 100644
-+--- framework/util/makefile.mk
-++++ framework/util/makefile.mk
-+@@ -273,6 +273,7 @@ SHL4OBJS= \
-+ $(SLO)$/jobresult.obj \
-+ $(SLO)$/joburl.obj \
-+ $(SLO)$/keymapping.obj \
-++ $(SLO)$/launchpadinterceptor.obj \
-+ $(SLO)$/langselectionstatusbarcontroller.obj \
-+ $(SLO)$/layoutmanager.obj \
-+ $(SLO)$/loaddispatcher.obj \
-+diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
-+index 5b01e9b..22fd23e 100644
-+--- starmath/uiconfig/smath/menubar/menubar.xml
-++++ starmath/uiconfig/smath/menubar/menubar.xml
-+@@ -112,6 +112,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
-+index 8cd46b6..e6abd21 100644
-+--- sw/uiconfig/sglobal/menubar/menubar.xml
-++++ sw/uiconfig/sglobal/menubar/menubar.xml
-+@@ -452,6 +452,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
-+index fa417a6..0f7dcce 100644
-+--- sw/uiconfig/sweb/menubar/menubar.xml
-++++ sw/uiconfig/sweb/menubar/menubar.xml
-+@@ -381,6 +381,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
-+index cc8b013..2df85de 100644
-+--- sw/uiconfig/swform/menubar/menubar.xml
-++++ sw/uiconfig/swform/menubar/menubar.xml
-+@@ -447,6 +447,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
-+index cc8b013..2df85de 100644
-+--- sw/uiconfig/swreport/menubar/menubar.xml
-++++ sw/uiconfig/swreport/menubar/menubar.xml
-+@@ -447,6 +447,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
-+index 58422d9..245234e 100644
-+--- sw/uiconfig/swriter/menubar/menubar.xml
-++++ sw/uiconfig/swriter/menubar/menubar.xml
-+@@ -456,6 +456,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
-+diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
-+index 32df447..78f8bc2 100644
-+--- sw/uiconfig/swxform/menubar/menubar.xml
-++++ sw/uiconfig/swxform/menubar/menubar.xml
-+@@ -448,6 +448,10 @@
-+ <menu:menuitem menu:id=".uno:HelpIndex"/>
-+ <menu:menuitem menu:id=".uno:ExtendedHelp"/>
-+ <menu:menuseparator/>
-++ <menu:menuitem menu:id=".launchpad:HelpOnline"/>
-++ <menu:menuitem menu:id=".launchpad:HelpTranslate"/>
-++ <menu:menuitem menu:id=".launchpad:HelpReportProblem"/>
-++ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowLicense"/>
-+ <menu:menuseparator/>
-+ <menu:menuitem menu:id=".uno:ShowCredits"/>
diff --git a/patches/lp720716.diff b/patches/lp720716.diff
deleted file mode 100644
index eec8a0f..0000000
--- a/patches/lp720716.diff
+++ /dev/null
@@ -1,734 +0,0 @@
-Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0020-lp720716.diff 2011-06-28 16:28:21.542707012 +0200
-@@ -0,0 +1,729 @@
-+
-+diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
-+index 3cb84f8..a2693a5 100644
-+--- sysui/desktop/menus/base.desktop
-++++ sysui/desktop/menus/base.desktop
-+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Base
-+ GenericName=Database Development
-+ Comment=Manage databases, create queries and reports to track and manage your information by using Base.
-+ InitialPreference=5
-++X-Ayatana-Desktop-Shortcuts=New
-++[New Shortcut Group]
-++UnityQuicklist=New Database
-++Exec=libreoffice -base %U
-++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
-+index d885589..b93e8a1 100644
-+--- sysui/desktop/menus/calc.desktop
-++++ sysui/desktop/menus/calc.desktop
-+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Calc
-+ GenericName=Spreadsheet
-+ Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-+ InitialPreference=5
-++X-Ayatana-Desktop-Shortcuts=New
-++[New Shortcut Group]
-++UnityQuicklist=New Spreadsheet
-++Exec=libreoffice -calc %U
-++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
-+index 21c31b8..6748f61 100644
-+--- sysui/desktop/menus/draw.desktop
-++++ sysui/desktop/menus/draw.desktop
-+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Draw
-+ GenericName=Drawing Program
-+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
-+ InitialPreference=5
-++X-Ayatana-Desktop-Shortcuts=New
-++[New Shortcut Group]
-++UnityQuicklist=New Drawing
-++Exec=libreoffice -draw %U
-++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
-+index 33a7d90..301131a 100644
-+--- sysui/desktop/menus/impress.desktop
-++++ sysui/desktop/menus/impress.desktop
-+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Impress
-+ GenericName=Presentation
-+ Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-+ InitialPreference=5
-++X-Ayatana-Desktop-Shortcuts=New
-++[New Shortcut Group]
-++UnityQuicklist=New Presentation
-++Exec=libreoffice -impress %U
-++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
-+index cd0717a..71468cc 100644
-+--- sysui/desktop/menus/math.desktop
-++++ sysui/desktop/menus/math.desktop
-+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Math
-+ GenericName=Formula Editor
-+ Comment=Create and edit scientific formulas and equations by using Math.
-+ InitialPreference=5
-++X-Ayatana-Desktop-Shortcuts=New
-++[New Shortcut Group]
-++UnityQuicklist=New Formula
-++Exec=libreoffice -math %U
-++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
-+index 95fe8db..f16a132 100644
-+--- sysui/desktop/menus/writer.desktop
-++++ sysui/desktop/menus/writer.desktop
-+@@ -11,3 +11,8 @@ Name[pt_BR]=%PRODUCTNAME_BR Writer
-+ GenericName=Word Processor
-+ Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-+ InitialPreference=5
-++X-Ayatana-Desktop-Shortcuts=New
-++[New Shortcut Group]
-++UnityQuicklist=New Document
-++Exec=libreoffice -writer %U
-++TargetEnvironment=Unity
-+diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf
-+index e369492..7bd3179 100644
-+--- sysui/desktop/share/launcher_comment.ulf
-++++ sysui/desktop/share/launcher_comment.ulf
-+@@ -1,21 +1,192 @@
-+ [writer]
-+ en-US = "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer."
-++ast = "Escribi y edita testos y gráficos en cartes, informes, documentos y páxines web."
-++ca = "Creeu i editeu text i gràfics a cartes, informes, documents i pàgines web."
-++da = "Opret og redigér tekst og grafik i breve, rapporter, dokumenter og hjemmesider."
-++de = "Texte und Grafiken in Briefen, Berichten, Dokumenten und Webseiten erstellen und bearbeiten."
-++es = "Cree y edite textos y gráficos en cartas, informes, documentos y páginas web."
-++el = "Δημιουργία και επεξεργασία κειμένου και γραφικών σε επιστολές, αναφορές, έγγραφα και ιστοσελίδες."
-++fi = "Luo ja muokkaa tekstejä ja grafiikkaa kirjeisiin, raportteihin, asiakirjoihin ja WWW-sivuille."
-++fr = "Créer et modifier des textes et graphiques pour lettres, rapports, documents ou pages Web."
-++gl = "Cree e modifique textos e gráficos en cartas, informes, documentos e páxinas web."
-++he = "יצירה ועריכה של טקסט וגרפיקה במכתבים, דוחות, מסמכים ואתרי אינטרנט."
-++hr = "Stvorite i uredite tekstualna i grafička pisma, izvještaje, dokumente i web stranice."
-++hu = "Levelek, jelentések, dokumentumok és weboldalak szövegének és grafikájának létrehozása és szerkesztése"
-++it = "Crea e modifica testo e grafica in lettere, rapporti, documenti e pagine Web."
-++is = "Búa til og sýsla með texta og myndefni í bréfum, skýrslum, ýmsum textaskjölum og vefsíðum."
-++ja = "手紙やレポート、文書、Webページ向けの文章や画像を作成・編集します。"
-++ku = "Nivîs û grafîkên di name, rapor, belge û rûpelên torê de çêbike û sererast bike."
-++nl = "Tekst en afbeeldingen bewerken in brieven, rapporten, documenten en webpagina's. "
-++pt_BR = "Crie e edite seus textos e gráficos em cartas, relatórios, documentos ou páginas da web."
-++ro = "Creați și editați documente text și grafice sub formă de scrisori, rapoarte, articole sau pagini web."
-++ru = "Создание и редактирование текстов и изображений в письмах, отчётах, документах и на веб-страницах."
-++sl = "Ustvarjajte in urejajte besedilo in grafiko v pismih, poročilih, dokumentih in spletnih straneh."
-++te = "పత్రాలు, నివేదికలు మరియు వెబ్ పేజీలలో పాఠ్యం మరియు గ్రాఫిక్స్ సృష్టి మరియు సవరణ"
-++vi = "Tạo và soạn văn bản và hình trong thư, báo cáo, tài liệu và trang web."
-++zh_CN = "创建编辑文档、报告、信件和网页中的文本和图形。"
-++zh_TW = "建立與編輯書信、報告、文件與網頁中的文字和圖形。"
-+
-+ [impress]
-+ en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress."
-++ast = "Fai y edita presentaciones pa pases de diapositives, reuniones y páxines web."
-++ca = "Creeu i editeu presentacions per a diapositives, conferències i pàgines web."
-++da = "Opret og rediger præsentationer til diasshows, møder og hjemmesider."
-++de = "Präsentationen für Vorführungen, Besprechungen und Web-Auftritte erstellen und bearbeiten."
-++el = "Δημιουργία και επεξεργασία παρουσιάσεων για προβολές διαφανειών, συσκέψεις και ιστοσελίδες"
-++es = "Cree y edite presentaciones para pases de diapositivas, reuniones y páginas web."
-++fi = "Luo ja muokkaa esityksiä esitelmiin, tapaamisiin ja WWW-sivuille."
-++fr = "Créer et modifier des présentations pour des diaporamas, des conférences et pour le Web."
-++gl = "Cree e modifique presentacións para diaporamas, conferencias e páxinas web."
-++he = "יצירה ועריכה של מצגות עבור שקופיות, פגישות ואתרי אינטרנט."
-++hr = "Stvorite i uredite prezentacije za sastanke i web stranice."
-++hu = "Bemutatók készítése és szerkesztése diavetítésekhez vagy a webre"
-++it = "Crea e modifica presentazioni per proiezioni, meeting e pagine Web."
-++is = "Búa til og breyta kynningum fyrir ráðstefnur, fyrirlestra og fyrir birtingu á vef."
-++ja = "スライドショーや会議、Webページ向けのプレゼンテーションを作成・編集します。"
-++nl = "Presentaties maken voor diavoorstellingen, vergaderingen en webpagina's."
-++pt_BR = "Crie e edite apresentações para reuniões ou páginas da web."
-++ro = "Creați și editați prezentări, diapozitive sau pagini web."
-++ru = "Создание и редактирование презентаций для слайд-шоу, докладов и веб-страниц."
-++sl = "Ustvarjajte in urejajte predstavitve za srečanja, predstavitve in spletne strani."
-++vi = "Tạo trình diễn để chiếu tự động, cho cuộc họp hoặc trang web"
-++zh_CN = "创建编辑用于幻灯片放映、会议和网页的演示文稿。"
-++zh_TW = "建立與編輯投影片放映、會議、網頁中的簡報。"
-+
-+ [draw]
-+ en-US = "Create and edit drawings, flow charts, and logos by using Draw."
-++ast = "Crea y edita dibuxos, diagrames de fluxu y logos."
-++ca = "Creeu i editeu dibuixos, diagrames de flux i logotips."
-++da = "Opret og rediger tegninger, diagrammer og logoer."
-++de = "Zeichnungen, Flussdiagramme und Logos erstellen und bearbeiten"
-++el = "Δημιουργία και επεξεργασία σχεδιασμάτων, διαγραμμάτων ροής και λογοτύπων."
-++es = "Cree y edite dibujos, diagramas de flujo y logotipos."
-++fi = "Luo ja muokkaa piirroksia, vuokaavioita ja logoja."
-++fr = "Créer et modifier des dessins, diagrammes et logos."
-++gl = "Cree e modifique debuxos, diagramas de fluxo e logotipos."
-++he = ".יצירה ועריכה של ציורים, תרשימי זרימה וסמלילים"
-++hr = "Stvorite i uredite crteže, dijagrame toka i logotipove."
-++hu = "Rajzok, folyamatábrák és logók létrehozása és szerkesztése"
-++it = "Crea e modifica disegni, diagrammi di flusso e loghi."
-++is = "Búa til og breyta teikningum, skýringamyndum og flæðiritum."
-++ja = "ベクタ画像やフローチャート、ロゴを編集します。"
-++nl = "Tekeningen, diagrammen en logo's maken."
-++pt_BR = "Crie e edite desenho, fluxograma ou logos"
-++ro = "Creați și editați desene, grafice și logouri. "
-++ru = "Создание и редактирование рисунков, диаграмм и логотипов."
-++sl = "Ustvarjajte in urejajte slike, diagrame poteka in logotipe."
-++te = "చిత్రాలు,చిహ్నాలు(లోగో) మరియు ఫ్లో చార్టులు సృష్టి మరియు సవరణ"
-++vi = "Tạo và sửa hình vẽ, sơ đồ và biểu tượng"
-++zh_CN = "创建编辑图形、图表和标志。"
-++zn_TW = "建立與編輯繪圖、流程圖與標誌。"
-+
-+ [calc]
-+ en-US = "Perform calculation, analyze information and manage lists in spreadsheets by using Calc."
-++ast = "Fai cálculos, analiza información y xestiona llistes en fueyes de cálculu."
-++ca = "Executeu càlculs, analitzeu informació i gestioneu llistats en fulls de càlcul."
-++da = "Udfør beregninger, analysér information og håndter lister i regneark."
-++de = "Berechnungen ausführen, Informationen analysieren und Listen in Tabellen verwalten."
-++el = "Εκτέλεση υπολογισμών, ανάλυση πληροφοριών και διαχείριση καταλόγων στα λογιστικά φύλλα"
-++es = "Realice cálculos, analice información y gestione listas en hojas de cálculo."
-++fi = "Tee laskelmia, käsittele tietoa ja hallitse luetteloita laskentataulukoissa."
-++fr = "Réaliser des calculs, analyser les informations et gérer des listes avec des feuilles de calcul."
-++gl = "Realice cálculos, analice información e administre listas en follas de cálculo."
-++he = "ביצוע חישובים, ניתוח מידע וניהול רשימות בגיליונות אלקטרונים."
-++hr = "Upravljajte izračunima i analizirajte informacije u proračunskim tablicama."
-++hu = "Számítások végrehajtása, adatok elemzése és listák kezelése munkafüzetekben"
-++it = "Esegue calcoli, analizza informazioni e gestisce elenchi in fogli di calcolo."
-++is = "Framkvæma útreikninga, greina gögn og meðhöndla lista í töfluformi."
-++ja = "シート上にある数値の集計や分析、シートの管理を行います。"
-++nl = "Berekeningen maken, informatie analyseren en lijsten beheren in rekenbladen."
-++pt_BR = "Realize cálculos, analise informação e gerencie listas em planilhas"
-++ro = "Efectuați calcule, analizați informații și administrați liste în foi de calcul."
-++ru = "Расчёты, анализ информации и управление списками с помощью электронных таблиц."
-++sl = "Izvajajte izračune, analizirajte informacije in upravljajte sezname in preglednice."
-++te = "స్ప్రెడ్ షీట్ లో లెక్కించు, వివరాలను విశ్లేషించు మరియు జాబితా నిర్వహించు "
-++vi = "Tính toán, xử lý thông tin và quản lý danh sách trong tờ bảng tính"
-++zh_CN = "在电子表格中计算、分析、管理信息。"
-++zh_TW = "在試算表中進行計算、分析資訊，以及管理清單。"
-+
-+ [math]
-+ en-US = "Create and edit scientific formulas and equations by using Math."
-++ast = "Fai y edita fórmules científiques y ecuaciones."
-++ca = "Creeu i editeu fórmules científiques i equacions."
-++da = "Opret og redigér videnskabelige formler og ligninger."
-++de = "Wissenschaftliche Formeln und Gleichungen erstellen und bearbeiten."
-++el = "Δημιουργία και επεξεργασία επιστημονικών τύπων και εξισώσεων."
-++es = "Cree y edite fórmulas científicas y ecuaciones."
-++fi = "Luo ja muokkaa tieteellisiä kaavoja ja yhtälöitä."
-++fr = "Créer et modifier des formules scientifiques et des équations."
-++gl = "Cree e modifique fórmulas científicas e ecuacións."
-++he = "יצירה ועריכה של נוסחות מדעיות ומשוואות."
-++hr = "Stvorite i uredite znanstvene formule i jednadžbe."
-++hu = "Képletek és egyenletek létrehozása és szerkesztése"
-++it = "Crea e modifica formule scientifiche ed equazioni."
-++is = "Búa til og breyta vísindaformúlum og jöfnum."
-++ja = "数式や方程式を作成・編集します。"
-++nl = "Wetenschappelijke formules en vergelijkingen maken."
-++pt_BR = "Crie e edite fórmulas e equações científicas."
-++ro = "Creați și editați formule științifice și ecuații."
-++ru = "Создание и редактирование научных формул и уравнений."
-++sl = "Ustvarjajte in urejajte znanstvene formule in enačbe."
-++te = "శాస్త్ర సూత్రాలు మరియు సమీకరణాల సృష్టి మరియు సవరణ"
-++vi = "Tạo và soạn công thức và phương trình khoa học"
-++zh_CN = "创建编辑数学公式和方程"
-++zh_TW = "建立與編輯科學公式與方程式。"
-++
-+
-+ [base]
-+ en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
-++ast = "Xestiona bases de datos, fai consultes ya informes, sigui y xestiona la to información."
-++ca = "Gestioneu bases de dades, creeu consultes i informes per fer un seguiment i gestionar la vostra informació."
-++da = "Håndtér databaser, og opret forespørgsler og rapporter til at overvåge og administrere dine informationer."
-++de = "Datenbanken verwalten, Abfragen und Berichte erstellen, um Ihre Daten zu überblicken und zu verwalten."
-++el = "Διαχείριση βάσεων δεδομένων, δημιουργία ερωτημάτων και αναφορών για την παρακολούθηση και διαχείριση των πληροφοριών σας."
-++es = "Gestione bases de datos, cree consultas e informes, siga y gestione su información."
-++fi = "Hallitse tietokantoja, tee hakuja ja raportteja seurataksesi ja hallitaksesi tietoja."
-++fr = "Gérer des bases de données, créer des requêtes et des rapports pour le suivi et l'analyse de vos données."
-++gl = "Administre bases de datos, cree consultas e informes, siga e xestione a súa información."
-++he = "ניהול מסדי נתונים, יצירת חקירות ודוחות על מנת לנהל את המידע שלכם ולעקוב אחריו."
-++hr = "Upravljajte bazama podataka, definirajte upite i izvještaje za praćenje i upravljanje vašim informacijama."
-++hu = "Adatbázisok kezelése, lekérdezések és jelentések készítése az információinak kezeléséhez"
-++it = "Gestisce database, crea query e rapporti per tracciare e gestire le proprie informazioni."
-++is = "Sýsla með gagnagrunna, búa til útfyllingarform og skýrslur, safna saman og vinna úr ýmiskonar gögnum."
-++ja = "データベースの管理やクエリの作成、情報の追跡や管理した結果を報告します。"
-++nl = "Databases beheren, query's en rapporten maken om uw informatie te beheren en op te zoeken."
-++nn = "Handsam databaser og lag spørringar og rapportar for å gjera informasjonen oversiktleg"
-++pt_BR = "Administre base de dados, crie consultas e relatórios para rastrear e gerenciar informação."
-++ro = "Administrați baze de date, creați interogări și rapoarte pentru a urmări și administra informațiile proprii."
-++ru = "Управление базами данных, создание запросов и отчётов для контролирования вашей информации."
-++sl = "Upravljajte podatkovne zbirke, ustvarjajte poizvedbe in poročila za sledenje in upravljanje svojih podatkov."
-++te = "మీ జాబితా మరియు వివరాలకోసం డాటాబేస్ నిర్వహణ మరియు ప్రశ్నలు, నివేదికల సృష్టి "
-++vi = "Quản lý cơ sở dữ liệu, tạo lệnh tìm kiếm và báo cáo để theo dõi và quản lý thông tin của bạn."
-++zh_CN = "管理数据库，创建查询和报告，跟踪和管理您的信息。"
-++zh_TW = "管理資料庫、建立查詢與報告，以追蹤及管理您的資訊。"
-++
-+
-+ [startcenter]
-+ en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation."
-++ast = "Suite de productividá d'oficina compatible con ODF, el formatu de documentos abiertu y estandarizáu. Col sofitu de la Document Foundation."
-++ca = "Paquet ofimàtic compatible amb el format estàndard de documents ODF. Mantingut per la Document Foundation."
-++da = "Office produktionspakken er kompatibel med det åbne og standardiseret ODF-dokumentformat. Understøttet af The Document Foundation."
-++de = "Die zum offenen und standardisierten ODF-Format kompatible Sammlung von Büroanwendungen. Unterstützt durch »The Document Foundation«."
-++es = "Suite de productividad para la oficina compatible con ODF, el formato de documentos abierto y estandarizado. Con el soporte de la Document Foundation."
-++el = "Η συμβατή με την ανοικτή και πρότυπη μορφή εγγράφων ODF σουίτα γραφείου. Υποστηρίζεται από το The Document Foundation."
-++fi = "Avointa ja standardoitua ODF-asiakirjamuotoa tukeva toimisto-ohjelmisto. The Document Foundation -säätiön tukema."
-++fr = "Suite bureautique compatible avec le format de document standard et ouvert ODF. Soutenue par The Document Foundation."
-++gl = "A suite de produtividade de oficina compatíbel co formato aberto e estandarizado de documentos ODF. Co apoio da Document Foundation"
-++he = "חבילת כלי העבודה המשרדית תואמת את מבנה המסמכים הפתוח והתקני ODF. נתמכת על ידי The Document Foundation."
-++hr = "Paket uredskih aplikacija s podrškom za otvoren i standardiziran ODF format dokumenata. Podržan od strane Document fundacije."
-++hu = "A nyílt és szabványos ODF formátummal kompatibilis irodai programcsomag a Document Foundation támogatásával"
-++it = "La suite di produttività compatibile con il formato standard e aperto dei documenti ODF. Supportata dalla The Document Foundation."
-++is = "Forritavöndull til hjálpar við vinnu við gagna- og textavinnslu, styðst við ODF sjalasniðið sem er staðlað og frjálst snið fyrir ýmiskonar skjöl. Stutt af Document Foundation."
-++ja = "オープンで標準化されたODFドキュメントフォーマットに対応した生産性の高いオフィススイートです。The Document Foundationによってサポートされています。"
-++nl = "Het kantoorpakket compatibel met ODF (het gestandaardiseerde Open Document Formaat). Ondersteund door The Document Foundation. "
-++pt_BR = "Suíte de escritório produtiva, compatível com o formato aberto ODF. Suportado pela The Document Foundation."
-++ro = "Suita de birou compatibilă cu formatul de document liber și standardizat ODF, cu asistență oferită de The Document Foundation."
-++ru = "Офисный пакет, совместимый с открытым и стандартизованным форматом документов ODF. Поддерживается The Document Foundation."
-++sl = "Pisarniška zbirka, združljiva z odprtim in standardiziranim zapisom ODF. Podpira jo The Document Foundation."
-++te = "రహస్యాలు లేని మరియు ప్రామాణికమైన ODF కు అనుకూలమైన కార్యాలయ ఉత్పాదకత అనువర్తనాల సముదాయం, డాక్యుమెంట్ ఫౌండేషన్ తోడ్పాటుతో"
-++vi = "Bộ văn phòng thích hợp với chuẩn đinh dạng tài liệu mở ODF, nhận được sự hỗ trợ từ Quỹ The Document Foundation"
-++zh_CN = "兼容开放标准 ODF 的办公软件套装。由 The Document Foundation 支持。"
-++zh_TW = "與開放且標準化的 ODF 文件格式相容的辦公生產力套裝軟體。由文件基金會提供支援。"
-+
-+diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
-+index ff8041a..ba16f53 100644
-+--- sysui/desktop/share/launcher_genericname.ulf
-++++ sysui/desktop/share/launcher_genericname.ulf
-+@@ -1,23 +1,191 @@
-+ [writer]
-+ en-US = "Word Processor"
-++ast = "Procesador de testos"
-++ca = "Processador de texts"
-++da = "Tekstbehandling"
-++de = "Textverarbeitung"
-++es = "Procesador de textos"
-++el = "Επεξεργαστής κειμένου"
-++fi = "Tekstinkäsittely"
-++fr = "Traitement de texte"
-++gl = "Procesador de texto"
-++he = "מעבד תמלילים"
-++hr = "Obrađivač teksta"
-++hu = "Szövegszerkesztő"
-++it = "Word processor"
-++is = "Ritvinnsla"
-++ja = "ワープロ"
-++ku = "Bernameya nivîsê"
-++nl = "Tekstverwerker"
-++pt_BR = "Processador de texto"
-++ro = "Procesor de documente"
-++ru = "Редактор документов"
-++sl = "Urejevalnik besedila"
-++te = "పాఠ్య సవరణ"
-++vi = "Soạn thảo văn bản"
-++zh_CN = "文档编辑器"
-++zh_TW = "文書處理器"
-+
-+ [impress]
-+ en-US = "Presentation"
-++ast = "Presentación"
-++ca = "Presentació"
-++da = "Præsentation"
-++de = "Präsentationen"
-++el = "Παρουσίαση"
-++es = "Presentación"
-++fi = "Esitys"
-++fr = "Présentation"
-++gl = "Presentación"
-++he = "מצגות"
-++hr = "Prezentacija"
-++hu = "Bemutatókészítő"
-++it = "Presentazione"
-++is = "Skyggnusýning"
-++ja = "プレゼンテーション"
-++nl = "Presentatie"
-++pt_BR = "Apresentação"
-++ro = "Prezentări"
-++ru = "Презентация"
-++sl = "Predstavitev"
-++vi = "Trình diễn"
-++zh_CN = "演示文稿"
-++zh_TW = "簡報"
-+
-+ [calc]
-+ en-US = "Spreadsheet"
-++ast = "Fueya de cálculu"
-++ca = "Full de càlcul"
-++da = "Regneark"
-++de = "Tabellenkalkulation"
-++el = "Λογιστικό φύλλο"
-++es = "Hoja de cálculo"
-++fi = "Taulukko"
-++fr = "Feuille de calcul"
-++gl = "Folla de cálculo"
-++he = "גיליון אלקטרוני"
-++hr = "Proračunske tablice"
-++hu = "Táblázatkezelő"
-++it = "Foglio di calcolo"
-++is = "Töflureikniblað"
-++ja = "表計算"
-++nl = "Rekenblad"
-++pt_BR = "Planilha"
-++ro = "Foi de calcul"
-++ru = "Электронные таблицы"
-++sl = "Preglednica"
-++te = "స్ప్రెడ్ షీట్"
-++vi = "Tờ bảng tính"
-++zh_CN = "电子表格"
-++zh_TW = "試算表"
-+
-+ [base]
-+ en-US = "Database Development"
-++ast = "Desendolcu de bases de datos"
-++ca = "Desenvolupament de bases de dades"
-++da = "Databaseudvikling"
-++de = "Datenbankentwicklung"
-++el = "Ανάπτυξη βάσεων δεδομένων"
-++es = "Desarrollo de bases de datos"
-++fi = "Tietokanta"
-++fr = "Développement de bases de données"
-++gl = "Desenvolvemento de bases de datos"
-++he = "פיתוח מסדי נתונים"
-++hr = "Razvoj baza podataka"
-++hu = "Adatbázis-fejlesztés"
-++it = "Sviluppo database"
-++is = "Hönnun gagnagrunna"
-++ja = "データベース開発"
-++nl = "Database-ontwikkeling"
-++nn = "Databasehandsaming"
-++pt_BR = "Desenvolvimento de base de dados"
-++ro = "Dezvoltare baze de date"
-++ru = "Разработка баз данных"
-++sl = "Razvoj podatkovnih zbirk"
-++te = "డాటాబేస్ అభివృద్ధి"
-++vi = "Phát triển Cơ sở dữ liệu"
-++zn_CN = "数据库开发"
-++zh_TW = "資料庫開發"
-+
-+ [math]
-+ en-US = "Formula Editor"
-++ast = "Editor de fórmules"
-++ca = "Editor de fórmules"
-++da = "Formelredigering"
-++de = "Formel-Editor"
-++el = "Τύπος"
-++es = "Editor de fórmulas"
-++fi = "Kaavaeditori"
-++fr = "Éditeur de formules"
-++gl = "Editor de fórmulas"
-++he = "עורך נוסחות"
-++hr = "Uređivač jednadžbi"
-++hu = "Képletszerkesztő"
-++it = "Editor di formule"
-++is = "Formúluritill"
-++ja = "数式エディタ"
-++nl = "Formule-editor"
-++pt_BR = "Editor de fórmula"
-++ro = "Editor de formule"
-++ru = "Редактор формул"
-++sl = "Urejevalnik formule"
-++te = "సూత్ర సవరణి"
-++vi = "Trình soạn công thức"
-++zh_CN = "公式编辑器"
-++zh_TW = "公式編輯器"
-+
-+ [draw]
-+ en-US = "Drawing Program"
-++ast = "Programa de dibuxu"
-++ca = "Programa de dibuix"
-++da = "Tegneprogram"
-++de = "Zeichenprogramm"
-++el = "Πρόγραμμα Σχεδίασης"
-++es = "Programa de dibujo"
-++fi = "Piirros"
-++fr = "Logiciel de dessin"
-++gl = "Programa de debuxo"
-++he = "תוכנת ציור"
-++hr = "Crtanje"
-++hu = "Rajzoló"
-++it = "Programma di disegno"
-++is = "Teikniforrit"
-++ja = "図形描画"
-++nl = "Tekenprogramma"
-++pt_BR = "Programa para desenho"
-++ro = "Program de desensare "
-++ru = "Программа для рисования"
-++sl = "Program za risanje"
-++te = "చిత్రలేఖన ప్రోగ్రామ్"
-++vi = "Chương trình Vẽ"
-++zh_CN = "绘图工具"
-++zh_TW = "繪圖程式"
-+
-+ [startcenter]
-+ en-US = "Office"
-++ast = "Oficina"
-++ca = "Oficina"
-++da = "Kontor"
-++de = "Büroanwendungen"
-++es = "Oficina"
-++fi = "Toimisto"
-++fr = "Bureautique"
-++gl = "Oficina"
-++he = "אופיס"
-++hr = "Ured"
-++hu = "Iroda"
-++it = "Office"
-++is = "Skrifstofa"
-++ja = "オフィス"
-++nl = "Kantoor"
-++pt_BR = "Escritório"
-++ro = "Suită de birou"
-++ru = "Офис"
-++sl = "Pisarna"
-++te = "కార్యాలయం"
-++vi = "Bộ văn phòng"
-++zh_CN = "办公"
-++zh_TW = "辦公"
-+
-+ [javafilter]
-+ en-US = "Small Device Format Importer"
-+diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf
-+new file mode 100644
-+index 0000000..7b4c18a
-+--- /dev/null
-++++ sysui/desktop/share/launcher_unityquicklist.ulf
-+@@ -0,0 +1,168 @@
-++[writer]
-++en-US = "New Document"
-++ast = "Documentu nuevu"
-++ca = "Document nou"
-++da = "Nyt dokument"
-++de = "Neues Dokument"
-++es = "Documento nuevo"
-++el = "Νέο έγγραφο"
-++fi = "Uusi tekstiasiakirja"
-++fr = "Nouveau document"
-++gl = "Novo documento"
-++he = "מסמך חדש"
-++hr = "Novi dokument"
-++hu = "Új dokumentum"
-++it = "Nuovo documento"
-++is = "Nýtt textaskjal"
-++ja = "新規文書を作成"
-++ku = "Belgeya nû"
-++nl = "Nieuw Document"
-++pt_BR = "Novo documento"
-++ro = "Document nou"
-++ru = "Новый документ"
-++sl = "Nov dokument"
-++te = "కొత్త పత్రం"
-++vi = "Tài liệu mới"
-++zh_CN = "新建文档"
-++zh_TW = "新增文件"
-++
-++[impress]
-++en-US = "New Presentation"
-++ast = "Presentación nueva"
-++ca = "Presentació nova"
-++da = "Ny præsentation"
-++de = "Neue Präsentation"
-++el = "Νέα παρουσίαση"
-++es = "Presentación nueva"
-++fi = "Uusi esitys"
-++fr = "Nouvelle présentation"
-++gl = "Nova presentación"
-++he = "מצגת חדשה"
-++hr = "Nova prezentacija"
-++hu = "Új bemutató"
-++it = "Nuova presentazione"
-++is = "Ný skyggnusýning"
-++ja = "新規プレゼンテーションを作成"
-++nl = "Nieuwe presentatie"
-++pt_BR = "Nova apresentação"
-++ro = "Prezentare nouă"
-++ru = "Новая презентация"
-++sl = "Nova predstavitev"
-++vi = "Trình diễn mới"
-++zh_CN = "新建演示文稿"
-++zh_TW = "新增簡報"
-++
-++[calc]
-++en-US = "New Spreadsheet"
-++ast = "Fueya de cálculu nueva"
-++ca = "Full de càlcul nou"
-++da = "Nyt regneark"
-++de = "Neue Tabelle"
-++el = "Δημιουργία Νέου λογιστικού φύλλου"
-++es = "Hoja de cálculo nueva"
-++fi = "Uusi taulukko"
-++fr = "Nouvelle feuille de calcul"
-++gl = "Nova folla de cálculo"
-++he = "גיליון אלקטרוני חדש"
-++hr = "Nova proračunska tablica"
-++hu = "Új táblázat"
-++it = "Nuovo foglio di calcolo"
-++is = "Nýtt töflureikniblað"
-++ja = "新規シートを作成"
-++nl = "Nieuw Rekenblad"
-++pt_BR = "Nova planilha"
-++ro = "Foaie de calcul nouă"
-++ru = "Новая электронная таблица"
-++sl = "Nova preglednica"
-++te = "కొత్త స్ప్రెడ్ షీట్"
-++vi = "Bảng tính mới"
-++zh_CN = "新建表格"
-++zh_TW = "新增試算"
-++
-++[base]
-++en-US = "New Database"
-++ast = "Base de datos nueva"
-++ca = "Base de dades nova"
-++da = "Ny database"
-++de = "Neue Datenbank"
-++el = "Νέα βάση δεδομένων"
-++es = "Base de datos nueva"
-++fi = "Uusi tietokanta"
-++fr = "Nouvelle base de données"
-++gl = "Nova base de datos"
-++he = "מסד נתונים חדש"
-++hr = "Nova baza podataka"
-++hu = "Új adatbázis"
-++it = "Nuovo database"
-++is = "Nýr Base gagnagrunnur"
-++ja = "新規デ>ータベースを作成"
-++nl = "Nieuwe database"
-++nn = "Ny database"
-++pt_BR = "Nova base de dados"
-++ro = "Bază de date nouă"
-++ru = "Новая база данных"
-++sl = "Nova podatkovna zbirka"
-++te = "కొత్త డాటాబేస్"
-++vi = "Cơ sở dữ liệu mới"
-++zn_CN = "新建数据库"
-++zh_TW = "新增資料庫"
-++
-++[math]
-++en-US = "New Formula"
-++ast = "Fórmula nueva"
-++ca = "Fórmula nova"
-++da = "Ny formel"
-++de = "Neue Formel"
-++el = "Νέος τύπος"
-++es = "Fórmula nueva"
-++fi = "Uusi kaava"
-++fr = "Nouvelle formule"
-++gl = "Nova fórmula"
-++he = "נוסחה חדשה"
-++hr = "Nova jednadžba"
-++hu = "Új képlet"
-++it = "Nuova formula"
-++is = "Ný formúla"
-++ja = "新しい数式を作成"
-++nl = "Nieuwe formule"
-++pt_BR = "Nova fórmula"
-++ro = "Formulă nouă"
-++ru = "Новая формула"
-++sl = "Nova formula"
-++te = ""కొత్త సూత్రం
-++vi = "Công thức mới"
-++zh_CN = "新建公式"
-++zh_TW = "新增公式"
-++
-++[draw]
-++en-US = "New Drawing"
-++ast = "Dibuxu nuevu"
-++ca = "Dibuix nou"
-++da = "Ny tegning"
-++de = "Neue Zeichnung"
-++el = "Νέα σχεδίαση"
-++es = "Dibujo nuevo"
-++fi = "Uusi piirros"
-++fr = "Nouveau dessin"
-++gl = "Novo debuxo"
-++he = "ציור חדש"
-++hr = "Nov crtež"
-++hu = "Új rajz"
-++it = "Nuovo disegno"
-++is = "Ný teikning"
-++ja = "新規画像を作成"
-++nl = "Nieuwe tekening"
-++pt_BR = "Novo desenho"
-++ro = "Desen nou"
-++ru = "Новый рисунок"
-++sl = "Nova risba"
-++te = "కొత్త చిత్రం"
-++vi = "Hình vẽ mới"
-++zh_CN = "新建绘图"
-++zh_TW = "新增繪圖"
-++
-++[startcenter]
-++en-US = ""
-++
-++[javafilter]
-++en-US = ""
-+diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
-+index 898d7b0..7c35386 100644
-+--- sysui/desktop/share/makefile.mk
-++++ sysui/desktop/share/makefile.mk
-+@@ -50,6 +50,7 @@ ULFFILES= \
-+ documents.ulf \
-+ launcher_comment.ulf \
-+ launcher_genericname.ulf \
-++ launcher_unityquicklist.ulf \
-+ launcher_name.ulf
-+
-+ LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter javafilter
-+@@ -145,7 +146,7 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build
-+ # merge-in the translations.
-+ #
-+
-+-$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf
-++$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl $(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf $(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
-+ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
-+ @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
-+ @echo Creating desktop entries for $(@:f) ..
-+@@ -154,6 +155,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
-+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
-+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -b '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
-+ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
-++ @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -p '$${{PRODUCTNAME_BR}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH).$(@:f) --ext "desktop" --key "UnityQuicklist" $(ULFDIR)$/launcher_unityquicklist.ulf
-+ .IF "$(WITH_LIBSN)"=="YES"
-+ @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x
-+ .ENDIF
-+diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
-+index cb209e4..fe7fecd 100644
-+--- sysui/desktop/share/translate.pl
-++++ sysui/desktop/share/translate.pl
-+@@ -69,6 +69,12 @@ while ($_ = $ARGV[0], /^-/) {
-+ }
-+ }
-+
-++# hack for unity section
-++$outkey = $key;
-++if ( $outkey eq "UnityQuicklist" ) {
-++ $outkey = "Name";
-++}
-++
-+ # open input file
-+ unless (open(SOURCE, $ARGV[0])) {
-+ print STDERR "Can't open $ARGV[0] file: $!\n";
-+@@ -111,9 +117,12 @@ while (<SOURCE>) {
-+
-+ # Pass the head of the template to the output file
-+ KEY: while (<TEMPLATE>) {
-+- print OUTFILE;
-++ $keyline = $_;
-+ last KEY if (/$key/);
-++ print OUTFILE;
-+ }
-++ $keyline=~s/^$key/$outkey/;
-++ print OUTFILE $keyline;
-+
-+ } else {
-+ # split locale = "value" into 2 strings
-+@@ -125,16 +134,19 @@ KEY: while (<TEMPLATE>) {
-+
-+ # use just anything inside the ""
-+ $value = substr($value, index($value, "\"") + 1, rindex($value, "\"") - 1);
-+-
-++
-+ # replace resource placeholder
-+ $value=~s/%PRODUCTNAME_BR/$productname_br/g;
-+ $value=~s/%PRODUCTNAME/$productname/g;
-+
-+ $locale=~s/-/_/;
-++
-++ if (not $value eq '') {
-+ if ($ext eq "desktop") {
-+- print OUTFILE "$key\[$locale\]=$value\n";
-++ print OUTFILE "$outkey\[$locale\]=$value\n";
-+ } else {
-+- print OUTFILE "\t\[$locale\]$key=$value\n";
-++ print OUTFILE "\t\[$locale\]$outkey=$value\n";
-++ }
-+ }
-+ }
-+ }
diff --git a/patches/lp746375.diff b/patches/lp746375.diff
deleted file mode 100644
index 645c5d5..0000000
--- a/patches/lp746375.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0030-lp746375.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntu-0030-lp746375.diff 2011-06-28 16:28:40.412707010 +0200
-@@ -0,0 +1,47 @@
-+
-+From df71bb6970dc95a963ef2ea52f1f93f5f50325ed Mon Sep 17 00:00:00 2001
-+From: Caolán McNamara <caolanm@redhat.com>
-+Date: Wed, 13 Apr 2011 11:23:40 +0000
-+Subject: Related: lp#746375 ensure a deterministic shutdown order for globals
-+
-+---
-+diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
-+index 68bb949..97e44e7 100644
-+--- vcl/unx/gtk/a11y/atkutil.cxx
-++++ vcl/unx/gtk/a11y/atkutil.cxx
-+@@ -66,7 +66,14 @@
-+
-+ using namespace ::com::sun::star;
-+
-+-static uno::WeakReference< accessibility::XAccessible > xNextFocusObject;
-++namespace
-++{
-++ struct theNextFocusObject :
-++ public rtl::Static< uno::WeakReference< accessibility::XAccessible >, theNextFocusObject>
-++ {
-++ };
-++}
-++
-+ static guint focus_notify_handler = 0;
-+
-+ /*****************************************************************************/
-+@@ -80,7 +87,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
-+
-+ focus_notify_handler = 0;
-+
-+- uno::Reference< accessibility::XAccessible > xAccessible = xNextFocusObject;
-++ uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject::get();
-+ if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) )
-+ {
-+ AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL;
-+@@ -135,7 +142,7 @@ atk_wrapper_focus_tracker_notify_when_idle( const uno::Reference< accessibility:
-+ if( focus_notify_handler )
-+ g_source_remove(focus_notify_handler);
-+
-+- xNextFocusObject = xAccessible;
-++ theNextFocusObject::get() = xAccessible;
-+
-+ focus_notify_handler = g_idle_add (atk_wrapper_focus_idle_handler, xAccessible.get());
-+ }
-+--
-+cgit v0.8.3-6-g21f6
--
LibreOffice packaging repository
Reply to: