[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 5 commits - officecfg/registry readlicense_oo/html readlicense_oo/makefile.mk readlicense_oo/odt readlicense_oo/prj readlicense_oo/source readlicense_oo/txt

Fridrich Strba fridrich at kemper.freedesktop.org
Mon Dec 13 11:14:26 PST 2010


 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    4 
 readlicense_oo/html/makefile.mk                            |   47 
 readlicense_oo/makefile.mk                                 |   36 
 readlicense_oo/odt/makefile.mk                             |   48 
 readlicense_oo/prj/build.lst                               |   10 
 readlicense_oo/prj/d.lst                                   |   24 
 readlicense_oo/source/license/license_en-US.html           |  109 
 readlicense_oo/source/license/license_en-US.rtf            |11122 -------------
 readlicense_oo/source/license/license_en-US.txt            | 5304 ------
 readlicense_oo/txt/license.txt                             | 5304 ++++++
 10 files changed, 5330 insertions(+), 16678 deletions(-)

New commits:
commit d565aa114b1c8533bb267d5635a6af19e6536ffa
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Dec 9 11:59:50 2010 +0000

    cleanup deliver syntax

diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 1739f6f..d4d5026 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,9 +4,9 @@ mkdir: %_DEST%\pck%_EXT%
 dos: echo =====================================================================
 dos: echo Delivering LICENSE files
 dos: echo =====================================================================
-..\%__SRC%\misc\LICENSE     %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE     %_DEST%\bin%_EXT%\osl\LICENSE
+..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl\license.txt
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl\LICENSE.odt
 
 ..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
 ..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
commit cc504fa0699657ac4123c3d4c0ba40db7e9d26de
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Dec 9 11:49:52 2010 +0000

    further simplification of license build / installation

diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index 0b41cff..ee1facd 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -6,23 +6,11 @@ TARGET=source
 .INCLUDE: settings.mk
 # ------------------------------------------------------------------
 
-.IF "$(GUI)"=="WNT"
-SYSLICBASE=license.txt LICENSE.odt
-SYSLICDEST=$(MISC)$/license$/wnt
-.ELSE          # "$(GUI)"=="WNT"
-SYSLICBASE=LICENSE LICENSE.odt
-SYSLICDEST=$(MISC)$/license$/unx
-.ENDIF          # "$(GUI)"=="WNT"
-
-SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)$(i:e))
-
-fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
-
 # ------------------------------------------------------------------
 .INCLUDE: target.mk
 # ------------------------------------------------------------------
 
-ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics \
+ALLTAR: $(MISC)/$/license.txt $(MISC)/$/LICENSE \
         $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
         $(MISC)$/THIRDPARTYLICENSEREADME.html
 
@@ -36,16 +24,13 @@ just_for_nice_optics: $(fallbacklicenses)
     @$(ECHONL)
 
 # for windows, convert linends to DOS
-$(SYSLICDEST)$/license.% : txt$/license.%
-    @-$(MKDIRHIER) $(SYSLICDEST)
+$(MISC)$/license.txt : txt$/license.txt
     $(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
-
 # for others just copy
-$(SYSLICDEST)$/LICENSE : txt$/license.txt
-    @-$(MKDIRHIER) $(SYSLICDEST)
+$(MISC)$/LICENSE : txt$/license.txt
     $(COPY) $< $@
-$(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
-    @-$(MKDIRHIER) $(SYSLICDEST)
+
+$(MISC)$/SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
     $(COPY) $< $@
 
 # just copy into misc
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index deb1c94..1739f6f 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,17 +4,17 @@ mkdir: %_DEST%\pck%_EXT%
 dos: echo =====================================================================
 dos: echo Delivering LICENSE files
 dos: echo =====================================================================
-..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\unx\LICENSE*.odt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\LICENSE*.odt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE     %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl
+
 ..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
 ..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
 
 # URE:
 mkdir: %_DEST%\bin%_EXT%\ure
-..\%__SRC%\misc\license\unx\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license.txt %_DEST%\bin%_EXT%\ure\license.txt
+..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
+..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\ure\license.txt
 
 ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
 
commit 50db6d730f388a77b6e341afbac7502a30b0259a
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 8 20:48:37 2010 +0000

    get the rule names right, and cleanup delivery

diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index dcbafb0..0b41cff 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -22,7 +22,9 @@ fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(forea
 .INCLUDE: target.mk
 # ------------------------------------------------------------------
 
-ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics
+ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics \
+        $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
+        $(MISC)$/THIRDPARTYLICENSEREADME.html
 
 .IF "$(fallbacklicenses)"!=""
 $(fallbacklicenses) : $(SOURCELICENCES)
@@ -47,9 +49,9 @@ $(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
     $(COPY) $< $@
 
 # just copy into misc
-$(MISC)$/LICENSE.odt: LICENSE.odt
-    $(COPY) LICENSE.odt $@
-$(MISC)$/CREDITS.odt: CREDITS.odt
-    $(COPY) CREDITS.odt $@
-$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
-    $(COPY) THIRDPARTYLICENSEREADME.html $@
+$(MISC)$/LICENSE.odt: odt/LICENSE.odt
+    $(COPY) odt/LICENSE.odt $@
+$(MISC)$/CREDITS.odt: odt/CREDITS.odt
+    $(COPY) odt/CREDITS.odt $@
+$(MISC)$/THIRDPARTYLICENSEREADME.html: html/THIRDPARTYLICENSEREADME.html
+    $(COPY) html/THIRDPARTYLICENSEREADME.html $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index aa771c5..deb1c94 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,30 +4,20 @@ mkdir: %_DEST%\pck%_EXT%
 dos: echo =====================================================================
 dos: echo Delivering LICENSE files
 dos: echo =====================================================================
-
-# Can we finally unify Windows and unx file names to upper case
-# LICENSE/LICENSE.html?
-# FIXME: is - can you solve this?
 ..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\unx\LICENSE*.html %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\unx\LICENSE*.odt %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\wnt\LICENSE*.odt %_DEST%\bin%_EXT%\osl
 ..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.html %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.rtf %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
+..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
 
 # URE:
 mkdir: %_DEST%\bin%_EXT%\ure
-..\%__SRC%\misc\license\unx\LICENSE_en-US %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
+..\%__SRC%\misc\license\unx\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
+..\%__SRC%\misc\license\wnt\license.txt %_DEST%\bin%_EXT%\ure\license.txt
 
-# RTF only for Windows?
-# Why? It comes from cws_src680_langsupporter.
 ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
 
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
-..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
 
 dos: echo =====================================================================
 dos: echo Delivering README files
commit 17744748fa68f55c0133b34330d572f799e4f5a9
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Dec 9 10:55:33 2010 +0000

    Simplify, remove lang suffix, remove html and rtf licenses, to use odt.
    
    Conflicts:
    
    	readlicense_oo/odt/makefile.mk

diff --git a/readlicense_oo/html/makefile.mk b/readlicense_oo/html/makefile.mk
deleted file mode 100644
index 332d23d..0000000
--- a/readlicense_oo/html/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=readlicense_oo
-TARGET=html
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-all: $(MISC)$/THIRDPARTYLICENSEREADME.html
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
-    $(COPY) THIRDPARTYLICENSEREADME.html $@
-
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index 0568a98..dcbafb0 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -7,14 +7,14 @@ TARGET=source
 # ------------------------------------------------------------------
 
 .IF "$(GUI)"=="WNT"
-SYSLICBASE=license.txt license.html license.rtf
+SYSLICBASE=license.txt LICENSE.odt
 SYSLICDEST=$(MISC)$/license$/wnt
 .ELSE          # "$(GUI)"=="WNT"
-SYSLICBASE=LICENSE LICENSE.html
+SYSLICBASE=LICENSE LICENSE.odt
 SYSLICDEST=$(MISC)$/license$/unx
 .ENDIF          # "$(GUI)"=="WNT"
 
-SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)_en-US$(i:e))
+SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)$(i:e))
 
 fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
 
@@ -34,19 +34,22 @@ just_for_nice_optics: $(fallbacklicenses)
     @$(ECHONL)
 
 # for windows, convert linends to DOS
-$(SYSLICDEST)$/license_en-US.% : source$/license$/license_en-US.%
+$(SYSLICDEST)$/license.% : txt$/license.%
     @-$(MKDIRHIER) $(SYSLICDEST)
     $(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
 
 # for others just copy
-$(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt
+$(SYSLICDEST)$/LICENSE : txt$/license.txt
     @-$(MKDIRHIER) $(SYSLICDEST)
     $(COPY) $< $@
-
-$(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html
+$(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
     @-$(MKDIRHIER) $(SYSLICDEST)
     $(COPY) $< $@
 
-$(SYSLICDEST)$/LICENSE.odt : source$/license$/license.odt
-    @-$(MKDIRHIER) $(SYSLICDEST)
-    $(COPY) $< $@
+# just copy into misc
+$(MISC)$/LICENSE.odt: LICENSE.odt
+    $(COPY) LICENSE.odt $@
+$(MISC)$/CREDITS.odt: CREDITS.odt
+    $(COPY) CREDITS.odt $@
+$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
+    $(COPY) THIRDPARTYLICENSEREADME.html $@
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
deleted file mode 100644
index 89cea1a..0000000
--- a/readlicense_oo/odt/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=readlicense_oo
-TARGET=odt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/LICENSE.odt: LICENSE.odt
-    $(COPY) LICENSE.odt $@
-$(MISC)$/CREDITS.odt: CREDITS.odt
-    $(COPY) CREDITS.odt $@
diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst
index 0f484d0..2296ead 100644
--- a/readlicense_oo/prj/build.lst
+++ b/readlicense_oo/prj/build.lst
@@ -1,7 +1,5 @@
-ro  readlicense_oo :    l10n solenv LIBXSLT:libxslt NULL
-ro  readlicense_oo			usr1 - all ro_root NULL
-ro  readlicense_oo\docs\readme			nmake - all ro_readme NULL
-ro  readlicense_oo\html			nmake - all ro_html NULL
-ro  readlicense_oo\odt			nmake - all ro_odt NULL
-ro  readlicense_oo			nmake - all ro_conv NULL
+ro  readlicense_oo : l10n solenv LIBXSLT:libxslt NULL
+ro  readlicense_oo		usr1 - all ro_root NULL
+ro  readlicense_oo\docs\readme	nmake - all ro_readme NULL
+ro  readlicense_oo		nmake - all ro_conv NULL
 
diff --git a/readlicense_oo/source/license/license_en-US.html b/readlicense_oo/source/license/license_en-US.html
deleted file mode 100644
index 3064ab1..0000000
--- a/readlicense_oo/source/license/license_en-US.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!--This file was converted to xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more info.--><head profile="http://dublincore.org/documents/dcmi-terms/"><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title xml:lang="en-US">- no title specified</title><meta name="DCTERMS.title" content="" xml:lang="en-US"/><meta name="DCTERMS.language" content="en-US" scheme="DCTERMS.RFC4646"/><meta name="DCTERMS.source" content="http://xml.openoffice.org/odf2xhtml"/><meta name="DCTERMS.issued" content="2010-09-23T20:59:05" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.contributor" content="Cédric Bosdonnat"/><meta name="DCTERMS.modified" content="2010-10-13T20:07:34" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.provenance" content="" xml:lang="en-US"/><meta name="DCTERMS.subject" content="," xml:lang="en-US"/><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" hreflang="en"/><link rel=
 "schema.DCTERMS" href="http://purl.org/dc/terms/" hreflang="en"/><link rel="schema.DCTYPE" href="http://purl.org/dc/dcmitype/" hreflang="en"/><link rel="schema.DCAM" href="http://purl.org/dc/dcam/" hreflang="en"/><base href="."/><style type="text/css">
-	@page {  }
-	table { border-collapse:collapse; border-spacing:0; empty-cells:show }
-	td, th { vertical-align:top; font-size:12pt;}
-	h1, h2, h3, h4, h5, h6 { clear:both }
-	ol, ul { margin:0; padding:0;}
-	li { list-style: none; margin:0; padding:0;}
-	<!-- "li span.odfLiEnd" - IE 7 issue-->
-	li span. { clear: both; line-height:0; width:0; height:0; margin:0; padding:0; }
-	span.footnodeNumber { padding-right:1em; }
-	span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000;  margin:0; border:0; padding:0;  }
-	* { margin:0;}
-	.Heading_20_1 { font-size:24pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale; writing-mode:page; font-weight:bold; }
-	.Heading_20_2 { font-size:18pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
-	.Heading_20_3 { font-size:14pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
-	.Heading_20_4 { font-size:12pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
-	.Horizontal_20_Line_borderStart { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; padding:0in; border-left-style:none; border-right-style:none; border-top-style:none; padding-bottom:0.1965in;  border-bottom-style:none; }
-	.Horizontal_20_Line { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; padding:0in; border-left-style:none; border-right-style:none; padding-top:0in; padding-bottom:0.1965in;  border-top-style:none; border-bottom-style:none; }
-	.Horizontal_20_Line_borderEnd { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; margin-bottom:0.1965in; padding:0in; border-left-style:none; border-right-style:none; border-bottom-width:0.0399cm; border-bottom-style:double; border-bottom-color:#808080; padding-top:0in;  border-top-style:none;}
-	.List_20_Contents { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-left:0.3937in; margin-right:0in; text-indent:0in; }
-	.P1 { font-size:12pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; text-align:left ! important; }
-	.P10 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:center ! important; font-weight:bold; }
-	.P11 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P12 { font-size:24pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale; writing-mode:page; }
-	.P13 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P14 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P15 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P16 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P17 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P18 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P19 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P2 { font-size:10pt; margin-bottom:0.1965in; margin-top:0in; font-family:Cumberland AMT; writing-mode:page; }
-	.P20 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P21 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P22 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P23 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P24 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P25 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P26 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P27 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P28 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P29 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P3 { font-size:12pt; margin-left:0.3937in; margin-right:0in; text-indent:0in; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; margin-bottom:0.1965in; }
-	.P30 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P31 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P32 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P33 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P34 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P35 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P36 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P37 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P38 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P39 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P4 { font-size:10pt; margin-bottom:0in; margin-top:0in; font-family:Cumberland AMT; writing-mode:page; font-weight:bold; }
-	.P40 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P41 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P42 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P43 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P44 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P45 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P46 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P47 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P48 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P49 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P5_borderStart { border-left-style:none; border-right-style:none; border-top-style:none; font-size:6pt; margin-top:0in; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-bottom:0.1965in;  border-bottom-style:none; }
-	.P5 { border-left-style:none; border-right-style:none; font-size:6pt; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-bottom:0.1965in; padding-top:0in;  border-top-style:none; border-bottom-style:none; }
-	.P5_borderEnd { border-bottom-width:0.0399cm; border-bottom-style:double; border-bottom-color:#808080; border-left-style:none; border-right-style:none; font-size:6pt; margin-bottom:0.1965in; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-top:0in;  border-top-style:none;}
-	.P50 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P51 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P52 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P53 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P54 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P55 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P56 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P57 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P58 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P59 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P6 { font-size:10pt; margin-bottom:0.1965in; margin-left:0.3937in; margin-right:0.3937in; margin-top:0in; text-indent:0in; font-family:Thorndale AMT; writing-mode:page; font-style:italic; }
-	.P60 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P61 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P62 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P63 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P64 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P65 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P66 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P67 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P68 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P69 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
-	.P7 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:left ! important; }
-	.P8 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:center ! important; }
-	.P9 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; font-style:italic; font-weight:bold; }
-	.Preformatted_20_Text { font-size:10pt; font-family:Cumberland AMT; writing-mode:page; margin-top:0in; margin-bottom:0in; }
-	.Quotations { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-left:0.3937in; margin-right:0.3937in; margin-top:0in; margin-bottom:0.1965in; text-indent:0in; }
-	.Text_20_body { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; margin-bottom:0.0835in; }
-	.Bullet_20_Symbols { font-family:OpenSymbol; }
-	.Emphasis { font-style:italic; }
-	.Strong_20_Emphasis { font-weight:bold; }
-	.T1 { font-style:italic; }
-	.T2 { font-style:italic; }
-	.T4 { font-weight:bold; }
-	.T5 { font-size:18pt; font-weight:bold; }
-	.T6 { color:#000000; }
-	.T7 { font-size:10pt; font-style:italic; }
-	<!-- ODF styles with no properties representable as CSS -->
-	.Numbering_20_Symbols .T3 { }

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list