[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 115 commits - chart2/source configure.ac cui/source cui/uiconfig drawinglayer/source editeng/source external/firebird framework/source include/editeng include/oox include/rtl include/sfx2 include/svl include/svx include/vcl include/xmloff officecfg/registry oox/CustomTarget_generated.mk oox/source readlicense_oo/license sc/inc sc/Library_sc.mk sc/sdi sc/source sd/source sd/uiconfig sfx2/sdi sfx2/source starmath/source svl/source svx/source sw/CppunitTest_sw_ooxmlimport.mk swext/mediawiki sw/qa sw/source toolkit/source translations vcl/aqua vcl/CustomTarget_kde4_moc.mk vcl/generic vcl/Library_vclplug_kde4.mk vcl/source vcl/unx writerfilter/source xmloff/source
Kohei Yoshida
kohei.yoshida at collabora.com
Wed Mar 26 03:49:33 PDT 2014
chart2/source/tools/ErrorBar.cxx | 2
chart2/source/tools/NumberFormatterWrapper.cxx | 6
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 8
configure.ac | 53 +
cui/source/dialogs/hldoctp.cxx | 2
cui/source/tabpages/align.cxx | 12
cui/source/tabpages/border.cxx | 22
cui/uiconfig/ui/hyphenate.ui | 191 ++--
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 56 -
editeng/source/editeng/editattr.cxx | 17
editeng/source/editeng/editattr.hxx | 12
editeng/source/editeng/editdoc.cxx | 9
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/eerdll.cxx | 12
editeng/source/items/borderline.cxx | 4
editeng/source/uno/unofdesc.cxx | 1
editeng/source/uno/unotext.cxx | 2
external/firebird/firebird-macosx.patch.1 | 6
framework/source/services/autorecovery.cxx | 8
include/editeng/eeitem.hxx | 17
include/editeng/eeitemid.hxx | 2
include/editeng/unoprnms.hxx | 1
include/editeng/unotext.hxx | 1
include/oox/core/contexthandler.hxx | 1
include/oox/core/filterbase.hxx | 5
include/oox/core/relations.hxx | 11
include/oox/core/xmlfilterbase.hxx | 2
include/oox/crypto/Standard2007Engine.hxx | 5
include/oox/drawingml/shapepropertymap.hxx | 3
include/oox/token/namespacemap.hxx | 11
include/rtl/ustring.hxx | 2
include/sfx2/sfxsids.hrc | 3
include/svl/listener.hxx | 2
include/svx/framelink.hxx | 19
include/vcl/outdev.hxx | 3
include/xmloff/xmlimp.hxx | 7
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 5
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 1
oox/CustomTarget_generated.mk | 8
oox/source/core/contexthandler.cxx | 5
oox/source/core/fastparser.cxx | 19
oox/source/core/filterdetect.cxx | 3
oox/source/core/relations.cxx | 37
oox/source/core/xmlfilterbase.cxx | 36
oox/source/crypto/CryptTools.cxx | 44 -
oox/source/crypto/DocumentDecryption.cxx | 1
oox/source/docprop/ooxmldocpropimport.cxx | 9
oox/source/drawingml/fillproperties.cxx | 4
oox/source/drawingml/graphicshapecontext.cxx | 14
oox/source/drawingml/shapepropertymap.cxx | 16
oox/source/drawingml/textcharacterproperties.cxx | 2
oox/source/drawingml/textcharacterpropertiescontext.cxx | 2
oox/source/export/drawingml.cxx | 10
oox/source/ppt/dgmimport.cxx | 2
oox/source/ppt/pptimport.cxx | 4
oox/source/ppt/presentationfragmenthandler.cxx | 10
oox/source/ppt/slidefragmenthandler.cxx | 4
oox/source/shape/ShapeContextHandler.cxx | 2
oox/source/token/namespacemap.cxx | 12
oox/source/token/namespaces-strict.txt | 82 +
oox/source/token/namespaces.pl | 31
readlicense_oo/license/LICENSE | 95 --
readlicense_oo/license/LICENSE.fodt | 46 -
readlicense_oo/license/LICENSE.html | 436 +++-------
sc/Library_sc.mk | 2
sc/inc/brdcst.hxx | 6
sc/inc/cellsuno.hxx | 2
sc/inc/chartlis.hxx | 2
sc/inc/column.hxx | 9
sc/inc/document.hxx | 12
sc/inc/formulacell.hxx | 11
sc/inc/formulagroup.hxx | 4
sc/inc/listenercontext.hxx | 12
sc/inc/lookupcache.hxx | 2
sc/inc/mtvcellfunc.hxx | 10
sc/inc/refhint.hxx | 62 +
sc/inc/refupdatecontext.hxx | 14
sc/inc/sc.hrc | 3
sc/inc/simplehintids.hxx | 22
sc/inc/table.hxx | 15
sc/inc/tokenarray.hxx | 24
sc/inc/types.hxx | 11
sc/sdi/formatsh.sdi | 1
sc/sdi/scalc.sdi | 26
sc/source/core/data/bcaslot.cxx | 49 +
sc/source/core/data/colorscale.cxx | 4
sc/source/core/data/column.cxx | 222 ++++-
sc/source/core/data/column2.cxx | 10
sc/source/core/data/column3.cxx | 69 +
sc/source/core/data/dociter.cxx | 4
sc/source/core/data/docpool.cxx | 3
sc/source/core/data/documen2.cxx | 19
sc/source/core/data/documen3.cxx | 8
sc/source/core/data/documen7.cxx | 52 +
sc/source/core/data/document.cxx | 34
sc/source/core/data/dpoutput.cxx | 4
sc/source/core/data/formulacell.cxx | 56 +
sc/source/core/data/listenercontext.cxx | 44 -
sc/source/core/data/refupdatecontext.cxx | 3
sc/source/core/data/table2.cxx | 37
sc/source/core/inc/bcaslot.hxx | 14
sc/source/core/opencl/formulagroupcl.cxx | 85 -
sc/source/core/opencl/opbase.hxx | 6
sc/source/core/tool/autoform.cxx | 2
sc/source/core/tool/chartlis.cxx | 2
sc/source/core/tool/clkernelthread.cxx | 15
sc/source/core/tool/formulagroup.cxx | 4
sc/source/core/tool/interpr6.cxx | 42
sc/source/core/tool/lookupcache.cxx | 2
sc/source/core/tool/refhint.cxx | 36
sc/source/core/tool/token.cxx | 239 ++++-
sc/source/filter/excel/excdoc.cxx | 3
sc/source/filter/excel/excrecds.cxx | 24
sc/source/filter/excel/xecontent.cxx | 12
sc/source/filter/excel/xeextlst.cxx | 2
sc/source/filter/excel/xeroot.cxx | 6
sc/source/filter/excel/xestream.cxx | 57 -
sc/source/filter/excel/xetable.cxx | 4
sc/source/filter/inc/excrecds.hxx | 25
sc/source/filter/inc/formulabuffer.hxx | 15
sc/source/filter/inc/sheetdatabuffer.hxx | 2
sc/source/filter/inc/sheetdatacontext.hxx | 4
sc/source/filter/inc/worksheethelper.hxx | 5
sc/source/filter/inc/xeroot.hxx | 2
sc/source/filter/inc/xestream.hxx | 4
sc/source/filter/oox/excelfilter.cxx | 2
sc/source/filter/oox/externallinkbuffer.cxx | 8
sc/source/filter/oox/formulabuffer.cxx | 44 -
sc/source/filter/oox/sheetdatabuffer.cxx | 13
sc/source/filter/oox/sheetdatacontext.cxx | 11
sc/source/filter/oox/workbookfragment.cxx | 17
sc/source/filter/oox/worksheetfragment.cxx | 8
sc/source/filter/oox/worksheethelper.cxx | 6
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 3
sc/source/filter/xml/pivotsource.cxx | 121 ++
sc/source/filter/xml/pivotsource.hxx | 90 ++
sc/source/filter/xml/xmldpimp.cxx | 45 -
sc/source/filter/xml/xmldpimp.hxx | 2
sc/source/filter/xml/xmlimprt.cxx | 12
sc/source/filter/xml/xmlimprt.hxx | 5
sc/source/ui/Accessibility/AccessibleDocument.cxx | 70 -
sc/source/ui/app/scmod.cxx | 1
sc/source/ui/docshell/dbdocimp.cxx | 4
sc/source/ui/docshell/docsh.cxx | 14
sc/source/ui/docshell/docsh5.cxx | 5
sc/source/ui/docshell/externalrefmgr.cxx | 1
sc/source/ui/docshell/servobj.cxx | 2
sc/source/ui/inc/formatsh.hxx | 3
sc/source/ui/inc/servobj.hxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 8
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 1
sc/source/ui/undo/refundo.cxx | 10
sc/source/ui/undo/undoblk.cxx | 13
sc/source/ui/undo/undotab.cxx | 8
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/view/formatsh.cxx | 48 -
sc/source/ui/view/spelldialog.cxx | 8
sc/source/ui/view/tabview3.cxx | 1
sc/source/ui/view/viewfun4.cxx | 6
sd/source/core/drawdoc4.cxx | 2
sd/source/core/stlpool.cxx | 5
sd/source/ui/remotecontrol/DiscoveryService.cxx | 33
sd/source/ui/remotecontrol/DiscoveryService.hxx | 6
sd/source/ui/sidebar/LayoutMenu.cxx | 3
sd/source/ui/sidebar/MasterPagesSelector.cxx | 4
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2
sd/source/ui/view/drtxtob1.cxx | 7
sd/uiconfig/sdraw/statusbar/statusbar.xml | 2
sd/uiconfig/simpress/statusbar/statusbar.xml | 2
sfx2/sdi/sfx.sdi | 5
sfx2/source/dialog/dinfdlg.cxx | 11
sfx2/source/doc/oleprops.hxx | 2
sfx2/source/sidebar/DeckLayouter.cxx | 8
sfx2/source/sidebar/SidebarChildWindow.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 32
sfx2/source/sidebar/TabBar.cxx | 25
starmath/source/ooxmlexport.cxx | 21
svl/source/notify/broadcast.cxx | 2
svl/source/notify/listener.cxx | 10
svx/source/dialog/dialcontrol.cxx | 5
svx/source/dialog/framelink.cxx | 53 -
svx/source/dialog/svxruler.cxx | 3
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 29
svx/source/stbctrls/modctrl.cxx | 16
svx/source/stbctrls/pszctrl.cxx | 11
svx/source/stbctrls/selctrl.cxx | 7
svx/source/stbctrls/xmlsecctrl.cxx | 25
svx/source/stbctrls/zoomsliderctrl.cxx | 39
svx/source/svdraw/svdotextdecomposition.cxx | 5
svx/source/table/svdotable.cxx | 31
svx/source/table/viewcontactoftableobj.cxx | 18
svx/source/tbxctrls/fontworkgallery.cxx | 4
svx/source/tbxctrls/layctrl.cxx | 81 +
svx/source/tbxctrls/tbcontrl.cxx | 19
svx/source/tbxctrls/tbcontrl.src | 2
svx/source/tbxctrls/tbunocontroller.cxx | 22
svx/source/unodraw/unoprov.cxx | 1
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xoutdev/xattrbmp.cxx | 4
sw/CppunitTest_sw_ooxmlimport.mk | 1
sw/qa/extras/inc/swmodeltestbase.hxx | 4
sw/qa/extras/odfimport/data/fdo75872_aoo40.odt |binary
sw/qa/extras/odfimport/data/fdo75872_ooo33.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 20
sw/qa/extras/ooxmlexport/data/1_page.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/qa/extras/ooxmlimport/data/bnc865381.docx |binary
sw/qa/extras/ooxmlimport/data/rhbz1075124.docx |binary
sw/qa/extras/ooxmlimport/data/rhbz988516.docx |binary
sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx |binary
sw/qa/extras/ooxmlimport/data/strict.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 78 +
sw/qa/extras/rtfimport/data/do-dhgt-old.rtf | 10
sw/qa/extras/rtfimport/data/dprect-anchor.rtf | 4
sw/qa/extras/rtfimport/data/dptxbx-relation.rtf | 5
sw/qa/extras/rtfimport/data/fdo68779.rtf | 25
sw/qa/extras/rtfimport/data/fdo69289.rtf | 6
sw/qa/extras/rtfimport/rtfimport.cxx | 101 ++
sw/qa/extras/uiwriter/data/fdo75110.odt |binary
sw/qa/extras/uiwriter/data/fdo75898.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 32
sw/qa/extras/ww8import/data/cp1000039.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 6
sw/source/core/crsr/crsrsh.cxx | 7
sw/source/core/edit/eddel.cxx | 9
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/frmedt/fetab.cxx | 8
sw/source/core/layout/atrfrm.cxx | 12
sw/source/core/layout/paintfrm.cxx | 173 ++-
sw/source/core/table/swnewtable.cxx | 16
sw/source/core/text/frmform.cxx | 8
sw/source/core/text/inftxt.hxx | 3
sw/source/core/text/portxt.cxx | 12
sw/source/core/txtnode/ndtxt.cxx | 2
sw/source/core/unocore/unofield.cxx | 21
sw/source/filter/html/htmlcss1.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 5
sw/source/ui/shells/tabsh.cxx | 3
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/uiview/view2.cxx | 7
sw/source/ui/uiview/viewport.cxx | 15
sw/source/ui/uno/unomailmerge.cxx | 2
sw/source/ui/utlui/content.cxx | 16
sw/source/ui/utlui/viewlayoutctrl.cxx | 45 -
swext/mediawiki/src/filter/odt2mediawiki.xsl | 21
toolkit/source/helper/accessibilityclient.cxx | 1
translations | 2
vcl/CustomTarget_kde4_moc.mk | 3
vcl/Library_vclplug_kde4.mk | 2
vcl/aqua/source/app/salsys.cxx | 2
vcl/aqua/source/gdi/salgdicommon.cxx | 2
vcl/aqua/source/window/salframe.cxx | 1
vcl/generic/fontmanager/fontconfig.cxx | 7
vcl/source/fontsubset/sft.cxx | 2
vcl/source/gdi/image.cxx | 9
vcl/source/gdi/outdev.cxx | 1
vcl/source/gdi/outdev3.cxx | 29
vcl/source/gdi/print3.cxx | 2
vcl/source/gdi/virdev.cxx | 2
vcl/source/window/msgbox.cxx | 15
vcl/source/window/toolbox.cxx | 56 -
vcl/source/window/toolbox2.cxx | 22
vcl/source/window/window.cxx | 16
vcl/unx/kde4/KDE4FilePicker.cxx | 15
vcl/unx/kde4/KDE4FilePicker.hxx | 5
vcl/unx/kde4/KDEData.cxx | 2
vcl/unx/kde4/KDESalDisplay.cxx | 24
vcl/unx/kde4/KDESalGraphics.cxx | 41
vcl/unx/kde4/KDESalInstance.cxx | 15
vcl/unx/kde4/KDESalInstance.hxx | 1
vcl/unx/kde4/KDEXLib.cxx | 174 +--
vcl/unx/kde4/KDEXLib.hxx | 11
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx | 126 ++
writerfilter/source/dmapper/ConversionHelper.cxx | 7
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 24
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 15
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 7
writerfilter/source/dmapper/GraphicHelpers.cxx | 10
writerfilter/source/dmapper/GraphicHelpers.hxx | 2
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 16
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 12
writerfilter/source/ooxml/OOXMLFactory.cxx | 12
writerfilter/source/ooxml/OOXMLFactory.hxx | 3
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 34
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 15
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 36
writerfilter/source/ooxml/factoryimpl.xsl | 4
writerfilter/source/ooxml/model.xml | 19
writerfilter/source/ooxml/namespaceids.xsl | 3
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 27
writerfilter/source/rtftok/rtfsdrimport.cxx | 8
writerfilter/source/rtftok/rtfsdrimport.hxx | 2
xmloff/source/chart/PropertyMap.hxx | 28
xmloff/source/core/xmlimp.cxx | 25
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 59 +
297 files changed, 4062 insertions(+), 1688 deletions(-)
New commits:
commit d90ae06e55c07db964c70c9cce462a174228a1ca
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue Mar 25 22:34:18 2014 -0400
fdo#74322: Handle moving of named ranges correctly.
But named ranges are adjusted if and only if the references are absolute.
Change-Id: I6c5287b413884b045f1a798c6c6683aa17863f24
(cherry picked from commit 003a27a14d5cf65fe0b528b6d6015e37a64dbb8e)
Reviewed-on: https://gerrit.libreoffice.org/8756
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 58ff8d4..5b3e080 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -164,6 +164,8 @@ public:
*/
sc::RefUpdateResult AdjustReferenceInName( const sc::RefUpdateContext& rCxt, const ScAddress& rPos );
+ sc::RefUpdateResult AdjustReferenceInMovedName( const sc::RefUpdateContext& rCxt, const ScAddress& rPos );
+
/**
* Adjust all references on sheet deletion.
*
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7a448fd..518766d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2529,8 +2529,21 @@ class UpdateRefOnNonCopy : std::unary_function<FormulaGroup, void>
bRecalcOnMove = aPos != aOldPos;
sc::RefUpdateResult aRes = pCode->AdjustReferenceOnMove(*mpCxt, aOldPos, aPos);
- if (aRes.mbReferenceModified || bRecalcOnMove)
+
+ if (aRes.mbReferenceModified || aRes.mbNameModified || bRecalcOnMove)
{
+ sc::AutoCalcSwitch(mpCxt->mrDoc, false);
+
+ if (aRes.mbNameModified)
+ {
+ // We need to re-compile the token array when a range name is
+ // modified, to correctly reflect the new references in the
+ // name.
+ ScCompiler aComp(&mpCxt->mrDoc, aPos, *pCode);
+ aComp.SetGrammar(mpCxt->mrDoc.GetGrammar());
+ aComp.CompileTokenArray();
+ }
+
// Perform end-listening, start-listening, and dirtying on all
// formula cells in the group.
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index eb40441..10c4c14 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2801,7 +2801,7 @@ bool ScFormulaCell::UpdateReferenceOnMove(
{
// Update cell or range references.
sc::RefUpdateResult aRes = pCode->AdjustReferenceOnMove(rCxt, aOldPos, aPos);
- bRefModified = aRes.mbReferenceModified;
+ bRefModified = aRes.mbReferenceModified || aRes.mbNameModified;
bValChanged = aRes.mbValueChanged;
}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 77cc06d..5618ed38 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2634,6 +2634,19 @@ bool expandRangeByEdge( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, co
return false;
}
+bool isNameModified( const sc::UpdatedRangeNames& rUpdatedNames, SCTAB nOldTab, const formula::FormulaToken& rToken )
+{
+ if (rToken.GetOpCode() != ocName)
+ return false;
+
+ SCTAB nTab = -1;
+ if (!rToken.IsGlobal())
+ nTab = nOldTab;
+
+ // Check if this named expression has been modified.
+ return rUpdatedNames.isNameUpdated(nTab, rToken.GetIndex());
+}
+
}
sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateContext& rCxt, const ScAddress& rOldPos )
@@ -2772,17 +2785,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const sc::RefUpdateCon
break;
case svIndex:
{
- const formula::FormulaToken* pToken = *p;
- if (pToken->GetOpCode() == ocName)
- {
- SCTAB nTab = -1;
- if (!pToken->IsGlobal())
- nTab = rOldPos.Tab();
-
- // Check if this named expression has been modified.
- if (rCxt.maUpdatedNames.isNameUpdated(nTab, pToken->GetIndex()))
- aRes.mbNameModified = true;
- }
+ if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ aRes.mbNameModified = true;
}
break;
default:
@@ -2837,6 +2841,12 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
rRef.SetRange(aAbs, rNewPos);
}
break;
+ case svIndex:
+ {
+ if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ aRes.mbNameModified = true;
+ }
+ break;
default:
;
}
@@ -2954,6 +2964,9 @@ bool adjustDoubleRefInName(
sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
const sc::RefUpdateContext& rCxt, const ScAddress& rPos )
{
+ if (rCxt.meMode == URM_MOVE)
+ return AdjustReferenceInMovedName(rCxt, rPos);
+
sc::RefUpdateResult aRes;
FormulaToken** p = pCode;
@@ -3004,6 +3017,67 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
return aRes;
}
+sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdateContext& rCxt, const ScAddress& rPos )
+{
+ // When moving, the range is the destination range.
+ ScRange aOldRange = rCxt.maRange;
+ aOldRange.Move(-rCxt.mnColDelta, -rCxt.mnRowDelta, -rCxt.mnTabDelta);
+
+ // In a named expression, we'll move the reference only when the reference
+ // is entirely absolute.
+
+ sc::RefUpdateResult aRes;
+
+
+ FormulaToken** p = pCode;
+ FormulaToken** pEnd = p + static_cast<size_t>(nLen);
+ for (; p != pEnd; ++p)
+ {
+ switch ((*p)->GetType())
+ {
+ case svSingleRef:
+ {
+ ScToken* pToken = static_cast<ScToken*>(*p);
+ ScSingleRefData& rRef = pToken->GetSingleRef();
+ if (rRef.IsColRel() || rRef.IsRowRel() || rRef.IsTabRel())
+ continue;
+
+ ScAddress aAbs = rRef.toAbs(rPos);
+ if (aOldRange.In(aAbs))
+ {
+ aAbs.Move(rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
+ aRes.mbReferenceModified = true;
+ }
+
+ rRef.SetAddress(aAbs, rPos);
+ }
+ break;
+ case svDoubleRef:
+ {
+ ScToken* pToken = static_cast<ScToken*>(*p);
+ ScComplexRefData& rRef = pToken->GetDoubleRef();
+ if (rRef.Ref1.IsColRel() || rRef.Ref1.IsRowRel() || rRef.Ref1.IsTabRel() ||
+ rRef.Ref2.IsColRel() || rRef.Ref2.IsRowRel() || rRef.Ref2.IsTabRel())
+ continue;
+
+ ScRange aAbs = rRef.toAbs(rPos);
+ if (aOldRange.In(aAbs))
+ {
+ aAbs.Move(rCxt.mnColDelta, rCxt.mnRowDelta, rCxt.mnTabDelta);
+ aRes.mbReferenceModified = true;
+ }
+
+ rRef.SetRange(aAbs, rPos);
+ }
+ break;
+ default:
+ ;
+ }
+ }
+
+ return aRes;
+}
+
namespace {
bool adjustSingleRefOnDeletedTab( ScSingleRefData& rRef, SCTAB nDelPos, SCTAB nSheets, const ScAddress& rOldPos, const ScAddress& rNewPos )
@@ -3087,17 +3161,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnDeletedTab( sc::RefUpdateDele
break;
case svIndex:
{
- const formula::FormulaToken* pToken = *p;
- if (pToken->GetOpCode() == ocName)
- {
- SCTAB nTab = -1;
- if (!pToken->IsGlobal())
- nTab = rOldPos.Tab();
-
- // Check if this named expression has been modified.
- if (rCxt.maUpdatedNames.isNameUpdated(nTab, pToken->GetIndex()))
- aRes.mbNameModified = true;
- }
+ if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ aRes.mbNameModified = true;
}
break;
default:
@@ -3140,17 +3205,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnInsertedTab( sc::RefUpdateIns
break;
case svIndex:
{
- const formula::FormulaToken* pToken = *p;
- if (pToken->GetOpCode() == ocName)
- {
- SCTAB nTab = -1;
- if (!pToken->IsGlobal())
- nTab = rOldPos.Tab();
-
- // Check if this named expression has been modified.
- if (rCxt.maUpdatedNames.isNameUpdated(nTab, pToken->GetIndex()))
- aRes.mbNameModified = true;
- }
+ if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ aRes.mbNameModified = true;
}
break;
default:
@@ -3214,17 +3270,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMovedTab( sc::RefUpdateMoveTa
break;
case svIndex:
{
- const formula::FormulaToken* pToken = *p;
- if (pToken->GetOpCode() == ocName)
- {
- SCTAB nTab = -1;
- if (!pToken->IsGlobal())
- nTab = rOldPos.Tab();
-
- // Check if this named expression has been modified.
- if (rCxt.maUpdatedNames.isNameUpdated(nTab, pToken->GetIndex()))
- aRes.mbNameModified = true;
- }
+ if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ aRes.mbNameModified = true;
}
break;
default:
commit b87389c426d2962c75b9115b7b9348eea931cf46
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Mar 23 15:00:19 2014 +0100
fdo#74981: cutting nothing should do nothing, should fix field dupes
Change-Id: I8a8c9bfcd0943904384bb12b510a050ef8df9adf
Reviewed-on: https://gerrit.libreoffice.org/8730
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 619e203..2be6fbb9 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1923,6 +1923,8 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx,
void SwTxtNode::CutText( SwTxtNode * const pDest,
const SwIndex & rStart, const xub_StrLen nLen )
{
+ if(nLen == 0)
+ return;
if(pDest)
{
SwIndex aDestStt(pDest, pDest->GetTxt().getLength());
commit d0f0a7f5284df8dfa09134c7675d790fffd20f64
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Mon Mar 24 18:19:54 2014 +0100
fdo#76222 oox: add support for MSO 2007 SP2 encrypted documents
Change-Id: I8fa586d49437ff5422fc3daa4c81439146e598a0
Reviewed-on: https://gerrit.libreoffice.org/8734
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index 37ae0a0..329d790 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -37,7 +37,10 @@ const sal_uInt32 ENCRYPT_PROVIDER_TYPE_AES = 0x00000018;
const sal_uInt32 ENCRYPT_PROVIDER_TYPE_RC4 = 0x00000001;
// version of encryption info used in MS Office 2007 (major = 3, minor = 2)
-const sal_uInt32 VERSION_INFO_2007_FORMAT = 0x00020003;
+const sal_uInt32 VERSION_INFO_2007_FORMAT = 0x00020003;
+// version of encryption info used in MS Office 2007 SP2 and older (major = 4, minor = 2)
+const sal_uInt32 VERSION_INFO_2007_FORMAT_SP2 = 0x00020004;
+
// version of encryption info - agile (major = 4, minor = 4)
const sal_uInt32 VERSION_INFO_AGILE = 0x00040004;
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index 47fa006..28eb79e 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -347,6 +347,7 @@ bool DocumentDecryption::readEncryptionInfo()
switch (aVersion)
{
case VERSION_INFO_2007_FORMAT:
+ case VERSION_INFO_2007_FORMAT_SP2:
mCryptoType = STANDARD_2007; // Set encryption info format
bResult = readStandard2007EncryptionInfo( aBinaryInputStream );
break;
commit adcdcfee4bd5c2101307780e12d448926e5c3926
Author: Mathias Supp <mathias.supp at vector.com>
Date: Tue Feb 25 04:04:48 2014 +0100
add parameter to supress dialog
With the new parameter you can now supress the dialog for document
compare in writer.
Change-Id: I984ee75552e5c006332331510df5d437b687903f
Reviewed-on: https://gerrit.libreoffice.org/8739
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index bc26695..c9f4caf 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -264,6 +264,7 @@
#define SID_MAIL_SENDDOCASFORMAT (SID_SFX_START + 1707)
#define SID_MAIL_SENDDOCASMS (SID_SFX_START + 1708)
#define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709)
+#define SID_NO_ACCEPT_DIALOG (SID_SFX_START + 1710)
#define SID_NOAUTOSAVE (SID_SFX_START + 1711)
#define SID_PRINT_SELECTEDSHEET (SID_SFX_START + 1712)
#define SID_OPTIONS_PAGEURL (SID_SFX_START + 1713)
@@ -285,6 +286,7 @@
// SID_SFX_free_START (SID_SFX_START + 1728)
// SID_SFX_free_END (SID_SFX_START + 3999)
+
#define SID_OPEN_NEW_VIEW (SID_SFX_START + 520)
// FREE, was SID_VIEW_ZOOM_MODE
// FREE, was SID_VIEW_POS_SIZE
@@ -753,7 +755,6 @@
#define SC_VIEW_START (SID_SC_START)
#endif
#define FID_CHG_RECORD (EDIT_MENU_START + 18)
-//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries
#define SID_CHG_PROTECT (SC_VIEW_START + 84)
// eof ------------------------------------------------------------------------
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 624e990..8f535c9 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1071,7 +1071,7 @@ SfxStringItem Comments SID_DOCINFO_COMMENTS
//--------------------------------------------------------------------------
SfxInt32Item CompareDocuments SID_DOCUMENT_COMPARE
-(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION)
+(SfxStringItem URL SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Password SID_PASSWORD,SfxStringItem FilterOptions SID_FILE_FILTEROPTIONS,SfxInt16Item Version SID_VERSION, SfxBoolItem NoAcceptDialog SID_NO_ACCEPT_DIALOG)
[
/* flags: */
AutoUpdate = FALSE,
@@ -4302,9 +4302,6 @@ SfxObjectItem Open SID_OPENDOC
RecordPerSet;
Asynchron;
- /* status: */
- SlotType = SfxStringItem
-
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index db42f21..5fe1367 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -711,6 +711,7 @@ void SwView::Execute(SfxRequest &rReq)
sal_Int16 nVersion = 0;
bool bHasFileName = false;
m_pViewImpl->SetParam( 0 );
+ bool bNoAcceptDialog = false;
if( pArgs )
{
@@ -726,6 +727,10 @@ void SwView::Execute(SfxRequest &rReq)
nVersion = ((const SfxInt16Item *)pItem)->GetValue();
m_pViewImpl->SetParam( nVersion );
}
+ if( SFX_ITEM_SET == pArgs->GetItemState( SID_NO_ACCEPT_DIALOG, sal_False, &pItem ))
+ {
+ bNoAcceptDialog = ((const SfxBoolItem *)pItem)->GetValue();
+ }
}
m_pViewImpl->InitRequest( rReq );
@@ -735,7 +740,7 @@ void SwView::Execute(SfxRequest &rReq)
{
rReq.SetReturnValue( SfxInt32Item( nSlot, nFound ));
- if (nFound > 0) // show Redline browser
+ if (nFound > 0 && !bNoAcceptDialog) // Redline-Browser anzeigen
{
SfxViewFrame* pVFrame = GetViewFrame();
pVFrame->ShowChildWindow(FN_REDLINE_ACCEPT);
commit 236faa801aa457bdeb8fd781eeffd00ebf39ee03
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 26 18:03:44 2013 +0200
WaE: unused variable 'aRet'
(cherry picked from commit 05fad0744c81a359c5cadb3f5a3c20551677db23)
Signed-off-by: Tor Lillqvist <tml at collabora.com>
Change-Id: Ieef0fec21504518e49b78cd49aa643eb545c3100
Reviewed-on: https://gerrit.libreoffice.org/8755
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 078fc1d..523fbda 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -700,7 +700,6 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
SalData::ensureThreadAutoreleasePool();
NSArray* pScreens = [NSScreen screens];
- Rectangle aRet;
NSScreen* pScreen = nil;
if( pScreens && nScreen < [pScreens count] )
{
commit 13e078f08ddccc85babca24334c76070ac0bb2aa
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 26 18:02:53 2013 +0200
WaE: unused variable 'aRefreshRect'
(cherry picked from commit 80b6f48d5e86c1489d1ae4a20fd5dcf5c324d33f)
Signed-off-by: Tor Lillqvist <tml at collabora.com>
Conflicts:
vcl/aqua/source/gdi/salgdicommon.cxx
Change-Id: I6ecc96a7da2358ff91d4db46b1b07f8e56548f88
Reviewed-on: https://gerrit.libreoffice.org/8754
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index eedf607..babdc5f 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -719,6 +719,8 @@ void AquaSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
CGContextDrawPath( mrContext, kCGPathStroke );
Rectangle aRefreshRect( nX1, nY1, nX2, nY2 );
+ (void) aRefreshRect;
+ // Is a call to RefreshRect( aRefreshRect ) missing here?
}
void AquaSalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, SalColor nMaskColor )
commit f99a9a925951b682b8d4918f18f877b6a478f628
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 26 18:00:28 2013 +0200
WaE: format string is not a string literal (potentially insecure)
(cherry picked from commit 765cd0ebaabf9cf7948ae1424681de144c7d267e)
Signed-off-by: Tor Lillqvist <tml at collabora.com>
Change-Id: I568817c33aa555bc8aef93105e6a00be1d4b501d
Reviewed-on: https://gerrit.libreoffice.org/8753
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 3cfcb3c..8058a95 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -155,7 +155,7 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle,
}
- int nResult = NSRunAlertPanel( pTitle, pMessage, pDefText, pAltText, pOthText );
+ int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage );
if( pTitle )
[pTitle release];
commit 0f6bbf15962cb4beaffe6b04a5836fe776c77925
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 10 11:22:05 2014 +0200
-fno-weak is unknown in the Clang 3.4 in current Xcode (5.1)
(cherry picked from commit dd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc)
Signed-off-by: Tor Lillqvist <tml at collabora.com>
Change-Id: I10611e97c17de9c00b818e22ac88ffbb736aaf37
Reviewed-on: https://gerrit.libreoffice.org/8752
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index adede1c..0ad9bd9 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -87,14 +87,16 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.
export DYLD_LIBRARY_PATH
MACOSX_DEPLOYMENT_TARGET=10.6
-@@ -27,8 +27,8 @@
+@@ -27,9 +27,9 @@
OS_ServerFiles=inet_server.cpp
-PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
+-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
+PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
+DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+ fbtracemgr
commit 2f21e365873b33e40be8109e81107520fa60fc70
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Mar 25 12:27:34 2014 +0100
fdo#76568 remove BerkeleyDB from license text
Change-Id: If269f9058bba37eca8abf4745fd30214fbdd1890
Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 26214b9..a82e6b6 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -110,101 +110,6 @@ beanshell
See LGPL Version 3 below
-BerkeleyDB
-
- 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:
-
- Copyright (c) 1990-2004 Sleepycat Software. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. 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.
-
- 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.
-
- Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of
- California. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. 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.
-
- 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.
-
- Copyright (c) 1995, 1996 The President and Fellows of Harvard
- University. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. 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.
-
- 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.
-
C++ Boost Library
The following software may be included in this product: C++ Boost
diff --git a/readlicense_oo/license/LICENSE.fodt b/readlicense_oo/license/LICENSE.fodt
index c334858..c3c8dd5 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -3400,50 +3400,6 @@
<text:p text:style-name="Standard">Alternatively, the contents of this file may be used under the terms of the GNU Lesser General Public License (the "LGPL"), in which case the provisions of LGPL are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the LGPL and not to allow others to use your version of this file under the SPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the LGPL. If you do not delete the provisions above, a recipient may use your version of this file under either the SPL or the LGPL.</text:p>
<text:p text:style-name="Standard">Patrick Niemeyer (pat at pat.net) Author of Learning Java, O'Reilly & Associates <text:a xlink:type="simple" xlink:href="http://www.pat.net/~pat/">http://www.pat.net/~pat/</text:a></text:p>
<text:p text:style-name="Standard"><text:a xlink:type="simple" xlink:href="#1.GNU Lesser General Public License Version 3|outline">Jump to LGPL Version 3</text:a></text:p>
- <text:h text:style-name="Heading_20_2" text:outline-level="2"><text:soft-page-break/>BerkeleyDB</text:h>
- <text:p text:style-name="Standard">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:</text:p>
- <text:p text:style-name="Standard">Copyright (c) 1990-2004 Sleepycat Software. All rights reserved.</text:p>
- <text:p text:style-name="Standard">Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</text:p>
- <text:list xml:id="list514908698508208726" text:style-name="L1">
- <text:list-item>
- <text:p text:style-name="P98">Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</text:p>
- </text:list-item>
- <text:list-item>
- <text:p text:style-name="P98">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.</text:p>
- </text:list-item>
- <text:list-item>
- <text:p text:style-name="P98">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.</text:p>
- </text:list-item>
- </text:list>
- <text:p text:style-name="Standard">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.</text:p>
- <text:p text:style-name="Standard">Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California. All rights reserved.</text:p>
- <text:p text:style-name="Standard">Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</text:p>
- <text:list xml:id="list140436640025479537" text:style-name="L2">
- <text:list-item>
- <text:p text:style-name="P99">Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</text:p>
- </text:list-item>
- <text:list-item>
- <text:p text:style-name="P99"><text:soft-page-break/>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.</text:p>
- </text:list-item>
- <text:list-item>
- <text:p text:style-name="P99">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.</text:p>
- </text:list-item>
- </text:list>
- <text:p text:style-name="Standard">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.</text:p>
- <text:p text:style-name="Standard">Copyright (c) 1995, 1996 The President and Fellows of Harvard University. All rights reserved.</text:p>
- <text:p text:style-name="Standard">Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</text:p>
- <text:list xml:id="list2325450656311329023" text:style-name="L3">
- <text:list-item>
- <text:p text:style-name="P100">Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</text:p>
- </text:list-item>
- <text:list-item>
- <text:p text:style-name="P100">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.</text:p>
- </text:list-item>
- <text:list-item>
- <text:p text:style-name="P100">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.</text:p>
- </text:list-item>
- </text:list>
- <text:p text:style-name="Standard">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 <text:soft-page-break/>THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">C++ Boost Library</text:h>
<text:p text:style-name="Standard">The following software may be included in this product: C++ Boost Library. Use of any of this software is governed by the terms of the license below:</text:p>
<text:p text:style-name="Standard">Boost Software License - Version 1.0 - August 17th, 2003</text:p>
@@ -6919,4 +6875,4 @@
<text:p text:style-name="Standard">Creative Commons may be contacted at <text:a xlink:type="simple" xlink:href="http://creativecommons.org/">http://creativecommons.org/</text:a>.</text:p>
</office:text>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/readlicense_oo/license/LICENSE.html b/readlicense_oo/license/LICENSE.html
index d2701f2..56d1809 100644
--- a/readlicense_oo/license/LICENSE.html
+++ b/readlicense_oo/license/LICENSE.html
@@ -159,110 +159,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.12in; margin-bottom: 0.12in"><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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">Copyright
-(c) 1990-2004 Sleepycat Software. All rights reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">Copyright
-(c) 1990, 1993, 1994, 1995 The Regents of the University of
-California. All rights reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">Copyright
-(c) 1995, 1996 The President and Fellows of Harvard University. All
-rights reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">
- 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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">The
following software may be included in this product: C++ Boost
@@ -655,7 +551,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.12in; margin-bottom: 0.12in">Copyright
-© 2002 Keith Packard
+© 2002 Keith Packard
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">Permission
to use, copy, modify, distribute, and sell this software and its
@@ -667,7 +563,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.12in; margin-bottom: 0.12in">THE
AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
@@ -676,7 +572,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.12in; margin-bottom: 0.12in">The
@@ -715,7 +611,7 @@ to MPL Version 1.1</A></P>
is licensed under the so-called "Old MIT" license. Details
follow. For parts of HarfBuzz that are licensed under different
licenses see individual files names COPYING in subdirectories where
-applicable.
+applicable.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">Copyright
© 2010,2011,2012 Google, Inc. <BR>Copyright © 2012 Mozilla
@@ -725,24 +621,24 @@ Foundation <BR>Copyright © 2011 Codethink Limited <BR>Copyright ©
International <BR>Copyright © 2007 Chris Wilson <BR>Copyright ©
2006 Behdad Esfahbod <BR>Copyright © 2005 David Turner <BR>Copyright
© 2004,2007,2008,2009,2010 Red Hat, Inc. <BR>Copyright © 1998-2004
- David Turner and Werner Lemberg
+ David Turner and Werner Lemberg
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">For
-full copyright notices consult the individual files in the package.
+full copyright notices consult the individual files in the package.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">Permission
is hereby granted, without written agreement and without license or
royalty fees, to use, copy, modify, and distribute this software and
its documentation for any purpose, provided that the above copyright
notice and the following two paragraphs appear in all copies of this
-software.
+software.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">IN
NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">THE
COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
@@ -889,21 +785,21 @@ following conditions are met:</P>
<OL>
<LI><P CLASS="western">Redistributions of source code must retain
the above copyright notice, this list of conditions and the
- following disclaimer.
+ following disclaimer.
</P>
</OL>
<OL>
<LI><P CLASS="western">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.
+ provided with the distribution.
</P>
</OL>
<OL>
<LI><P CLASS="western">Neither the name of the Linux Foundation nor
the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
- permission.
+ permission.
</P>
</OL>
<P CLASS="western">THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
@@ -925,7 +821,7 @@ Initiative "Simplified BSD License" as published at:
Foundation. The IAccessible2 mark may be used in accordance with the
<A HREF="http://www.linuxfoundation.org/collaborate/workgroups/accessibility/trademark-policy">Linux
Foundation Trademark Policy</A> to indicate compliance with the
-IAccessible2 specification.
+IAccessible2 specification.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">Find
out more about IAccessible2 at
@@ -1031,7 +927,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>
@@ -1324,11 +1220,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
@@ -1352,7 +1248,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
@@ -1370,14 +1266,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.12in; margin-bottom: 0.12in">The
@@ -1540,7 +1436,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.12in; margin-bottom: 0.12in">The
@@ -1577,7 +1473,7 @@ SOFTWARE.</P>
<H2 CLASS="western">Mesa</H2>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">Copyright
(C) 1999-2007 Brian Paul All Rights Reserved.</P>
@@ -1588,7 +1484,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.12in; margin-bottom: 0.12in">The
above copyright notice and this permission notice shall be included
@@ -1645,7 +1541,7 @@ Microsoft</P>
<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
supplements,</P>
<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
- Internet-based services, and
+ Internet-based services, and
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
support services</P>
@@ -1894,7 +1790,7 @@ holders.</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">OpenLDAP
is a registered trademark of the OpenLDAP Foundation.</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">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>
@@ -3034,18 +2930,18 @@ support the use of the AFM files.</P>
(c) 2012 Huerta Tipografia</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">This
Font Software is licensed under the Apache License, Version 2.0 as
-shown below.
+shown below.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in"><A HREF="#11.Apache License|outline">Jump
to Apache License Version 2.0</A></P>
<H2 CLASS="western">Carlito</H2>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">Copyright
(c) 2010-2013 by tyPoland Lukasz Dziedzic with Reserved Font Name
-"Carlito".
+"Carlito".
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">This
Font Software is licensed under the SIL Open Font License, Version
-1.1 as shown below.
+1.1 as shown below.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in"><A HREF="#13.SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007|outline">Jump
to SIL Open Font License, Version 1.1</A></P>
@@ -3635,7 +3531,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">Permission
is hereby granted, free of charge, to any person obtaining a copy of
@@ -4699,7 +4595,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><A HREF="#5.GNU Lesser General Public License Version 2.1|outline">Jump
to LGPL Version 2.1</A></P>
@@ -4947,7 +4843,7 @@ following software may be included in this product: Portuguese
(Brazilian) sentence checker. Use of any of this software is governed
by the terms of the license below:</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">MPL
-1.1 / GPLv3+ / LGPLv3+
+1.1 / GPLv3+ / LGPLv3+
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">2013
© Raimundo Santos Moura</P>
@@ -5055,7 +4951,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.12in; margin-bottom: 0.12in">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>
@@ -6132,7 +6028,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.12in; margin-bottom: 0.12in">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
@@ -6146,13 +6042,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">When
we speak of free software, we are referring to freedom, not price.
@@ -6160,13 +6056,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">For
example, if you distribute copies of the library, whether gratis or
@@ -6175,12 +6071,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">Also,
for each distributor's protection, we want to make certain that
@@ -6188,7 +6084,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.12in; margin-bottom: 0.12in">Finally,
any free program is threatened constantly by software patents. We
@@ -6196,7 +6092,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.12in; margin-bottom: 0.12in">Most
GNU software, including some libraries, is covered by the ordinary
@@ -6204,7 +6100,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.12in; margin-bottom: 0.12in">The
reason we have a separate public license for some libraries is that
@@ -6214,13 +6110,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">However,
unrestricted linking of non-free programs would deprive the users of
@@ -6231,18 +6127,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">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>
@@ -6251,13 +6147,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">The
"Library", below, refers to any such software library or
@@ -6267,14 +6163,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.12in; margin-bottom: 0.12in">"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.12in; margin-bottom: 0.12in">Activities
other than copying, distribution and modification are not covered by
@@ -6283,7 +6179,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.12in; margin-bottom: 0.12in"><STRONG>1.</STRONG>
You may copy and distribute verbatim copies of the Library's complete
@@ -6292,32 +6188,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><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.12in; margin-bottom: 0.12in">
<STRONG>a)</STRONG> The modified work must itself be a software
- library.
+ library.
</P>
<LI><P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in">
<STRONG>d)</STRONG> If a facility in the modified Library refers to
@@ -6326,7 +6222,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.12in; margin-bottom: 0.12in">
(For example, a function in a library to compute square roots has a
@@ -6345,19 +6241,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><STRONG>3.</STRONG>
You may opt to apply the terms of the ordinary GNU General Public
@@ -6367,16 +6263,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><STRONG>4.</STRONG>
You may copy and distribute the Library (or a portion or derivative
@@ -6384,21 +6280,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><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.12in; margin-bottom: 0.12in">However,
linking a "work that uses the Library" with the Library
@@ -6413,7 +6309,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.12in; margin-bottom: 0.12in">If
such an object file uses only numerical parameters, data structure
@@ -6421,13 +6317,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><STRONG>6.</STRONG>
As an exception to the Sections above, you may also compile or link a
@@ -6435,7 +6331,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.12in; margin-bottom: 0.12in">You
must give prominent notice with each copy of the work that the
@@ -6444,7 +6340,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.12in; margin-bottom: 0.12in">
@@ -6458,22 +6354,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.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in">For
@@ -6484,13 +6380,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><STRONG>7.</STRONG>
You may place library facilities that are a work based on the Library
@@ -6498,20 +6394,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.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in">
<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.12in; margin-bottom: 0.12in"><STRONG>8.</STRONG>
@@ -6521,7 +6417,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.12in; margin-bottom: 0.12in"><STRONG>9.</STRONG>
You are not required to accept this License, since you have not
@@ -6531,7 +6427,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.12in; margin-bottom: 0.12in"><STRONG>10.</STRONG>
Each time you redistribute the Library (or any work based on the
@@ -6540,7 +6436,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.12in; margin-bottom: 0.12in"><STRONG>11.</STRONG>
If, as a consequence of a court judgment or allegation of patent
@@ -6555,13 +6451,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in">It
is not the purpose of this section to induce you to infringe any
@@ -6573,11 +6469,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.12in; margin-bottom: 0.12in">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.12in; margin-bottom: 0.12in"><STRONG>12.</STRONG>
If the distribution and/or use of the Library is restricted in
@@ -6586,13 +6482,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.12in; margin-bottom: 0.12in"><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.12in; margin-bottom: 0.12in">Each
version is given a distinguishing version number. If the Library
@@ -6601,7 +6497,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.12in; margin-bottom: 0.12in"><STRONG>14.</STRONG>
If you wish to incorporate parts of the Library into other free
@@ -6611,7 +6507,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.12in; margin-bottom: 0.12in"><STRONG>NO
WARRANTY</STRONG></P>
@@ -6624,7 +6520,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.12in; margin-bottom: 0.12in"><STRONG>16.</STRONG>
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
@@ -6636,7 +6532,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.12in; margin-bottom: 0.12in"><B>END
OF TERMS AND CONDITIONS</B></P>
@@ -6646,14 +6542,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.12in; margin-bottom: 0.12in">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>
@@ -6673,12 +6569,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.12in; margin-bottom: 0.12in">
Also add information on how to contact you by electronic and paper
-mail.
+mail.
</P>
<P CLASS="western" STYLE="margin-top: 0.12in; margin-bottom: 0.12in">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
@@ -8208,20 +8104,20 @@ Mozilla Public License Version 2.0</H1>
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
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.2in">
- 1.2. “Contributor Versionâ€
+ 1.2. “Contributor Versionâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
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.2in">
- 1.3. “Contributionâ€
+ 1.3. “Contributionâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means Covered Software of a particular Contributor.</DD><DT CLASS="western" STYLE="margin-bottom: 0.2in">
- 1.4. “Covered Softwareâ€
+ 1.4. “Covered Softwareâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
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.2in">
- 1.5. “Incompatible With Secondary Licensesâ€
+ 1.5. “Incompatible With Secondary Licensesâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means</DD></DL>
<OL TYPE=a>
@@ -8233,22 +8129,22 @@ Mozilla Public License Version 2.0</H1>
of a Secondary License.</DD></OL>
<DL>
<DT CLASS="western" STYLE="margin-bottom: 0.2in">1.6. “Executable
- Formâ€
+ Formâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means any form of the work other than Source Code Form.</DD><DT CLASS="western" STYLE="margin-bottom: 0.2in">
- 1.7. “Larger Workâ€
+ 1.7. “Larger Workâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
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.2in">
- 1.8. “Licenseâ€
+ 1.8. “Licenseâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means this document.</DD><DT CLASS="western" STYLE="margin-bottom: 0.2in">
- 1.9. “Licensableâ€
+ 1.9. “Licensableâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
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.2in">
- 1.10. “Modificationsâ€
+ 1.10. “Modificationsâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means any of the following:</DD></DL>
<OL TYPE=a>
@@ -8259,7 +8155,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.2in">1.11. “Patent
- Claims†of a Contributor
+ Claims†of a Contributor
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
@@ -8267,16 +8163,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.2in">
- 1.12. “Secondary Licenseâ€
+ 1.12. “Secondary Licenseâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
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.2in">
- 1.13. “Source Code Formâ€
+ 1.13. “Source Code Formâ€
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means the form of the work preferred for making modifications.</DD><DT CLASS="western" STYLE="margin-bottom: 0.2in">
- 1.14. “You†(or “Yourâ€)
+ 1.14. “You†(or “Yourâ€)
</DT><DD CLASS="western" STYLE="margin-bottom: 0.2in">
means an individual or a legal entity exercising rights under this
License. For legal entities, “You†includes any entity that
@@ -8836,8 +8732,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',
@@ -8864,11 +8760,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
@@ -8878,7 +8774,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)
@@ -8899,16 +8795,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'.
@@ -8949,8 +8845,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
@@ -8960,13 +8856,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)
@@ -8976,7 +8872,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
@@ -9003,15 +8899,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
@@ -9080,7 +8976,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
@@ -9090,17 +8986,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
@@ -9183,7 +9079,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
@@ -9197,7 +9093,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
@@ -9227,7 +9123,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
@@ -9241,7 +9137,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.12in; margin-bottom: 0.12in">THE
@@ -9272,7 +9168,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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list