[Libreoffice-commits] core.git: 5 commits - include/filter sw/inc sw/Library_msword.mk sw/source writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Jan 27 11:19:43 PST 2014
include/filter/msfilter/sprmids.hxx | 301 +++++++++++++++++
sw/Library_msword.mk | 1
sw/inc/pch/precompiled_msword.hxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/wrtw8num.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 2
writerfilter/source/ooxml/README.efforts | 149 --------
writerfilter/source/ooxml/status.sh | 41 --
writerfilter/source/resourcemodel/resourcemodel.cxx | 343 --------------------
writerfilter/source/resourcemodel/resourcemodel.hxx | 72 ----
14 files changed, 309 insertions(+), 614 deletions(-)
New commits:
commit 1cfb281c2daafcdefe5404f51037c72f9b57dde8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 27 20:10:52 2014 +0100
remove script that parsed no longer available WRITERFILTERSTATUS comments
Change-Id: I137d2a9e4c0edda3e2509696ba4b0f5f4913bbc3
diff --git a/writerfilter/source/ooxml/README.efforts b/writerfilter/source/ooxml/README.efforts
deleted file mode 100644
index 4448912..0000000
--- a/writerfilter/source/ooxml/README.efforts
+++ /dev/null
@@ -1,149 +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 .
-#
-
-This file describes how the remaining efforts for writerfilter can be
-extracted from the source code.
-
-1. Marking up the efforts in the code.
-
-Efforts are marked up in the code with comments like this:
-
-/* WRITERFILTERSTATUS: done: <percent done>, planned: <effort planned>, spent: <effort spent, yet> */
-
-The comments have to follow a case-label immediately. Consecutive
-case-labels can be marked up, too. In the latter case the efforts are
-counted for the preceeding case-labels as a whole.
-
-2. Extraction process
-
-2.1. Stage 1:
-
-This stage is handled in status.sh. An XML-file is generated that
-contains a top level element <stage1>. <stage1> contains an element
-<analyze> and several <qname> and <status> elements.
-
-2.1.1. Use analyzemodel.xsl to extract necessary data from model.xml.
-
-- Namespaces can be flagged with attribute @todo="ignore" to prevent
- the namespace being considered.
-
-- For every <element>/<attribute> an entry in an according element in <analyze> is genereated. These elements look like this:
-
-<attribute id="..." resource="..." tokenid="..." qname="..." namespace="..." define="..." name="..."/>
-
-Important for the extraction of efforts: @qname is the identifier used
-in case-labels in .cxx files and thus links the status mark up
-comments with elements/attributes in the model.xml.
-
-2.1.2. Extract status information
-
-The variable SEARCHIN in status.sh determines in what directory the script will search for case labels and status comments. Only .cxx files are searched. Lines like this
-
-case NS_rtf::LN_UNUSED4:
-
-result in elements like this
-
-<qname file="/DomainMapper.cxx" line="216" qname="NS_rtf::LN_UNUSED4"/>.
-
-Lines like this
-
-/* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-
-result in elements like this
-
-<status done="0" planned="0" spent="0"/>
-
-The <qname> and <status> elements are children of the <stage1>
-element. The are inserted in the same order as found in the
-code. Therefore a <status> element corresponds to the group of
-consecutive preceding <qname> elements.
-
-2.2. Stage 2
-
-In this stage analyzestage2.xsl is used on the result of stage 1 to
-group the <qname> and <status> elements from stage 1. For each
-<status> element a <qnames> element is generated that contains the
-<qname> elements that the <status> element refers to, plus the
-<status> element.
-
-2.3. Stage 3
-
-This stage associates the <attribute> and <element> elements in
-model.xml with the extracted data. It uses analyzestage3.xsl on the
-result of stage 2 to do this.
-
-E.g. for given elements from stage 2:
-
-<attribute
- id="dml-wordprocessingDrawing:CT_Inline:distR"
- resource="Properties"
- tokenid="ooxml:CT_Inline_distR"
- qname="NS_ooxml::LN_CT_Inline_distR"
- namespace="dml-wordprocessingDrawing"
- define="CT_Inline"
- name="distR"/>
-
-and
-
- <qnames>
- <qname file="/GraphicImport.cxx" line="1078" qname="NS_ooxml::LN_CT_Inline_distT"/>
- <qname file="/GraphicImport.cxx" line="1079" qname="NS_ooxml::LN_CT_Inline_distB"/>
- <qname file="/GraphicImport.cxx" line="1080" qname="NS_ooxml::LN_CT_Inline_distL"/>
- <qname file="/GraphicImport.cxx" line="1081" qname="NS_ooxml::LN_CT_Inline_distR"/>
- <status done="0" planned="0.5" spent="0"/>
- </qnames>
-
-the result of stage 3 will be
-
- <attribute
- id="dml-wordprocessingDrawing:CT_Inline:distR"
- resource="Properties"
- tokenid="ooxml:CT_Inline_distR"
- qname="NS_ooxml::LN_CT_Inline_distR"
- namespace="dml-wordprocessingDrawing"
- define="CT_Inline" name="distR">
-
- <file name="/GraphicImport.cxx" line="1081">
- <status done="0" planned="0.5" spent="0" qname-count="4"/>
- </file>
-
- </attribute>
-
- at qname-count is the number of case-labels that the according mark-up comment refers to.
-
-3. Collect efforts
-
-This is done by the script efforts.sh. It uses status.sh to extract the status and determines the efforts in two steps.
-
-3.1. Choose which <attribute>/<element> elements need effort
-
-This stage uses todo.xsl on the result of 2.3.
-
-There are two criteria that imply effort:
-
-- The <attribute>/<element> is not handled in any file.
-
-- The status for the <attribute>/<element> declares that work is
- planned for it and less than 100 percent of this work is done.
-
-3.2. Generate table of efforts in CSV format
-
-This stage uses effort.xsl on the results of 3.1. and produces the
-table of efforts. If there is no status defined for an
-<attribute>/<element> it is assumed that the planned effort is 0.5
-hours and no work has been done.
diff --git a/writerfilter/source/ooxml/status.sh b/writerfilter/source/ooxml/status.sh
deleted file mode 100644
index 42ec08d..0000000
--- a/writerfilter/source/ooxml/status.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# 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 .
-#
-
-SEARCHIN=$SRC_ROOT/writerfilter/source/dmapper
-
-(
-echo '<?xml version="1.0"?>'
-echo "<stage1>"
-
-xsltproc analyzemodel.xsl model.xml | tail -n +2
-
-find $SEARCHIN -name "*.cxx" -exec grep -nH -A 1 "case NS_" {} \; |
-grep -v "//.*case NS_" |
-sed 's#'$SEARCHIN'##' |
-sed 's#\(^[^:]*\):\([0-9]*\):#<qname file="\1" line="\2"#' |
-sed 's#[/* ]*case \(NS_.*\):.*# qname="\1"/>#' |
-sed 's#.*WRITERFILTERSTATUS: done: \([0-9]*\), planned: \([0-9.]*\), spent: \([0-9.]*\).*#<status done="\1" planned="\2" spent="\3"/>#' |
-sed 's#.*WRITERFILTERSTATUS:.*#<status done="100"/>#' |
-sed 's#^.*-[0-9][0-9]*-.*$#<nostatus/>#' |
-grep -v "^--"
-
-echo "</stage1>"
-) |
-xsltproc analyzestage2.xsl - |
-xsltproc analyzestage3.xsl -
commit 4520e37785c485e7a29a069c32d91832c59a95bc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 27 20:03:32 2014 +0100
filter: add sprmids header
This was generated previously in writerfilter, but keeping around an XML
file of 8000+ lines just to generate these constants is an overkill.
Additionally, these constants are hardwired in all available WW8 files,
so they won't change. By copying it here, it's possible to incrementally
remove what's still remaining from writerfilter's not used doctok.
Change-Id: I1d30da1f635946b15a37de68080fd9eebc2ad88e
diff --git a/include/filter/msfilter/sprmids.hxx b/include/filter/msfilter/sprmids.hxx
new file mode 100644
index 0000000..3b45041
--- /dev/null
+++ b/include/filter/msfilter/sprmids.hxx
@@ -0,0 +1,301 @@
+/*
+ * 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 .
+ */
+#ifndef INCLUDED_SPRMIDS
+#define INCLUDED_SPRMIDS
+
+#include <sal/types.h>
+
+namespace NS_sprm {
+ const sal_uInt16 LN_PContextualSpacing = 0x246d;
+ const sal_uInt16 LN_PIstdPermute = 0xc601;
+ const sal_uInt16 LN_PTabProps = 0x646b;
+ const sal_uInt16 LN_TFCantSplit90 = 0x3466;
+ const sal_uInt16 LN_TCantSplit = 0x3644;
+ const sal_uInt16 LN_PIncLvl = 0x2602;
+ const sal_uInt16 LN_PJcExtra = 0x2461;
+ const sal_uInt16 LN_PJc = 0x2403;
+ const sal_uInt16 LN_PFSideBySide = 0x2404;
+ const sal_uInt16 LN_PFKeep = 0x2405;
+ const sal_uInt16 LN_PFKeepFollow = 0x2406;
+ const sal_uInt16 LN_PFPageBreakBefore = 0x2407;
+ const sal_uInt16 LN_PBrcl = 0x2408;
+ const sal_uInt16 LN_PBrcp = 0x2409;
+ const sal_uInt16 LN_PIlvl = 0x260a;
+ const sal_uInt16 LN_PIlfo = 0x460b;
+ const sal_uInt16 LN_PFNoLineNumb = 0x240c;
+ const sal_uInt16 LN_PChgTabsPapx = 0xc60d;
+ const sal_uInt16 LN_PDxaRight = 0x840e;
+ const sal_uInt16 LN_PDxaLeft = 0x840f;
+ const sal_uInt16 LN_PNest = 0x4610;
+ const sal_uInt16 LN_PDxaLeft180 = 0x8411;
+ const sal_uInt16 LN_PDyaLine = 0x6412;
+ const sal_uInt16 LN_PDyaBefore = 0xa413;
+ const sal_uInt16 LN_PDyaAfter = 0xa414;
+ const sal_uInt16 LN_PChgTabs = 0xc615;
+ const sal_uInt16 LN_PFInTable = 0x2416;
+ const sal_uInt16 LN_PCell = 0x244b;
+ const sal_uInt16 LN_PRow = 0x244c;
+ const sal_uInt16 LN_PFTtp = 0x2417;
+ const sal_uInt16 LN_PDxaAbs = 0x8418;
+ const sal_uInt16 LN_PDyaAbs = 0x8419;
+ const sal_uInt16 LN_PDxaWidth = 0x841a;
+ const sal_uInt16 LN_PPc = 0x261b;
+ const sal_uInt16 LN_PBrcTop10 = 0x461c;
+ const sal_uInt16 LN_PBrcLeft10 = 0x461d;
+ const sal_uInt16 LN_PBrcBottom10 = 0x461e;
+ const sal_uInt16 LN_PBrcRight10 = 0x461f;
+ const sal_uInt16 LN_PBrcBetween10 = 0x4620;
+ const sal_uInt16 LN_PBrcBar10 = 0x4621;
+ const sal_uInt16 LN_PDxaFromText10 = 0x4622;
+ const sal_uInt16 LN_PWr = 0x2423;
+ const sal_uInt16 LN_PBrcBar = 0x6629;
+ const sal_uInt16 LN_PFNoAutoHyph = 0x242a;
+ const sal_uInt16 LN_PWHeightAbs = 0x442b;
+ const sal_uInt16 LN_PDcs = 0x442c;
+ const sal_uInt16 LN_PShd = 0x442d;
+ const sal_uInt16 LN_PDyaFromText = 0x842e;
+ const sal_uInt16 LN_PDxaFromText = 0x842f;
+ const sal_uInt16 LN_PFLocked = 0x2430;
+ const sal_uInt16 LN_PFWidowControl = 0x2431;
+ const sal_uInt16 LN_PRuler = 0xc632;
+ const sal_uInt16 LN_PFKinsoku = 0x2433;
+ const sal_uInt16 LN_PFWordWrap = 0x2434;
+ const sal_uInt16 LN_PFOverflowPunct = 0x2435;
+ const sal_uInt16 LN_PFTopLinePunct = 0x2436;
+ const sal_uInt16 LN_PFAutoSpaceDE = 0x2437;
+ const sal_uInt16 LN_PFAutoSpaceDN = 0x2438;
+ const sal_uInt16 LN_PWAlignFont = 0x4439;
+ const sal_uInt16 LN_PFrameTextFlow = 0x443a;
+ const sal_uInt16 LN_PISnapBaseLine = 0x243b;
+ const sal_uInt16 LN_PAnld = 0xc63e;
+ const sal_uInt16 LN_PPropRMark = 0xc63f;
+ const sal_uInt16 LN_POutLvl = 0x2640;
+ const sal_uInt16 LN_PFBiDi = 0x2441;
+ const sal_uInt16 LN_PFNumRMIns = 0x2443;
+ const sal_uInt16 LN_PCrLf = 0x2444;
+ const sal_uInt16 LN_PNumRM = 0xc645;
+ const sal_uInt16 LN_PHugePapx = 0x6645;
+ const sal_uInt16 LN_PFUsePgsuSettings = 0x2447;
+ const sal_uInt16 LN_PFAdjustRight = 0x2448;
+ const sal_uInt16 LN_CFRMarkDel = 0x0800;
+ const sal_uInt16 LN_CFRMark = 0x0801;
+ const sal_uInt16 LN_CFFldVanish = 0x0802;
+ const sal_uInt16 LN_CPicLocation = 0x6a03;
+ const sal_uInt16 LN_CIbstRMark = 0x4804;
+ const sal_uInt16 LN_CDttmRMark = 0x6805;
+ const sal_uInt16 LN_CFData = 0x0806;
+ const sal_uInt16 LN_CIdslRMark = 0x4807;
+ const sal_uInt16 LN_CChs = 0xea08;
+ const sal_uInt16 LN_CSymbol = 0x6a09;
+ const sal_uInt16 LN_CFOle2 = 0x080a;
+ const sal_uInt16 LN_CIdCharType = 0x480b;
+ const sal_uInt16 LN_CHighlight = 0x2a0c;
+ const sal_uInt16 LN_CObjLocation = 0x680e;
+ const sal_uInt16 LN_CFFtcAsciSymb = 0x2a10;
+ const sal_uInt16 LN_CIstd = 0x4a30;
+ const sal_uInt16 LN_CIstdPermute = 0xca31;
+ const sal_uInt16 LN_CDefault = 0x2a32;
+ const sal_uInt16 LN_CPlain = 0x2a33;
+ const sal_uInt16 LN_CKcd = 0x2a34;
+ const sal_uInt16 LN_CFBold = 0x0835;
+ const sal_uInt16 LN_CFItalic = 0x0836;
+ const sal_uInt16 LN_CFStrike = 0x0837;
+ const sal_uInt16 LN_CFOutline = 0x0838;
+ const sal_uInt16 LN_CFShadow = 0x0839;
+ const sal_uInt16 LN_CFSmallCaps = 0x083a;
+ const sal_uInt16 LN_CFCaps = 0x083b;
+ const sal_uInt16 LN_CFVanish = 0x083c;
+ const sal_uInt16 LN_CFtcDefault = 0x4a3d;
+ const sal_uInt16 LN_CKul = 0x2a3e;
+ const sal_uInt16 LN_CSizePos = 0xea3f;
+ const sal_uInt16 LN_CDxaSpace = 0x8840;
+ const sal_uInt16 LN_CLid = 0x4a41;
+ const sal_uInt16 LN_CIco = 0x2a42;
+ const sal_uInt16 LN_CHps = 0x4a43;
+ const sal_uInt16 LN_CHpsInc = 0x2a44;
+ const sal_uInt16 LN_CHpsPos = 0x4845;
+ const sal_uInt16 LN_CHpsPosAdj = 0x2a46;
+ const sal_uInt16 LN_CMajority = 0xca47;
+ const sal_uInt16 LN_CIss = 0x2a48;
+ const sal_uInt16 LN_CHpsNew50 = 0xca49;
+ const sal_uInt16 LN_CHpsInc1 = 0xca4a;
+ const sal_uInt16 LN_CHpsKern = 0x484b;
+ const sal_uInt16 LN_CMajority50 = 0xca4c;
+ const sal_uInt16 LN_CHpsMul = 0x4a4d;
+ const sal_uInt16 LN_CYsri = 0x484e;
+ const sal_uInt16 LN_CRgFtc0 = 0x4a4f;
+ const sal_uInt16 LN_CRgFtc1 = 0x4a50;
+ const sal_uInt16 LN_CRgFtc2 = 0x4a51;
+ const sal_uInt16 LN_CCharScale = 0x4852;
+ const sal_uInt16 LN_CFDStrike = 0x2a53;
+ const sal_uInt16 LN_CFImprint = 0x0854;
+ const sal_uInt16 LN_CFNoProof = 0x0875;
+ const sal_uInt16 LN_CFspecVanish = 0x0818;
+ const sal_uInt16 LN_CFitText = 0xca76;
+ const sal_uInt16 LN_CComplexScript = 0x882;
+ const sal_uInt16 LN_PTightWrap = 0x2471;
+ const sal_uInt16 LN_CFSpec = 0x0855;
+ const sal_uInt16 LN_CFObj = 0x0856;
+ const sal_uInt16 LN_CPropRMark = 0xca57;
+ const sal_uInt16 LN_CFEmboss = 0x0858;
+ const sal_uInt16 LN_CSfxText = 0x2859;
+ const sal_uInt16 LN_CFBiDi = 0x085a;
+ const sal_uInt16 LN_CFDiacColor = 0x085b;
+ const sal_uInt16 LN_CFBoldBi = 0x085c;
+ const sal_uInt16 LN_CFItalicBi = 0x085d;
+ const sal_uInt16 LN_CFtcBi = 0x4a5e;
+ const sal_uInt16 LN_CLidBi = 0x485f;
+ const sal_uInt16 LN_CIcoBi = 0x4a60;
+ const sal_uInt16 LN_CHpsBi = 0x4a61;
+ const sal_uInt16 LN_CDispFldRMark = 0xca62;
+ const sal_uInt16 LN_CIbstRMarkDel = 0x4863;
+ const sal_uInt16 LN_CDttmRMarkDel = 0x6864;
+ const sal_uInt16 LN_CBrc = 0x6865;
+ const sal_uInt16 LN_CShd = 0x4866;
+ const sal_uInt16 LN_CIdslRMarkDel = 0x4867;
+ const sal_uInt16 LN_CFUsePgsuSettings = 0x0868;
+ const sal_uInt16 LN_CCpg = 0x486b;
+ const sal_uInt16 LN_CRgLid0_80 = 0x486d;
+ const sal_uInt16 LN_CRgLid1_80 = 0x486e;
+ const sal_uInt16 LN_CIdctHint = 0x286f;
+ const sal_uInt16 LN_PicBrcl = 0x2e00;
+ const sal_uInt16 LN_PicScale = 0xce01;
+ const sal_uInt16 LN_PicBrcTop = 0x6c02;
+ const sal_uInt16 LN_PicBrcLeft = 0x6c03;
+ const sal_uInt16 LN_PicBrcBottom = 0x6c04;
+ const sal_uInt16 LN_PicBrcRight = 0x6c05;
+ const sal_uInt16 LN_ScnsPgn = 0x3000;
+ const sal_uInt16 LN_SiHeadingPgn = 0x3001;
+ const sal_uInt16 LN_SOlstAnm = 0xd202;
+ const sal_uInt16 LN_SDxaColWidth = 0xf203;
+ const sal_uInt16 LN_SDxaColSpacing = 0xf204;
+ const sal_uInt16 LN_SFEvenlySpaced = 0x3005;
+ const sal_uInt16 LN_SFProtected = 0x3006;
+ const sal_uInt16 LN_SDmBinFirst = 0x5007;
+ const sal_uInt16 LN_SDmBinOther = 0x5008;
+ const sal_uInt16 LN_SBkc = 0x3009;
+ const sal_uInt16 LN_SFTitlePage = 0x300a;
+ const sal_uInt16 LN_SCcolumns = 0x500b;
+ const sal_uInt16 LN_SDxaColumns = 0x900c;
+ const sal_uInt16 LN_SFAutoPgn = 0x300d;
+ const sal_uInt16 LN_SNfcPgn = 0x300e;
+ const sal_uInt16 LN_SDyaPgn = 0xb00f;
+ const sal_uInt16 LN_SDxaPgn = 0xb010;
+ const sal_uInt16 LN_SFPgnRestart = 0x3011;
+ const sal_uInt16 LN_SFEndnote = 0x3012;
+ const sal_uInt16 LN_SLnc = 0x3013;
+ const sal_uInt16 LN_SGprfIhdt = 0x3014;
+ const sal_uInt16 LN_SNLnnMod = 0x5015;
+ const sal_uInt16 LN_SDxaLnn = 0x9016;
+ const sal_uInt16 LN_SDyaHdrTop = 0xb017;
+ const sal_uInt16 LN_SDyaHdrBottom = 0xb018;
+ const sal_uInt16 LN_SLBetween = 0x3019;
+ const sal_uInt16 LN_SVjc = 0x301a;
+ const sal_uInt16 LN_SLnnMin = 0x501b;
+ const sal_uInt16 LN_SPgnStart = 0x501c;
+ const sal_uInt16 LN_SBOrientation = 0x301d;
+ const sal_uInt16 LN_SBCustomize = 0x301e;
+ const sal_uInt16 LN_SXaPage = 0xb01f;
+ const sal_uInt16 LN_SYaPage = 0xb020;
+ const sal_uInt16 LN_SDxaLeft = 0xb021;
+ const sal_uInt16 LN_SDxaRight = 0xb022;
+ const sal_uInt16 LN_SDyaTop = 0x9023;
+ const sal_uInt16 LN_SDyaBottom = 0x9024;
+ const sal_uInt16 LN_SDzaGutter = 0xb025;
+ const sal_uInt16 LN_SDmPaperReq = 0x5026;
+ const sal_uInt16 LN_SPropRMark = 0xd227;
+ const sal_uInt16 LN_SFBiDi = 0x3228;
+ const sal_uInt16 LN_SFFacingCol = 0x3229;
+ const sal_uInt16 LN_SFRTLGutter = 0x322a;
+ const sal_uInt16 LN_SBrcTop = 0x702b;
+ const sal_uInt16 LN_SBrcLeft = 0x702c;
+ const sal_uInt16 LN_SBrcBottom = 0x702d;
+ const sal_uInt16 LN_SBrcRight = 0x702e;
+ const sal_uInt16 LN_SPgbProp = 0x522f;
+ const sal_uInt16 LN_SDxtCharSpace = 0x7030;
+ const sal_uInt16 LN_SDyaLinePitch = 0x9031;
+ const sal_uInt16 LN_SClm = 0x5032;
+ const sal_uInt16 LN_STextFlow = 0x5033;
+ const sal_uInt16 LN_TJc = 0x5400;
+ const sal_uInt16 LN_TDxaLeft = 0x9601;
+ const sal_uInt16 LN_TDxaGapHalf = 0x9602;
+ const sal_uInt16 LN_TFCantSplit = 0x3403;
+ const sal_uInt16 LN_TTableHeader = 0x3404;
+ const sal_uInt16 LN_TTableBorders = 0xd605;
+ const sal_uInt16 LN_TDefTable10 = 0xd606;
+ const sal_uInt16 LN_TDyaRowHeight = 0x9407;
+ const sal_uInt16 LN_TDefTable = 0xd608;
+ const sal_uInt16 LN_TDefTableShd = 0xd609;
+ const sal_uInt16 LN_TCellShd = 0xd612;
+ const sal_uInt16 LN_TTlp = 0x740a;
+ const sal_uInt16 LN_TFBiDi = 0x560b;
+ const sal_uInt16 LN_THTMLProps = 0x740c;
+ const sal_uInt16 LN_TSetBrc = 0xd620;
+ const sal_uInt16 LN_TInsert = 0x7621;
+ const sal_uInt16 LN_TDelete = 0x5622;
+ const sal_uInt16 LN_TDxaCol = 0x7623;
+ const sal_uInt16 LN_TMerge = 0x5624;
+ const sal_uInt16 LN_TSplit = 0x5625;
+ const sal_uInt16 LN_TSetBrc10 = 0xd626;
+ const sal_uInt16 LN_TSetShd = 0x7627;
+ const sal_uInt16 LN_TSetShdOdd = 0x7628;
+ const sal_uInt16 LN_TTextFlow = 0x7629;
+ const sal_uInt16 LN_TDiagLine = 0xd62a;
+ const sal_uInt16 LN_TVertMerge = 0xd62b;
+ const sal_uInt16 LN_TVertAlign = 0xd62c;
+ const sal_uInt16 LN_TCellTopColor = 0xd61a;
+ const sal_uInt16 LN_TCellLeftColor = 0xd61b;
+ const sal_uInt16 LN_TCellBottomColor = 0xd61c;
+ const sal_uInt16 LN_TCellRightColor = 0xd61d;
+ const sal_uInt16 LN_TGridLineProps = 0xd613;
+ const sal_uInt16 LN_Cdelrsid = 0x6817;
+ const sal_uInt16 LN_PTableDepth = 0x6649;
+ const sal_uInt16 LN_TCellShadow = 0xd670;
+ const sal_uInt16 LN_PBrcTop = 0x6424;
+ const sal_uInt16 LN_PBrcLeft = 0x6425;
+ const sal_uInt16 LN_PBrcBottom = 0x6426;
+ const sal_uInt16 LN_PBrcRight = 0x6427;
+ const sal_uInt16 LN_PBrcBetween = 0x6428;
+ const sal_uInt16 LN_PBorderTop = 0xc64e;
+ const sal_uInt16 LN_PBorderLeft = 0xc64f;
+ const sal_uInt16 LN_PBorderBottom = 0xc650;
+ const sal_uInt16 LN_PBorderRight = 0xc651;
+ const sal_uInt16 LN_PBorderBetween = 0xc652;
+ const sal_uInt16 LN_CBorder = 0xca72;
+ const sal_uInt16 LN_TTPreferredWidth = 0xf614;
+ const sal_uInt16 LN_CEastAsianLayout = 0xca78;
+ const sal_uInt16 LN_TWidthBefore = 0xf617;
+ const sal_uInt16 LN_TWidthAfter = 0xf618;
+ const sal_uInt16 LN_PDxaLeft1 = 0x8460;
+ const sal_uInt16 LN_PRsid = 0x6467;
+ const sal_uInt16 LN_CRsidProp = 0x6815;
+ const sal_uInt16 LN_CRgLid0 = 0x4873;
+ const sal_uInt16 LN_CRgLid1 = 0x4874;
+ const sal_uInt16 LN_TCellPaddingDefault = 0xd634;
+ const sal_uInt16 LN_TRsid = 0x7479;
+ const sal_uInt16 LN_TFAutofit = 0x3615;
+ const sal_uInt16 LN_TPc = 0x360d;
+ const sal_uInt16 LN_TDyaAbs = 0x940f;
+ const sal_uInt16 LN_TDxaFromText = 0x9410;
+ const sal_uInt16 LN_TDyaFromText = 0x9411;
+ const sal_uInt16 LN_TDxaFromTextRight = 0x941e;
+ const sal_uInt16 LN_TDyaFromTextBottom = 0x941f;
+ const sal_uInt16 LN_TFNoAllowOverlap = 0x3465;
+}
+
+#endif // INCLUDED_SPRMIDS
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 336f267..135eb57 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
$(eval $(call gb_Library_use_custom_headers,msword,\
oox/generated \
- writerfilter/source \
))
$(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword))
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 44cddc2..7622359 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -102,7 +102,7 @@
#include <cppuhelper/implementationentry.hxx>
#include <cstdio>
#include <cstring>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/autokernitem.hxx>
#include <editeng/blinkitem.hxx>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 0b00005..d09d9cf 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -83,7 +83,7 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/WordType.hpp>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 02a3138..301459f 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -31,7 +31,7 @@
#include <unotools/fontcfg.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include "ww8attributeoutput.hxx"
#include "writerhelper.hxx"
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index b46ebe4..ba882ad 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -61,7 +61,7 @@
#include <msfilter.hxx>
#include <swmodule.hxx>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index af08976..c565c6b 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -86,7 +86,7 @@
#include <fmtfsize.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/string.hxx>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 7c1cf7f..df9e380 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -51,7 +51,7 @@
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include <doc.hxx>
#include "writerhelper.hxx"
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c20dac1..96b9f63 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -115,7 +115,7 @@
#include <chpfld.hxx>
#include <fmthdft.hxx>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include <fmtcntnt.hxx>
#include "writerhelper.hxx"
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index df653db..bd44acc 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -67,7 +67,7 @@
#include <editeng/frmdiritem.hxx>
#include <editeng/charhiddenitem.hxx>
#include <i18nlangtag/mslangid.hxx>
-#include <doctok/sprmids.hxx>
+#include <filter/msfilter/sprmids.hxx>
#include <fmtpdsc.hxx>
#include <node.hxx>
#include <ndtxt.hxx>
commit 82d83af95a0d3ab9010782baea266f05717b56f0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 27 20:02:01 2014 +0100
writerfilter: drop unused WW8TableHandler class
Change-Id: Ib74ac172088e7ad906fb3a28652948e2476a4cb2
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 978e77e..275b377 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -195,13 +195,6 @@ void WW8TableManager::endParagraphGroup()
TableManager<string, TablePropsRef_t>::endParagraphGroup();
}
-void WW8TableHandler::entry(int /*pos*/,
- writerfilter::Reference<Properties>::Pointer_t /*ref*/)
-{
- output.addItem("<tableentry>");
- output.addItem("</tableentry>");
-}
-
void WW8BinaryObjHandler::data
(const sal_uInt8 * buf, size_t length,
writerfilter::Reference<Properties>::Pointer_t /*pRef*/)
diff --git a/writerfilter/source/resourcemodel/resourcemodel.hxx b/writerfilter/source/resourcemodel/resourcemodel.hxx
index 9b85fc2..ebbe356 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.hxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.hxx
@@ -35,23 +35,6 @@ public:
writerfilter::Reference<Properties>::Pointer_t ref);
};
-class WW8TableHandler : public Table
-{
- WW8TableManager* mpTableManager;
-
-public:
- WW8TableHandler(WW8TableManager* pTableManager)
- : mpTableManager(pTableManager)
- {
- }
-
- virtual ~WW8TableHandler()
- {
- }
-
- void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
-};
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f9fef7e3ba53d8232ac2d06183978789cc4b0c1d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 27 20:00:53 2014 +0100
writerfilter: drop unused WW8StreamHandler class
Change-Id: I79ea120223094f52996b52020fb86ddf9a919688
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 6a5a8b3..978e77e 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -195,205 +195,6 @@ void WW8TableManager::endParagraphGroup()
TableManager<string, TablePropsRef_t>::endParagraphGroup();
}
-/* WW8StreamHandler */
-
-WW8StreamHandler::WW8StreamHandler()
-: mnUTextCount(0)
-{
- output.closeGroup();
- output.addItem("<stream>");
- mpTableManager = new WW8TableManager;
- mpTableManager->startLevel();
-}
-
-WW8StreamHandler::~WW8StreamHandler()
-{
- mpTableManager->endLevel();
- delete mpTableManager;
-
- output.closeGroup();
- output.addItem("</stream>");
-}
-
-void WW8StreamHandler::startSectionGroup()
-{
- output.addItem("<section-group>");
-}
-
-void WW8StreamHandler::endSectionGroup()
-{
- output.addItem("</section-group>");
-}
-
-void WW8StreamHandler::startParagraphGroup()
-{
- output.openGroup();
- output.addItem("<paragraph-group>");
-
- mpTableManager->startParagraphGroup();
- mpTableManager->handle(gInfo);
-}
-
-void WW8StreamHandler::endParagraphGroup()
-{
- mpTableManager->endParagraphGroup();
-
- output.addItem("</paragraph-group>");
- output.closeGroup();
-
-}
-
-void WW8StreamHandler::startCharacterGroup()
-{
- output.addItem("<character-group>");
-}
-
-void WW8StreamHandler::endCharacterGroup()
-{
- output.addItem("</character-group>");
-}
-
-void WW8StreamHandler::startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > /*xShape*/ )
-{
- output.addItem("<shape>");
-}
-
-void WW8StreamHandler::endShape( )
-{
- output.addItem( "</shape>" );
-}
-
-void WW8StreamHandler::text(const sal_uInt8 * data, size_t len)
-{
- string tmpStr = "<text>";
-
- for (unsigned int n = 0; n < len; ++n)
- {
- switch (static_cast<unsigned char>(data[n]))
- {
- case '<':
- tmpStr += "<";
-
- break;
- case '>':
- tmpStr += ">";
-
- break;
-
- case '&':
- tmpStr += "&";
-
- break;
- default:
- if (isprint(data[n]))
- tmpStr += static_cast<char>(data[n]);
- else
- {
- char sBuffer[256];
-
- snprintf(sBuffer, sizeof(sBuffer), "\\0x%02x", data[n]);
-
- tmpStr += sBuffer;
- }
- }
- }
-
- tmpStr += "</text>";
-
- output.addItem(tmpStr);
-
- mpTableManager->text(data, len);
-}
-
-void WW8StreamHandler::utext(const sal_uInt8 * data, size_t len)
-{
- static char sBuffer[256];
- snprintf(sBuffer, sizeof(sBuffer), "<utext count=\"%d\">", mnUTextCount);
- string tmpStr(sBuffer);
-
- for (unsigned int n = 0; n < len; ++n)
- {
- sal_Unicode nChar = data[n * 2] + (data[n * 2 + 1] << 8);
- if (nChar < 0xff && isprint(nChar))
- {
- switch (nChar)
- {
- case '&':
- tmpStr += "&";
- break;
- case '<':
- tmpStr += "<";
- break;
- case '>':
- tmpStr += ">";
- break;
- default:
- tmpStr += static_cast<char>(nChar);
- }
- }
- else
- {
- snprintf(sBuffer, sizeof(sBuffer), "\\0x%04x", nChar);
-
- tmpStr += sBuffer;
- }
- }
-
- tmpStr += "</utext>";
-
- output.addItem(tmpStr);
-
- mpTableManager->utext(data, len);
-
- mnUTextCount++;
-}
-
-void WW8StreamHandler::props(writerfilter::Reference<Properties>::Pointer_t ref)
-{
- output.addItem("<properties type=\"" + ref->getType() + "\">");
- output.addItem("</properties>");
-}
-
-void WW8StreamHandler::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
-{
- WW8TableHandler aHandler(mpTableManager);
-
- output.addItem("<table id=\"" + (*QNameToString::Instance())(name)
- + "\">");
-
- try
- {
- ref->resolve(aHandler);
- }
- catch (const Exception &e)
- {
- output.addItem("<exception>" + e.getText() + "</exception>");
- }
-
- output.addItem("</table>");
-}
-
-void WW8StreamHandler::substream(Id name,
- writerfilter::Reference<Stream>::Pointer_t ref)
-{
- output.addItem("<substream name=\"" + (*QNameToString::Instance())(name)
- + "\">");
-
- mpTableManager->startLevel();
-
- ref->resolve(*this);
-
- mpTableManager->endLevel();
-
- output.addItem("</substream>");
-}
-
-void WW8StreamHandler::info(const string & info_)
-{
- gInfo = info_;
- output.addItem("<info>" + info_ + "</info>");
-}
-
void WW8TableHandler::entry(int /*pos*/,
writerfilter::Reference<Properties>::Pointer_t /*ref*/)
{
diff --git a/writerfilter/source/resourcemodel/resourcemodel.hxx b/writerfilter/source/resourcemodel/resourcemodel.hxx
index 773043c..9b85fc2 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.hxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.hxx
@@ -20,37 +20,6 @@
namespace writerfilter {
class WW8TableManager;
-class WW8StreamHandler : public Stream
-{
- int mnUTextCount;
- WW8TableManager* mpTableManager;
-
-public:
- WW8StreamHandler();
- virtual ~WW8StreamHandler();
-
- virtual void startSectionGroup();
- virtual void endSectionGroup();
- virtual void startParagraphGroup();
- virtual void endParagraphGroup();
- virtual void startCharacterGroup();
- virtual void endCharacterGroup();
- virtual void text(const sal_uInt8 * data, size_t len);
- virtual void utext(const sal_uInt8 * data, size_t len);
- virtual void positivePercentage(const OUString& /*rText*/) { }
-
- virtual void props(writerfilter::Reference<Properties>::Pointer_t ref);
- virtual void table(Id name,
- writerfilter::Reference<Table>::Pointer_t ref);
-
- virtual void startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
- virtual void endShape( );
-
- virtual void substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref);
-
- virtual void info(const string & info);
-};
-
class WW8BinaryObjHandler : public BinaryObj
{
public:
commit 44d08b67fec8219354ae5709372676d091c086f2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 27 19:58:40 2014 +0100
writerfilter: unused WW8PropertiesHandler class
Change-Id: Ie6a6d47241cdf0f4986aee9b2f30ecae55e6518c
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index bf414ca..6a5a8b3 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -350,13 +350,7 @@ void WW8StreamHandler::utext(const sal_uInt8 * data, size_t len)
void WW8StreamHandler::props(writerfilter::Reference<Properties>::Pointer_t ref)
{
- WW8PropertiesHandler aHandler(mpTableManager);
-
output.addItem("<properties type=\"" + ref->getType() + "\">");
- ref->resolve(aHandler);
-
- //mpTableManager->props(ref);
-
output.addItem("</properties>");
}
@@ -400,141 +394,10 @@ void WW8StreamHandler::info(const string & info_)
output.addItem("<info>" + info_ + "</info>");
}
-void WW8PropertiesHandler::attribute(Id name, Value & val)
-{
- boost::shared_ptr<OString> pStr(new OString());
- OUString aStr = val.getString();
- aStr.convertToString(pStr.get(), RTL_TEXTENCODING_ASCII_US,
- OUSTRING_TO_OSTRING_CVTFLAGS);
- string sXMLValue = xmlify(pStr->getStr());
-
- char sBuffer[256];
- snprintf(sBuffer, sizeof(sBuffer), "0x%x", val.getInt());
-
- output.addItem("<attribute name=\"" +
- (*QNameToString::Instance())(name) +
- "\" value=\"" +
- sXMLValue +
- + "\" hexvalue=\""
- + sBuffer + "\">");
-
- writerfilter::Reference<Properties>::Pointer_t pProps = val.getProperties();
-
- if (pProps.get() != NULL)
- {
- output.addItem("<properties name=\"" +
- (*QNameToString::Instance())(name)
- + "\" type=\"" + pProps->getType() + "\">");
-
- try
- {
- pProps->resolve(*this);
- }
- catch (const ExceptionOutOfBounds &)
- {
- }
-
- output.addItem("</properties>");
- }
-
- writerfilter::Reference<Stream>::Pointer_t pStream = val.getStream();
-
- if (pStream.get() != NULL)
- {
- try
- {
- WW8StreamHandler aHandler;
-
- pStream->resolve(aHandler);
- }
- catch (const ExceptionOutOfBounds &)
- {
- }
- }
-
- writerfilter::Reference<BinaryObj>::Pointer_t pBinObj = val.getBinary();
-
- if (pBinObj.get() != NULL)
- {
- try
- {
- WW8BinaryObjHandler aHandler;
-
- pBinObj->resolve(aHandler);
- }
- catch (const ExceptionOutOfBounds &)
- {
- }
- }
-
- output.addItem("</attribute>");
-}
-
-void WW8PropertiesHandler::sprm(Sprm & sprm_)
-{
- string tmpStr = "<sprm id=\"";
- char buffer[256];
- snprintf(buffer, sizeof(buffer), "0x%" SAL_PRIxUINT32, sprm_.getId());
- tmpStr += buffer;
- tmpStr += "\" name=\"";
- tmpStr += sprm_.getName();
- tmpStr += "\">";
- output.addItem(tmpStr);
- output.addItem(sprm_.toString());
-
- writerfilter::Reference<Properties>::Pointer_t pProps = sprm_.getProps();
-
- if (pProps.get() != NULL)
- {
- output.addItem("<properties type=\"" + pProps->getType() + "\">");
- pProps->resolve(*this);
- output.addItem("</properties>");
- }
-
- writerfilter::Reference<BinaryObj>::Pointer_t pBinObj = sprm_.getBinary();
-
- if (pBinObj.get() != NULL)
- {
- output.addItem("<binary>");
- WW8BinaryObjHandler aHandler;
- pBinObj->resolve(aHandler);
- output.addItem("</binary>");
- }
-
- writerfilter::Reference<Stream>::Pointer_t pStream = sprm_.getStream();
-
- if (pStream.get() != NULL)
- {
- output.addItem("<stream>");
- WW8StreamHandler aHandler;
- pStream->resolve(aHandler);
- output.addItem("</stream>");
- }
-
- mpTableManager->sprm(sprm_);
-
- output.addItem("</sprm>");
-}
-
void WW8TableHandler::entry(int /*pos*/,
- writerfilter::Reference<Properties>::Pointer_t ref)
+ writerfilter::Reference<Properties>::Pointer_t /*ref*/)
{
output.addItem("<tableentry>");
-
- WW8PropertiesHandler aHandler(mpTableManager);
-
- try
- {
- ref->resolve(aHandler);
- }
- catch (const Exception &e)
- {
- output.addItem("<exception>" + e.getText() + "</exception>");
- output.addItem("</tableentry>");
-
- throw;
- }
-
output.addItem("</tableentry>");
}
diff --git a/writerfilter/source/resourcemodel/resourcemodel.hxx b/writerfilter/source/resourcemodel/resourcemodel.hxx
index ecaaac6..773043c 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.hxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.hxx
@@ -51,30 +51,6 @@ public:
virtual void info(const string & info);
};
-class WW8PropertiesHandler : public Properties
-{
- typedef boost::shared_ptr<Sprm> SprmSharedPointer_t;
- typedef vector<SprmSharedPointer_t> SprmPointers_t;
- SprmPointers_t sprms;
- WW8TableManager* mpTableManager;
-
-public:
- WW8PropertiesHandler(WW8TableManager* pTableManager)
- : mpTableManager(pTableManager)
- {
- }
-
- virtual ~WW8PropertiesHandler()
- {
- }
-
- virtual void attribute(Id name, Value & val);
- virtual void sprm(Sprm & sprm);
-
- void dumpSprm(SprmSharedPointer_t sprm);
- void dumpSprms();
-};
-
class WW8BinaryObjHandler : public BinaryObj
{
public:
More information about the Libreoffice-commits
mailing list