[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 30 commits - chart2/source configure.ac editeng/source filter/source framework/source instsetoo_native/util oox/source readlicense_oo/html readlicense_oo/odt readlicense_oo/txt sc/source setup_native/source solenv/bin svx/source sw/qa sw/source toolkit/source tools/source vcl/generic vcl/source vcl/win wizards/com writerfilter/source xmloff/source
Andras Timar
andras.timar at collabora.com
Tue Apr 8 06:06:34 PDT 2014
chart2/source/tools/ErrorBar.cxx | 2
configure.ac | 2
editeng/source/items/borderline.cxx | 4
filter/source/graphicfilter/itiff/lzwdecom.cxx | 42 +
framework/source/services/autorecovery.cxx | 8
instsetoo_native/util/openoffice.lst.in | 2
oox/source/drawingml/textcharacterproperties.cxx | 2
readlicense_oo/html/LICENSE.html | 426 +++++----------
readlicense_oo/odt/LICENSE.odt |binary
readlicense_oo/txt/license.txt | 95 ---
sc/source/core/tool/addincol.cxx | 16
sc/source/ui/Accessibility/AccessibleDocument.cxx | 70 +-
sc/source/ui/docshell/externalrefmgr.cxx | 1
setup_native/source/packinfo/finals_instsetoo.txt | 2
solenv/bin/modules/installer/globals.pm | 2
svx/source/smarttags/SmartTagMgr.cxx | 2
sw/qa/extras/ww8import/data/bnc821208.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 3
sw/source/core/ole/ndole.cxx | 17
sw/source/core/txtnode/thints.cxx | 2
sw/source/ui/uiview/viewport.cxx | 15
toolkit/source/helper/accessibilityclient.cxx | 1
tools/source/generic/poly.cxx | 17
vcl/generic/fontmanager/fontconfig.cxx | 7
vcl/source/fontsubset/sft.cxx | 2
vcl/source/gdi/metaact.cxx | 41 -
vcl/source/gdi/print3.cxx | 2
vcl/win/source/gdi/winlayout.cxx | 17
wizards/com/sun/star/wizards/ui/ImageList.py | 2
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 15
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 7
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 12
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
xmloff/source/chart/PropertyMap.hxx | 2
xmloff/source/style/xmlnumfi.cxx | 9
35 files changed, 380 insertions(+), 469 deletions(-)
New commits:
commit c79dcd629eb8ff27c420d727f206aef3b3d48f82
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Apr 8 15:05:32 2014 +0200
disable MSP creation
Change-Id: Idfd0fb7841b54aad01167a2149b07b41c29090d0
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 58ea4fc..8083d56 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -26,7 +26,7 @@ Globals
REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
- CREATE_MSP_INSTALLSET 1
+ CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt
index 78260c6..d1d9241 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,4 +30,4 @@
# OpenOffice pro de \\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
# OpenOfficeLanguagePack pro es \\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
# URE pro en-US \\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-LibreOffice pro en-US,ar,as,ast,bg,bn-IN,br,ca,ca-XV,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.1-3\LibreOffice_4.1-3_Win_x86.msi
+# LibreOffice pro en-US,ar,as,ast,bg,bn-IN,br,ca,ca-XV,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sh,sk,sl,sr,sv,ta,te,tr,uk,vi,zh-CN,zh-TW c:\lo\src\cp-4.1-3\LibreOffice_4.1-3_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 94e6912..b3088c8 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -222,7 +222,7 @@ BEGIN
$fix_number_of_cab_files = 1;
$cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression)
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
- $include_cab_in_msi = 0;
+ $include_cab_in_msi = 1;
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
commit f3e687334e7f32d7c6d2ed6efab8cbc777593b74
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Apr 8 14:50:19 2014 +0200
Bump version to 4.1-7
Change-Id: Iadabc89fc0b6505d0d615d8b64d78e3806f1e5e8
diff --git a/configure.ac b/configure.ac
index 42a67fe..dc75154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[4.1.10.6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.7],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
commit 2cd7c4f2c16be7b230e8e5919b46a5d911b050b9
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Apr 7 10:21:05 2014 +0200
fdo#76298: sw: do not start up every OLE object on deletion
First check if it's actually a Chart embedded object; starting up
external processes on Windows for arbitrary OLEs is likely expensive.
(regression from 1ba29be90f7141077f2d079d40dffc2efd4f1a2c)
(cherry picked from commit 206848294f686a0ccf4c741d7e92a2314a88ea48)
Conflicts:
sw/source/core/ole/ndole.cxx
Conflicts:
sw/source/core/ole/ndole.cxx
Change-Id: I3c64444b6cf4d4f791cafc77ec1f9b2b0150ad1b
Reviewed-on: https://gerrit.libreoffice.org/8882
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 1f74ff5..3e21ec0 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -340,27 +340,28 @@ sal_Bool SwOLENode::SavePersistentData()
if ( xChild.is() )
xChild->setParent( 0 );
- // pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
/* #i119941: When cut or move the chart, SwUndoFlyBase::DelFly will call SaveSection to store the comtent to strorage.
In this step, chart filter functions will be called. And chart filter will call chart core functions to create the chart again.
Then chart core function will call the class ExplicitCategoryProvider to create data source.
- In this step, when SW data source provider create the data source, it will create a new SwFlyFrm.
+ In this step, when SW
+ source provider create the data source, an UnoActionRemoveContext
+ will mess with the layout and create a new SwFlyFrm.
But later in SwUndoFlyBase::DelFly, it will clear anchor related attributes of SwFlyFrm. Then finally null pointer occur.
Resolution:
In pCnt->RemoveEmbeddedObject in SaveSection process of table chart, only remove the object from the object container,
without removing it's storage and graphic stream. The chart already removed from formatter.> */
- sal_Bool bChartWithInternalProvider = sal_False;
sal_Bool bKeepObjectToTempStorage = sal_True;
uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
- if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
+ if (IsChart() && sChartTblName.Len()
+ && svt::EmbeddedObjectRef::TryRunningState(xIP))
{
uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
- if ( xChart.is() && xChart->hasInternalDataProvider() )
- bChartWithInternalProvider = sal_True;
+ if (xChart.is() && !xChart->hasInternalDataProvider())
+ {
+ bKeepObjectToTempStorage = sal_False;
+ }
}
- if ( IsChart() && sChartTblName.Len() && !bChartWithInternalProvider )
- bKeepObjectToTempStorage = sal_False;
pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False, bKeepObjectToTempStorage );
// modify end
commit f8218676b976f4648028fbce504a0d48b58af31a
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 4 11:57:43 2014 +0200
accept proper number style condition != as not equal operator, fdo#76777
ODF 1.2 specifies '!=' as not equal operator in <number:number-style>
<style:map> style:condition attribute. So far '<>' is written, accept
the correct operator.
Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1
(cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd)
Reviewed-on: https://gerrit.libreoffice.org/8836
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index ece3ea8..3debbf4 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2067,7 +2067,14 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
if (!bDefaultCond)
{
- sal_Int32 nPos = sRealCond.indexOf( '.' );
+ // Convert != to <>
+ sal_Int32 nPos = sRealCond.indexOf( "!=" );
+ if ( nPos >= 0 )
+ {
+ sRealCond = sRealCond.replaceAt( nPos, 2, "<>" );
+ }
+
+ nPos = sRealCond.indexOf( '.' );
if ( nPos >= 0 )
{
// #i8026# #103991# localize decimal separator
commit 2b99cb70004f87fb61405181fa8fe75f6ec672dc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Apr 3 17:40:05 2014 +0200
bnc#821208 DOC import: fix unwanted char background in numbering char style
Word supports formatting the paragraph parker itself, and we import that
as a formatting at a position after the last character (e.g. "foo" will
have that formatting at char pos 3, which is ignored by the layout).
In addition to this hack, commit
1c22545edf9085b9f2656ca92781158b6b123db3 (Fix issue #i119405: Numbering
text style changed after importing the *.doc, 2012-08-24) added a
SwTxtNode::TryCharSetExpandToNum() hack to Writer core, where in case
such a paragraph marker attribute is set, and the SwTxtNode has a
numbering, then also modify the associated character style as well.
As that commit already noticed, there are attributes which should not be
propagated to that character style. Extend this blacklist to ignore
RES_CHRATR_BACKGROUND as well, as Word does.
Change-Id: Idcb40d37d8688c76fbd61f28428f6e3bc995f799
(cherry picked from commit 5a5d948e230dfea61108452579b68da75706cad4)
Reviewed-on: https://gerrit.libreoffice.org/8828
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc b/sw/qa/extras/ww8import/data/bnc821208.doc
index d89d711..cfe7680 100755
Binary files a/sw/qa/extras/ww8import/data/bnc821208.doc and b/sw/qa/extras/ww8import/data/bnc821208.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index c34e354..17fb1e7 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -310,6 +310,9 @@ void Test::testBnc821208()
beans::PropertyState ePropertyState = xPropertyState->getPropertyState("CharFontName");
// This was beans::PropertyState_DIRECT_VALUE.
CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
+
+ // Background of the numbering itself should have been the default, was yellow (0xffff00).
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProperty<sal_Int32>(xPropertyState, "CharBackColor"));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 34dac0a..38461ef 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1612,7 +1612,7 @@ void SwTxtNode::DelSoftHyph( const xub_StrLen nStt, const xub_StrLen nEnd )
//In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich)
{
- return (nWhich == RES_CHRATR_UNDERLINE);
+ return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND);
}
//In MS Word, following properties of the paragraph end position wont affect the formatting of bullets, so we ignore them:
commit f11b7e26c79f9660ec0348819f0db3f0a211f1be
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 3 12:59:21 2014 +0200
Support SmartTagRecognizers again
The XContentEnumerationAccess is at the service manager, not the component
context. Regression introduced in LO 4.0 with
4381f3dd5ae9e042840a16f69d07267208160420 "fdo#46808, Use BreakIterator ::create
method."
Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d
(cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de)
Reviewed-on: https://gerrit.libreoffice.org/8826
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index ebd6733..3204ef4 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -309,7 +309,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( Run
*/
void SmartTagMgr::LoadLibraries()
{
- Reference< container::XContentEnumerationAccess > rContent( mxContext , UNO_QUERY );
+ Reference< container::XContentEnumerationAccess > rContent( mxContext->getServiceManager(), UNO_QUERY );
if ( !rContent.is() )
return;
commit d1b5da74d394e098194b0bb9a3f047df05e554d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 2 09:33:03 2014 +0100
init a few more stream-read svm elements
(cherry picked from commit 67c6ea0c426c2796fc1b80cbe2cb0347686db90d)
Conflicts:
vcl/source/gdi/metaact.cxx
Change-Id: I3dfa2485afbe66131b86764374d53181b55c2346
(cherry picked from commit 21212a65c5653bdc38cea426710e68ed40c66eb8)
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 828420a..689f35a 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1567,7 +1567,7 @@ SvStream& operator>>( SvStream& rIStream, Polygon& rPoly )
DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" );
sal_uInt16 i;
- sal_uInt16 nPoints;
+ sal_uInt16 nPoints(0);
// read all points and create array
rIStream >> nPoints;
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 6bafdab..46eda99 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -982,7 +982,7 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
rIStm >> maLineInfo;
if ( aCompat.GetVersion() >= 3 )
{
- sal_uInt8 bHasPolyFlags;
+ sal_uInt8 bHasPolyFlags(0);
rIStm >> bHasPolyFlags;
if ( bHasPolyFlags )
maPoly.Read( rIStm );
@@ -1164,10 +1164,11 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
if ( aCompat.GetVersion() >= 2 ) // Version 2
{
- sal_uInt16 i, nIndex, nNumberOfComplexPolygons;
+ sal_uInt16 nNumberOfComplexPolygons(0);
rIStm >> nNumberOfComplexPolygons;
- for ( i = 0; i < nNumberOfComplexPolygons; i++ )
+ for (sal_uInt16 i = 0; i < nNumberOfComplexPolygons; ++i)
{
+ sal_uInt16 nIndex(0);
rIStm >> nIndex;
Polygon aPoly;
aPoly.Read( rIStm );
@@ -1697,18 +1698,20 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
COMPAT( rIStm );
//#fdo39428 SvStream no longer supports operator>>(long&)
- sal_uInt32 nTemp;
- sal_Int32 nTemp2;
rIStm >> maPos;
- rIStm >> nTemp2;
- mnWidth = nTemp2;
- rIStm >> nTemp;
- meStrikeout = (FontStrikeout)nTemp;
- rIStm >> nTemp;
- meUnderline = (FontUnderline)nTemp;
+ sal_Int32 nTempWidth(0);
+ rIStm >> nTempWidth;
+ mnWidth = nTempWidth;
+ sal_uInt32 nTempStrikeout(0);
+ rIStm >> nTempStrikeout;
+ meStrikeout = (FontStrikeout)nTempStrikeout;
+ sal_uInt32 nTempUnderline(0);
+ rIStm >> nTempUnderline;
+ meUnderline = (FontUnderline)nTempUnderline;
if ( aCompat.GetVersion() >= 2 ) {
- rIStm >> nTemp;
- meUnderline = (FontUnderline)nTemp;
+ sal_uInt32 nTempUnderline2(0);
+ rIStm >> nTempUnderline2;
+ meUnderline = (FontUnderline)nTempUnderline2;
}
}
@@ -3357,7 +3360,7 @@ void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
- sal_uInt16 nTmp16;
+ sal_uInt16 nTmp16(0);
COMPAT( rIStm );
rIStm >> nTmp16; maAlign = (TextAlign) nTmp16;
@@ -3632,7 +3635,7 @@ void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* )
{
- sal_uInt16 nTmp16;
+ sal_uInt16 nTmp16(0);
COMPAT( rIStm );
rIStm >> nTmp16; meRasterOp = (RasterOp) nTmp16;
@@ -4085,9 +4088,9 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
SvMemoryStream aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
SvMemoryStream aDest;
- sal_Int32 nLeft, nRight, nTop, nBottom;
- sal_Int32 nPixX, nPixY, nMillX, nMillY;
- float m11, m12, m21, m22, mdx, mdy;
+ sal_Int32 nLeft(0), nRight(0), nTop(0), nBottom(0);
+ sal_Int32 nPixX(0), nPixY(0), nMillX(0), nMillY(0);
+ float m11(0), m12(0), m21(0), m22(0), mdx(0), mdy(0);
// read data
aMemStm >> nLeft >> nTop >> nRight >> nBottom;
commit c2426bd0da91fe991b28b9608284ea6e23f6c036
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 2 09:13:37 2014 +0100
valgrind: Conditional jump or move depends on uninitialised value
Change-Id: I1939d376afe5dd5c67f378ffb2520a066dc99077
(cherry picked from commit 6efbc4598aea1e87c1569c7beef13d44b1a4202c)
(cherry picked from commit 1742008dd0d83f3e69b6e09d9e3223d0c5d28096)
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index c83282c..828420a 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1650,7 +1650,7 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly )
void Polygon::ImplRead( SvStream& rIStream )
{
- sal_uInt8 bHasPolyFlags;
+ sal_uInt8 bHasPolyFlags(0);
rIStream >> *this
>> bHasPolyFlags;
commit dc4d3baaddb8e30fd4dc555aa3e16ffd16663a07
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 2 09:02:19 2014 +0100
detect add to table beyond MAX_TABLE_SIZE
Change-Id: I9b1357e583620c59898cd7a649a5b39a6d7e3739
(cherry picked from commit e326b5e06d74685b1853d61c465e5be0b5bf1595)
(cherry picked from commit 4e2c5ffa89b77e4d6b0a1dc964d330d2ae3636d6)
diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx
index 2fdb054..4ac9d4c 100644
--- a/filter/source/graphicfilter/itiff/lzwdecom.cxx
+++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx
@@ -20,14 +20,16 @@
#include "lzwdecom.hxx"
+#define MAX_TABLE_SIZE 4096
+
LZWDecompressor::LZWDecompressor()
: pOutBufData(NULL)
{
sal_uInt16 i;
- pTable=new LZWTableEntry[4096];
- pOutBuf=new sal_uInt8[4096];
- for (i=0; i<4096; i++)
+ pTable=new LZWTableEntry[MAX_TABLE_SIZE];
+ pOutBuf=new sal_uInt8[MAX_TABLE_SIZE];
+ for (i=0; i<MAX_TABLE_SIZE; i++)
{
pTable[i].nPrevCode=0;
pTable[i].nDataCount=1;
@@ -144,6 +146,15 @@ sal_uInt16 LZWDecompressor::GetNextCode()
void LZWDecompressor::AddToTable(sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData)
{
+ if (nTableSize >= MAX_TABLE_SIZE)
+ {
+ //It might be possible to force emit a 256 to flush the buffer and try
+ //to continue later?
+ SAL_WARN("filter.tiff", "Too much data at scanline");
+ bEOIFound = sal_True;
+ return;
+ }
+
while (pTable[nCodeFirstData].nDataCount>1)
nCodeFirstData=pTable[nCodeFirstData].nPrevCode;
@@ -160,20 +171,33 @@ void LZWDecompressor::DecompressSome()
sal_uInt16 i,nCode;
nCode=GetNextCode();
- if (nCode==256) {
+ if (nCode==256)
+ {
nTableSize=258;
nCode=GetNextCode();
- if (nCode==257) { bEOIFound=sal_True; return; }
+ if (nCode==257)
+ {
+ bEOIFound=sal_True;
+ }
+ }
+ else if (nCode<nTableSize)
+ AddToTable(nOldCode,nCode);
+ else if (nCode==nTableSize)
+ AddToTable(nOldCode,nOldCode);
+ else
+ {
+ bEOIFound=sal_True;
}
- else if (nCode<nTableSize) AddToTable(nOldCode,nCode);
- else if (nCode==nTableSize) AddToTable(nOldCode,nOldCode);
- else { bEOIFound=sal_True; return; }
+
+ if (bEOIFound)
+ return;
nOldCode=nCode;
nOutBufDataLen=pTable[nCode].nDataCount;
pOutBufData=pOutBuf+nOutBufDataLen;
- for (i=0; i<nOutBufDataLen; i++) {
+ for (i=0; i<nOutBufDataLen; i++)
+ {
*(--pOutBufData)=pTable[nCode].nData;
nCode=pTable[nCode].nPrevCode;
}
commit 6ab3b114fe7ee912908e66897cc89fc89c0757b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Apr 1 16:52:21 2014 +0100
valgrind: Conditional jump or move depends on uninitialised value
(cherry picked from commit e3dad060929de9beeeed2978f1b1427a91152073)
Conflicts:
vcl/source/gdi/metaact.cxx
Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a
(cherry picked from commit a37f474a2272c505778774cd1d92897d8a744863)
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 417c9d6..6bafdab 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1064,7 +1064,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
if( aCompat.GetVersion() >= 2 ) // Version 2
{
- sal_uInt8 bHasPolyFlags;
+ sal_uInt8 bHasPolyFlags(0);
rIStm >> bHasPolyFlags;
if ( bHasPolyFlags )
maPoly.Read( rIStm );
commit 061e968bd271986ab43b58b6d9bf7a0b3f213a30
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Mar 30 21:38:04 2014 +0200
Resolves: fdo#76802 error msg in Web Page Wizard dialog
Change-Id: I0fa0537a8726bbda182dea8c3a9014d77973edea
Reviewed-on: https://gerrit.libreoffice.org/8798
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py
index a42eb01..7decec7 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.py
+++ b/wizards/com/sun/star/wizards/ui/ImageList.py
@@ -242,7 +242,7 @@ class ImageList(ListDataListener):
def refreshCounterText(self):
self.lblCounter.Model.Label = self.counterRenderer.render(
- self.Counter (self.pageStart + 1, self.pageEnd,
+ self.Counter (self.pageStart + 1, self.pageEnd(),
self.listModel.getSize()))
def pageEnd(self):
commit ccead9c561a21e6041dfb524dca0685a86ed7b80
Author: Jürgen Schmidt <jsc at apache.org>
Date: Fri Mar 28 10:52:29 2014 +0000
Resolves: #i124453# check if the resulting polygon...
has already exceeded the number of points (2^16) that can be handled by a tools
polygon
(cherry picked from commit 804e547d70552fd64e1344d538427f8898824b43)
Change-Id: I437a84493e264f7b650561599170e831da20c9aa
(cherry picked from commit a9582c05f854cad02710178ab7fa79498573269e)
(cherry picked from commit ab71a4512557b7290cd7b1b4923463052acf164e)
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 9ea5fe4..c83282c 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -911,6 +911,19 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
}
*aPointIter++ = mpImplPolygon->mpPointAry[ i++ ];
+
+ if (aPoints.size() >= SAL_MAX_UINT16)
+ {
+ OSL_ENSURE(aPoints.size() < SAL_MAX_UINT16,
+ "Polygon::AdapativeSubdivision created polygon too many points;"
+ " using original polygon instead");
+
+ // The resulting polygon can not hold all the points
+ // that we have created so far. Stop the subdivision
+ // and return a copy of the unmodified polygon.
+ rResult = *this;
+ return;
+ }
}
// fill result polygon
commit 8e1f15241166fcd7d4fe8574d0b2072a6cbd254e
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Mar 27 16:07:37 2014 +0000
Related: #i124516# handle bad surrogate pairs gracefully on Windows
When running into invalid Unicode surrogate pairs the text layout code on
Windows ran into massive problems like crashes. This change detects the
situation of an invalid surrogate pair and falls back to treat it as
a simple character instead of requesting a complex glyph fallback.
(cherry picked from commit 913f1fc4b1362f6e91595af5ae10c4cba79fd355)
Change-Id: I2988f4b64061d0a5df211f6f0f04b1f235fcd6a5
(cherry picked from commit 67688d3118b1a361d5dbdaa78e918815c163d75c)
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 3113b0a..6fdc5ba 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -386,12 +386,19 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
bool bSurrogate = ((nCharCode >= 0xD800) && (nCharCode <= 0xDFFF));
if( bSurrogate )
{
- if( nCharCode >= 0xDC00 ) // this part of a surrogate pair was already processed
+ // ignore high surrogates, they were already processed with their low surrogates
+ if( nCharCode >= 0xDC00 )
continue;
- nCharCode = 0x10000 + ((pCodes[0] - 0xD800) << 10) + (pCodes[1] - 0xDC00);
- }
+ // check the second half of the surrogate pair
+ bSurrogate &= (0xDC00 <= pCodes[1]) && (pCodes[1] <= 0xDFFF);
+ // calculate the UTF-32 code of valid surrogate pairs
+ if( bSurrogate )
+ nCharCode = 0x10000 + ((pCodes[0] - 0xD800) << 10) + (pCodes[1] - 0xDC00);
+ else // or fall back to a replacement character
+ nCharCode = '?';
+ }
- // get the advance width for the current UCS-4 code point
+ // get the advance width for the current UTF-32 code point
int nGlyphWidth = mrWinFontEntry.GetCachedGlyphWidth( nCharCode );
if( nGlyphWidth == -1 )
{
@@ -409,7 +416,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
mpGlyphAdvances[ i ] = nGlyphWidth;
mnWidth += nGlyphWidth;
- // remaining codes of surrogate pair get a zero width
+ // the second half of surrogate pair gets a zero width
if( bSurrogate && ((i+1) < mnGlyphCount) )
mpGlyphAdvances[ i+1 ] = 0;
commit e8103ced2e5b803cf7a597f6420496d869a4eb01
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Mar 27 09:47:55 2014 +0000
fdo#62155 - don't crash if we can't create an instance of a calc addin.
Change-Id: I478d7777949683a91e7adf9fa6b54e9d01ced676
Reviewed-on: https://gerrit.libreoffice.org/8771
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index d5c5401..1aa393c 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -602,11 +602,19 @@ void ScUnoAddInCollection::LoadComponent( const ScUnoAddInFuncData& rFuncData )
{
OUString aServiceName = aFullName.copy( 0, nPos );
- uno::Reference<lang::XMultiServiceFactory> xServiceFactory = comphelper::getProcessServiceFactory();
- uno::Reference<uno::XInterface> xInterface( xServiceFactory->createInstance( aServiceName ) );
+ try
+ {
+ uno::Reference<lang::XMultiServiceFactory> xServiceFactory = comphelper::getProcessServiceFactory();
+ uno::Reference<uno::XInterface> xInterface( xServiceFactory->createInstance( aServiceName ) );
- if (xInterface.is())
- UpdateFromAddIn( xInterface, aServiceName );
+ if (xInterface.is())
+ UpdateFromAddIn( xInterface, aServiceName );
+ }
+ catch (const uno::Exception &)
+ {
+ SAL_WARN ("sc", "Failed to create addin component '"
+ << aServiceName << "'");
+ }
}
}
commit 84f659782bdf07a147c19d26451f48c7e71535b5
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Mar 25 12:57:10 2014 +0100
fdo#76568 remove BerkeleyDB from license text
Change-Id: I2cb20a50706d2bae158e9e04d21e357c51a2ad10
Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 9338397..27207d9 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -168,110 +168,6 @@ Niemeyer (pat at pat.net) Author of Learning Java, O'Reilly &
Associates <A HREF="http://www.pat.net/~pat/">http://www.pat.net/~pat/</A></P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#1.GNU Lesser General Public License Version 3|outline">Jump
to LGPL Version 3</A></P>
-<H2 CLASS="western">BerkeleyDB</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: BerkeleyDB. Use
-of any of this software is governed by the terms of the license
-below:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-(c) 1990-2004 Sleepycat Software. All rights reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Redistribution
-and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:</P>
-<OL>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions in any form must be accompanied by information on
- how to obtain complete source code for the DB software and any
- accompanying software that uses the DB software. The source code
- must either be included in the distribution or be available for no
- more than the cost of distribution plus a nominal fee, and must be
- freely redistributable under reasonable conditions. For an
- executable file, complete source code means the source code for all
- modules it contains. It does not include source code for modules or
- files that typically accompany the major components of the operating
- system on which the executable file runs.</P>
-</OL>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THIS
-SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT
-SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-(c) 1990, 1993, 1994, 1995 The Regents of the University of
-California. All rights reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Redistribution
-and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:</P>
-<OL>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.</P>
-</OL>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THIS
-SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-(c) 1995, 1996 The President and Fellows of Harvard University. All
-rights reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Redistribution
-and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:</P>
-<OL>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.</P>
-</OL>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THIS
-SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
<H2 CLASS="western">C++ Boost Library</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
following software may be included in this product: C++ Boost
@@ -651,7 +547,7 @@ following software may be included in this product: fontconfig. Use
of any of this software is governed by the terms of the license
below:</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-© 2002 Keith Packard
+© 2002 Keith Packard
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Permission
to use, copy, modify, distribute, and sell this software and its
@@ -663,7 +559,7 @@ advertising or publicity pertaining to distribution of the software
without specific, written prior permission. The authors make no
representations about the suitability of this software for any
purpose. It is provided "as is" without express or implied
-warranty.
+warranty.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THE
AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
@@ -672,7 +568,7 @@ NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-USE OR PERFORMANCE OF THIS SOFTWARE.
+USE OR PERFORMANCE OF THIS SOFTWARE.
</P>
<H2 CLASS="western">Graphite2</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
@@ -932,7 +828,7 @@ sole proprietor of its copyright holder, Aladdin Enterprises of Menlo
Park, CA. ansi2knr.c is NOT covered by the above copyright and
conditions, but instead by the usual distribution terms of the Free
Software Foundation; principally, that you must include source code
-if you redistribute it. (See the file ansi2knr.c for full details.)
+if you redistribute it. (See the file ansi2knr.c for full details.)
However, since ansi2knr.c is not needed as part of any program
generated from the IJG code, this does not limit you more than the
foregoing paragraphs do.</P>
@@ -1188,11 +1084,11 @@ Truta<BR><BR>libpng versions 1.0.7, July 1, 2000, through 1.2.5 -
October 3, 2002, are<BR>Copyright (c) 2000-2002 Glenn
Randers-Pehrson, and are<BR>distributed according to the same
disclaimer and license as libpng-1.0.6<BR>with the following
-individuals added to the list of Contributing Authors<BR><BR>
+individuals added to the list of Contributing Authors<BR><BR>
Simon-Pierre Cadieux<BR> Eric S. Raymond<BR> Gilles Vollant<BR><BR>and
with the following additions to the disclaimer:<BR><BR> There is no
-warranty against interference with your enjoyment of the<BR>
-library or against infringement. There is no warranty that our<BR>
+warranty against interference with your enjoyment of the<BR>
+library or against infringement. There is no warranty that our<BR>
efforts or the library will fulfill any of your particular purposes<BR>
or needs. This library is provided with all faults, and the
entire<BR> risk of satisfactory quality, performance, accuracy, and
@@ -1216,7 +1112,7 @@ Martindale<BR> Guy Eric Schalnat<BR> Paul Schmidt<BR> Tim
Wegner<BR><BR>The PNG Reference Library is supplied "AS IS".
The Contributing Authors<BR>and Group 42, Inc. disclaim all
warranties, expressed or implied,<BR>including, without limitation,
-the warranties of merchantability and of<BR>fitness for any purpose.
+the warranties of merchantability and of<BR>fitness for any purpose.
The Contributing Authors and Group 42, Inc.<BR>assume no liability
for direct, indirect, incidental, special, exemplary,<BR>or
consequential damages, which may result from the use of the
@@ -1234,14 +1130,14 @@ this source code as a component to<BR>supporting the PNG file format
in commercial products. If you use this<BR>source code in a product,
acknowledgment is not required but would be<BR>appreciated.<BR><BR><BR>A
"png_get_copyright" function is available, for convenient
-use in "about"<BR>boxes and the like:<BR><BR>
+use in "about"<BR>boxes and the like:<BR><BR>
printf("%s",png_get_copyright(NULL));<BR><BR>Also, the PNG
logo (in PNG format, of course) is supplied in the<BR>files
"pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png"
(98x31).<BR><BR>Libpng is OSI Certified Open Source Software. OSI
Certified Open Source is a<BR>certification mark of the Open Source
Initiative.<BR><BR>Glenn Randers-Pehrson<BR>glennrp at
-users.sourceforge.net<BR>February 3, 2011
+users.sourceforge.net<BR>February 3, 2011
</P>
<H2 CLASS="western">libvisio</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
@@ -1404,7 +1300,7 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
</P>
<H2 CLASS="western">lpsolve</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
@@ -1441,7 +1337,7 @@ SOFTWARE.</P>
<H2 CLASS="western">Mesa</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
following software may be included in this product: The Mesa 3D
-Graphics Library. The default Mesa license is as follows:
+Graphics Library. The default Mesa license is as follows:
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
(C) 1999-2007 Brian Paul All Rights Reserved.</P>
@@ -1452,7 +1348,7 @@ to deal in the Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+the following conditions:
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
above copyright notice and this permission notice shall be included
@@ -1509,7 +1405,7 @@ Microsoft</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
supplements,</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Internet-based services, and
+ Internet-based services, and
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
support services</P>
@@ -1758,7 +1654,7 @@ holders.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">OpenLDAP
is a registered trademark of the OpenLDAP Foundation.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-1999-2003 The OpenLDAP Foundation, Redwood City, California, USA.
+1999-2003 The OpenLDAP Foundation, Redwood City, California, USA.
All Rights Reserved. Permission to copy and distribute verbatim
copies of this document is granted.</P>
<H2 CLASS="western">OpenSSL</H2>
@@ -2137,7 +2033,7 @@ third party.</P>
By clicking on the "ACCEPT" button where indicated, or by
copying, installing or otherwise using Python 1.6.1, Licensee agrees
to be bound by the terms and conditions of this License Agreement.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
ACCEPT</P>
<H3 CLASS="western">CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH
1.2</H3>
@@ -3483,7 +3379,7 @@ following software may be included in this product: Czech thesaurus.
Use of any of this software is governed by the terms of the license
below:</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-(c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz,
+(c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz,
NLPlab, Faculty of Informatics, Masaryk University</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Permission
is hereby granted, free of charge, to any person obtaining a copy of
@@ -3675,19 +3571,19 @@ files. To enable the broadest (re)use the language files are freely
available under the below, liberal licenses at the discretion of the
user. We strongly recommend to read the applicable license before
usage.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
A. BSD (revised version):</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Full license text:
<A HREF="http://creativecommons.org/licenses/BSD/legalcode">http://creativecommons.org/licenses/BSD/legalcode</A></P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Summary: <A HREF="http://creativecommons.org/licenses/BSD/deed.en">http://creativecommons.org/licenses/BSD/deed.en</A></P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
B. Creative Commons, Attribution 3.0 (unported)</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Full license text:
<A HREF="http://creativecommons.org/licenses/by/3.0/legalcode">http://creativecommons.org/licenses/by/3.0/legalcode</A></P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
+<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Summary: <A HREF="http://creativecommons.org/licenses/by/3.0/deed.en">http://creativecommons.org/licenses/by/3.0/deed.en</A></P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">7.
Support OpenTaal: OpenTaal is a non-profit volunteer project. With
@@ -4537,7 +4433,7 @@ following software may be included in this product: Latvian
hyphenation patterns. Use of any of this software is governed by the
terms of the license below:</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-(C) 2004-2005 Jânis Vilims, jvilims at apollo.lv
+(C) 2004-2005 Jânis Vilims, jvilims at apollo.lv
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump
to LGPL Version 2.1</A></P>
@@ -4820,7 +4716,7 @@ following software may be included in this product: Portuguese
(Brazilian) hyphenation patterns. Use of any of this software is
governed by the terms of the license below:</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">MPL
-1.1 / GPLv3+ / LGPLv3+
+1.1 / GPLv3+ / LGPLv3+
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">2013
© Raimundo Santos Moura</P>
@@ -4928,7 +4824,7 @@ checker. Use of any of this software is governed by the terms of the
license below:</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">2009,
2011, 2012 (c) Yakov Reztsov <yr at myooo dot ru>, license: MPL
-1.1 / GPL / LGPL
+1.1 / GPL / LGPL
</P>
<H2 CLASS="western">Scottish Gaelic</H2>
<H3 CLASS="western">Spelling dictionary</H3>
@@ -6005,7 +5901,7 @@ That's all there is to it!</P>
<H1 CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__6755_841587373"></A><A NAME="9.GNU Library General Public License Version 2|outline"></A><A NAME="9.GNU Library General Public License Version 2|outline"></A><A NAME="9.GNU Library General Public License Version 2|outline"></A>
GNU Library General Public License Version 2</H1>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Version
-2, June 1991
+2, June 1991
</P>
<PRE CLASS="western">Copyright (C) 1991 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
@@ -6019,13 +5915,13 @@ Preamble</H2>
licenses for most software are designed to take away your freedom to
share and change it. By contrast, the GNU General Public Licenses are
intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.
+software--to make sure the software is free for all its users.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
license, the Library General Public License, applies to some
specially designated Free Software Foundation software, and to any
other libraries whose authors decide to use it. You can use it for
-your libraries, too.
+your libraries, too.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">When
we speak of free software, we are referring to freedom, not price.
@@ -6033,13 +5929,13 @@ Our General Public Licenses are designed to make sure that you have
the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+in new free programs; and that you know you can do these things.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">To
protect your rights, we need to make restrictions that forbid anyone
to deny you these rights or to ask you to surrender the rights. These
restrictions translate to certain responsibilities for you if you
-distribute copies of the library, or if you modify it.
+distribute copies of the library, or if you modify it.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">For
example, if you distribute copies of the library, whether gratis or
@@ -6048,12 +5944,12 @@ you. You must make sure that they, too, receive or can get the source
code. If you link a program with the library, you must provide
complete object files to the recipients so that they can relink them
with the library, after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
+it. And you must show them these terms so they know their rights.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Our
method of protecting your rights has two steps: (1) copyright the
library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
+permission to copy, distribute and/or modify the library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Also,
for each distributor's protection, we want to make certain that
@@ -6061,7 +5957,7 @@ everyone understands that there is no warranty for this free library.
If the library is modified by someone else and passed on, we want its
recipients to know that what they have is not the original version,
so that any problems introduced by others will not reflect on the
-original authors' reputations.
+original authors' reputations.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Finally,
any free program is threatened constantly by software patents. We
@@ -6069,7 +5965,7 @@ wish to avoid the danger that companies distributing free software
will individually obtain patent licenses, thus in effect transforming
the program into proprietary software. To prevent this, we have made
it clear that any patent must be licensed for everyone's free use or
-not licensed at all.
+not licensed at all.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Most
GNU software, including some libraries, is covered by the ordinary
@@ -6077,7 +5973,7 @@ GNU General Public License, which was designed for utility programs.
This license, the GNU Library General Public License, applies to
certain designated libraries. This license is quite different from
the ordinary one; be sure to read it in full, and don't assume that
-anything in it is the same as in the ordinary license.
+anything in it is the same as in the ordinary license.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
reason we have a separate public license for some libraries is that
@@ -6087,13 +5983,13 @@ without changing the library, is in some sense simply using the
library, and is analogous to running a utility program or application
program. However, in a textual and legal sense, the linked executable
is a combined work, a derivative of the original library, and the
-ordinary General Public License treats it as such.
+ordinary General Public License treats it as such.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Because
of this blurred distinction, using the ordinary General Public
License for libraries did not effectively promote software sharing,
because most developers did not use the libraries. We concluded that
-weaker conditions might promote sharing better.
+weaker conditions might promote sharing better.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">However,
unrestricted linking of non-free programs would deprive the users of
@@ -6104,18 +6000,18 @@ preserving your freedom as a user of such programs to change the free
libraries that are incorporated in them. (We have not seen how to
achieve this as regards changes in header files, but we have achieved
it as regards changes in the actual functions of the Library.) The
-hope is that this will lead to faster development of free libraries.
+hope is that this will lead to faster development of free libraries.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the
library". The former contains code derived from the library,
-while the latter only works together with the library.
+while the latter only works together with the library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Note
that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
+General Public License rather than by this special one.
</P>
<H2 CLASS="western">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
AND MODIFICATION</H2>
@@ -6124,13 +6020,13 @@ This License Agreement applies to any software library which contains
a notice placed by the copyright holder or other authorized party
saying it may be distributed under the terms of this Library General
Public License (also called "this License"). Each licensee
-is addressed as "you".
+is addressed as "you".
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">A
"library" means a collection of software functions and/or
data prepared so as to be conveniently linked with application
programs (which use some of those functions and data) to form
-executables.
+executables.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
"Library", below, refers to any such software library or
@@ -6140,14 +6036,14 @@ under copyright law: that is to say, a work containing the Library or
a portion of it, either verbatim or with modifications and/or
translated straightforwardly into another language. (Hereinafter,
translation is included without limitation in the term
-"modification".)
+"modification".)
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">"Source
code" for a work means the preferred form of the work for making
modifications to it. For a library, complete source code means all
the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control
-compilation and installation of the library.
+compilation and installation of the library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Activities
other than copying, distribution and modification are not covered by
@@ -6156,7 +6052,7 @@ program using the Library is not restricted, and output from such a
program is covered only if its contents constitute a work based on
the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
+and what the program that uses the Library does.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>1.</STRONG>
You may copy and distribute verbatim copies of the Library's complete
@@ -6165,32 +6061,32 @@ conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
-Library.
+Library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">You
may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
+may at your option offer warranty protection in exchange for a fee.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>2.</STRONG>
You may modify your copy or copies of the Library or any portion of
it, thus forming a work based on the Library, and copy and distribute
such modifications or work under the terms of Section 1 above,
-provided that you also meet all of these conditions:
+provided that you also meet all of these conditions:
</P>
<UL>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>a)</STRONG> The modified work must itself be a software
- library.
+ library.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>b)</STRONG> You must cause the files modified to carry
prominent notices stating that you changed the files and the date of
- any change.
+ any change.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>c)</STRONG> You must cause the whole of the work to be
licensed at no charge to all third parties under the terms of this
- License.
+ License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>d)</STRONG> If a facility in the modified Library refers to
@@ -6199,7 +6095,7 @@ provided that you also meet all of these conditions:
when the facility is invoked, then you must make a good faith effort
to ensure that, in the event an application does not supply such
function or table, the facility still operates, and performs
- whatever part of its purpose remains meaningful.
+ whatever part of its purpose remains meaningful.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">(For
example, a function in a library to compute square roots has a
@@ -6218,19 +6114,19 @@ you distribute them as separate works. But when you distribute the
same sections as part of a whole which is a work based on the
Library, the distribution of the whole must be on the terms of this
License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
+whole, and thus to each and every part regardless of who wrote it.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Thus,
it is not the intent of this section to claim rights or contest your
rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
-collective works based on the Library.
+collective works based on the Library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">In
addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
-the scope of this License.
+the scope of this License.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>3.</STRONG>
You may opt to apply the terms of the ordinary GNU General Public
@@ -6240,16 +6136,16 @@ that they refer to the ordinary GNU General Public License, version
2, instead of to this License. (If a newer version than version 2 of
the ordinary GNU General Public License has appeared, then you can
specify that version instead if you wish.) Do not make any other
-change in these notices.
+change in these notices.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Once
this change is made in a given copy, it is irreversible for that
copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
+subsequent copies and derivative works made from that copy.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
option is useful when you wish to copy part of the code of the
-Library into a program that is not a library.
+Library into a program that is not a library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>4.</STRONG>
You may copy and distribute the Library (or a portion or derivative
@@ -6257,21 +6153,21 @@ of it, under Section 2) in object code or executable form under the
terms of Sections 1 and 2 above provided that you accompany it with
the complete corresponding machine-readable source code, which must
be distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange.
+customarily used for software interchange.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">If
distribution of object code is made by offering access to copy from a
designated place, then offering equivalent access to copy the source
code from the same place satisfies the requirement to distribute the
source code, even though third parties are not compelled to copy the
-source along with the object code.
+source along with the object code.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>5.</STRONG>
A program that contains no derivative of any portion of the Library,
but is designed to work with the Library by being compiled or linked
with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
+therefore falls outside the scope of this License.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">However,
linking a "work that uses the Library" with the Library
@@ -6286,7 +6182,7 @@ file that is part of the Library, the object code for the work may be
a derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
+threshold for this to be true is not precisely defined by law.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">If
such an object file uses only numerical parameters, data structure
@@ -6294,13 +6190,13 @@ layouts and accessors, and small macros and small inline functions
(ten lines or less in length), then the use of the object file is
unrestricted, regardless of whether it is legally a derivative work.
(Executables containing this object code plus portions of the Library
-will still fall under Section 6.)
+will still fall under Section 6.)
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Otherwise,
if the work is a derivative of the Library, you may distribute the
object code for the work under the terms of Section 6. Any
executables containing that work also fall under Section 6, whether
-or not they are linked directly with the Library itself.
+or not they are linked directly with the Library itself.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>6.</STRONG>
As an exception to the Sections above, you may also compile or link a
@@ -6308,7 +6204,7 @@ As an exception to the Sections above, you may also compile or link a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
+engineering for debugging such modifications.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">You
must give prominent notice with each copy of the work that the
@@ -6317,7 +6213,7 @@ this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
-of these things:
+of these things:
</P>
<UL>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
@@ -6331,22 +6227,22 @@ of these things:
modified executable containing the modified Library. (It is
understood that the user who changes the contents of definitions
files in the Library will not necessarily be able to recompile the
- application to use the modified definitions.)
+ application to use the modified definitions.)
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>b)</STRONG> Accompany the work with a written offer, valid
for at least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more than the
- cost of performing this distribution.
+ cost of performing this distribution.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>c)</STRONG> If distribution of the work is made by offering
access to copy from a designated place, offer equivalent access to
- copy the above specified materials from the same place.
+ copy the above specified materials from the same place.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>d)</STRONG> Verify that the user has already received a copy
- of these materials or that you have already sent this user a copy.
+ of these materials or that you have already sent this user a copy.
</P>
</UL>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">For
@@ -6357,13 +6253,13 @@ the source code distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
-the executable.
+the executable.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">It
may happen that this requirement contradicts the license restrictions
of other proprietary libraries that do not normally accompany the
operating system. Such a contradiction means you cannot use both them
-and the Library together in an executable that you distribute.
+and the Library together in an executable that you distribute.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>7.</STRONG>
You may place library facilities that are a work based on the Library
@@ -6371,20 +6267,20 @@ side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a
combined library, provided that the separate distribution of the work
based on the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
+permitted, and provided that you do these two things:
</P>
<UL>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>a)</STRONG> Accompany the combined library with a copy of
the same work based on the Library, uncombined with any other
library facilities. This must be distributed under the terms of the
- Sections above.
+ Sections above.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>b)</STRONG> Give prominent notice with the combined library
of the fact that part of it is a work based on the Library, and
explaining where to find the accompanying uncombined form of the
- same work.
+ same work.
</P>
</UL>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>8.</STRONG>
@@ -6394,7 +6290,7 @@ otherwise to copy, modify, sublicense, link with, or distribute the
Library is void, and will automatically terminate your rights under
this License. However, parties who have received copies, or rights,
from you under this License will not have their licenses terminated
-so long as such parties remain in full compliance.
+so long as such parties remain in full compliance.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>9.</STRONG>
You are not required to accept this License, since you have not
@@ -6404,7 +6300,7 @@ prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+the Library or works based on it.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>10.</STRONG>
Each time you redistribute the Library (or any work based on the
@@ -6413,7 +6309,7 @@ original licensor to copy, distribute, link with or modify the
Library subject to these terms and conditions. You may not impose any
further restrictions on the recipients' exercise of the rights
granted herein. You are not responsible for enforcing compliance by
-third parties to this License.
+third parties to this License.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>11.</STRONG>
If, as a consequence of a court judgment or allegation of patent
@@ -6428,13 +6324,13 @@ if a patent license would not permit royalty-free redistribution of
the Library by all those who receive copies directly or indirectly
through you, then the only way you could satisfy both it and this
License would be to refrain entirely from distribution of the
-Library.
+Library.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">If
any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended
to apply, and the section as a whole is intended to apply in other
-circumstances.
+circumstances.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">It
is not the purpose of this section to induce you to infringe any
@@ -6446,11 +6342,11 @@ generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is
willing to distribute software through any other system and a
-licensee cannot impose that choice.
+licensee cannot impose that choice.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
+consequence of the rest of this License.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>12.</STRONG>
If the distribution and/or use of the Library is restricted in
@@ -6459,13 +6355,13 @@ original copyright holder who places the Library under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+the limitation as if written in the body of this License.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>13.</STRONG>
The Free Software Foundation may publish revised and/or new versions
of the Library General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
+differ in detail to address new problems or concerns.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Each
version is given a distinguishing version number. If the Library
@@ -6474,7 +6370,7 @@ specifies a version number of this License which applies to it and
terms and conditions either of that version or of any later version
published by the Free Software Foundation. If the Library does not
specify a license version number, you may choose any version ever
-published by the Free Software Foundation.
+published by the Free Software Foundation.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>14.</STRONG>
If you wish to incorporate parts of the Library into other free
@@ -6484,7 +6380,7 @@ copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free
status of all derivatives of our free software and of promoting the
-sharing and reuse of software generally.
+sharing and reuse of software generally.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>NO
WARRANTY</STRONG></P>
@@ -6497,7 +6393,7 @@ KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>16.</STRONG>
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
@@ -6509,7 +6405,7 @@ DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY
INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE
OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH
HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+DAMAGES.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><B>END
OF TERMS AND CONDITIONS</B></P>
@@ -6519,14 +6415,14 @@ you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
+of the ordinary General Public License).
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">To
apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most
effectively convey the exclusion of warranty; and each file should
have at least the "copyright" line and a pointer to where
-the full notice is found.
+the full notice is found.
</P>
<PRE CLASS="western"><VAR>one line to give the library's name and an idea of what it does.</VAR>
Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
@@ -6546,12 +6442,12 @@ License along with this library; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.</PRE><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
Also add information on how to contact you by electronic and paper
-mail.
+mail.
</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">You
should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the
-library, if necessary. Here is a sample; alter the names:
+library, if necessary. Here is a sample; alter the names:
</P>
<PRE CLASS="western">Yoyodyne, Inc., hereby disclaims all copyright interest in
the library `Frob' (a library for tweaking knobs) written
@@ -8082,20 +7978,20 @@ Mozilla Public License Version 2.0</H1>
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means each individual or legal entity that creates, contributes to
the creation of, or owns Covered Software.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.2. “Contributor Versionâ€
+ 1.2. “Contributor Versionâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means the combination of the Contributions of others (if any) used
by a Contributor and that particular Contributor’s Contribution.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.3. “Contributionâ€
+ 1.3. “Contributionâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means Covered Software of a particular Contributor.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.4. “Covered Softwareâ€
+ 1.4. “Covered Softwareâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means Source Code Form to which the initial Contributor has attached
the notice in Exhibit A, the Executable Form of such Source Code
Form, and Modifications of such Source Code Form, in each case
including portions thereof.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.5. “Incompatible With Secondary Licensesâ€
+ 1.5. “Incompatible With Secondary Licensesâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means</DD></DL>
<OL TYPE=a>
@@ -8107,22 +8003,22 @@ Mozilla Public License Version 2.0</H1>
of a Secondary License.</DD></OL>
<DL>
<DT CLASS="western" STYLE="margin-bottom: 0.5cm">1.6. “Executable
- Formâ€
+ Formâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means any form of the work other than Source Code Form.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.7. “Larger Workâ€
+ 1.7. “Larger Workâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.8. “Licenseâ€
+ 1.8. “Licenseâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means this document.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.9. “Licensableâ€
+ 1.9. “Licensableâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means having the right to grant, to the maximum extent possible,
whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.10. “Modificationsâ€
+ 1.10. “Modificationsâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means any of the following:</DD></DL>
<OL TYPE=a>
@@ -8133,7 +8029,7 @@ Mozilla Public License Version 2.0</H1>
any new file in Source Code Form that contains any Covered Software.</DD></OL>
<DL>
<DT CLASS="western" STYLE="margin-bottom: 0.5cm">1.11. “Patent
- Claims†of a Contributor
+ Claims†of a Contributor
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
@@ -8141,16 +8037,16 @@ Mozilla Public License Version 2.0</H1>
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.12. “Secondary Licenseâ€
+ 1.12. “Secondary Licenseâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.13. “Source Code Formâ€
+ 1.13. “Source Code Formâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means the form of the work preferred for making modifications.</DD><DT CLASS="western" STYLE="margin-bottom: 0.5cm">
- 1.14. “You†(or “Yourâ€)
+ 1.14. “You†(or “Yourâ€)
</DT><DD CLASS="western" STYLE="margin-bottom: 0.5cm">
means an individual or a legal entity exercising rights under this
License. For legal entities, “You†includes any entity that
@@ -8710,8 +8606,8 @@ which the LaTeX kernel and the base LaTeX packages are distributed.
You may use this license for any work of which you hold the copyright
and which you wish to distribute. This license may be particularly
-suitable if your work is TeX-related (such as a LaTeX package), but
-it is written in such a way that you can use it even if your work is
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
unrelated to TeX.
The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
@@ -8738,11 +8634,11 @@ In this license document the following terms are used:
`Work'
Any work being distributed under this License.
-
+
`Derived Work'
Any work that under any applicable law is derived from the Work.
- `Modification'
+ `Modification'
Any procedure that produces a Derived Work under any applicable
law -- for example, the production of a file containing an
original file associated with the Work or a significant portion of
@@ -8752,7 +8648,7 @@ In this license document the following terms are used:
`Modify'
To apply any procedure that produces a Derived Work under any
applicable law.
-
+
`Distribution'
Making copies of the Work available from one person to another, in
whole or in part. Distribution includes (but is not limited to)
@@ -8773,16 +8669,16 @@ In this license document the following terms are used:
no such explicit nomination then it is the `Copyright Holder' under
any applicable law.
- `Base Interpreter'
+ `Base Interpreter'
A program or process that is normally needed for running or
- interpreting a part or the whole of the Work.
+ interpreting a part or the whole of the Work.
A Base Interpreter may depend on external components but these
are not considered part of the Base Interpreter provided that each
external component clearly identifies itself whenever it is used
interactively. Unless explicitly specified when applying the
license to the Work, the only applicable Base Interpreter is a
- `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-Format' or in the case of files belonging to the
`LaTeX-format' a program implementing the `TeX language'.
@@ -8823,8 +8719,8 @@ the Derived Work.
distribute a Derived Work provided the following conditions are met
for every component of the Work unless that component clearly states
in the copyright notice that it is exempt from that condition. Only
-the Current Maintainer is allowed to add such statements of exemption
-to a component of the Work.
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
a. If a component of this Derived Work can be a direct replacement
for a component of the Work when that component is used with the
@@ -8834,13 +8730,13 @@ to a component of the Work.
clearly and unambiguously identifies itself as a modified version
of this component to the user when used interactively with that
Base Interpreter.
-
+
b. Every component of the Derived Work contains prominent notices
detailing the nature of the changes to that component, or a
prominent reference to another file that is distributed as part
of the Derived Work and that contains a complete and accurate log
of the changes.
-
+
c. No information in the Derived Work implies that any persons,
including (but not limited to) the authors of the original version
of the Work, provide any support, including (but not limited to)
@@ -8850,7 +8746,7 @@ to a component of the Work.
d. You distribute at least one of the following with the Derived Work:
- 1. A complete, unmodified copy of the Work;
+ 1. A complete, unmodified copy of the Work;
if your distribution of a modified component is made by
offering access to copy the modified component from a
designated place, then offering equivalent access to copy
@@ -8877,15 +8773,15 @@ format, where the Work or that Derived Work (in whole or in part) is
then produced by applying some process to that format, does not relax or
nullify any sections of this license as they pertain to the results of
applying that process.
-
+
10. a. A Derived Work may be distributed under a different license
provided that license itself honors the conditions listed in
Clause 6 above, in regard to the Work, though it does not have
to honor the rest of the conditions in this license.
-
+
b. If a Derived Work is distributed under a different license, that
Derived Work must provide sufficient documentation as part of
- itself to allow each recipient of that Derived Work to honor the
+ itself to allow each recipient of that Derived Work to honor the
restrictions in Clause 6 above, concerning changes from the Work.
11. This license places no restrictions on works that are unrelated to
@@ -8954,7 +8850,7 @@ the Work through the following steps:
a. If it is being maintained, then ask the Current Maintainer
to update their communication data within one month.
-
+
b. If the search is unsuccessful or no action to resume active
maintenance is taken by the Current Maintainer, then announce
within the pertinent community your intention to take over
@@ -8964,17 +8860,17 @@ the Work through the following steps:
3a. If the Current Maintainer is reachable and agrees to pass
maintenance of the Work to you, then this takes effect
immediately upon announcement.
-
+
b. If the Current Maintainer is not reachable and the Copyright
Holder agrees that maintenance of the Work be passed to you,
- then this takes effect immediately upon announcement.
-
+ then this takes effect immediately upon announcement.
+
4. If you make an `intention announcement' as described in 2b. above
and after three months your intention is challenged neither by
the Current Maintainer nor by the Copyright Holder nor by other
people, then you may arrange for the Work to be changed so as
to name you as the (new) Current Maintainer.
-
+
5. If the previously unreachable Current Maintainer becomes
reachable once more within three months of a change completed
under the terms of 3b) or 4), then that Current Maintainer must
@@ -9057,7 +8953,7 @@ Here is an example of such a notice and statement:
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
- %
+ %
% The Current Maintainer of this work is M. Y. Name.
%
% This work consists of the files pig.dtx and pig.ins
@@ -9071,7 +8967,7 @@ referring to any `LaTeX-Format', and both `Copyright Holder' and
`Current Maintainer' referring to the person `M. Y. Name'.
If you do not want the Maintenance section of LPPL to apply to your
-Work, change `maintained' above into `author-maintained'.
+Work, change `maintained' above into `author-maintained'.
However, we recommend that you use `maintained', as the Maintenance
section was added in order to ensure that your Work remains useful to
the community even when you can no longer maintain and support it
@@ -9101,7 +8997,7 @@ Important Recommendations
using a line such as:
% This work consists of all files listed in manifest.txt.
-
+
in that place. In the absence of an unequivocal list it might be
impossible for the licensee to determine what is considered by you
to comprise the Work and, in such a case, the licensee would be
@@ -9115,7 +9011,7 @@ SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO
WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS
-LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
</P>
<H2 CLASS="western"><EM>License</EM></H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THE
@@ -9146,7 +9042,7 @@ Definitions</STRONG></P>
doubt, where the Work is a musical work, performance or phonogram,
the synchronization of the Work in timed-relation with a moving
image ("synching") will be considered an Adaptation for
- the purpose of this License.
+ the purpose of this License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Collection"</STRONG> means a collection of
@@ -9159,7 +9055,7 @@ Definitions</STRONG></P>
contributions, each constituting separate and independent works in
themselves, which together are assembled into a collective whole. A
work that constitutes a Collection will not be considered an
- Adaptation (as defined below) for the purposes of this License.
+ Adaptation (as defined below) for the purposes of this License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Creative Commons Compatible License"</STRONG>
@@ -9171,22 +9067,22 @@ Definitions</STRONG></P>
Elements of this License; and, (ii) explicitly permits the
relicensing of adaptations of works made available under that
license under this License or a Creative Commons jurisdiction
- license with the same License Elements as this License.
+ license with the same License Elements as this License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Distribute"</STRONG> means to make available to
the public the original and copies of the Work or Adaptation, as
- appropriate, through sale or other transfer of ownership.
+ appropriate, through sale or other transfer of ownership.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"License Elements"</STRONG> means the following
high-level license attributes as selected by Licensor and indicated
- in the title of this License: Attribution, ShareAlike.
+ in the title of this License: Attribution, ShareAlike.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Licensor"</STRONG> means the individual,
individuals, entity or entities that offer(s) the Work under the
- terms of this License.
+ terms of this License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Original Author"</STRONG> means, in the case of a
@@ -9199,7 +9095,7 @@ Definitions</STRONG></P>
folklore; (ii) in the case of a phonogram the producer being the
person or legal entity who first fixes the sounds of a performance
or other sounds; and, (iii) in the case of broadcasts, the
- organization that transmits the broadcast.
+ organization that transmits the broadcast.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Work"</STRONG> means the literary and/or artistic
@@ -9219,14 +9115,14 @@ Definitions</STRONG></P>
architecture or science; a performance; a broadcast; a phonogram; a
compilation of data to the extent it is protected as a copyrightable
work; or a work performed by a variety or circus performer to the
- extent it is not otherwise considered a literary or artistic work.
+ extent it is not otherwise considered a literary or artistic work.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"You"</STRONG> means an individual or entity
exercising rights under this License who has not previously violated
the terms of this License with respect to the Work, or who has
received express permission from the Licensor to exercise rights
- under this License despite a previous violation.
+ under this License despite a previous violation.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>"Publicly Perform"</STRONG> means to perform
@@ -9245,7 +9141,7 @@ Definitions</STRONG></P>
Work by any means including without limitation by sound or visual
recordings and the right of fixation and reproducing fixations of
the Work, including storage of a protected performance or phonogram
- in digital form or other electronic medium.
+ in digital form or other electronic medium.
</P>
</OL>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>2.
@@ -9264,7 +9160,7 @@ below:</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the
- Collections;
+ Collections;
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
to create and Reproduce Adaptations provided that any such
@@ -9273,14 +9169,14 @@ below:</P>
that changes were made to the original Work. For example, a
translation could be marked "The original work was translated
from English to Spanish," or a modification could indicate "The
- original work has been modified.";
+ original work has been modified.";
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
to Distribute and Publicly Perform the Work including as
- incorporated in Collections; and,
+ incorporated in Collections; and,
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- to Distribute and Publicly Perform Adaptations.
+ to Distribute and Publicly Perform Adaptations.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
For the avoidance of doubt:</P>
@@ -9290,21 +9186,21 @@ below:</P>
jurisdictions in which the right to collect royalties through any
statutory or compulsory licensing scheme cannot be waived, the
Licensor reserves the exclusive right to collect such royalties for
- any exercise by You of the rights granted under this License;
+ any exercise by You of the rights granted under this License;
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>Waivable Compulsory License Schemes</STRONG>. In those
jurisdictions in which the right to collect royalties through any
statutory or compulsory licensing scheme can be waived, the
Licensor waives the exclusive right to collect such royalties for
- any exercise by You of the rights granted under this License; and,
+ any exercise by You of the rights granted under this License; and,
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
<STRONG>Voluntary License Schemes</STRONG>. The Licensor waives the
right to collect royalties, whether individually or, in the event
that the Licensor is a member of a collecting society that
administers voluntary licensing schemes, via that society, from any
- exercise by You of the rights granted under this License.
+ exercise by You of the rights granted under this License.
</P>
</OL>
</OL>
@@ -9340,7 +9236,7 @@ expressly made subject to and limited by the following restrictions:</P>
remove from the Collection any credit as required by Section 4(c),
as requested. If You create an Adaptation, upon notice from any
Licensor You must, to the extent practicable, remove from the
- Adaptation any credit as required by Section 4(c), as requested.
+ Adaptation any credit as required by Section 4(c), as requested.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
You may Distribute or Publicly Perform an Adaptation only under the
@@ -9371,7 +9267,7 @@ expressly made subject to and limited by the following restrictions:</P>
Applicable License. This Section 4(b) applies to the Adaptation as
incorporated in a Collection, but this does not require the
Collection apart from the Adaptation itself to be made subject to
- the terms of the Applicable License.
+ the terms of the Applicable License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
If You Distribute, or Publicly Perform the Work or any Adaptations
@@ -9405,7 +9301,7 @@ expressly made subject to and limited by the following restrictions:</P>
endorsement by the Original Author, Licensor and/or Attribution
Parties, as appropriate, of You or Your use of the Work, without the
separate, express prior written permission of the Original Author,
- Licensor and/or Attribution Parties.
+ Licensor and/or Attribution Parties.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
Except as otherwise agreed in writing by the Licensor or as may be
@@ -9422,7 +9318,7 @@ expressly made subject to and limited by the following restrictions:</P>
or not assert, as appropriate, this Section, to the fullest extent
permitted by the applicable national law, to enable You to
reasonably exercise Your right under Section 3(b) of this License
- (right to make Adaptations) but not otherwise.
+ (right to make Adaptations) but not otherwise.
</P>
</OL>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>5.
@@ -9453,7 +9349,7 @@ Termination</STRONG></P>
from You under this License, however, will not have their licenses
terminated provided such individuals or entities remain in full
compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
- survive any termination of this License.
+ survive any termination of this License.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
Subject to the above terms and conditions, the license granted here
@@ -9464,7 +9360,7 @@ Termination</STRONG></P>
election will not serve to withdraw this License (or any other
license that has been, or is required to be, granted under the terms
of this License), and this License will continue in full force and
- effect unless terminated as stated above.
+ effect unless terminated as stated above.
</P>
</OL>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><STRONG>8.
@@ -9474,13 +9370,13 @@ Miscellaneous</STRONG></P>
Each time You Distribute or Publicly Perform the Work or a
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list