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

Proposed by Miklos Vajna on 2012-03-07
Status: Merged
Merged at revision: 36
Proposed branch: lp:~vmiklos/eoec/barcode-lo34
Merge into: lp:eoec
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
Daniel Darabos 2012-03-07 Approve on 2012-03-07
Review via email: mp+96366@code.launchpad.net

Description of the change

Hello Dani,

This small change makes the barcode extension work under LibreOffice 3.4 and 3.5, without breaking older versions (tested with LibreOffice 3.3).

Please consider merging this trivial fix.

Thanks,

Miklos

To post a comment you must log in.
Daniel Darabos (darabos-daniel) wrote :

Fantastic, thanks! Is it that the base classes were made new-style at some point?

Can I ask you to make this change to the other extensioncode.py files in EOEC as well? This would presumably fix the rest of the examples and any future extensions created from the template.

Thanks!

Miklos Vajna (vmiklos) wrote :

Hi,

Right, see the examples under desktop/test/deployment in LibreOffice's source code, they assume new-style base classes as well.

Sure, I just pushed one more revision to bzr+ssh://bazaar.launchpad.net/~vmiklos/eoec/barcode-lo34/, if you merge it, you'll have that fix as well.

Thanks,

Miklos

lp:~vmiklos/eoec/barcode-lo34 updated on 2012-03-07
37. By Miklos Vajna on 2012-03-07

do the same for all the other extensions as well

Daniel Darabos (darabos-daniel) wrote :

Awesome! I'll merge this when I get home.

review: Approve
KAMI (kami911) wrote :

Thank you Miklós to track down the problem. The Open Source Conf was
useful, wasn't it?

Kami

2012/3/7, Miklos Vajna <email address hidden>:
> Hi,
>
> Right, see the examples under desktop/test/deployment in LibreOffice's
> source code, they assume new-style base classes as well.
>
> Sure, I just pushed one more revision to
> bzr+ssh://bazaar.launchpad.net/~vmiklos/eoec/barcode-lo34/, if you merge it,
> you'll have that fix as well.
>
> Thanks,
>
> Miklos
> --
> https://code.launchpad.net/~vmiklos/eoec/barcode-lo34/+merge/96366
> You are subscribed to branch lp:eoec.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/Barcode/barcode/extensioncore.py'
--- examples/Barcode/barcode/extensioncore.py 2009-02-02 16:31:01 +0000
+++ examples/Barcode/barcode/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]
2727
=== modified file 'examples/Lookup/lookup/extensioncore.py'
--- examples/Lookup/lookup/extensioncore.py 2009-05-08 08:44:34 +0000
+++ examples/Lookup/lookup/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]
2727
=== modified file 'examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py'
--- examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py 2009-01-29 12:18:41 +0000
+++ examples/Merriam-Webster Dictionary/merriamwebsterdictionary/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]
2727
=== modified file 'examples/Sharpen/sharpen/extensioncore.py'
--- examples/Sharpen/sharpen/extensioncore.py 2009-05-08 08:44:34 +0000
+++ examples/Sharpen/sharpen/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]
2727
=== modified file 'examples/Shuffle/shuffle/extensioncore.py'
--- examples/Shuffle/shuffle/extensioncore.py 2009-05-08 08:44:34 +0000
+++ examples/Shuffle/shuffle/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]
2727
=== modified file 'examples/Star Maker/starmaker/extensioncore.py'
--- examples/Star Maker/starmaker/extensioncore.py 2009-01-29 12:18:41 +0000
+++ examples/Star Maker/starmaker/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]
2727
=== modified file 'template/%extensionname%/extensioncore.py'
--- template/%extensionname%/extensioncore.py 2009-01-29 12:18:41 +0000
+++ template/%extensionname%/extensioncore.py 2012-03-07 17:06:31 +0000
@@ -20,7 +20,7 @@
2020
21from com.sun.star.beans import XPropertySet21from com.sun.star.beans import XPropertySet
22from com.sun.star.lang import XServiceInfo22from com.sun.star.lang import XServiceInfo
23class propset( object, unohelper.Base, XPropertySet, XServiceInfo ):23class propset( unohelper.Base, XPropertySet, XServiceInfo ):
24 def __init__( self, *args, **kwargs ):24 def __init__( self, *args, **kwargs ):
25 if args:25 if args:
26 self.dict = args[0]26 self.dict = args[0]

Subscribers

People subscribed via source and target branches

to all changes: