[Libreoffice-commits] core.git: 2 commits - writerfilter/Library_writerfilter.mk writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Nov 29 12:05:51 PST 2013
writerfilter/Library_writerfilter.mk | 2
writerfilter/source/doctok/DffImpl.cxx | 264 ---------------------------
writerfilter/source/doctok/WW8Annotation.cxx | 31 ---
writerfilter/source/doctok/resources.xmi | 3
4 files changed, 300 deletions(-)
New commits:
commit dc03d0defa0d3f17ff10df51f4a59e8f624e7f9f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 28 21:22:44 2013 +0100
writerfilter: remove unused WW8Annotation in doctok
Change-Id: I30ae3416d795069246cb165c96342448c5b22011
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 1e1279e..05701cf 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -122,7 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/TblStylePrHandler \
writerfilter/source/dmapper/ThemeTable \
writerfilter/source/dmapper/WrapPolygonHandler \
- writerfilter/source/doctok/WW8Annotation \
writerfilter/source/doctok/WW8CpAndFc \
writerfilter/source/doctok/WW8FKPImpl \
writerfilter/source/doctok/WW8Picture \
diff --git a/writerfilter/source/doctok/WW8Annotation.cxx b/writerfilter/source/doctok/WW8Annotation.cxx
deleted file mode 100644
index e616e28..0000000
--- a/writerfilter/source/doctok/WW8Annotation.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include <doctok/resources.hxx>
-
-namespace writerfilter {
-namespace doctok
-{
-OUString WW8ATRD::get_xstUsrInitl()
-{
- return getString(0x0);
-}
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 9706d75..409accf 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -28127,9 +28127,6 @@
<!--Class FRD-->
<!--Class ATRD-->
<UML:Class xmi.id="ATRD" name="ATRD">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="ww8resource"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>28</UML:TaggedValue.dataValue>
commit e8e293de1052543431d8196e6bfd19265a79f89b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Nov 28 21:21:29 2013 +0100
writerfilter: remove unused DffImpl in doctok
Change-Id: Ife6a9962b5aa6d2189e31924845df655a9ba41f2
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index ff16aac..1e1279e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -122,7 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/TblStylePrHandler \
writerfilter/source/dmapper/ThemeTable \
writerfilter/source/dmapper/WrapPolygonHandler \
- writerfilter/source/doctok/DffImpl \
writerfilter/source/doctok/WW8Annotation \
writerfilter/source/doctok/WW8CpAndFc \
writerfilter/source/doctok/WW8FKPImpl \
diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
deleted file mode 100644
index 2c14d3e..0000000
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include "doctok/resources.hxx"
-
-namespace writerfilter {
-namespace doctok
-{
-
-class ShapeTypeToString
-{
- typedef boost::shared_ptr<ShapeTypeToString> Pointer_t;
-
- static Pointer_t pInstance;
-
- typedef map<sal_uInt32, string> Map_t;
- Map_t mMap;
-
-protected:
- ShapeTypeToString();
-
-public:
- static Pointer_t Instance()
- {
- if (pInstance == 0)
- pInstance = Pointer_t(new ShapeTypeToString());
-
- return pInstance;
- }
-
- string operator()(sal_uInt32 nShapeType)
- {
- return mMap[nShapeType];
- }
-};
-
-ShapeTypeToString::Pointer_t ShapeTypeToString::pInstance;
-
-ShapeTypeToString::ShapeTypeToString()
-{
- mMap[0]="NotPrimitive";
- mMap[1]="Rectangle";
- mMap[2]="RoundRectangle";
- mMap[3]="Ellipse";
- mMap[4]="Diamond";
- mMap[5]="IsocelesTriangle";
- mMap[6]="RightTriangle";
- mMap[7]="Parallelogram";
- mMap[8]="Trapezoid";
- mMap[9]="Hexagon";
- mMap[10]="Octagon";
- mMap[11]="Plus";
- mMap[12]="Star";
- mMap[13]="Arrow";
- mMap[14]="ThickArrow";
- mMap[15]="HomePlate";
- mMap[16]="Cube";
- mMap[17]="Balloon";
- mMap[18]="Seal";
- mMap[19]="Arc";
- mMap[20]="Line";
- mMap[21]="Plaque";
- mMap[22]="Can";
- mMap[23]="Donut";
- mMap[24]="TextSimple";
- mMap[25]="TextOctagon";
- mMap[26]="TextHexagon";
- mMap[27]="TextCurve";
- mMap[28]="TextWave";
- mMap[29]="TextRing";
- mMap[30]="TextOnCurve";
- mMap[31]="TextOnRing";
- mMap[32]="StraightConnector1";
- mMap[33]="BentConnector2";
- mMap[34]="BentConnector3";
- mMap[35]="BentConnector4";
- mMap[36]="BentConnector5";
- mMap[37]="CurvedConnector2";
- mMap[38]="CurvedConnector3";
- mMap[39]="CurvedConnector4";
- mMap[40]="CurvedConnector5";
- mMap[41]="Callout1";
- mMap[42]="Callout2";
- mMap[43]="Callout3";
- mMap[44]="AccentCallout1";
- mMap[45]="AccentCallout2";
- mMap[46]="AccentCallout3";
- mMap[47]="BorderCallout1";
- mMap[48]="BorderCallout2";
- mMap[49]="BorderCallout3";
- mMap[50]="AccentBorderCallout1";
- mMap[51]="AccentBorderCallout2";
- mMap[52]="AccentBorderCallout3";
- mMap[53]="Ribbon";
- mMap[54]="Ribbon2";
- mMap[55]="Chevron";
- mMap[56]="Pentagon";
- mMap[57]="NoSmoking";
- mMap[58]="Seal8";
- mMap[59]="Seal16";
- mMap[60]="Seal32";
- mMap[61]="WedgeRectCallout";
- mMap[62]="WedgeRRectCallout";
- mMap[63]="WedgeEllipseCallout";
- mMap[64]="Wave";
- mMap[65]="FoldedCorner";
- mMap[66]="LeftArrow";
- mMap[67]="DownArrow";
- mMap[68]="UpArrow";
- mMap[69]="LeftRightArrow";
- mMap[70]="UpDownArrow";
- mMap[71]="IrregularSeal1";
- mMap[72]="IrregularSeal2";
- mMap[73]="LightningBolt";
- mMap[74]="Heart";
- mMap[75]="PictureFrame";
- mMap[76]="QuadArrow";
- mMap[77]="LeftArrowCallout";
- mMap[78]="RightArrowCallout";
- mMap[79]="UpArrowCallout";
- mMap[80]="DownArrowCallout";
- mMap[81]="LeftRightArrowCallout";
- mMap[82]="UpDownArrowCallout";
- mMap[83]="QuadArrowCallout";
- mMap[84]="Bevel";
- mMap[85]="LeftBracket";
- mMap[86]="RightBracket";
- mMap[87]="LeftBrace";
- mMap[88]="RightBrace";
- mMap[89]="LeftUpArrow";
- mMap[90]="BentUpArrow";
- mMap[91]="BentArrow";
- mMap[92]="Seal24";
- mMap[93]="StripedRightArrow";
- mMap[94]="NotchedRightArrow";
- mMap[95]="BlockArc";
- mMap[96]="SmileyFace";
- mMap[97]="VerticalScroll";
- mMap[98]="HorizontalScroll";
- mMap[99]="CircularArrow";
- mMap[100]="NotchedCircularArrow";
- mMap[101]="UturnArrow";
- mMap[102]="CurvedRightArrow";
- mMap[103]="CurvedLeftArrow";
- mMap[104]="CurvedUpArrow";
- mMap[105]="CurvedDownArrow";
- mMap[106]="CloudCallout";
- mMap[107]="EllipseRibbon";
- mMap[108]="EllipseRibbon2";
- mMap[109]="FlowChartProcess";
- mMap[110]="FlowChartDecision";
- mMap[111]="FlowChartInputOutput";
- mMap[112]="FlowChartPredefinedProcess";
- mMap[113]="FlowChartInternalStorage";
- mMap[114]="FlowChartDocument";
- mMap[115]="FlowChartMultidocument";
- mMap[116]="FlowChartTerminator";
- mMap[117]="FlowChartPreparation";
- mMap[118]="FlowChartManualInput";
- mMap[119]="FlowChartManualOperation";
- mMap[120]="FlowChartConnector";
- mMap[121]="FlowChartPunchedCard";
- mMap[122]="FlowChartPunchedTape";
- mMap[123]="FlowChartSummingJunction";
- mMap[124]="FlowChartOr";
- mMap[125]="FlowChartCollate";
- mMap[126]="FlowChartSort";
- mMap[127]="FlowChartExtract";
- mMap[128]="FlowChartMerge";
- mMap[129]="FlowChartOfflineStorage";
- mMap[130]="FlowChartOnlineStorage";
- mMap[131]="FlowChartMagneticTape";
- mMap[132]="FlowChartMagneticDisk";
- mMap[133]="FlowChartMagneticDrum";
- mMap[134]="FlowChartDisplay";
- mMap[135]="FlowChartDelay";
- mMap[136]="TextPlainText";
- mMap[137]="TextStop";
- mMap[138]="TextTriangle";
- mMap[139]="TextTriangleInverted";
- mMap[140]="TextChevron";
- mMap[141]="TextChevronInverted";
- mMap[142]="TextRingInside";
- mMap[143]="TextRingOutside";
- mMap[144]="TextArchUpCurve";
- mMap[145]="TextArchDownCurve";
- mMap[146]="TextCircleCurve";
- mMap[147]="TextButtonCurve";
- mMap[148]="TextArchUpPour";
- mMap[149]="TextArchDownPour";
- mMap[150]="TextCirclePour";
- mMap[151]="TextButtonPour";
- mMap[152]="TextCurveUp";
- mMap[153]="TextCurveDown";
- mMap[154]="TextCascadeUp";
- mMap[155]="TextCascadeDown";
- mMap[156]="TextWave1";
- mMap[157]="TextWave2";
- mMap[158]="TextWave3";
- mMap[159]="TextWave4";
- mMap[160]="TextInflate";
- mMap[161]="TextDeflate";
- mMap[162]="TextInflateBottom";
- mMap[163]="TextDeflateBottom";
- mMap[164]="TextInflateTop";
- mMap[165]="TextDeflateTop";
- mMap[166]="TextDeflateInflate";
- mMap[167]="TextDeflateInflateDeflate";
- mMap[168]="TextFadeRight";
- mMap[169]="TextFadeLeft";
- mMap[170]="TextFadeUp";
- mMap[171]="TextFadeDown";
- mMap[172]="TextSlantUp";
- mMap[173]="TextSlantDown";
- mMap[174]="TextCanUp";
- mMap[175]="TextCanDown";
- mMap[176]="FlowChartAlternateProcess";
- mMap[177]="FlowChartOffpageConnector";
- mMap[178]="Callout90";
- mMap[179]="AccentCallout90";
- mMap[180]="BorderCallout90";
- mMap[181]="AccentBorderCallout90";
- mMap[182]="LeftRightUpArrow";
- mMap[183]="Sun";
- mMap[184]="Moon";
- mMap[185]="BracketPair";
- mMap[186]="BracePair";
- mMap[187]="Seal4";
- mMap[188]="DoubleWave";
- mMap[189]="ActionButtonBlank";
- mMap[190]="ActionButtonHome";
- mMap[191]="ActionButtonHelp";
- mMap[192]="ActionButtonInformation";
- mMap[193]="ActionButtonForwardNext";
- mMap[194]="ActionButtonBackPrevious";
- mMap[195]="ActionButtonEnd";
- mMap[196]="ActionButtonBeginning";
- mMap[197]="ActionButtonReturn";
- mMap[198]="ActionButtonDocument";
- mMap[199]="ActionButtonSound";
- mMap[200]="ActionButtonMovie";
- mMap[201]="HostControl";
- mMap[202]="TextBox";
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list