[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Nov 25 12:41:52 PST 2013


 writerfilter/Library_writerfilter.mk     |    1 
 writerfilter/source/doctok/WW8Table.cxx  |  128 -------------------------------
 writerfilter/source/doctok/resources.xmi |   36 --------
 3 files changed, 165 deletions(-)

New commits:
commit 4944da6a5475c3c9c25ea684077f94348fddd2e5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Nov 25 21:38:18 2013 +0100

    writerfilter: remove unused WW8Table in doctok
    
    Change-Id: I388339da81247c56aa70bd370c8ffb1fdcaf2de6

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 47133ff..7306cec 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -129,7 +129,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/doctok/WW8PropertySetImpl \
     writerfilter/source/doctok/WW8ResourceModelImpl \
     writerfilter/source/doctok/WW8StructBase \
-    writerfilter/source/doctok/WW8Table \
     writerfilter/source/filter/ImportFilter \
     writerfilter/source/filter/RtfFilter \
     writerfilter/source/filter/WriterFilter \
diff --git a/writerfilter/source/doctok/WW8Table.cxx b/writerfilter/source/doctok/WW8Table.cxx
deleted file mode 100644
index abc3cb4..0000000
--- a/writerfilter/source/doctok/WW8Table.cxx
+++ /dev/null
@@ -1,128 +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 {
-
-/* WW8sprmTDefTable */
-
-sal_uInt32 WW8sprmTDefTable::get_cellx_count()
-{
-    return getU8(0x4) + 1;
-}
-
-sal_uInt16 WW8sprmTDefTable::get_cellx(sal_uInt32 nIndex)
-{
-    return getU16(0x5 + nIndex * 2);
-}
-
-sal_uInt32 WW8sprmTDefTable::get_tc_count()
-{
-    return get_cellx_count() - 1;
-}
-
-writerfilter::Reference<Properties>::Pointer_t
-WW8sprmTDefTable::get_tc(sal_uInt32 pos)
-{
-    return writerfilter::Reference<Properties>::Pointer_t
-        (new WW8TC(this,
-                   0x5 + get_cellx_count() * 2 + pos * WW8TC::getSize()));
-}
-
-/* WW8sprmTTableBorders */
-
-sal_uInt32 WW8sprmTTableBorders::get_rgbbrc_count()
-{
-    return 6;
-}
-
-writerfilter::Reference<Properties>::Pointer_t
-WW8sprmTTableBorders::get_rgbbrc(sal_uInt32 pos)
-{
-    return writerfilter::Reference<Properties>::Pointer_t
-        (new WW8BRC(*this, 0x3 + pos * WW8BRC::getSize()));
-}
-
-/* WW8sprmTCellBottomColor */
-
-sal_uInt32 WW8sprmTCellBottomColor::get_cellBottomColor_count()
-{
-    return getU8(0x2) / 4;
-}
-
-sal_uInt32 WW8sprmTCellBottomColor::get_cellBottomColor(sal_uInt32 pos)
-{
-    return getU32(0x3 + 4 * pos);
-}
-
-/* WW8sprmTCellLeftColor */
-
-sal_uInt32 WW8sprmTCellLeftColor::get_cellLeftColor_count()
-{
-    return getU8(0x2) / 4;
-}
-
-sal_uInt32 WW8sprmTCellLeftColor::get_cellLeftColor(sal_uInt32 pos)
-{
-    return getU32(0x3 + 4 * pos);
-}
-
-/* WW8sprmTCellTopColor */
-
-sal_uInt32 WW8sprmTCellTopColor::get_cellTopColor_count()
-{
-    return getU8(0x2) / 4;
-}
-
-sal_uInt32 WW8sprmTCellTopColor::get_cellTopColor(sal_uInt32 pos)
-{
-    return getU32(0x3 + 4 * pos);
-}
-
-/* WW8sprmTCellRightColor */
-
-sal_uInt32 WW8sprmTCellRightColor::get_cellRightColor_count()
-{
-    return getU8(0x2) / 4;
-}
-
-sal_uInt32 WW8sprmTCellRightColor::get_cellRightColor(sal_uInt32 pos)
-{
-    return getU32(0x3 + 4 * pos);
-}
-
-/* WW8sprmTDefTableShd */
-
-sal_uInt32 WW8sprmTDefTableShd::get_shd_count()
-{
-    return getU8(0x2) / WW8SHD::getSize();
-}
-
-writerfilter::Reference<Properties>::Pointer_t
-WW8sprmTDefTableShd::get_shd(sal_uInt32 pos)
-{
-    return writerfilter::Reference<Properties>::Pointer_t
-        (new WW8SHD(*this, 0x3 + pos * WW8SHD::getSize()));
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 1d21370..52c3d01 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -36193,9 +36193,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD605</UML:TaggedValue.dataValue>
@@ -36319,9 +36316,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD608</UML:TaggedValue.dataValue>
@@ -36403,12 +36397,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8nocalcsize"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD609</UML:TaggedValue.dataValue>
@@ -37734,12 +37722,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8nocalcsize"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD61A</UML:TaggedValue.dataValue>
@@ -37801,12 +37783,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8nocalcsize"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD61B</UML:TaggedValue.dataValue>
@@ -37868,12 +37844,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8nocalcsize"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD61C</UML:TaggedValue.dataValue>
@@ -37935,12 +37905,6 @@
           <UML:ModelElement.stereotype>
             <UML:Stereotype xmi.idref="ww8sprm"/>
           </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8nocalcsize"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>0xD61D</UML:TaggedValue.dataValue>


More information about the Libreoffice-commits mailing list