[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Mon May 26 09:02:42 PDT 2014


 sw/inc/fmtflcnt.hxx                         |    6 
 sw/source/core/doc/docbm.cxx                |   22 
 writerfilter/source/ooxml/dummyannotate.xsl |  833 ----------------------------
 3 files changed, 19 insertions(+), 842 deletions(-)

New commits:
commit 2013d184f1cf5928fa4a919d1521c1ae7b053796
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon May 26 17:08:54 2014 +0200

    coverity#1158084 Unchecked dynamic_cast
    
    Change-Id: Ia800e45166b0206377fa9e138c4e444e476e3863

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index dc54734..5aa68f1 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1906,19 +1906,25 @@ void _RestoreCntntIdx(std::vector<sal_uLong> &rSaveArr,
             case 0x8000:
             {
                 MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aSave.GetCount()].get());
-                SwPosition aNewPos(pMark->GetMarkPos());
-                aNewPos.nNode = rNd;
-                aNewPos.nContent.Assign(pCNd, std::min(aSave.GetContent(), nLen));
-                pMark->SetMarkPos(aNewPos);
+                if (pMark)
+                {
+                    SwPosition aNewPos(pMark->GetMarkPos());
+                    aNewPos.nNode = rNd;
+                    aNewPos.nContent.Assign(pCNd, std::min(aSave.GetContent(), nLen));
+                    pMark->SetMarkPos(aNewPos);
+                }
             }
             break;
             case 0x8001:
             {
                 MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aSave.GetCount()].get());
-                SwPosition aNewPos(pMark->GetOtherMarkPos());
-                aNewPos.nNode = rNd;
-                aNewPos.nContent.Assign(pCNd, std::min(aSave.GetContent(), nLen));
-                pMark->SetOtherMarkPos(aNewPos);
+                if (pMark)
+                {
+                    SwPosition aNewPos(pMark->GetOtherMarkPos());
+                    aNewPos.nNode = rNd;
+                    aNewPos.nContent.Assign(pCNd, std::min(aSave.GetContent(), nLen));
+                    pMark->SetOtherMarkPos(aNewPos);
+                }
             }
             break;
             case 0x1001:
commit 785dd5a3a79383d86d1b5de4f1d7acdf3913322d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon May 26 17:05:35 2014 +0200

    writerfilter: remove unused dummyannotate.xsl
    
    Change-Id: Ie922a7114040ad7a1e3a96d57beb36e48bdf2e34

diff --git a/writerfilter/source/ooxml/dummyannotate.xsl b/writerfilter/source/ooxml/dummyannotate.xsl
deleted file mode 100644
index c4d1dd8..0000000
--- a/writerfilter/source/ooxml/dummyannotate.xsl
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<xsl:stylesheet 
-    version="1.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xml:space="default" xml:indent="true">
-  <xsl:output method="xml" />
-  
-  <xsl:template match="rng:define" mode="dummydoc">
-<xsl:processing-instruction name="mso-application">progid="Word.Document"</xsl:processing-instruction>
-<pkg:package xmlns:pkg="http://schemas.microsoft.com/office/2006/xmlPackage">
-  <pkg:part pkg:name="/_rels/.rels" pkg:contentType="application/vnd.openxmlformats-package.relationships+xml" pkg:padding="512">
-    <pkg:xmlData>
-      <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-        <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>
-        <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>
-        <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/>
-      </Relationships>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/_rels/document.xml.rels" pkg:contentType="application/vnd.openxmlformats-package.relationships+xml" pkg:padding="256">
-    <pkg:xmlData>
-      <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-        <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings" Target="webSettings.xml"/>
-        <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings" Target="settings.xml"/>
-        <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>
-        <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/>
-        <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable" Target="fontTable.xml"/>
-      </Relationships>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/document.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml">
-    <pkg:xmlData>
-      <w:document xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml">
-        <w:body>
-      <xsl:for-each select=".//rng:element">
-        <w:p>
-          <w:pPr/>
-          <w:r>
-            <w:rPr>
-              <xsl:element name="w:{@name}"/>
-            </w:rPr>
-            <xsl:element name="w:t">
-              <xsl:value-of select="@name"/>
-            </xsl:element>
-          </w:r>
-        </w:p>
-      </xsl:for-each>
-          <w:sectPr w:rsidR="00164A8D" w:rsidSect="008B7467">
-            <w:pgSz w:w="11906" w:h="16838"/>
-            <w:pgMar w:top="1417" w:right="1417" w:bottom="1134" w:left="1417" w:header="708" w:footer="708" w:gutter="0"/>
-            <w:cols w:space="708"/>
-            <w:docGrid w:linePitch="360"/>
-          </w:sectPr>
-        </w:body>
-      </w:document>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/theme/theme1.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.theme+xml">
-    <pkg:xmlData>
-      <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
-        <a:themeElements>
-          <a:clrScheme name="Office">
-            <a:dk1>
-              <a:sysClr val="windowText" lastClr="000000"/>
-            </a:dk1>
-            <a:lt1>
-              <a:sysClr val="window" lastClr="FFFFFF"/>
-            </a:lt1>
-            <a:dk2>
-              <a:srgbClr val="1F497D"/>
-            </a:dk2>
-            <a:lt2>
-              <a:srgbClr val="EEECE1"/>
-            </a:lt2>
-            <a:accent1>
-              <a:srgbClr val="4F81BD"/>
-            </a:accent1>
-            <a:accent2>
-              <a:srgbClr val="C0504D"/>
-            </a:accent2>
-            <a:accent3>
-              <a:srgbClr val="9BBB59"/>
-            </a:accent3>
-            <a:accent4>
-              <a:srgbClr val="8064A2"/>
-            </a:accent4>
-            <a:accent5>
-              <a:srgbClr val="4BACC6"/>
-            </a:accent5>
-            <a:accent6>
-              <a:srgbClr val="F79646"/>
-            </a:accent6>
-            <a:hlink>
-              <a:srgbClr val="0000FF"/>
-            </a:hlink>
-            <a:folHlink>
-              <a:srgbClr val="800080"/>
-            </a:folHlink>
-          </a:clrScheme>
-          <a:fontScheme name="Office">
-            <a:majorFont>
-              <a:latin typeface="Cambria"/>
-              <a:ea typeface=""/>
-              <a:cs typeface=""/>
-              <a:font script="Jpan" typeface="MS ゴシック"/>
-              <a:font script="Hang" typeface="맑은 고딕"/>
-              <a:font script="Hans" typeface="宋体"/>
-              <a:font script="Hant" typeface="新細明體"/>
-              <a:font script="Arab" typeface="Times New Roman"/>
-              <a:font script="Hebr" typeface="Times New Roman"/>
-              <a:font script="Thai" typeface="Angsana New"/>
-              <a:font script="Ethi" typeface="Nyala"/>
-              <a:font script="Beng" typeface="Vrinda"/>
-              <a:font script="Gujr" typeface="Shruti"/>
-              <a:font script="Khmr" typeface="MoolBoran"/>
-              <a:font script="Knda" typeface="Tunga"/>
-              <a:font script="Guru" typeface="Raavi"/>
-              <a:font script="Cans" typeface="Euphemia"/>
-              <a:font script="Cher" typeface="Plantagenet Cherokee"/>
-              <a:font script="Yiii" typeface="Microsoft Yi Baiti"/>
-              <a:font script="Tibt" typeface="Microsoft Himalaya"/>
-              <a:font script="Thaa" typeface="MV Boli"/>
-              <a:font script="Deva" typeface="Mangal"/>
-              <a:font script="Telu" typeface="Gautami"/>
-              <a:font script="Taml" typeface="Latha"/>
-              <a:font script="Syrc" typeface="Estrangelo Edessa"/>
-              <a:font script="Orya" typeface="Kalinga"/>
-              <a:font script="Mlym" typeface="Kartika"/>
-              <a:font script="Laoo" typeface="DokChampa"/>
-              <a:font script="Sinh" typeface="Iskoola Pota"/>
-              <a:font script="Mong" typeface="Mongolian Baiti"/>
-              <a:font script="Viet" typeface="Times New Roman"/>
-              <a:font script="Uigh" typeface="Microsoft Uighur"/>
-            </a:majorFont>
-            <a:minorFont>
-              <a:latin typeface="Calibri"/>
-              <a:ea typeface=""/>
-              <a:cs typeface=""/>
-              <a:font script="Jpan" typeface="MS 明朝"/>
-              <a:font script="Hang" typeface="맑은 고딕"/>
-              <a:font script="Hans" typeface="宋体"/>
-              <a:font script="Hant" typeface="新細明體"/>
-              <a:font script="Arab" typeface="Arial"/>
-              <a:font script="Hebr" typeface="Arial"/>
-              <a:font script="Thai" typeface="Cordia New"/>
-              <a:font script="Ethi" typeface="Nyala"/>
-              <a:font script="Beng" typeface="Vrinda"/>
-              <a:font script="Gujr" typeface="Shruti"/>
-              <a:font script="Khmr" typeface="DaunPenh"/>
-              <a:font script="Knda" typeface="Tunga"/>
-              <a:font script="Guru" typeface="Raavi"/>
-              <a:font script="Cans" typeface="Euphemia"/>
-              <a:font script="Cher" typeface="Plantagenet Cherokee"/>
-              <a:font script="Yiii" typeface="Microsoft Yi Baiti"/>
-              <a:font script="Tibt" typeface="Microsoft Himalaya"/>
-              <a:font script="Thaa" typeface="MV Boli"/>
-              <a:font script="Deva" typeface="Mangal"/>
-              <a:font script="Telu" typeface="Gautami"/>
-              <a:font script="Taml" typeface="Latha"/>
-              <a:font script="Syrc" typeface="Estrangelo Edessa"/>
-              <a:font script="Orya" typeface="Kalinga"/>
-              <a:font script="Mlym" typeface="Kartika"/>
-              <a:font script="Laoo" typeface="DokChampa"/>
-              <a:font script="Sinh" typeface="Iskoola Pota"/>
-              <a:font script="Mong" typeface="Mongolian Baiti"/>
-              <a:font script="Viet" typeface="Arial"/>
-              <a:font script="Uigh" typeface="Microsoft Uighur"/>
-            </a:minorFont>
-          </a:fontScheme>
-          <a:fmtScheme name="Office">
-            <a:fillStyleLst>
-              <a:solidFill>
-                <a:schemeClr val="phClr"/>
-              </a:solidFill>
-              <a:gradFill rotWithShape="1">
-                <a:gsLst>
-                  <a:gs pos="0">
-                    <a:schemeClr val="phClr">
-                      <a:tint val="50000"/>
-                      <a:satMod val="300000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="35000">
-                    <a:schemeClr val="phClr">
-                      <a:tint val="37000"/>
-                      <a:satMod val="300000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="100000">
-                    <a:schemeClr val="phClr">
-                      <a:tint val="15000"/>
-                      <a:satMod val="350000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                </a:gsLst>
-                <a:lin ang="16200000" scaled="1"/>
-              </a:gradFill>
-              <a:gradFill rotWithShape="1">
-                <a:gsLst>
-                  <a:gs pos="0">
-                    <a:schemeClr val="phClr">
-                      <a:shade val="51000"/>
-                      <a:satMod val="130000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="80000">
-                    <a:schemeClr val="phClr">
-                      <a:shade val="93000"/>
-                      <a:satMod val="130000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="100000">
-                    <a:schemeClr val="phClr">
-                      <a:shade val="94000"/>
-                      <a:satMod val="135000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                </a:gsLst>
-                <a:lin ang="16200000" scaled="0"/>
-              </a:gradFill>
-            </a:fillStyleLst>
-            <a:lnStyleLst>
-              <a:ln w="9525" cap="flat" cmpd="sng" algn="ctr">
-                <a:solidFill>
-                  <a:schemeClr val="phClr">
-                    <a:shade val="95000"/>
-                    <a:satMod val="105000"/>
-                  </a:schemeClr>
-                </a:solidFill>
-                <a:prstDash val="solid"/>
-              </a:ln>
-              <a:ln w="25400" cap="flat" cmpd="sng" algn="ctr">
-                <a:solidFill>
-                  <a:schemeClr val="phClr"/>
-                </a:solidFill>
-                <a:prstDash val="solid"/>
-              </a:ln>
-              <a:ln w="38100" cap="flat" cmpd="sng" algn="ctr">
-                <a:solidFill>
-                  <a:schemeClr val="phClr"/>
-                </a:solidFill>
-                <a:prstDash val="solid"/>
-              </a:ln>
-            </a:lnStyleLst>
-            <a:effectStyleLst>
-              <a:effectStyle>
-                <a:effectLst>
-                  <a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0">
-                    <a:srgbClr val="000000">
-                      <a:alpha val="38000"/>
-                    </a:srgbClr>
-                  </a:outerShdw>
-                </a:effectLst>
-              </a:effectStyle>
-              <a:effectStyle>
-                <a:effectLst>
-                  <a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0">
-                    <a:srgbClr val="000000">
-                      <a:alpha val="35000"/>
-                    </a:srgbClr>
-                  </a:outerShdw>
-                </a:effectLst>
-              </a:effectStyle>
-              <a:effectStyle>
-                <a:effectLst>
-                  <a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0">
-                    <a:srgbClr val="000000">
-                      <a:alpha val="35000"/>
-                    </a:srgbClr>
-                  </a:outerShdw>
-                </a:effectLst>
-                <a:scene3d>
-                  <a:camera prst="orthographicFront">
-                    <a:rot lat="0" lon="0" rev="0"/>
-                  </a:camera>
-                  <a:lightRig rig="threePt" dir="t">
-                    <a:rot lat="0" lon="0" rev="1200000"/>
-                  </a:lightRig>
-                </a:scene3d>
-                <a:sp3d>
-                  <a:bevelT w="63500" h="25400"/>
-                </a:sp3d>
-              </a:effectStyle>
-            </a:effectStyleLst>
-            <a:bgFillStyleLst>
-              <a:solidFill>
-                <a:schemeClr val="phClr"/>
-              </a:solidFill>
-              <a:gradFill rotWithShape="1">
-                <a:gsLst>
-                  <a:gs pos="0">
-                    <a:schemeClr val="phClr">
-                      <a:tint val="40000"/>
-                      <a:satMod val="350000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="40000">
-                    <a:schemeClr val="phClr">
-                      <a:tint val="45000"/>
-                      <a:shade val="99000"/>
-                      <a:satMod val="350000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="100000">
-                    <a:schemeClr val="phClr">
-                      <a:shade val="20000"/>
-                      <a:satMod val="255000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                </a:gsLst>
-                <a:path path="circle">
-                  <a:fillToRect l="50000" t="-80000" r="50000" b="180000"/>
-                </a:path>
-              </a:gradFill>
-              <a:gradFill rotWithShape="1">
-                <a:gsLst>
-                  <a:gs pos="0">
-                    <a:schemeClr val="phClr">
-                      <a:tint val="80000"/>
-                      <a:satMod val="300000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                  <a:gs pos="100000">
-                    <a:schemeClr val="phClr">
-                      <a:shade val="30000"/>
-                      <a:satMod val="200000"/>
-                    </a:schemeClr>
-                  </a:gs>
-                </a:gsLst>
-                <a:path path="circle">
-                  <a:fillToRect l="50000" t="50000" r="50000" b="50000"/>
-                </a:path>
-              </a:gradFill>
-            </a:bgFillStyleLst>
-          </a:fmtScheme>
-        </a:themeElements>
-        <a:objectDefaults/>
-        <a:extraClrSchemeLst/>
-      </a:theme>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/settings.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml">
-    <pkg:xmlData>
-      <w:settings xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main">
-        <w:zoom w:percent="100"/>
-        <w:defaultTabStop w:val="708"/>
-        <w:hyphenationZone w:val="425"/>
-        <w:characterSpacingControl w:val="doNotCompress"/>
-        <w:compat/>
-        <w:rsids>
-          <w:rsidRoot w:val="009E60C2"/>
-          <w:rsid w:val="001D264D"/>
-          <w:rsid w:val="008B7467"/>
-          <w:rsid w:val="009E60C2"/>
-          <w:rsid w:val="00E36106"/>
-        </w:rsids>
-        <m:mathPr>
-          <m:mathFont m:val="Cambria Math"/>
-          <m:brkBin m:val="before"/>
-          <m:brkBinSub m:val="--"/>
-          <m:smallFrac m:val="off"/>
-          <m:dispDef/>
-          <m:lMargin m:val="0"/>
-          <m:rMargin m:val="0"/>
-          <m:defJc m:val="centerGroup"/>
-          <m:wrapIndent m:val="1440"/>
-          <m:intLim m:val="subSup"/>
-          <m:naryLim m:val="undOvr"/>
-        </m:mathPr>
-        <w:themeFontLang w:val="de-DE"/>
-        <w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/>
-        <w:shapeDefaults>
-          <o:shapedefaults v:ext="edit" spidmax="1026"/>
-          <o:shapelayout v:ext="edit">
-            <o:idmap v:ext="edit" data="1"/>
-          </o:shapelayout>
-        </w:shapeDefaults>
-        <w:decimalSymbol w:val=","/>
-        <w:listSeparator w:val=";"/>
-      </w:settings>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/fontTable.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml">
-    <pkg:xmlData>
-      <w:fonts xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-        <w:font w:name="Calibri">
-          <w:panose1 w:val="020F0502020204030204"/>
-          <w:charset w:val="00"/>
-          <w:family w:val="swiss"/>
-          <w:pitch w:val="variable"/>
-          <w:sig w:usb0="A00002EF" w:usb1="4000207B" w:usb2="00000000" w:usb3="00000000" w:csb0="0000009F" w:csb1="00000000"/>
-        </w:font>
-        <w:font w:name="Times New Roman">
-          <w:panose1 w:val="02020603050405020304"/>
-          <w:charset w:val="00"/>
-          <w:family w:val="roman"/>
-          <w:pitch w:val="variable"/>
-          <w:sig w:usb0="20002A87" w:usb1="80000000" w:usb2="00000008" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/>
-        </w:font>
-        <w:font w:name="Cambria">
-          <w:panose1 w:val="02040503050406030204"/>
-          <w:charset w:val="00"/>
-          <w:family w:val="roman"/>
-          <w:pitch w:val="variable"/>
-          <w:sig w:usb0="A00002EF" w:usb1="4000004B" w:usb2="00000000" w:usb3="00000000" w:csb0="0000009F" w:csb1="00000000"/>
-        </w:font>
-      </w:fonts>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/webSettings.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml">
-    <pkg:xmlData>
-      <w:webSettings xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-        <w:optimizeForBrowser/>
-      </w:webSettings>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/docProps/app.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.extended-properties+xml" pkg:padding="256">
-    <pkg:xmlData>
-      <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
-        <Template>Normal.dotm</Template>
-        <TotalTime>0</TotalTime>
-        <Pages>1</Pages>
-        <Words>0</Words>
-        <Characters>4</Characters>
-        <Application>Microsoft Office Word</Application>
-        <DocSecurity>0</DocSecurity>
-        <Lines>1</Lines>
-        <Paragraphs>1</Paragraphs>
-        <ScaleCrop>false</ScaleCrop>
-        <Company>The Document Foundation</Company>
-        <LinksUpToDate>false</LinksUpToDate>
-        <CharactersWithSpaces>4</CharactersWithSpaces>
-        <SharedDoc>false</SharedDoc>
-        <HyperlinksChanged>false</HyperlinksChanged>
-        <AppVersion>12.0000</AppVersion>
-      </Properties>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/docProps/core.xml" pkg:contentType="application/vnd.openxmlformats-package.core-properties+xml" pkg:padding="256">
-    <pkg:xmlData>
-      <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <dc:title/>
-        <dc:subject/>
-        <dc:creator>Administrator</dc:creator>
-        <cp:keywords/>
-        <dc:description/>
-        <cp:lastModifiedBy>Administrator</cp:lastModifiedBy>
-        <cp:revision>1</cp:revision>
-        <dcterms:created xsi:type="dcterms:W3CDTF">2007-04-02T14:46:00Z</dcterms:created>
-        <dcterms:modified xsi:type="dcterms:W3CDTF">2007-04-02T14:47:00Z</dcterms:modified>
-      </cp:coreProperties>
-    </pkg:xmlData>
-  </pkg:part>
-  <pkg:part pkg:name="/word/styles.xml" pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml">
-    <pkg:xmlData>
-      <w:styles xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-        <w:docDefaults>
-          <w:rPrDefault>
-            <w:rPr>
-              <w:rFonts w:asciiTheme="minorHAnsi" w:eastAsiaTheme="minorHAnsi" w:hAnsiTheme="minorHAnsi" w:cstheme="minorBidi"/>
-              <w:sz w:val="22"/>
-              <w:szCs w:val="22"/>
-              <w:lang w:val="de-DE" w:eastAsia="en-US" w:bidi="ar-SA"/>
-            </w:rPr>
-          </w:rPrDefault>
-          <w:pPrDefault>
-            <w:pPr>
-              <w:spacing w:after="200" w:line="276" w:lineRule="auto"/>
-            </w:pPr>
-          </w:pPrDefault>
-        </w:docDefaults>
-        <w:latentStyles w:defLockedState="0" w:defUIPriority="99" w:defSemiHidden="1" w:defUnhideWhenUsed="1" w:defQFormat="0" w:count="267">
-          <w:lsdException w:name="Normal" w:semiHidden="0" w:uiPriority="0" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="heading 1" w:semiHidden="0" w:uiPriority="9" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="heading 2" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 3" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 4" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 5" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 6" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 7" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 8" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="heading 9" w:uiPriority="9" w:qFormat="1"/>
-          <w:lsdException w:name="toc 1" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 2" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 3" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 4" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 5" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 6" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 7" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 8" w:uiPriority="39"/>
-          <w:lsdException w:name="toc 9" w:uiPriority="39"/>
-          <w:lsdException w:name="caption" w:uiPriority="35" w:qFormat="1"/>
-          <w:lsdException w:name="Title" w:semiHidden="0" w:uiPriority="10" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Default Paragraph Font" w:uiPriority="1"/>
-          <w:lsdException w:name="Subtitle" w:semiHidden="0" w:uiPriority="11" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Strong" w:semiHidden="0" w:uiPriority="22" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Emphasis" w:semiHidden="0" w:uiPriority="20" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Table Grid" w:semiHidden="0" w:uiPriority="59" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Placeholder Text" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="No Spacing" w:semiHidden="0" w:uiPriority="1" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Light Shading" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Shading Accent 1" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List Accent 1" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid Accent 1" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1 Accent 1" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2 Accent 1" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1 Accent 1" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Revision" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="List Paragraph" w:semiHidden="0" w:uiPriority="34" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Quote" w:semiHidden="0" w:uiPriority="29" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Intense Quote" w:semiHidden="0" w:uiPriority="30" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Medium List 2 Accent 1" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1 Accent 1" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2 Accent 1" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3 Accent 1" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List Accent 1" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading Accent 1" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List Accent 1" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid Accent 1" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Shading Accent 2" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List Accent 2" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid Accent 2" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1 Accent 2" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2 Accent 2" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1 Accent 2" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 2 Accent 2" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1 Accent 2" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2 Accent 2" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3 Accent 2" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List Accent 2" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading Accent 2" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List Accent 2" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid Accent 2" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Shading Accent 3" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List Accent 3" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid Accent 3" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1 Accent 3" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2 Accent 3" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1 Accent 3" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 2 Accent 3" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1 Accent 3" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2 Accent 3" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3 Accent 3" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List Accent 3" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading Accent 3" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List Accent 3" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid Accent 3" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Shading Accent 4" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List Accent 4" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid Accent 4" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1 Accent 4" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2 Accent 4" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1 Accent 4" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 2 Accent 4" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1 Accent 4" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2 Accent 4" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3 Accent 4" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List Accent 4" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading Accent 4" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List Accent 4" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid Accent 4" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Shading Accent 5" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List Accent 5" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid Accent 5" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1 Accent 5" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2 Accent 5" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1 Accent 5" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 2 Accent 5" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1 Accent 5" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2 Accent 5" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3 Accent 5" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List Accent 5" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading Accent 5" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List Accent 5" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid Accent 5" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Shading Accent 6" w:semiHidden="0" w:uiPriority="60" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light List Accent 6" w:semiHidden="0" w:uiPriority="61" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Light Grid Accent 6" w:semiHidden="0" w:uiPriority="62" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 1 Accent 6" w:semiHidden="0" w:uiPriority="63" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Shading 2 Accent 6" w:semiHidden="0" w:uiPriority="64" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 1 Accent 6" w:semiHidden="0" w:uiPriority="65" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium List 2 Accent 6" w:semiHidden="0" w:uiPriority="66" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 1 Accent 6" w:semiHidden="0" w:uiPriority="67" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 2 Accent 6" w:semiHidden="0" w:uiPriority="68" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Medium Grid 3 Accent 6" w:semiHidden="0" w:uiPriority="69" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Dark List Accent 6" w:semiHidden="0" w:uiPriority="70" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Shading Accent 6" w:semiHidden="0" w:uiPriority="71" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful List Accent 6" w:semiHidden="0" w:uiPriority="72" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Colorful Grid Accent 6" w:semiHidden="0" w:uiPriority="73" w:unhideWhenUsed="0"/>
-          <w:lsdException w:name="Subtle Emphasis" w:semiHidden="0" w:uiPriority="19" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Intense Emphasis" w:semiHidden="0" w:uiPriority="21" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Subtle Reference" w:semiHidden="0" w:uiPriority="31" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Intense Reference" w:semiHidden="0" w:uiPriority="32" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Book Title" w:semiHidden="0" w:uiPriority="33" w:unhideWhenUsed="0" w:qFormat="1"/>
-          <w:lsdException w:name="Bibliography" w:uiPriority="37"/>
-          <w:lsdException w:name="TOC Heading" w:uiPriority="39" w:qFormat="1"/>
-        </w:latentStyles>
-        <w:style w:type="paragraph" w:default="1" w:styleId="Normal">
-          <w:name w:val="Normal"/>
-          <w:qFormat/>
-          <w:rsid w:val="008B7467"/>
-        </w:style>
-        <w:style w:type="character" w:default="1" w:styleId="DefaultParagraphFont">
-          <w:name w:val="Default Paragraph Font"/>
-          <w:uiPriority w:val="1"/>
-          <w:semiHidden/>
-          <w:unhideWhenUsed/>
-        </w:style>
-        <w:style w:type="table" w:default="1" w:styleId="TableNormal">
-          <w:name w:val="Normal Table"/>
-          <w:uiPriority w:val="99"/>
-          <w:semiHidden/>
-          <w:unhideWhenUsed/>
-          <w:qFormat/>
-          <w:tblPr>
-            <w:tblInd w:w="0" w:type="dxa"/>
-            <w:tblCellMar>
-              <w:top w:w="0" w:type="dxa"/>
-              <w:left w:w="108" w:type="dxa"/>
-              <w:bottom w:w="0" w:type="dxa"/>
-              <w:right w:w="108" w:type="dxa"/>
-            </w:tblCellMar>
-          </w:tblPr>
-        </w:style>
-        <w:style w:type="numbering" w:default="1" w:styleId="NoList">
-          <w:name w:val="No List"/>
-          <w:uiPriority w:val="99"/>
-          <w:semiHidden/>
-          <w:unhideWhenUsed/>
-        </w:style>
-      </w:styles>
-    </pkg:xmlData>
-  </pkg:part>
-</pkg:package>
-  </xsl:template>
-
-  <xsl:template match="rng:define" mode="attrvalue">
-    <xsl:variable name="name" select="@name"/>
-    <xsl:element name="resource">
-      <xsl:attribute name="name">
-        <xsl:value-of select="@name"/>
-      </xsl:attribute>
-      <xsl:attribute name="resource">List</xsl:attribute>
-      <xsl:for-each select=".//rng:value">
-        <xsl:element name="value">
-          <xsl:attribute name="tokenid">
-            <xsl:text>ooxml:Value_</xsl:text>
-            <xsl:value-of select="$name"/>
-            <xsl:text>_</xsl:text>
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-          <xsl:value-of select="."/>
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="rng:define" mode="resourcesPropertySetValue">
-    <xsl:variable name="name" select="@name"/>
-    <xsl:element name="resource">
-      <xsl:attribute name="name">
-        <xsl:value-of select="@name"/>
-      </xsl:attribute>
-      <xsl:attribute name="resource">
-        <xsl:text>Properties</xsl:text>
-      </xsl:attribute>
-      <xsl:for-each select=".//rng:element">
-        <xsl:element name="element">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@name"/>
-          </xsl:attribute>
-          <xsl:attribute name="tokenid">
-            <xsl:text>ooxml:</xsl:text>
-            <xsl:value-of select="$name"/>
-            <xsl:text>_</xsl:text>
-            <xsl:value-of select="@name"/>
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:for-each>
-      <xsl:for-each select=".//rng:attribute">
-        <xsl:element name="attribute">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@name"/>
-          </xsl:attribute>
-          <xsl:attribute name="tokenid">
-            <xsl:text>ooxml:</xsl:text>
-            <xsl:value-of select="$name"/>
-            <xsl:text>_</xsl:text>
-            <xsl:value-of select="@name"/>
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="rng:define" mode="resourcevalues">
-    <xsl:variable name="definename" select="@name"/>
-    <xsl:element name="resource">
-      <xsl:attribute name="name">
-        <xsl:value-of select="@name"/>
-      </xsl:attribute>
-      <xsl:attribute name="resource">List</xsl:attribute>
-      <xsl:for-each select=".//rng:value">
-        <xsl:element name="value">
-          <xsl:attribute name="name">
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-          <xsl:attribute name="tokenid">
-            <xsl:text>ooxml:Value_</xsl:text>
-            <xsl:value-of select="$definename"/>
-            <xsl:text>_</xsl:text>
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-          <xsl:value-of select="."/>
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="rng:define" mode="tabledoc" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">
-    <xsl:for-each select=".//rng:element">
-      <w:tbl>
-        <w:tblPr>
-          <xsl:element name="w:{@name}"/>
-        </w:tblPr>
-        <w:tr>
-          <w:tc>
-            <w:tcPr/>
-            <w:p >
-              <w:pPr>
-                <w:rPr/>
-              </w:pPr>
-              <w:r><w:t><xsl:value-of select="@name"/></w:t></w:r>
-            </w:p>
-          </w:tc>
-        </w:tr>
-      </w:tbl>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:key name="resources" match="resource" use="@resource"/>
-
-  <xsl:template name="resources">
-    <xsl:for-each select="//resource">
-      <xsl:if test="generate-id(.) = generate-id(key('resources', @resource)[1])">
-        <xsl:element name="resource">
-          <xsl:attribute name="resource">
-            <xsl:value-of select="@resource"/>
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="genfastresxsl">
-    <xsl:for-each select="//namespace[not(@name = 'wml')]">
-      <xsl:text>
-sed "s/wml/</xsl:text>
-<xsl:value-of select="@name"/>
-<xsl:text>/" < fastresourcesimpl_wml.xsl > fastresourcesimpl_</xsl:text>
-<xsl:value-of select="@name"/>
-<xsl:text>.xsl</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="genresxsl">
-    <xsl:for-each select="//namespace">
-      <xsl:text>
-sed "s/wml/</xsl:text>
-<xsl:value-of select="@name"/>
-<xsl:text>/;s/_WML_/_</xsl:text>
-<xsl:value-of select="translate(@name, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
-<xsl:text>_/" < fastresources_.xsl > fastresources_</xsl:text>
-<xsl:value-of select="@name"/>
-<xsl:text>.xsl</xsl:text>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="findpath">
-    <xsl:param name="path"/>
-    <xsl:variable name="name" select="@name"/>
-    <xsl:if test="not(contains($path, concat(@name, ',')))">
-      <xsl:for-each select="ancestor::rng:grammar//rng:ref[@name=$name]">
-        <xsl:for-each select="ancestor::rng:define">
-          <xsl:call-template name="findpath">
-            <xsl:with-param name="path" select="concat($path, @name, ',')"/>
-          </xsl:call-template>
-          <xsl:value-of select="@name"/>
-          <xsl:text> -> </xsl:text>
-          <xsl:value-of select="$name"/>
-        <xsl:text>&#xa;</xsl:text>
-        </xsl:for-each>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="/">
-    <out>
-      <xsl:apply-templates select="//rng:define[@name='CT_SdtContentCell']" 
-                           mode='resourcesPropertySetValue'/>
-    </out>
-  </xsl:template>
-</xsl:stylesheet>
commit 8db20d8b4ea8b30cc92ac414daf1b57fc9852e1a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon May 26 16:49:34 2014 +0200

    SwFmtFlyCnt: add doxygen comment
    
    Change-Id: I9e48b471f4afbb071112f3b1f5b71ee42cfe186f

diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index d79566b..ea57e38 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -23,8 +23,12 @@
 
 class SwFrmFmt;
 class SwTxtFlyCnt;
-// ATT_FLYCNT
 
+/**
+ * Format of a fly content.
+ *
+ * A pool item that is attached to the placeholder character of an as-character frame. (TextFrame, etc.)
+ */
 class SwFmtFlyCnt : public SfxPoolItem
 {
     friend class SwTxtFlyCnt;


More information about the Libreoffice-commits mailing list