r50475 - in /branches/upstream/libopenoffice-oodoc-perl/current: ./ OODoc/ OODoc/data/ OODoc/templates/ examples/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Jan 7 17:01:09 UTC 2010
Author: jawnsy-guest
Date: Thu Jan 7 17:00:54 2010
New Revision: 50475
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50475
Log:
[svn-upgrade] Integrating new upstream version, libopenoffice-oodoc-perl (2.109)
Modified:
branches/upstream/libopenoffice-oodoc-perl/current/Changes
branches/upstream/libopenoffice-oodoc-perl/current/INSTALL
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/File.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pod
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/data/image.png
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odg
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odp
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.ods
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odt
branches/upstream/libopenoffice-oodoc-perl/current/build_date
branches/upstream/libopenoffice-oodoc-perl/current/examples/oodoc_test
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/Changes (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/Changes Thu Jan 7 17:00:54 2010
@@ -1,3 +1,11 @@
+2.109 2010-01-05
+ Cosmetic changes in the installation tests; changed the test image.
+ Updated template documents.
+ Makefile.PL: Updated dependencies (updated INSTALL accordingly).
+ Makefile.PL: utf8 becomes the default character set.
+ File.pm: Archive::Zip 1.18 now required; IO::File required; file handles supported.
+ Meta.pm: Added user-defined property access methods; added getTemplate(), unlinkTemplate().
+ Text.pm: Added setNote(), fixed a bug in getTableByName() [#48356].
2.108 2009-05-24
Some doc cleaning
Meta.pm: added getUserProperty(), setUserProperty(), removeUserProperty()
Modified: branches/upstream/libopenoffice-oodoc-perl/current/INSTALL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/INSTALL?rev=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/INSTALL (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/INSTALL Thu Jan 7 17:00:54 2010
@@ -1,12 +1,13 @@
-OpenOffice::OODoc installation (2008-10-10)
+OpenOffice::OODoc installation (2010-01-05)
SYSTEM REQUIREMENTS
Perl >= 5.8.0
- Archive::Zip >= 1.14
- XML::Twig >= 3.22
+ Archive::Zip >= 1.18
+ XML::Twig >= 3.32
Time::Local >= 1.07
File::Temp >= 0.12
+ IO::File >= 1.14
INSTALLATION FROM THE CPAN DISTRIBUTION
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/META.yml (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/META.yml Thu Jan 7 17:00:54 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: OpenOffice-OODoc
-version: 2.108
+version: 2.109
abstract: The Perl Open OpenDocument Connector
license: LGPL
author:
@@ -8,9 +8,10 @@
generated_by: ExtUtils::MakeMaker version 6.42
distribution_type: module
requires:
- Archive::Zip: 1.14
+ Archive::Zip: 1.18
File::Find: 1.01
File::Temp: 0.12
+ IO::File: 1.14
Time::Local: 1.07
XML::Twig: 3.32
meta-spec:
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/Makefile.PL Thu Jan 7 17:00:54 2010
@@ -1,5 +1,5 @@
#------------------------------------------------------
-# OpenOffice::OODoc packaging & installation 2008-11-08
+# OpenOffice::OODoc packaging & installation 2010-01-05
#------------------------------------------------------
use 5.008;
@@ -13,7 +13,7 @@
(
'config!' => \(my $config = 1),
'prompt!' => \(my $prompt = 1),
- 'encoding=s' => \(my $encoding = 'iso-8859-1'),
+ 'encoding=s' => \(my $encoding = 'utf8'),
'colormap=s' => \(my $colormap = ''),
'workdir=s' => \(my $workdir = '.'),
'format=s' => \(my $format = 2),
@@ -153,10 +153,11 @@
'PREREQ_PM' =>
{
'XML::Twig' => '3.32',
- 'Archive::Zip' => '1.14',
+ 'Archive::Zip' => '1.18',
'File::Temp' => '0.12',
'File::Find' => '1.01',
- 'Time::Local' => '1.07'
+ 'Time::Local' => '1.07',
+ 'IO::File' => '1.14'
},
'EXE_FILES' =>
[
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm Thu Jan 7 17:00:54 2010
@@ -1,14 +1,14 @@
#-----------------------------------------------------------------------------
#
-# $Id : OODoc.pm 2.108 2009-05-24 JMG$
+# $Id : OODoc.pm 2.109 2010-01-05 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2008 by Genicorp, S.A. (www.genicorp.com)
#
#-----------------------------------------------------------------------------
-use OpenOffice::OODoc::File 2.118;
-use OpenOffice::OODoc::Meta 2.013;
+use OpenOffice::OODoc::File 2.201;
+use OpenOffice::OODoc::Meta 2.014;
use OpenOffice::OODoc::Document 2.023;
use OpenOffice::OODoc::Manifest 2.005;
@@ -16,7 +16,7 @@
package OpenOffice::OODoc;
use 5.008_000;
-our $VERSION = 2.108;
+our $VERSION = 2.109;
require Exporter;
our @ISA = qw(Exporter);
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/File.pm Thu Jan 7 17:00:54 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : File.pm 2.118 2009-01-30 JMG$
+# $Id : File.pm 2.201 2009-06-06 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2009 by Genicorp, S.A. (www.genicorp.com)
@@ -9,9 +9,10 @@
package OpenOffice::OODoc::File;
use 5.008_000;
-our $VERSION = 2.118;
-use Archive::Zip 1.14 qw ( :DEFAULT :CONSTANTS :ERROR_CODES );
+our $VERSION = 2.201;
+use Archive::Zip 1.18 qw ( :DEFAULT :CONSTANTS :ERROR_CODES );
use File::Temp;
+use IO::File;
#-----------------------------------------------------------------------------
# some defaults
@@ -358,9 +359,15 @@
return undef;
}
-
- $self->{'source_file'} = $sourcefile;
-
+ if ($sourcefile->isa('IO::Handle'))
+ {
+ $self->{'io_handle'} = $sourcefile;
+ }
+ else
+ {
+ $self->{'source_file'} = $sourcefile;
+ }
+
unless ($sourcefile)
{
warn "[" . __PACKAGE__ . "::new] Missing file name\n";
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm Thu Jan 7 17:00:54 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : Meta.pm 2.013 2009-05-24 JMG$
+# $Id : Meta.pm 2.014 2010-01-05 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2009 by Genicorp, S.A. (www.genicorp.com)
@@ -9,7 +9,7 @@
package OpenOffice::OODoc::Meta;
use 5.008_000;
-our $VERSION = 2.013;
+our $VERSION = 2.014;
use OpenOffice::OODoc::XPath 2.229;
our @ISA = qw ( OpenOffice::OODoc::XPath );
@@ -411,16 +411,60 @@
#-----------------------------------------------------------------------------
+sub getUserPropertyElements
+ {
+ my $self = shift;
+ return $self->getElementList('//meta:user-defined');
+ }
+
+#-----------------------------------------------------------------------------
+
+sub removeUserProperties
+ {
+ my $self = shift;
+ my $count = 0;
+ foreach my $element ($self->getUserPropertyElements())
+ {
+ $element->delete; $count++;
+ }
+ return $count;
+ }
+
+#-----------------------------------------------------------------------------
+
+sub getUserPropertyElement
+ {
+ my $self = shift;
+ my $arg = shift;
+ return undef unless defined $arg;
+ if (ref $arg)
+ {
+ return ($arg->hasTag('meta:user-defined')) ?
+ $arg :
+ undef;
+ }
+ else
+ {
+ my $name = $self->inputTextConversion($arg);
+ return $self->getNodeByXPath
+ ("//meta:user-defined[\@meta:name=\"$name\"]");
+ }
+ }
+
+#-----------------------------------------------------------------------------
+
sub getUserProperty
{
my $self = shift;
- my $name = $self->inputTextConversion(shift) or return undef;
- my $property = $self->getNodeByXPath
- ("//meta:user-defined[\@meta:name=\"$name\"]")
- or return undef;
-
- my $type = $self->getAttribute($property, 'meta:value-type');
- my $value = $self->getText($property);
+ my $property = $self->getUserPropertyElement(shift);
+ my $type = undef;
+ my $value = undef;
+
+ if ($property)
+ {
+ $type = $self->getAttribute($property, 'meta:value-type');
+ $value = $self->getText($property);
+ }
return (wantarray) ? ($type, $value) : $value;
}
@@ -430,23 +474,30 @@
sub setUserProperty
{
my $self = shift;
- my $name = shift or return undef;
+ my $name = shift;
+ unless (defined $name)
+ {
+ return (wantarray) ? (undef, undef) : undef;
+ }
my %opt = @_;
- my $n = $self->inputTextConversion($name);
- my $property = $self->getNodeByXPath
- ("//meta:user-defined[\@meta:name=\"$n\"]");
- unless ($property)
- {
- $property = $self->appendElement
- (
- $self->{'body'}, 'meta:user-defined',
- );
- $self->setAttribute($property, 'meta:name', $name);
- }
- $opt{'type'} = 'string' unless defined $opt{'type'};
- $self->setAttribute($property, 'meta:value-type', $opt{'type'});
- $self->setText($property, $opt{'value'});
- return (wantarray) ? ($opt{'type'}, $opt{'value'}) : $opt{'value'};
+
+ my $property = $self->getUserPropertyElement($name);
+ unless ($property)
+ {
+ $property =$self->appendElement
+ ($self->{'body'}, 'meta:user-defined');
+ $self->setAttribute($property, 'meta:name', $name);
+ }
+
+ my $type = $opt{'type'} ||
+ $self->getAttribute
+ ($property, 'meta:value-type') ||
+ 'string';
+
+ $self->setAttribute($property, 'meta:value-type', $type);
+ $self->setText($property, $opt{'value'}) if defined $opt{'value'};
+
+ return $self->getUserProperty($property);
}
#-----------------------------------------------------------------------------
@@ -478,4 +529,25 @@
}
#-----------------------------------------------------------------------------
+
+sub getTemplate
+ {
+ my $self = shift;
+ my $element = $self->getElement('//meta:template', 0)
+ or return undef;
+ my %t = $self->getAttributes($element);
+ return (wantarray) ?
+ ($t{'xlink:href'}, $t{'meta:date'}, $t{'xlink:title'}) :
+ $t{'xlink:href'};
+ }
+
+#-----------------------------------------------------------------------------
+
+sub unlinkTemplate
+ {
+ my $self = shift;
+ return $self->removeElement('//meta:template', 0);
+ }
+
+#-----------------------------------------------------------------------------
1;
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod?rev=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod Thu Jan 7 17:00:54 2010
@@ -120,10 +120,28 @@
With argument, inserts any signature.
+=head3 getTemplate()
+
+ Returns information about the template that is linked to the current
+ document, if any.
+
+ In scalar context, the returned information is the location (URL) of
+ the template, or undef if the document isn't linked to any template.
+
+ In array context, the returned values are, in this order, the location
+ of the template document, the date and time when the template was last
+ modified prior to being used to create the current document, then the
+ title of the template document.
+
+ See also unlinkTemplate().
+
=head3 getUserProperty(name)
Retrieves the content of the user-defined property corresponding to the
given name, if any.
+
+ The argument may be an already retrieved user-defined property element
+ reference instead of a name.
In scalar context, returns the value only.
In array context, returns the data type (1st) and the value (2nd).
@@ -131,6 +149,17 @@
Returns undef if the property is not defined.
See also setUserProperty().
+
+=head3 getUserPropertyElement(name)
+
+ Like getUserProperty(), but the return value is the user property
+ element instead of its value and/or type. Returns undef if the given
+ property is not defined (or if the given object is not a user-defined
+ property element).
+
+=head3 getUserPropertyElements()
+
+ Returns the list of all the existing user-defined property elements.
=head3 initial_creator()
@@ -168,6 +197,12 @@
Deletes the user-defined property corresponding to the given name (does
nothing if the given property is not defined in the document).
+=head3 removeUserProperties()
+
+ Deletes all the existing user-defined properties and returns the number
+ or really deleted elements (does nothing and returns 0 if no user
+ property is defined in the document).
+
=head3 setUserProperty(name, type => value_type, value => text)
Creates or updates a user-defined property with the given data type and
@@ -182,8 +217,32 @@
ODF compliance requires 'true' or 'false' for a boolean, and the ISO-8601
format for a date (see odfLocaltime()).
- If the 'type' option is not provided, the 'string' type is selected
- by default.
+ Example:
+
+ $meta->setUserProperty
+ (
+ "Approved",
+ type => 'boolean', value => 'false'
+ );
+ $meta->setUserProperty
+ (
+ "Circulation",
+ type => 'string', value => "Internal"
+ );
+ $meta->setUserProperty
+ (
+ "Release date",
+ type => 'date', value => "2010-01-01'
+ );
+ $meta->setUserProperty
+ (
+ "Release number",
+ type => 'float', value => "5.4'
+ );
+
+ The 'type' option allows to change the data type of an existing user-
+ defined property. However, if a new property is created without 'type'
+ option, the 'string' type is selected by default.
The return value reflects the new status of the user defined item,
in the same format as with getUserProperty().
@@ -251,6 +310,11 @@
With argument, adds a new title to the document.
+=head3 unlinkTemplate()
+
+ Removes the reference to a template document, if any, ensuring that
+ the document no longer depends on any external template.
+
=head3 user_defined()
Returns the list of the user defined fields of the document.
@@ -263,10 +327,10 @@
provided items is less than the numbers of existing user defined
properties, the exceding properties are left unchanged.
- Warning: this method is deprecated; it fits with some legacy
- documents where the number of user defined properties was fixed.
- The newer getUserProperty() and setUserProperty() methods should
- be preferred.
+ Warning: this method is deprecated. Newer methods such as
+ setUserProperty(), getUserProperty(), removeUserProperties(),
+ getUserPropertyElements(), and getUserPropertyElements() should be
+ preferred.
=head3 version()
@@ -282,7 +346,7 @@
Contact: jmgdoc at cpan.org
-Copyright 2004-2009 by Genicorp, S.A. L<http://www.genicorp.com>
+Copyright 2004-2010 by Genicorp, S.A. L<http://www.genicorp.com>
Initial English version of the reference manual by Graeme A. Hunter
(graeme.hunter at zen.co.uk).
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm Thu Jan 7 17:00:54 2010
@@ -1,6 +1,6 @@
#----------------------------------------------------------------------------
#
-# $Id : Text.pm 2.236 2009-02-18 JMG$
+# $Id : Text.pm 2.237 2010-01-05 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2009 by Genicorp, S.A. (www.genicorp.com)
@@ -11,7 +11,7 @@
use 5.008_000;
use OpenOffice::OODoc::XPath 2.229;
our @ISA = qw ( OpenOffice::OODoc::XPath );
-our $VERSION = 2.236;
+our $VERSION = 2.237;
#-----------------------------------------------------------------------------
# synonyms
@@ -879,6 +879,54 @@
}
#-----------------------------------------------------------------------------
+# creates and inserts a footnote or endnote
+
+sub setNote
+ {
+ my $self = shift;
+ my $path = shift;
+ my $pos = ref $path ? undef : shift;
+ my $element = $self->getElement($path, $pos) or return undef;
+ my $text = shift;
+ my %opt =
+ (
+ 'offset' => 0,
+ 'text' => "",
+ 'style' => 'Standard',
+ 'citation' => undef,
+ 'id' => undef,
+ 'class' => 'footnote',
+ 'label' => undef,
+ @_
+ );
+ my $note = $element->insertNewNode
+ ('text:note', 'within', $opt{'offset'});
+ $self->setAttributes
+ (
+ $note,
+ 'text:id' => $opt{'id'},
+ 'text:note-class' => $opt{'class'}
+ );
+ my $note_citation = $note->appendChild('text:note-citation');
+ if (defined $opt{'label'})
+ {
+ $self->setAttribute
+ ($note_citation, 'text:label', $opt{'label'});
+ $opt{'citation'} = $opt{'label'}
+ unless defined $opt{'citation'};
+ }
+ $self->setText($note_citation, $opt{'citation'});
+ my $note_body = $note->appendChild('text:note-body');
+ $self->appendParagraph
+ (
+ attachment => $note_body,
+ text => $text,
+ style => $opt{'style'}
+ );
+ return $note;
+ }
+
+#-----------------------------------------------------------------------------
sub removeSpan
{
@@ -3182,7 +3230,7 @@
my $self = shift;
my $name = $self->inputTextConversion(shift);
my $table = $self->getNodeByXPath
- ("//table:table[\@table:name=\"$n\"]");
+ ("//table:table[\@table:name=\"$name\"]");
return $self->getTable($table, @_);
}
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pod?rev=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pod (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pod Thu Jan 7 17:00:54 2010
@@ -2474,6 +2474,37 @@
such a link is the concatenation of a file path, a "#", and a local
name that makes sense in the target document (bookmark, heading...).
+=head3 setNote(path, position, text [, options])
+
+=head3 setNote(element, text [, options])
+
+ Creates and inserts a footnote or an endnote in the given element with
+ the given text as the note content. Returns the new note element in
+ case of success, or undef if the target element doesn't exist.
+
+ Supported options are:
+
+ 'offset' => specifies the numeric position of the note in the text of the
+ target element; by default the note is located at the beginning;
+
+ 'class' => specifies the display class of the now note; may be 'footnote'
+ or 'endnote', default is 'footnote';
+
+ 'id' => a note identifier, must be provided by the application and must
+ be unique for the class (be careful, the uniqueness is not automatically
+ checked and no default is provided);
+
+ 'citation' => specifies the character string to display as note citation
+ (at the place in the host element where the note is anchored);
+
+ 'label' => this option, if provided, means that the note should not be
+ processed as automatically numbered by the printing/editing applications
+ and that it should be represented by the given (arbitrary) string; if
+ 'label' is defined, it becomes the default value of 'citation';
+
+ 'style' => specifies the style of the note content (should be a regular
+ paragraph style).
+
=head3 setSpan(path, position, [context,] expression, style)
=head3 setSpan(element, [context,] expression, style)
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml Thu Jan 7 17:00:54 2010
@@ -3,10 +3,10 @@
<comment>OpenOffice::OODoc local configuration file</comment>
<OpenOffice-OODoc>
<File-DEFAULT_OFFICE_FORMAT>2</File-DEFAULT_OFFICE_FORMAT>
- <XPath-LOCAL_CHARSET>iso-8859-1</XPath-LOCAL_CHARSET>
+ <XPath-LOCAL_CHARSET>utf8</XPath-LOCAL_CHARSET>
<File-WORKING_DIRECTORY>.</File-WORKING_DIRECTORY>
<Styles-COLORMAP></Styles-COLORMAP>
- <BUILD_DATE>2009-05-24T20:09:08</BUILD_DATE>
+ <BUILD_DATE>2010-01-05T19:34:46</BUILD_DATE>
<INSTALLATION_DATE>N/A</INSTALLATION_DATE>
</OpenOffice-OODoc>
</config>
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/data/image.png
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/data/image.png?rev=50475&op=diff
==============================================================================
Binary files - no diff available.
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odg
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odg?rev=50475&op=diff
==============================================================================
Binary files - no diff available.
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odp
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odp?rev=50475&op=diff
==============================================================================
Binary files - no diff available.
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.ods
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.ods?rev=50475&op=diff
==============================================================================
Binary files - no diff available.
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odt
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/templates/template.odt?rev=50475&op=diff
==============================================================================
Binary files - no diff available.
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/build_date (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/build_date Thu Jan 7 17:00:54 2010
@@ -1,1 +1,1 @@
-2009-05-24T20:09:08
+2010-01-05T19:34:46
Modified: branches/upstream/libopenoffice-oodoc-perl/current/examples/oodoc_test
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/examples/oodoc_test?rev=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/examples/oodoc_test (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/examples/oodoc_test Thu Jan 7 17:00:54 2010
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#-----------------------------------------------------------------------------
-# OpenOffice::OODoc test 2008-10-31
+# OpenOffice::OODoc test 2010-01-05
#-----------------------------------------------------------------------------
=head1 NAME
@@ -41,7 +41,7 @@
"odftest.odt" : "ootest.sxw";
my $class = "text";
my $image_file = "$instpath/data/image.png";
-my $image_size = "91mm, 53mm";
+my $image_size = "60mm, 82mm";
my $test_date = odfLocaltime();
print "Generating $testfile file\n";
@@ -89,9 +89,10 @@
'Centered Image',
properties =>
{
- 'style:horizontal-pos' => 'center',
- 'style:vertical-pos' => 'from-top',
- 'fo:margin-bottom' => '2cm'
+ 'horizontal-pos' => 'center',
+ 'vertical-pos' => 'from-top',
+ 'wrap' => 'none',
+ 'fo:margin-bottom' => '1cm'
}
);
# Inserting an image in the document
@@ -216,6 +217,9 @@
$meta->generator($generator);
$meta->creation_date($test_date);
$meta->date($test_date);
+$meta->removeUserProperties();
+$meta->setUserProperty("Application", type => 'string', value => "oodoc_test");
+$meta->setUserProperty("Test date", type => 'date', value => $test_date);
# Saving the $testfile file
print "Saving $testfile file\n";
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t Thu Jan 7 17:00:54 2010
@@ -1,12 +1,12 @@
#-----------------------------------------------------------------------------
-# 01write.t OpenOffice::OODoc Installation test 2009-05-24
+# 01write.t OpenOffice::OODoc Installation test 2010-01-05
#-----------------------------------------------------------------------------
use Test;
BEGIN { plan tests => 19 }
-use OpenOffice::OODoc 2.108;
-ok($OpenOffice::OODoc::VERSION >= 2.108);
+use OpenOffice::OODoc 2.109;
+ok($OpenOffice::OODoc::VERSION >= 2.109);
#-----------------------------------------------------------------------------
@@ -16,7 +16,7 @@
"odftest.odt" : "ootest.sxw";
my $class = "text";
my $image_file = "OODoc/data/image.png";
-my $image_size = "91mm, 53mm";
+my $image_size = "7.06cm, 9.60cm";
my $test_date = odfLocaltime();
# Creating an empty new ODF file with the default template
@@ -41,8 +41,10 @@
"page, and if the informations below make sense, " .
"your installation is probably OK.";
-my $title = "OpenOffice::OODoc test document";
-my $description = "Generated by $generator";
+my $title = "ODF sample document";
+my $description =
+ "Generated using OpenOffice::OODoc " .
+ "$OpenOffice::OODoc::VERSION";
# Opening the content using OpenOffice::OODoc::Document
my $doc = odfConnector
@@ -70,9 +72,10 @@
'Centered Image',
properties =>
{
- 'style:horizontal-pos' => 'center',
- 'style:vertical-pos' => 'from-top',
- 'fo:margin-bottom' => '2cm'
+ 'horizontal-pos' => 'center',
+ 'vertical-pos' => 'from-top',
+ 'wrap' => 'none',
+ 'fo:margin-bottom' => '1cm'
}
)
);
@@ -211,6 +214,8 @@
ok($meta->date($test_date));
$meta->creator($ENV{'USER'});
$meta->initial_creator($ENV{'USER'});
+$meta->subject("OpenOffice::OODoc installation test");
+$meta->removeUserProperties();
# Saving the $testfile file
ok($archive->save);
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=50475&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t Thu Jan 7 17:00:54 2010
@@ -1,12 +1,12 @@
#-----------------------------------------------------------------------------
-# 02read.t OpenOffice::OODoc Installation test 2009-01-16
+# 02read.t OpenOffice::OODoc Installation test 2009-12-23
#-----------------------------------------------------------------------------
use Test;
BEGIN { plan tests => 12 }
-use OpenOffice::OODoc 2.108;
-ok($OpenOffice::OODoc::VERSION >= 2.108);
+use OpenOffice::OODoc 2.109;
+ok($OpenOffice::OODoc::VERSION >= 2.109);
#-----------------------------------------------------------------------------
More information about the Pkg-perl-cvs-commits
mailing list