David Tardon
13 years ago
parent
c66ada513b
commit
23a17657a4
@ -1,85 +0,0 @@
|
||||
From c57fcf8d8873638b8ea9eb33c527e03939aaf80a Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Fri, 16 Dec 2011 06:44:18 +0100
|
||||
Subject: [PATCH 1/2] fix syntactic error
|
||||
|
||||
---
|
||||
.../sun/star/wizards/common/PropertySetHelper.py | 18 ++++++------------
|
||||
1 files changed, 6 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
|
||||
index fbb31d8..8ce949e 100644
|
||||
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
|
||||
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
|
||||
@@ -4,16 +4,8 @@ class PropertySetHelper(object):
|
||||
|
||||
@classmethod
|
||||
def __init__(self, _aObj):
|
||||
- if not _aObj:
|
||||
- return
|
||||
-
|
||||
self.m_xPropertySet = _aObj
|
||||
-
|
||||
- def getHashMap(self):
|
||||
- if self.m_aHashMap == None:
|
||||
- self.m_aHashMap = HashMap < String, Object >.Object()
|
||||
-
|
||||
- return self.m_aHashMap
|
||||
+ self.m_aHashMap = {}
|
||||
|
||||
'''
|
||||
set a property, don't throw any exceptions,
|
||||
@@ -55,7 +47,7 @@ class PropertySetHelper(object):
|
||||
DebugHelper.exception(e)
|
||||
|
||||
else:
|
||||
- getHashMap().put(_sName, _aValue)
|
||||
+ self.m_aHashMap[_sName] = _aValue
|
||||
|
||||
'''
|
||||
get a property and convert it to a int value
|
||||
@@ -128,9 +120,11 @@ class PropertySetHelper(object):
|
||||
except com.sun.star.lang.WrappedTargetException, e:
|
||||
DebugHelper.writeInfo(e.getMessage())
|
||||
|
||||
+ # TODO: I wonder why the same thing is not done in the rest of the
|
||||
+ # getPropertyValueAs* functions...
|
||||
if aObject == None:
|
||||
- if getHashMap().containsKey(_sName):
|
||||
- aObject = getHashMap().get(_sName)
|
||||
+ if _sName in self.m_aHashMap:
|
||||
+ aObject = self.m_aHashMap[_sName]
|
||||
|
||||
if aObject != None:
|
||||
try:
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
From 0e7ac37f00ded5db953aed60ec67fafcfe28f21c Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Fri, 16 Dec 2011 06:53:23 +0100
|
||||
Subject: [PATCH 2/2] fix syntactic error
|
||||
|
||||
---
|
||||
.../sun/star/wizards/common/PropertySetHelper.py | 5 +----
|
||||
1 files changed, 1 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
|
||||
index 8ce949e..970e453 100644
|
||||
--- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py
|
||||
+++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py
|
||||
@@ -225,10 +225,7 @@ class PropertySetHelper(object):
|
||||
def showProperties(self):
|
||||
sName = ""
|
||||
if self.m_xPropertySet != None:
|
||||
- XServiceInfo xServiceInfo = (XServiceInfo)
|
||||
- UnoRuntime.queryInterface(XServiceInfo.class, self.m_xPropertySet)
|
||||
- if xServiceInfo != None:
|
||||
- sName = xServiceInfo.getImplementationName()
|
||||
+ sName = self.m_xPropertySet.getImplementationName()
|
||||
|
||||
xInfo = self.m_xPropertySet.getPropertySetInfo()
|
||||
aAllProperties = xInfo.getProperties()
|
||||
--
|
||||
1.7.7.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From eca998dc1dc874415794a27336d5db1679ef69b8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
|
||||
Date: Sat, 17 Dec 2011 13:29:50 +0100
|
||||
Subject: [PATCH] gcc-trunk: avoid confusion
|
||||
|
||||
Signed-off-by: David Tardon <dtardon@redhat.com>
|
||||
---
|
||||
svtools/source/graphic/graphic.hxx | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
|
||||
index 7b4f5e0..a1efca0 100644
|
||||
--- a/svtools/source/graphic/graphic.hxx
|
||||
+++ b/svtools/source/graphic/graphic.hxx
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
Graphic();
|
||||
~Graphic() throw();
|
||||
|
||||
- using unographic::GraphicDescriptor::init;
|
||||
+ using ::unographic::GraphicDescriptor::init;
|
||||
void init( const ::Graphic& rGraphic ) throw();
|
||||
|
||||
static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
|
||||
--
|
||||
1.7.7.5
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,72 +0,0 @@
|
||||
From b90ac7d682fd65f75eff4225d871130c0ae9f185 Mon Sep 17 00:00:00 2001
|
||||
From: Joshua Cogliati <jjcogliati-r1@yahoo.com>
|
||||
Date: Fri, 6 Jan 2012 10:48:01 +0000
|
||||
Subject: [PATCH] smath does not handle accents in MathML
|
||||
|
||||
---
|
||||
starmath/source/node.cxx | 36 ++++++++++++++++++++++++++++++++----
|
||||
1 files changed, 32 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
|
||||
index 58010e7..d5866cd 100644
|
||||
--- a/starmath/source/node.cxx
|
||||
+++ b/starmath/source/node.cxx
|
||||
@@ -2821,23 +2821,51 @@ void SmAttributNode::CreateTextFromNode(String &rText)
|
||||
nLast = aStr.GetChar(0);
|
||||
switch (nLast)
|
||||
{
|
||||
- case 0xAF:
|
||||
+ case 0xAF: // MACRON
|
||||
APPEND(rText,"overline ");
|
||||
break;
|
||||
- case 0x2d9:
|
||||
+ case 0x2d9: // DOT ABOVE
|
||||
APPEND(rText,"dot ");
|
||||
break;
|
||||
- case 0x2dc:
|
||||
+ case 0x2dc: // SMALL TILDE
|
||||
APPEND(rText,"widetilde ");
|
||||
break;
|
||||
- case 0xA8:
|
||||
+ case 0xA8: // DIAERESIS
|
||||
APPEND(rText,"ddot ");
|
||||
break;
|
||||
case 0xE082:
|
||||
break;
|
||||
case 0xE09B:
|
||||
+ case 0x20DB: // COMBINING THREE DOTS ABOVE
|
||||
APPEND(rText,"dddot ");
|
||||
break;
|
||||
+ case 0x301: // COMBINING ACUTE ACCENT
|
||||
+ APPEND(rText,"acute ");
|
||||
+ break;
|
||||
+ case 0x300: // COMBINING GRAVE ACCENT
|
||||
+ APPEND(rText,"grave ");
|
||||
+ break;
|
||||
+ case 0x30C: // COMBINING CARON
|
||||
+ APPEND(rText,"check ");
|
||||
+ break;
|
||||
+ case 0x306: // COMBINING BREVE
|
||||
+ APPEND(rText,"breve ");
|
||||
+ break;
|
||||
+ case 0x30A: // COMBINING RING ABOVE
|
||||
+ APPEND(rText,"circle ");
|
||||
+ break;
|
||||
+ case 0x20D7: // COMBINING RIGHT ARROW ABOVE
|
||||
+ APPEND(rText,"vec ");
|
||||
+ break;
|
||||
+ case 0x303: // COMBINING TILDE
|
||||
+ APPEND(rText,"tilde ");
|
||||
+ break;
|
||||
+ case 0x302: // COMBINING CIRCUMFLEX ACCENT
|
||||
+ APPEND(rText,"hat ");
|
||||
+ break;
|
||||
+ case 0x304: // COMBINING MACRON
|
||||
+ APPEND(rText,"bar ");
|
||||
+ break;
|
||||
default:
|
||||
rText.Append(nLast);
|
||||
break;
|
||||
--
|
||||
1.7.6.5
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@suse.cz>
|
||||
Date: Fri, 6 Jan 2012 10:55:03 +0100
|
||||
Subject: [PATCH] workaround for LO namespace pollution breaking KDE4 fpicker
|
||||
build
|
||||
|
||||
---
|
||||
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 8 ++++++++
|
||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
index f282645..69be3b1 100644
|
||||
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
@@ -56,7 +56,10 @@
|
||||
#define Region QtXRegion
|
||||
|
||||
//kde has an enum that uses this...OO does too
|
||||
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
|
||||
#undef SETTINGS_MOUSE
|
||||
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
|
||||
+#undef SETTINGS_LOCALE
|
||||
|
||||
#include <kfiledialog.h>
|
||||
#include <kwindowsystem.h>
|
||||
@@ -70,6 +73,11 @@
|
||||
|
||||
#undef Region
|
||||
|
||||
+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
|
||||
+#undef LO_SETTINGS_MOUSE
|
||||
+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
|
||||
+#undef LO_SETTINGS_LOCALE
|
||||
+
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
using namespace ::com::sun::star::ui::dialogs;
|
||||
--
|
||||
1.7.7.5
|
||||
|
||||
Loading…
Reference in new issue