Merge lp:~vmiklos/eoec/barcode-lo34 into lp:~kami911/eoec/barcode-improved

Proposed by Miklos Vajna
Status: Merged
Merged at revision: 60
Proposed branch: lp:~vmiklos/eoec/barcode-lo34
Merge into: lp:~kami911/eoec/barcode-improved
Diff against target: 90 lines (+7/-7)
7 files modified
examples/Barcode/barcode/extensioncore.py (+1/-1)
examples/Lookup/lookup/extensioncore.py (+1/-1)
examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py (+1/-1)
examples/Sharpen/sharpen/extensioncore.py (+1/-1)
examples/Shuffle/shuffle/extensioncore.py (+1/-1)
examples/Star Maker/starmaker/extensioncore.py (+1/-1)
template/%extensionname%/extensioncore.py (+1/-1)
To merge this branch: bzr merge lp:~vmiklos/eoec/barcode-lo34
Reviewer Review Type Date Requested Status
KAMI Approve
Review via email: mp+96367@code.launchpad.net

Description of the change

.

To post a comment you must log in.
lp:~vmiklos/eoec/barcode-lo34 updated
37. By Miklos Vajna

do the same for all the other extensions as well

Revision history for this message
KAMI (kami911) wrote :

Thank you for the patches

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/Barcode/barcode/extensioncore.py'
2--- examples/Barcode/barcode/extensioncore.py 2009-02-02 16:31:01 +0000
3+++ examples/Barcode/barcode/extensioncore.py 2012-03-07 17:06:30 +0000
4@@ -20,7 +20,7 @@
5
6 from com.sun.star.beans import XPropertySet
7 from com.sun.star.lang import XServiceInfo
8-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
9+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
10 def __init__( self, *args, **kwargs ):
11 if args:
12 self.dict = args[0]
13
14=== modified file 'examples/Lookup/lookup/extensioncore.py'
15--- examples/Lookup/lookup/extensioncore.py 2009-05-08 08:44:34 +0000
16+++ examples/Lookup/lookup/extensioncore.py 2012-03-07 17:06:30 +0000
17@@ -20,7 +20,7 @@
18
19 from com.sun.star.beans import XPropertySet
20 from com.sun.star.lang import XServiceInfo
21-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
22+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
23 def __init__( self, *args, **kwargs ):
24 if args:
25 self.dict = args[0]
26
27=== modified file 'examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py'
28--- examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py 2009-01-29 12:18:41 +0000
29+++ examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py 2012-03-07 17:06:30 +0000
30@@ -20,7 +20,7 @@
31
32 from com.sun.star.beans import XPropertySet
33 from com.sun.star.lang import XServiceInfo
34-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
35+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
36 def __init__( self, *args, **kwargs ):
37 if args:
38 self.dict = args[0]
39
40=== modified file 'examples/Sharpen/sharpen/extensioncore.py'
41--- examples/Sharpen/sharpen/extensioncore.py 2009-05-08 08:44:34 +0000
42+++ examples/Sharpen/sharpen/extensioncore.py 2012-03-07 17:06:30 +0000
43@@ -20,7 +20,7 @@
44
45 from com.sun.star.beans import XPropertySet
46 from com.sun.star.lang import XServiceInfo
47-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
48+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
49 def __init__( self, *args, **kwargs ):
50 if args:
51 self.dict = args[0]
52
53=== modified file 'examples/Shuffle/shuffle/extensioncore.py'
54--- examples/Shuffle/shuffle/extensioncore.py 2009-05-08 08:44:34 +0000
55+++ examples/Shuffle/shuffle/extensioncore.py 2012-03-07 17:06:30 +0000
56@@ -20,7 +20,7 @@
57
58 from com.sun.star.beans import XPropertySet
59 from com.sun.star.lang import XServiceInfo
60-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
61+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
62 def __init__( self, *args, **kwargs ):
63 if args:
64 self.dict = args[0]
65
66=== modified file 'examples/Star Maker/starmaker/extensioncore.py'
67--- examples/Star Maker/starmaker/extensioncore.py 2009-01-29 12:18:41 +0000
68+++ examples/Star Maker/starmaker/extensioncore.py 2012-03-07 17:06:30 +0000
69@@ -20,7 +20,7 @@
70
71 from com.sun.star.beans import XPropertySet
72 from com.sun.star.lang import XServiceInfo
73-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
74+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
75 def __init__( self, *args, **kwargs ):
76 if args:
77 self.dict = args[0]
78
79=== modified file 'template/%extensionname%/extensioncore.py'
80--- template/%extensionname%/extensioncore.py 2009-01-29 12:18:41 +0000
81+++ template/%extensionname%/extensioncore.py 2012-03-07 17:06:30 +0000
82@@ -20,7 +20,7 @@
83
84 from com.sun.star.beans import XPropertySet
85 from com.sun.star.lang import XServiceInfo
86-class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):
87+class propset( unohelper.Base, XPropertySet, XServiceInfo ):
88 def __init__( self, *args, **kwargs ):
89 if args:
90 self.dict = args[0]

Subscribers

People subscribed via source and target branches

to all changes: