rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop integrated patches

Browse Source
f41
Caolán McNamara 14 years ago
parent e40a9eca4a
commit 3e61694df0
6 changed files with 0 additions and 195 deletions
Show Stats Download Patch File Download Diff File

36
0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
Unescape View File

@ -1,36 +0,0 @@
From f167cafd5edfcac674a556fa2f813ce0dec34303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 27 Jan 2011 12:14:17 +0000
Subject: [PATCH] Related: rhbz#610103 more woes on rpm upgrade vs rpm erase
---
sfx2/source/appl/shutdowniconunx.cxx | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 5618e73..cfbf974 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -375,8 +375,20 @@
static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
{
- if (event_type == G_FILE_MONITOR_EVENT_DELETED)
- exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+ //Shutdown the quick starter if anything has happened to make it unsafe
+ //to remain running, e.g. rpm --erased and all libs deleted, or
+ //rpm --upgrade and libs being overwritten
+ switch (event_type)
+ {
+ case G_FILE_MONITOR_EVENT_DELETED:
+ case G_FILE_MONITOR_EVENT_CREATED:
+ case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
+ case G_FILE_MONITOR_EVENT_UNMOUNTED:
+ exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+ break;
+ default:
+ break;
+ }
}
#endif

39
0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
Unescape View File

@ -1,39 +0,0 @@
From 69aadc54a50352f69457899c176286d3ac66ca7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sun, 30 Jan 2011 20:38:00 +0000
Subject: [PATCH] Resolves: rhbz#673819 crash on changing position of drawing object in header
The header/footer objects are cunning wrappers to pretend to some parts
of the drawing stuff that there are multiple objects, while in reality
there is only one. So call HasText actually gets a totally different
object from the cast :-(
---
cui/source/tabpages/swpossizetabpage.cxx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index ee3add0..9955420 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1930,7 +1930,10 @@
}
// this should happen via SID_ATTR_TRANSFORM_AUTOSIZE
- if( rMarkList.GetMarkCount() == 1 )
+ if( rMarkList.GetMarkCount() != 1 )
+ m_bIsMultiSelection = true;
+#if OSL_DEBUG_LEVEL > 1
+ else
{
const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
@@ -1941,8 +1944,7 @@
DBG_ERROR("AutoWidth/AutoHeight should be enabled");
}
}
- else
- m_bIsMultiSelection = true;
+#endif
// use page offset and recalculate
Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() );

26
0001-don-t-pushback-and-process-a-corrupt-extension.patch
Unescape View File

@ -1,26 +0,0 @@
From 0a8149b7e317b9f6d666f4fbcb649f9301da3581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 18 Jan 2011 12:11:52 +0000
Subject: [PATCH] don't pushback and process a corrupt extension
---
.../deployment/registry/package/dp_package.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index f31cf3f..9cbbf83 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1618,7 +1618,8 @@ BackendImpl::PackageImpl::getPackagesFromDb(
Reference<deployment::XPackage> xExtension =
bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv);
OSL_ASSERT(xExtension.is());
- retVector.push_back(xExtension);
+ if (xExtension.is())
+ retVector.push_back(xExtension);
}
return retVector;
--
1.7.3.4

36
0001-fexceptions-fexceptions.patch
Unescape View File

@ -29,39 +29,3 @@ index 27ff2ef..8476053 100644
+
+OBJEXT=o
+DYNEXT=so
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index d0ee030..5ff8668 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -48,7 +48,6 @@
# if defined(_GNUC__)
# pragma GCC visibility push(default)
# endif
-# include _STLP_NATIVE_HEADER(exception_defines.h)
# include _STLP_NATIVE_HEADER(limits)
# include _STLP_NATIVE_HEADER(memory)
# include _STLP_NATIVE_HEADER(exception)
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 044dfc5..1d28d05 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -32,9 +32,10 @@
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
-#include <cxxabi.h>
#include <hash_map>
+#include <cxxabi.h>
+
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
@@ -47,7 +48,6 @@
#include "share.hxx"
-
using namespace ::std;
using namespace ::osl;
using namespace ::rtl;

27
0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
Unescape View File

@ -1,27 +0,0 @@
From a0f63a4c3a5430b6b81318f2dc380ca8975d4d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 18 Jan 2011 12:11:52 +0000
Subject: rhbz#666440 don't pushback and process a corrupt extension
Signed-off-by: David Tardon <dtardon@redhat.com>
---
.../deployment/registry/package/dp_package.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 603f524..b084d87 100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1620,7 +1620,8 @@ BackendImpl::PackageImpl::getPackagesFromDb(
Reference<deployment::XPackage> xExtension =
bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv);
OSL_ASSERT(xExtension.is());
- retVector.push_back(xExtension);
+ if (xExtension.is())
+ retVector.push_back(xExtension);
}
return retVector;
--
1.7.4

31
libreoffice-fdo32561.comphelper.patch
Unescape View File

@ -1,31 +0,0 @@
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 950ef90..a93318f 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -485,8 +485,6 @@ namespace comphelper
try
{
- ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
-
// check for unknown properties
// we cannot simply rely on the XMultiPropertySet::setPropertyValues
// implementation of our base class, since it does not throw
@@ -503,6 +501,7 @@ namespace comphelper
++pName, ++pHandle, ++pProperty
)
{
+ ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
*pHandle = rPropInfo.getHandleByName( *pName );
if ( *pHandle != -1 )
continue;
@@ -513,9 +512,6 @@ namespace comphelper
// add the property
sal_Int16 nAttributes = PropertyAttribute::BOUND | PropertyAttribute::REMOVEABLE | PropertyAttribute::MAYBEDEFAULT;
addProperty( *pName, nAttributes, pProperty->Value );
- // rPropInfo is invalid, refetch
- rPropInfo = getInfoHelper();
- *pHandle = rPropInfo.getHandleByName( *pName );
continue;
}
Write Preview
Loading…
Cancel
Save