[libreoffice/master-4.0] fix patches
David Tardon
dtardon at fedoraproject.org
Thu Nov 29 13:39:24 UTC 2012
commit ce85ecbe65883a70d004ca6fd6278ff3555e7603
Author: David Tardon <dtardon at redhat.com>
Date: Thu Nov 29 14:35:40 2012 +0100
fix patches
libreoffice.spec | 9 +--
...ffice.org-3.0.0.ooo88341.sc.verticalboxes.patch | 28 +++++-----
...e.org-3.1.0.ooo101274.opening-a-directory.patch | 57 ++++++++++----------
...rg-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch | 38 +++++--------
4 files changed, 60 insertions(+), 72 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index ef98fb4..3f2ed60 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -846,13 +846,10 @@ rm -rf git-hooks */git-hooks
mv -f redhat.soc extras/source/palettes/standard.soc
%patch1 -p1
%patch2 -p1 -b .ooo86080.unopkg.bodge.patch
-# FIXME build error
-#%%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch3 -p1 -b .ooo88341.sc.verticalboxes.patch
%patch4 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-# FIXME build error
-#%%patch5 -p1 -b .ooo101274.opening-a-directory.patch
-# FIXME ask Eike/Caolan about the broken hunk
-#%%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch5 -p1 -b .ooo101274.opening-a-directory.patch
+%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch
%patch7 -p1 -b .libreoffice-installfix.patch
%patch26 -p1 -b .disable-failing-check.patch
%if 0%{?rhel} && 0%{?rhel} < 7
diff --git a/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch b/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
index a943d48..113cbe7 100644
--- a/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+++ b/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
@@ -1,18 +1,18 @@
-From 5316edea6948f3e2a77e4fc68799f67de21fada7 Mon Sep 17 00:00:00 2001
+From 8208f795bb6882cf77adef940839f0c46b9befb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Mon, 5 Dec 2011 15:28:19 +0100
Subject: [PATCH] vertical content overflowing out of cell (#i88341#)
---
- sc/source/ui/inc/output.hxx | 2 +
- sc/source/ui/view/output2.cxx | 66 ++++++++++++++++++++++++++--------------
+ sc/source/ui/inc/output.hxx | 2 ++
+ sc/source/ui/view/output2.cxx | 66 ++++++++++++++++++++++++++++---------------
2 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
-index 72934cf..3a91c14 100644
+index 1b8d8f5..6dcbe2e 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
-@@ -306,6 +306,8 @@ public:
+@@ -296,6 +296,8 @@ public:
void DrawExtraShadow(sal_Bool bLeft, sal_Bool bTop, sal_Bool bRight, sal_Bool bBottom);
void DrawFrame();
@@ -22,10 +22,10 @@ index 72934cf..3a91c14 100644
void DrawEdit(sal_Bool bPixelToLogic);
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
-index de1506a..5522e69 100644
+index ac6365c..141ef00 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
-@@ -2818,13 +2818,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
+@@ -2905,13 +2905,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
(ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE);
bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
@@ -40,7 +40,7 @@ index de1506a..5522e69 100644
bClip = true;
else
bSimClip = true;
-@@ -2859,6 +2853,19 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
+@@ -2946,6 +2940,19 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
}
Rectangle aLogicClip;
@@ -60,7 +60,7 @@ index de1506a..5522e69 100644
if (bClip || bSimClip)
{
// Clip marks are already handled in GetOutputArea
-@@ -3191,13 +3198,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
+@@ -3278,13 +3285,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
(ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE);
bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
@@ -76,7 +76,7 @@ index de1506a..5522e69 100644
bClip = true;
else
bSimClip = true;
-@@ -3563,13 +3565,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam)
+@@ -3650,13 +3652,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam)
(ScMergeAttr*)&rParam.mpPattern->GetItem(ATTR_MERGE);
bool bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
@@ -91,7 +91,7 @@ index de1506a..5522e69 100644
bClip = true;
else
bSimClip = true;
-@@ -4460,6 +4456,20 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
+@@ -4547,6 +4543,20 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
}
@@ -102,7 +102,7 @@ index de1506a..5522e69 100644
+ // except when font size is from conditional formatting.
+ //! Allow clipping when vertically merged?
+ if ( eType != OUTTYPE_PRINTER ||
-+ ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
++ ( mpDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
+ ( pCondSet && SFX_ITEM_SET ==
+ pCondSet->GetItemState(ATTR_FONT_HEIGHT, sal_True) ) )
+ bNormalClip = true;
@@ -112,7 +112,7 @@ index de1506a..5522e69 100644
void ScOutputData::DrawEdit(sal_Bool bPixelToLogic)
{
ScFieldEditEngine* pEngine = NULL;
-@@ -5168,11 +5178,21 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic)
+@@ -5258,11 +5268,21 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic)
else
{
// bei gedrehtem Text ist Standard zentriert
@@ -137,5 +137,5 @@ index de1506a..5522e69 100644
}
--
-1.7.7.3
+1.8.0
diff --git a/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch b/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
index c443cf7..9bfc221 100644
--- a/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+++ b/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
@@ -1,18 +1,18 @@
-From 7e3bdb601c02e60b772e64ec9d11c56881c9a643 Mon Sep 17 00:00:00 2001
+From 1be2e01e592466aec2e60fbf1af528cfab1572db Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Thu, 1 Dec 2011 14:02:07 +0100
-Subject: [PATCH 1/2] #i101274 a directory on command line is silently ignored
+Subject: [PATCH] #i101274 a directory on command line is silently ignored
---
- .../source/misc/stillreadwriteinteraction.cxx | 1 +
- ucbhelper/source/client/content.cxx | 75 ++++++++++++++++++++
- 2 files changed, 76 insertions(+), 0 deletions(-)
+ .../source/misc/stillreadwriteinteraction.cxx | 1 +
+ ucbhelper/source/client/content.cxx | 75 ++++++++++++++++++++++
+ 2 files changed, 76 insertions(+)
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
-index 124564d..506f31c 100644
+index b3dd6e8..d0f5738 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
-@@ -96,6 +96,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction:
+@@ -87,6 +87,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction:
bAbort = (
(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED )
|| (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
@@ -21,10 +21,10 @@ index 124564d..506f31c 100644
#ifdef MACOSX
// this is a workaround for MAC, on this platform if the file is locked
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
-index 676acd5..4a599c9 100644
+index 95e589f..d7fc181 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
-@@ -38,6 +38,7 @@
+@@ -27,6 +27,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -32,7 +32,7 @@ index 676acd5..4a599c9 100644
#include <com/sun/star/ucb/CheckinArgument.hpp>
#include <com/sun/star/ucb/ContentCreationError.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-@@ -47,6 +48,8 @@
+@@ -37,6 +38,8 @@
#include <com/sun/star/ucb/ContentAction.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
@@ -41,7 +41,7 @@ index 676acd5..4a599c9 100644
#include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/OpenMode.hpp>
-@@ -64,6 +67,8 @@
+@@ -56,12 +59,18 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
@@ -50,7 +50,6 @@ index 676acd5..4a599c9 100644
#include <ucbhelper/macros.hxx>
#include <ucbhelper/content.hxx>
#include <ucbhelper/activedatasink.hxx>
-@@ -71,6 +76,10 @@
#include <ucbhelper/activedatastreamer.hxx>
#include <ucbhelper/interactionrequest.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
@@ -61,7 +60,7 @@ index 676acd5..4a599c9 100644
using namespace com::sun::star::container;
using namespace com::sun::star::beans;
-@@ -373,6 +382,54 @@ static Reference< XContent > getContent(
+@@ -283,6 +292,54 @@ static Reference< XContent > getContent(
return Reference< XContent >();
}
@@ -70,16 +69,16 @@ index 676acd5..4a599c9 100644
+
+void
+lcl_displayMessage(
++ const Reference<XComponentContext>& rContext,
+ const Reference<XCommandEnvironment>& rEnvironment,
+ const rtl::OUString& rUri)
+{
+ // Create exception
-+ const Reference<XContentProviderManager> xCPM(
-+ getContentBroker(true)->getContentProviderManagerInterface());
++ const Reference<XUniversalContentBroker> xBroker(UniversalContentBroker::create(rContext));
+ const PropertyValue aUriProperty(
+ rtl::OUString::createFromAscii("Uri"),
+ -1,
-+ makeAny(getSystemPathFromFileURL(xCPM, rUri)),
++ makeAny(getSystemPathFromFileURL(xBroker, rUri)),
+ PropertyState_DIRECT_VALUE)
+ ;
+ Sequence<Any> lArguments(1);
@@ -116,72 +115,72 @@ index 676acd5..4a599c9 100644
//=========================================================================
//=========================================================================
//
-@@ -787,7 +902,10 @@ Reference< XInputStream > Content::openStream()
+@@ -699,7 +756,10 @@ Reference< XInputStream > Content::openStream()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
+ {
-+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
++ lcl_displayMessage(m_xImpl->getComponentContext(), m_xImpl->getEnvironment(), getURL());
return Reference< XInputStream >();
+ }
Reference< XActiveDataSink > xSink = new ActiveDataSink;
-@@ -813,7 +930,10 @@ Reference< XInputStream > Content::openStreamNoLock()
+@@ -724,7 +784,10 @@ Reference< XInputStream > Content::openStreamNoLock()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
+ {
-+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
++ lcl_displayMessage(m_xImpl->getComponentContext(), m_xImpl->getEnvironment(), getURL());
return Reference< XInputStream >();
+ }
Reference< XActiveDataSink > xSink = new ActiveDataSink;
-@@ -838,7 +965,10 @@ Reference< XStream > Content::openWriteableStream()
+@@ -749,7 +812,10 @@ Reference< XStream > Content::openWriteableStream()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
+ {
-+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
++ lcl_displayMessage(m_xImpl->getComponentContext(), m_xImpl->getEnvironment(), getURL());
return Reference< XStream >();
+ }
Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
-@@ -863,7 +990,10 @@ Reference< XStream > Content::openWriteableStreamNoLock()
+@@ -774,7 +840,10 @@ Reference< XStream > Content::openWriteableStreamNoLock()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
+ {
-+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
++ lcl_displayMessage(m_xImpl->getComponentContext(), m_xImpl->getEnvironment(), getURL());
return Reference< XStream >();
+ }
Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
-@@ -888,7 +1019,10 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
+@@ -799,7 +868,10 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
+ {
-+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
++ lcl_displayMessage(m_xImpl->getComponentContext(), m_xImpl->getEnvironment(), getURL());
return sal_False;
+ }
OpenCommandArgument2 aArg;
aArg.Mode = OpenMode::DOCUMENT;
-@@ -911,7 +1045,10 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
+@@ -822,7 +894,10 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
+ {
-+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
++ lcl_displayMessage(m_xImpl->getComponentContext(), m_xImpl->getEnvironment(), getURL());
return sal_False;
+ }
OpenCommandArgument2 aArg;
aArg.Mode = OpenMode::DOCUMENT;
--
-1.7.7.3
+1.8.0
diff --git a/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch b/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
index 2da9afd..4f68758 100644
--- a/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+++ b/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
@@ -1,18 +1,18 @@
-From 36644331aad8382ccab7fb19d7ab3339bbff0c20 Mon Sep 17 00:00:00 2001
+From bda1b906c7bee734dfc7242b60b7b1510886aee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Thu, 1 Dec 2011 14:18:09 +0100
-Subject: [PATCH 2/2] #i105784# vcl: improve selection of fallback font by
+Subject: [PATCH] #i105784# vcl: improve selection of fallback font by
supplying language hint when none exists
---
- vcl/generic/fontmanager/fontconfig.cxx | 143 +++++++++++++++++++++++++++++++-
- 1 files changed, 141 insertions(+), 2 deletions(-)
+ vcl/generic/fontmanager/fontconfig.cxx | 141 +++++++++++++++++++++++++++++++++
+ 1 file changed, 141 insertions(+)
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
-index 4d02a76..ecd3b5d 100644
+index 8270585..82ac6bc 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
-@@ -89,6 +89,9 @@ using namespace psp;
+@@ -91,6 +91,9 @@ using namespace psp;
#include "sal/alloca.h"
@@ -22,7 +22,7 @@ index 4d02a76..ecd3b5d 100644
#include <utility>
#include <algorithm>
-@@ -747,6 +750,138 @@ static void addtopattern(FcPattern *pPattern,
+@@ -911,6 +914,138 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
return 0;
}
@@ -161,23 +161,15 @@ index 4d02a76..ecd3b5d 100644
bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes )
{
bool bRet = false;
-@@ -764,14 +899,13 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
- FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8);
+@@ -929,6 +1064,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
- const rtl::OString aLangAttrib = MsLangId::convertLanguageToIsoByteString(rPattern.meLanguage);
-+ const FcChar8* pLangAttribUtf8 = NULL;
- if( !aLangAttrib.isEmpty() )
- {
-- const FcChar8* pLangAttribUtf8;
- if (aLangAttrib.equalsIgnoreAsciiCase(OString(RTL_CONSTASCII_STRINGPARAM("pa-in"))))
- pLangAttribUtf8 = (FcChar8*)"pa";
- else
- pLangAttribUtf8 = (FcChar8*)aLangAttrib.getStr();
-- FcPatternAddString(pPattern, FC_LANG, pLangAttribUtf8);
- }
+ const LanguageTag aLangTag(rPattern.meLanguage);
+ const rtl::OString aLangAttrib = mapToFontConfigLangTag(aLangTag);
++ const FcChar8* pLangAttribUtf8 = (const FcChar8*)aLangAttrib.getStr();
+ if (!aLangAttrib.isEmpty())
+ FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr());
- // Add required Unicode characters, if any
-@@ -783,11 +917,16 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
+@@ -941,11 +1077,16 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
// also handle unicode surrogates
const sal_uInt32 nCode = rMissingCodes.iterateCodePoints( &nStrIndex );
FcCharSetAddChar( unicodes, nCode );
@@ -195,5 +187,5 @@ index 4d02a76..ecd3b5d 100644
rPattern.meWidthType, rPattern.mePitch);
--
-1.7.7.3
+1.8.0
More information about the scm-commits
mailing list