r60353 - in /branches/upstream/libopenoffice-oodoc-perl/current: ./ OODoc/ t/
franck at users.alioth.debian.org
franck at users.alioth.debian.org
Fri Jul 16 20:36:18 UTC 2010
Author: franck
Date: Fri Jul 16 20:36:03 2010
New Revision: 60353
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60353
Log:
[svn-upgrade] new version libopenoffice-oodoc-perl (2.125)
Modified:
branches/upstream/libopenoffice-oodoc-perl/current/Changes
branches/upstream/libopenoffice-oodoc-perl/current/META.yml
branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL
branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Document.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Image.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Manifest.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Styles.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/XPath.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml
branches/upstream/libopenoffice-oodoc-perl/current/build_date
branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t
branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t
Modified: branches/upstream/libopenoffice-oodoc-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/Changes?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/Changes (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/Changes Fri Jul 16 20:36:03 2010
@@ -1,3 +1,8 @@
+2.125 2010-07-12
+ XPath.pm: bug #57888 fix
+ Text.pm: bug fix in selectElementByContent()
+ Styles.pm: bug fix in setBackgroundImage()
+ All: code cleaning
2.124 2010-04-02
Meta.pm: minor accessor improvement.
Text.pm: bug fixes in getTextElementList(), setSpan(), removeSpan(); removeTextStyleChanges() introduced as an alias of removeSpan(); textStyle(), getText() improvements.
Modified: branches/upstream/libopenoffice-oodoc-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/META.yml?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/META.yml (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/META.yml Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: OpenOffice-OODoc
-version: 2.124
+version: 2.125
abstract: The Perl Open OpenDocument Connector
author:
- Jean-Marie Gouarne <jmgdoc at cpan.org>
Modified: branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL Fri Jul 16 20:36:03 2010
@@ -1,8 +1,9 @@
#------------------------------------------------------
-# OpenOffice::OODoc packaging & installation 2010-01-05
+# OpenOffice::OODoc packaging & installation 2010-07-07
#------------------------------------------------------
use 5.008;
+use strict;
use Getopt::Long;
use Encode;
use ExtUtils::MakeMaker;
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm Fri Jul 16 20:36:03 2010
@@ -1,22 +1,23 @@
#-----------------------------------------------------------------------------
#
-# $Id : OODoc.pm 2.124 2010-04-02 JMG$
+# $Id : OODoc.pm 2.125 2010-07-08 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2010 by Genicorp, S.A. (www.genicorp.com)
#
#-----------------------------------------------------------------------------
-use OpenOffice::OODoc::File 2.202;
-use OpenOffice::OODoc::Meta 2.016;
+use OpenOffice::OODoc::File 2.203;
+use OpenOffice::OODoc::Meta 2.017;
use OpenOffice::OODoc::Document 2.023;
-use OpenOffice::OODoc::Manifest 2.005;
+use OpenOffice::OODoc::Manifest 2.007;
#-----------------------------------------------------------------------------
package OpenOffice::OODoc;
use 5.008_000;
-our $VERSION = 2.124;
+use strict;
+our $VERSION = '2.125';
require Exporter;
our @ISA = qw(Exporter);
@@ -33,6 +34,8 @@
odfReadConfig readConfig ooReadConfig
);
+our $INSTALLATION_PATH;
+
#-----------------------------------------------------------------------------
# config loader
@@ -67,8 +70,10 @@
next unless $node->isElementNode;
my $name = $node->getName; $name =~ s/-/::/g;
my $varname = 'OpenOffice::OODoc::' . $name;
+ no strict;
$$varname = $node->string_value;
$$varname = odfDecodeText($$varname);
+ use strict;
}
OpenOffice::OODoc::Styles::ooLoadColorMap();
return 1;
@@ -208,7 +213,7 @@
my $module_path = $INC{"OpenOffice/OODoc.pm"};
$module_path =~ s/\.pm$//;
- $OpenOffice::OODoc::INSTALLATION_PATH = $module_path;
+ $INSTALLATION_PATH = $module_path;
odfReadConfig() if ( -e "$INSTALLATION_PATH/config.xml" );
}
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Document.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Document.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Document.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Document.pm Fri Jul 16 20:36:03 2010
@@ -1,23 +1,25 @@
#-----------------------------------------------------------------------------
#
-# $Id : Document.pm 2.024 2008-10-23 JMG$
+# $Id : Document.pm 2.025 2010-07-08 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2008 by Genicorp, S.A. (www.genicorp.com)
#
#-----------------------------------------------------------------------------
-use OpenOffice::OODoc::Text 2.234;
-use OpenOffice::OODoc::Image 2.018;
-use OpenOffice::OODoc::Styles 2.025;
+use OpenOffice::OODoc::Text 2.243;
+use OpenOffice::OODoc::Image 2.020;
+use OpenOffice::OODoc::Styles 2.027;
package OpenOffice::OODoc::Document;
+use 5.008_000;
+use strict;
our @ISA = qw (
OpenOffice::OODoc::Text
OpenOffice::OODoc::Image
OpenOffice::OODoc::Styles
);
-our $VERSION = 2.024;
+our $VERSION = '2.025';
#-----------------------------------------------------------------------------
# constructor
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : File.pm 2.202 2010-01-10 JMG$
+# $Id : File.pm 2.203 2010-07-07 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2010 by Genicorp, S.A. (www.genicorp.com)
@@ -8,8 +8,9 @@
#-----------------------------------------------------------------------------
package OpenOffice::OODoc::File;
-use 5.008_000;
-our $VERSION = 2.202;
+use 5.008_000;
+use strict;
+our $VERSION = '2.203';
use Archive::Zip 1.18 qw ( :DEFAULT :CONSTANTS :ERROR_CODES );
use File::Temp;
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Image.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Image.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Image.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Image.pm Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : Image.pm 2.019 2009-02-18 JMG$
+# $Id : Image.pm 2.020 2009-07-07 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2009 by Genicorp, S.A. (www.genicorp.com)
@@ -9,10 +9,11 @@
package OpenOffice::OODoc::Image;
use 5.008_000;
-use OpenOffice::OODoc::XPath 2.229;
+use strict;
+use OpenOffice::OODoc::XPath 2.237;
use File::Basename;
our @ISA = qw ( OpenOffice::OODoc::XPath );
-our $VERSION = 2.019;
+our $VERSION = '2.020';
#-----------------------------------------------------------------------------
# default attributes for image style
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Manifest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Manifest.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Manifest.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Manifest.pm Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : Manifest.pm 2.006 2010-03-14 JMG$
+# $Id : Manifest.pm 2.007 2010-07-07 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2008 by Genicorp, S.A. (www.genicorp.com)
@@ -9,9 +9,10 @@
package OpenOffice::OODoc::Manifest;
use 5.008_000;
-our $VERSION = 2.006;
+use strict;
+our $VERSION = '2.007';
-use OpenOffice::OODoc::XPath 2.235;
+use OpenOffice::OODoc::XPath 2.237;
our @ISA = qw ( OpenOffice::OODoc::XPath );
#-----------------------------------------------------------------------------
@@ -69,7 +70,7 @@
sub setMainEntry
{
my $self = shift;
- return $element = $self->setEntry("/", @_);
+ return $self->setEntry("/", @_);
}
#-----------------------------------------------------------------------------
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : Meta.pm 2.016 2010-04-02 JMG$
+# $Id : Meta.pm 2.017 2010-07-07 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2010 by Genicorp, S.A. (www.genicorp.com)
@@ -9,8 +9,9 @@
package OpenOffice::OODoc::Meta;
use 5.008_000;
-our $VERSION = 2.016;
-use OpenOffice::OODoc::XPath 2.236;
+use strict;
+our $VERSION = '2.017';
+use OpenOffice::OODoc::XPath 2.237;
our @ISA = qw ( OpenOffice::OODoc::XPath );
#-----------------------------------------------------------------------------
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Styles.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Styles.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Styles.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Styles.pm Fri Jul 16 20:36:03 2010
@@ -1,17 +1,18 @@
#-----------------------------------------------------------------------------
#
-# $Id : Styles.pm 2.026 2010-03-10 JMG$
+# $Id : Styles.pm 2.027 2010-07-12 JMG$
#
# Created and maintained by Jean-Marie Gouarne
-# Copyright 2008 by Genicorp, S.A. (www.genicorp.com)
+# Copyright 2010 by Genicorp, S.A. (www.genicorp.com)
#
#-----------------------------------------------------------------------------
package OpenOffice::OODoc::Styles;
use 5.008_000;
-our $VERSION = 2.026;
-
-use OpenOffice::OODoc::XPath 2.233;
+use strict;
+our $VERSION = '2.027';
+
+use OpenOffice::OODoc::XPath 2.237;
use File::Basename;
require Exporter;
our @ISA = qw ( Exporter OpenOffice::OODoc::XPath );
@@ -255,7 +256,7 @@
return 'style:' . $nodename . '-style/style:properties';
}
my $path = $self->_properties_tagname($element, $part);
- $path .= ('/' . $nodename) if $nodename;
+ $path .= ('/style:' . $nodename) if $nodename;
return $path;
}
@@ -1352,8 +1353,7 @@
else
{
my $pm_name = ref $pagemaster ?
- $pm_name = $self->getAttribute
- ($pagemaster, 'style:name') :
+ $self->getAttribute($pagemaster, 'style:name') :
$pagemaster;
$self->setAttribute($masterpage, $layout_key => $pm_name);
return $pm_name;
@@ -1406,9 +1406,9 @@
else
{
my $xpath = $self->_get_property_path
- ($element, 'background-image') .
+ ($pagemaster, 'background-image') .
'[@xlink:href="' . $newlink . '"]';
-
+
return $self->makeXPath($pagemaster, $xpath);
}
}
@@ -1520,7 +1520,7 @@
$self->backgroundImageLink($pagemaster, $link);
}
}
- $self->raw_import($link, $filename);
+ $self->raw_import($link, $filename);
return $link;
}
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
#----------------------------------------------------------------------------
#
-# $Id : Text.pm 2.242 2010-04-02 JMG$
+# $Id : Text.pm 2.243 2010-07-08 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2010 by Genicorp, S.A. (www.genicorp.com)
@@ -9,9 +9,10 @@
package OpenOffice::OODoc::Text;
use 5.008_000;
-use OpenOffice::OODoc::XPath 2.236;
+use strict;
+use OpenOffice::OODoc::XPath 2.237;
our @ISA = qw ( OpenOffice::OODoc::XPath );
-our $VERSION = 2.242;
+our $VERSION = '2.243';
#-----------------------------------------------------------------------------
# synonyms
@@ -458,7 +459,7 @@
||
(
defined $self->_search_content
- ($node, $pattern, @_, $element)
+ ($node, $pattern, @_, $node->parent)
)
)
{
@@ -502,7 +503,7 @@
||
(
defined $self->_search_content
- ($node, $pattern, @_, $element)
+ ($node, $pattern, @_, $node->parent)
)
)
{
@@ -1313,7 +1314,7 @@
$type =~ s/ /-/g;
my $check = $opt{'check'}; delete $opt{'check'};
my $prefix = $opt{'prefix'} || 'text';
- my $container = $opt{'context'}; delete $opt{'context'};
+ my $context = $opt{'context'}; delete $opt{'context'};
my $content = $opt{'content'};
delete @opt{qw(after before replace)};
my %start = ();
@@ -3270,7 +3271,7 @@
sub _coord_conversion
{
- my $arg = shift or return ($arg, @_);
+ my $arg = shift; return ($arg, @_) unless $arg;
my $coord = uc $arg;
return ($arg, @_) unless $coord =~ /[A-Z]/;
@@ -4547,7 +4548,8 @@
sub headingLevel
{
my $element = shift;
- return $element->getAttribute($self->{'level_attr'});
+ my $level = $element->getAttribute('text:outline-level');
+ return defined $level ? $level : $element->getAttribute('text:level');
}
sub isTable
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/XPath.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/XPath.pm?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/XPath.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/XPath.pm Fri Jul 16 20:36:03 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : XPath.pm 2.236 2010-04-02 JMG$
+# $Id : XPath.pm 2.237 2010-07-12 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2010 by Genicorp, S.A. (www.genicorp.com)
@@ -9,7 +9,8 @@
package OpenOffice::OODoc::XPath;
use 5.008_000;
-our $VERSION = 2.236;
+use strict;
+our $VERSION = '2.237';
use XML::Twig 3.32;
use Encode;
require Exporter;
@@ -242,7 +243,7 @@
return undef if ref $name;
$name =~ s/^\s+//;
$name =~ s/\s+$//;
- if ($name =~ /^<.*>$/) # create element from XML string
+ if ($name =~ /^</) # create element from XML string
{
return OpenOffice::OODoc::Element->parse($name, @_);
}
@@ -532,7 +533,7 @@
# other OODoc::Xpath object
$self->{'container'} = $self->{'container'}->{'container'}
if (
- ref $container
+ ref($self->{container})
&&
$self->{'container'}->isa('OpenOffice::OODoc::XPath')
);
@@ -825,7 +826,7 @@
sub resetCurrentContext
{
- $self = shift;
+ my $self = shift;
return $self->currentContext($self->getRoot);
}
@@ -919,8 +920,8 @@
sub cloneContent
{
- $self = shift;
- $source = shift;
+ my $self = shift;
+ my $source = shift;
unless ($source && $source->{'xpath'})
{
@@ -3276,11 +3277,11 @@
my $number = shift;
$number = 1 unless defined $number;
my $position = shift || 'after';
- my $lastnode = $node;
+ my $last_node = $node;
while ($number > 0)
{
my $newnode = $node->copy;
- $newnode->paste($position => $lastnode);
+ $newnode->paste($position => $last_node);
$last_node = $newnode;
$number--;
}
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml Fri Jul 16 20:36:03 2010
@@ -6,7 +6,7 @@
<XPath-LOCAL_CHARSET>utf8</XPath-LOCAL_CHARSET>
<File-WORKING_DIRECTORY>.</File-WORKING_DIRECTORY>
<Styles-COLORMAP></Styles-COLORMAP>
- <BUILD_DATE>2010-04-02T20:03:52</BUILD_DATE>
+ <BUILD_DATE>2010-07-12T18:55:23</BUILD_DATE>
<INSTALLATION_DATE>N/A</INSTALLATION_DATE>
</OpenOffice-OODoc>
</config>
Modified: branches/upstream/libopenoffice-oodoc-perl/current/build_date
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/build_date?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/build_date (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/build_date Fri Jul 16 20:36:03 2010
@@ -1,1 +1,1 @@
-2010-04-02T20:03:52
+2010-07-12T18:55:23
Modified: branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t Fri Jul 16 20:36:03 2010
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
-# 01write.t OpenOffice::OODoc Installation test 2010-03-30
-#-----------------------------------------------------------------------------
-
+# 01write.t OpenOffice::OODoc Installation test 2010-07-07
+#-----------------------------------------------------------------------------
+use strict;
use Test;
BEGIN { plan tests => 19 }
Modified: branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t?rev=60353&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t Fri Jul 16 20:36:03 2010
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
-# 02read.t OpenOffice::OODoc Installation test 2010-03-30
+# 02read.t OpenOffice::OODoc Installation test 2010-07-07
#-----------------------------------------------------------------------------
-
+use strict;
use Test;
BEGIN { plan tests => 12 }
More information about the Pkg-perl-cvs-commits
mailing list