mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 04:42:48 +00:00
Updated to 4.2.5.2, sync patches with cooker
This commit is contained in:
Denis Silakov
parent
f513dff794
commit
75f5f66aa3
9 changed files with 2893 additions and 2929 deletions
36
.abf.yml
36
.abf.yml
|
|
@ -1,17 +1,45 @@
|
|||
removed_sources:
|
||||
libreoffice-4.2.3.1.tar.xz: bab0cfb0ffdf84774c24bb2fffaba39895e57ada
|
||||
libreoffice-4.2.3.3.tar.xz: 0dbd92f7fa212214df852cd01ffd2287b61d6b1a
|
||||
libreoffice-dictionaries-4.2.3.1.tar.xz: 21562dc917b6555d604f89adf2a39ce229ccf588
|
||||
libreoffice-dictionaries-4.2.3.3.tar.xz: 39f5e3b883f66aefc772a375681599ae4c7f2ce5
|
||||
libreoffice-help-4.2.3.1.tar.xz: 0f7b8116acd0d1012b38c47dd76304e5c1099a2d
|
||||
libreoffice-help-4.2.3.3.tar.xz: 21dbe38a5b6504d3355b1e9dc03b1bd7983f8bdf
|
||||
libreoffice-translations-4.2.3.1.tar.xz: a09ad7dbbced6510eb2568065dd91cc31e284dfe
|
||||
libreoffice-translations-4.2.3.3.tar.xz: ba41fd7aff5fd554738ee1a16e2bd402c586ea51
|
||||
sources:
|
||||
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz: 452eba922e4f41603539c9dc39947d2271e47093
|
||||
09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a
|
||||
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec
|
||||
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz: 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b
|
||||
1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz: 8f949ae74a6d66278a595bd063f13e0ad196d14a
|
||||
23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt: da769c6f73206f0f0e6db4697f802c0bacbf4d02
|
||||
27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt: 6d400d83fa2080847ad9d7e2ca466a98ee2dbfa4
|
||||
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz: efc1ab026e8e9ac4cd150cb4cf1b7e4663cddc84
|
||||
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050
|
||||
3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt: c01632cfaee10322bc4badef316bedd08a759224
|
||||
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt: e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda
|
||||
472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f
|
||||
4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6
|
||||
53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca
|
||||
8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt: ad53e6f0b18842ade578cad5acc9ea651ad01a03
|
||||
9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt: 0f0e7f1f1fd7951de2dd3b6bb7313c6adb4d17b8
|
||||
Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f
|
||||
a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853
|
||||
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz: d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7
|
||||
af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4
|
||||
apache-ant-1.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
|
||||
libreoffice-4.1.3.2.tar.xz: 0855ebef85ecad5f28c7b9d6f872d7c1d40e50be
|
||||
libreoffice-dictionaries-4.1.3.2.tar.xz: b340473a31c7c431d22aeef4642aecff4eaa4876
|
||||
libreoffice-help-4.1.3.2.tar.xz: 2873a84f858743f4a1ce753a6bbcf80a8d4c4a03
|
||||
libreoffice-translations-4.1.3.2.tar.xz: f5ed5424a50bc24761e7255b73079ad134eb164e
|
||||
b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705
|
||||
b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08
|
||||
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
|
||||
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
|
||||
bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt: c89331a8d7642429f4fe3ffe07ee6d675f99561a
|
||||
libreoffice-4.2.5.2.tar.xz: 42b532233e4226f2b71841806cab555f05132c3f
|
||||
libreoffice-dictionaries-4.2.5.2.tar.xz: c84fa5de085253df3e85952ee09d2726d8de3255
|
||||
libreoffice-help-4.2.5.2.tar.xz: 8c09ab1f8c42a4aeefcb60bd782db45bc5f18e7a
|
||||
libreoffice-translations-4.2.5.2.tar.xz: 8114da4235820205e4dd4650fcdfb049c823e516
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
From 3750deae3e2d8fcf8bcf795fe327e1da370a2c4d Mon Sep 17 00:00:00 2001
|
||||
From: Katarina Behrens <bubli@bubli.org>
|
||||
Date: Fri, 13 Sep 2013 17:29:12 +0200
|
||||
Subject: [PATCH] Avoid crash when a comment contains data, but no text
|
||||
|
||||
calling back() on empty vector results in undef behaviour
|
||||
|
||||
Crash originally reported here:
|
||||
http://lists.freedesktop.org/archives/libreoffice/2013-September/055827.html
|
||||
|
||||
Change-Id: Ibefdc7e2495fc31d748c16fedd3cee5eb957bfa2
|
||||
---
|
||||
oox/source/ppt/presentationfragmenthandler.cxx | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
|
||||
index 247b81b..826130c 100644
|
||||
--- a/oox/source/ppt/presentationfragmenthandler.cxx
|
||||
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
|
||||
@@ -323,8 +323,12 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, sal_Bool bFirst
|
||||
//set comment chars for last comment on slide
|
||||
SlideFragmentHandler* comment_handler =
|
||||
dynamic_cast<SlideFragmentHandler*>(xCommentsFragmentHandler.get());
|
||||
+ // some comments have no text -> set empty string as text to avoid
|
||||
+ // crash (back() on empty vector is undefined) and losing other
|
||||
+ // comment data that might be there (author, position, timestamp etc.)
|
||||
pCommentsPersistPtr->getCommentsList().cmLst.back().setText(
|
||||
- comment_handler->getCharVector().back() );
|
||||
+ comment_handler->getCharVector().empty() ? "" :
|
||||
+ comment_handler->getCharVector().back() );
|
||||
pCommentsPersistPtr->getCommentAuthors().setValues(maAuthorList);
|
||||
|
||||
//insert all comments from commentsList
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From b73dec8a06ef762098e642b2c37e4baad780b11a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 12 Sep 2013 10:56:37 +0100
|
||||
Subject: [PATCH] Resolves: rhbz#1006850 crash in
|
||||
SwCommentRuler::GetCommentControlRegion
|
||||
|
||||
Change-Id: Ic846da3b22391d724da6f8df94dd771e89d2efb4
|
||||
---
|
||||
sw/source/ui/misc/swruler.cxx | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx
|
||||
index a41fc0b..76fb8be 100644
|
||||
--- a/sw/source/ui/misc/swruler.cxx
|
||||
+++ b/sw/source/ui/misc/swruler.cxx
|
||||
@@ -247,6 +247,13 @@ void SwCommentRuler::UpdateCommentHelpText()
|
||||
Rectangle SwCommentRuler::GetCommentControlRegion()
|
||||
{
|
||||
SwPostItMgr *pPostItMgr = mpViewShell->GetPostItMgr();
|
||||
+
|
||||
+ //rhbz#1006850 When the SwPostItMgr ctor is called from SwView::SwView it
|
||||
+ //triggers an update of the uiview, but the result of the ctor hasn't been
|
||||
+ //set into the mpViewShell yet, so GetPostItMgr is temporarily still NULL
|
||||
+ if (!pPostItMgr)
|
||||
+ return Rectangle();
|
||||
+
|
||||
//FIXME When the page width is larger then screen, the ruler is misplaced by one pixel
|
||||
long nLeft = GetWinOffset() + GetPageOffset() + mpSwWin->LogicToPixel(Size(GetPageWidth(), 0)).Width();
|
||||
long nTop = 0 + 4; // Ruler::ImplDraw uses RULER_OFF (value: 3px) as offset, and Ruler::ImplFormat adds one extra pixel
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
--- libreoffice-4.1.0/configure.ac.omv~ 2013-08-30 00:27:27.892982601 +0200
|
||||
+++ libreoffice-4.1.0/configure.ac 2013-08-30 00:27:47.593610076 +0200
|
||||
@@ -7216,7 +7216,7 @@ libo_CHECK_SYSTEM_MODULE([libvisio],[VIS
|
||||
dnl ===================================================================
|
||||
dnl Check for system libcmis
|
||||
dnl ===================================================================
|
||||
-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1])
|
||||
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4])
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Check for system libwpd
|
||||
--- libreoffice-4.1.0/configure.omv~ 2013-08-30 00:27:50.498555145 +0200
|
||||
+++ libreoffice-4.1.0/configure 2013-08-30 00:28:51.163407981 +0200
|
||||
@@ -18803,12 +18803,12 @@ if test -n "$CMIS_CFLAGS"; then
|
||||
pkg_cv_CMIS_CFLAGS="$CMIS_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.3 >= 0.3.1\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libcmis-0.3 >= 0.3.1") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.4\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libcmis-0.4") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_CMIS_CFLAGS=`$PKG_CONFIG --cflags "libcmis-0.3 >= 0.3.1" 2>/dev/null`
|
||||
+ pkg_cv_CMIS_CFLAGS=`$PKG_CONFIG --cflags "libcmis-0.4" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -18820,12 +18820,12 @@ if test -n "$CMIS_LIBS"; then
|
||||
pkg_cv_CMIS_LIBS="$CMIS_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.3 >= 0.3.1\""; } >&5
|
||||
- ($PKG_CONFIG --exists --print-errors "libcmis-0.3 >= 0.3.1") 2>&5
|
||||
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcmis-0.4\""; } >&5
|
||||
+ ($PKG_CONFIG --exists --print-errors "libcmis-0.4") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
- pkg_cv_CMIS_LIBS=`$PKG_CONFIG --libs "libcmis-0.3 >= 0.3.1" 2>/dev/null`
|
||||
+ pkg_cv_CMIS_LIBS=`$PKG_CONFIG --libs "libcmis-0.4" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
@@ -18846,14 +18846,14 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
- CMIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcmis-0.3 >= 0.3.1" 2>&1`
|
||||
+ CMIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcmis-0.4" 2>&1`
|
||||
else
|
||||
- CMIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcmis-0.3 >= 0.3.1" 2>&1`
|
||||
+ CMIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcmis-0.4" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$CMIS_PKG_ERRORS" >&5
|
||||
|
||||
- as_fn_error $? "Package requirements (libcmis-0.3 >= 0.3.1) were not met:
|
||||
+ as_fn_error $? "Package requirements (libcmis-0.4) were not met:
|
||||
|
||||
$CMIS_PKG_ERRORS
|
||||
|
||||
--- libreoffice-4.1.0/ucb/source/ucp/cmis/auth_provider.hxx.omv~ 2013-08-30 03:41:06.437325736 +0200
|
||||
+++ libreoffice-4.1.0/ucb/source/ucp/cmis/auth_provider.hxx 2013-08-30 03:42:57.375242399 +0200
|
||||
@@ -13,6 +13,7 @@
|
||||
#define AUTH_PROVIDER_HXX
|
||||
|
||||
#include <libcmis/session.hxx>
|
||||
+#include <libcmis/session-factory.hxx>
|
||||
|
||||
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
|
||||
|
||||
--- libreoffice-4.1.0/ucb/source/ucp/cmis/cmis_repo_content.cxx.omv~ 2013-08-30 03:50:25.248828468 +0200
|
||||
+++ libreoffice-4.1.0/ucb/source/ucp/cmis/cmis_repo_content.cxx 2013-08-30 04:04:47.238571797 +0200
|
||||
@@ -43,7 +43,7 @@ namespace cmis
|
||||
{
|
||||
RepoContent::RepoContent( const uno::Reference< uno::XComponentContext >& rxContext,
|
||||
ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier,
|
||||
- list< libcmis::RepositoryPtr > aRepos )
|
||||
+ vector< libcmis::RepositoryPtr > aRepos )
|
||||
throw ( ucb::ContentCreationException )
|
||||
: ContentImplHelper( rxContext, pProvider, Identifier ),
|
||||
m_pProvider( pProvider ),
|
||||
@@ -172,7 +172,7 @@ namespace cmis
|
||||
|
||||
if ( !m_sRepositoryId.isEmpty() )
|
||||
{
|
||||
- for ( list< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
|
||||
+ for ( vector< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
|
||||
it != m_aRepositories.end( ) && NULL == repo.get( ); ++it )
|
||||
{
|
||||
if ( STD_TO_OUSTR( ( *it )->getId( ) ) == m_sRepositoryId )
|
||||
@@ -352,7 +352,7 @@ namespace cmis
|
||||
|
||||
if ( m_sRepositoryId.isEmpty( ) )
|
||||
{
|
||||
- for ( list< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
|
||||
+ for ( vector< libcmis::RepositoryPtr >::iterator it = m_aRepositories.begin( );
|
||||
it != m_aRepositories.end(); ++it )
|
||||
{
|
||||
URL aUrl( m_aURL );
|
||||
--- libreoffice-4.1.0/ucb/source/ucp/cmis/cmis_repo_content.hxx.omv~ 2013-08-30 03:50:48.639388911 +0200
|
||||
+++ libreoffice-4.1.0/ucb/source/ucp/cmis/cmis_repo_content.hxx 2013-08-30 03:51:45.660317315 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <libcmis/repository.hxx>
|
||||
|
||||
#include <list>
|
||||
+#include <vector>
|
||||
|
||||
namespace com { namespace sun { namespace star {
|
||||
namespace beans {
|
||||
@@ -55,7 +56,7 @@ private:
|
||||
URL m_aURL;
|
||||
OUString m_sRepositoryId;
|
||||
|
||||
- std::list< libcmis::RepositoryPtr > m_aRepositories;
|
||||
+ std::vector< libcmis::RepositoryPtr > m_aRepositories;
|
||||
|
||||
private:
|
||||
|
||||
@@ -80,7 +80,7 @@ public:
|
||||
RepoContent( const com::sun::star::uno::Reference<
|
||||
com::sun::star::uno::XComponentContext >& rxContext, ContentProvider *pProvider,
|
||||
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier,
|
||||
- std::list< libcmis::RepositoryPtr > aRepos = std::list< libcmis::RepositoryPtr > ( ) )
|
||||
+ std::vector< libcmis::RepositoryPtr > aRepos = std::vector< libcmis::RepositoryPtr > ( ) )
|
||||
throw ( com::sun::star::ucb::ContentCreationException );
|
||||
|
||||
virtual ~RepoContent();
|
||||
11
libreoffice-4.2.1-non-fatal-test-failures.patch
Normal file
11
libreoffice-4.2.1-non-fatal-test-failures.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- libreoffice-4.2.1/solenv/gbuild/CppunitTest.mk.omv~ 2014-02-24 08:54:32.591669325 +0100
|
||||
+++ libreoffice-4.2.1/solenv/gbuild/CppunitTest.mk 2014-02-24 08:55:24.354667206 +0100
|
||||
@@ -95,7 +95,7 @@ $(call gb_CppunitTest_get_target,%) :| $
|
||||
$(if $(value gb_CppunitTest_postprocess), \
|
||||
&& $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1) \
|
||||
&& cat $@.log && $(call gb_UNIT_FAILED_MSG,Cppunit,$*) \
|
||||
- && false))))
|
||||
+ || true))))
|
||||
|
||||
define gb_CppunitTest_CppunitTest
|
||||
$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1)))
|
||||
|
|
@ -1,26 +1,6 @@
|
|||
From 0c08a84c04b166ab6479716e2c33cd444d7e3dbe Mon Sep 17 00:00:00 2001
|
||||
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
|
||||
Date: Mon, 02 Apr 2012 16:46:32 +0000
|
||||
Subject: Make ICU build with icu-49 by removing no-longer used variables.
|
||||
|
||||
Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
|
||||
---
|
||||
diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt
|
||||
index 8e49a56..acb932e 100644
|
||||
--- a/i18npool/source/breakiterator/data/char.txt
|
||||
+++ b/i18npool/source/breakiterator/data/char.txt
|
||||
@@ -16,7 +16,6 @@
|
||||
$CR = [\p{Grapheme_Cluster_Break = CR}];
|
||||
$LF = [\p{Grapheme_Cluster_Break = LF}];
|
||||
$Control = [\p{Grapheme_Cluster_Break = Control}];
|
||||
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
|
||||
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
|
||||
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
|
||||
# True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
|
||||
diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt
|
||||
index 5e1ed67..5ad12a7 100644
|
||||
--- a/i18npool/source/breakiterator/data/char_in.txt
|
||||
+++ b/i18npool/source/breakiterator/data/char_in.txt
|
||||
diff -Naur libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char_in.txt libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char_in.txt
|
||||
--- libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char_in.txt 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char_in.txt 2014-06-20 11:55:03.763713998 +0400
|
||||
@@ -15,7 +15,6 @@
|
||||
$CR = [\p{Grapheme_Cluster_Break = CR}];
|
||||
$LF = [\p{Grapheme_Cluster_Break = LF}];
|
||||
|
|
@ -29,7 +9,7 @@ index 5e1ed67..5ad12a7 100644
|
|||
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
|
||||
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
|
||||
$BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
|
||||
@@ -72,7 +71,6 @@ $L ($L | $V | $LV | $LVT);
|
||||
@@ -73,7 +72,6 @@
|
||||
[^$Control $CR $LF] $Extend;
|
||||
|
||||
[^$Control $CR $LF] $SpacingMark;
|
||||
|
|
@ -37,7 +17,7 @@ index 5e1ed67..5ad12a7 100644
|
|||
|
||||
|
||||
## -------------------------------------------------
|
||||
@@ -94,7 +92,6 @@ $T ($LVT | $T);
|
||||
@@ -95,7 +93,6 @@
|
||||
|
||||
$Extend [^$Control $CR $LF];
|
||||
$SpacingMark [^$Control $CR $LF];
|
||||
|
|
@ -45,5 +25,14 @@ index 5e1ed67..5ad12a7 100644
|
|||
|
||||
|
||||
## -------------------------------------------------
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
diff -Naur libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char.txt libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char.txt
|
||||
--- libreoffice-4.2.5.2.orig/i18npool/source/breakiterator/data/char.txt 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/i18npool/source/breakiterator/data/char.txt 2014-06-20 11:55:03.742713998 +0400
|
||||
@@ -16,7 +16,6 @@
|
||||
$CR = [\p{Grapheme_Cluster_Break = CR}];
|
||||
$LF = [\p{Grapheme_Cluster_Break = LF}];
|
||||
$Control = [\p{Grapheme_Cluster_Break = Control}];
|
||||
-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}];
|
||||
$Extend = [\p{Grapheme_Cluster_Break = Extend}];
|
||||
$SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
|
||||
# True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/base.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/base.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/base.desktop 2013-11-15 13:25:32.389365730 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/base.desktop libreoffice-4.2.5.2/sysui/desktop/menus/base.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/base.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/base.desktop 2014-06-20 16:47:27.444539805 +0400
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=base
|
||||
|
|
@ -10,9 +10,9 @@ diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/base.desktop libreoffice-4.1.3
|
|||
Exec=${UNIXBASISROOTNAME} --base %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
|
||||
Name=%PRODUCTNAME Base
|
||||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/calc.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/calc.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/calc.desktop 2013-11-15 13:25:41.475513381 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/calc.desktop libreoffice-4.2.5.2/sysui/desktop/menus/calc.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/calc.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/calc.desktop 2014-06-20 16:47:27.466539805 +0400
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=calc
|
||||
|
|
@ -20,11 +20,11 @@ diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/calc.desktop libreoffice-4.1.3
|
|||
-Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
|
||||
+Categories=Office;Spreadsheet;
|
||||
Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;
|
||||
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;
|
||||
Name=%PRODUCTNAME Calc
|
||||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/draw.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/draw.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/draw.desktop 2013-11-15 13:25:52.312689503 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop libreoffice-4.2.5.2/sysui/desktop/menus/draw.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/draw.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/draw.desktop 2014-06-20 16:47:27.467539805 +0400
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=draw
|
||||
|
|
@ -32,11 +32,11 @@ diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/draw.desktop libreoffice-4.1.3
|
|||
-Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
|
||||
+Categories=Office;FlowChart;
|
||||
Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;
|
||||
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;
|
||||
Name=%PRODUCTNAME Draw
|
||||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/impress.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/impress.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/impress.desktop 2013-11-15 13:25:59.678809224 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop libreoffice-4.2.5.2/sysui/desktop/menus/impress.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/impress.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/impress.desktop 2014-06-20 16:47:27.467539805 +0400
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=impress
|
||||
|
|
@ -44,25 +44,25 @@ diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/impress.desktop libreoffice-4.
|
|||
-Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
|
||||
+Categories=Office;Presentation;
|
||||
Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;
|
||||
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;
|
||||
Name=%PRODUCTNAME Impress
|
||||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/math.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/math.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/math.desktop 2013-11-15 13:26:10.457984427 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop libreoffice-4.2.5.2/sysui/desktop/menus/math.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/math.desktop 2014-06-20 16:47:27.468539805 +0400
|
||||
@@ -21,7 +21,7 @@
|
||||
NoDisplay=true
|
||||
NoDisplay=false
|
||||
Icon=math
|
||||
Type=Application
|
||||
-Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
|
||||
+Categories=Office;Education;Science;Math;
|
||||
Exec=${UNIXBASISROOTNAME} --math %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;
|
||||
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
|
||||
Name=%PRODUCTNAME Math
|
||||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/startcenter.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/startcenter.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/startcenter.desktop 2013-11-15 13:26:22.524180566 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/startcenter.desktop libreoffice-4.2.5.2/sysui/desktop/menus/startcenter.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/startcenter.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/startcenter.desktop 2014-06-20 16:47:27.468539805 +0400
|
||||
@@ -21,7 +21,7 @@
|
||||
NoDisplay=true
|
||||
NoDisplay=false
|
||||
Icon=startcenter
|
||||
Type=Application
|
||||
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
|
||||
|
|
@ -70,9 +70,9 @@ diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/startcenter.desktop libreoffic
|
|||
Exec=${UNIXBASISROOTNAME} %%FILE%%
|
||||
MimeType=application/vnd.openofficeorg.extension;
|
||||
Name=%PRODUCTNAME
|
||||
diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/writer.desktop libreoffice-4.1.3.2-patched/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-4.1.3.2/sysui/desktop/menus/writer.desktop 2013-10-23 04:49:23.000000000 +1100
|
||||
+++ libreoffice-4.1.3.2-patched/sysui/desktop/menus/writer.desktop 2013-11-15 13:26:30.181305044 +1100
|
||||
diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/writer.desktop libreoffice-4.2.5.2/sysui/desktop/menus/writer.desktop
|
||||
--- libreoffice-4.2.5.2.orig/sysui/desktop/menus/writer.desktop 2014-06-12 12:25:19.000000000 +0400
|
||||
+++ libreoffice-4.2.5.2/sysui/desktop/menus/writer.desktop 2014-06-20 16:47:27.469539805 +0400
|
||||
@@ -20,7 +20,7 @@
|
||||
Terminal=false
|
||||
Icon=writer
|
||||
|
|
@ -80,5 +80,5 @@ diff -urN libreoffice-4.1.3.2/sysui/desktop/menus/writer.desktop libreoffice-4.1
|
|||
-Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
|
||||
+Categories=Office;WordProcessor;
|
||||
Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;
|
||||
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;
|
||||
Name=%PRODUCTNAME Writer
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -urN libreoffice-4.1.2.2-orig/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4.1.2.2-patched/vcl/unx/kde4/KDESalGraphics.cxx
|
||||
--- libreoffice-4.1.2.2-orig/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-18 03:27:21.000000000 +1100
|
||||
+++ libreoffice-4.1.2.2-patched/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-26 17:51:27.000000000 +1100
|
||||
@@ -167,8 +167,13 @@
|
||||
diff -urN libreoffice-4.2.5.2-orig/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4.2.5.2-patched/vcl/unx/kde4/KDESalGraphics.cxx
|
||||
--- libreoffice-4.2.5.2-orig/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-18 03:27:21.000000000 +1100
|
||||
+++ libreoffice-4.2.5.2-patched/vcl/unx/kde4/KDESalGraphics.cxx 2013-09-26 17:51:27.000000000 +1100
|
||||
@@ -163,8 +163,13 @@
|
||||
option->state |= state;
|
||||
option->rect = image->rect();
|
||||
|
||||
|
|
@ -16,4 +16,4 @@ diff -urN libreoffice-4.1.2.2-orig/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-4
|
|||
+ }
|
||||
}
|
||||
|
||||
int getFrameWidth()
|
||||
void lcl_drawFrame(QStyle::PrimitiveElement element, QImage* image, QStyle::State state)
|
||||
5468
libreoffice.spec
5468
libreoffice.spec
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue