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

Miklos Vajna vmiklos at collabora.co.uk
Sun Nov 3 20:34:47 CET 2013


 writerfilter/Library_writerfilter.mk        |    1 
 writerfilter/source/doctok/WW8FontTable.cxx |   60 ----------------------------
 writerfilter/source/doctok/resources.xmi    |    6 --
 3 files changed, 67 deletions(-)

New commits:
commit 75761f0fbb1765cf5f5ab241c84c7af984689f95
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 3 20:30:18 2013 +0100

    writerfilter: remove unused WW8Font class in doctok
    
    Change-Id: I483ccf31e6e67dec9f5c3992b362b63c5f14dfa3

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 4f04de5..90811dd 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -126,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
     writerfilter/source/doctok/WW8Annotation \
     writerfilter/source/doctok/WW8CpAndFc \
     writerfilter/source/doctok/WW8FKPImpl \
-    writerfilter/source/doctok/WW8FontTable \
     writerfilter/source/doctok/WW8Picture \
     writerfilter/source/doctok/WW8PropertySetImpl \
     writerfilter/source/doctok/WW8ResourceModelImpl \
diff --git a/writerfilter/source/doctok/WW8FontTable.cxx b/writerfilter/source/doctok/WW8FontTable.cxx
deleted file mode 100644
index 8c439ab..0000000
--- a/writerfilter/source/doctok/WW8FontTable.cxx
+++ /dev/null
@@ -1,60 +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 {
-
-sal_uInt32 WW8Font::get_f()
-{
-    return mnIndex;
-}
-
-OUString WW8Font::get_xszFfn()
-{
-    sal_uInt32 nOffset = 0x28;
-    sal_uInt32 nCount = get_cbFfnM1() - nOffset;
-
-    Sequence aSeq(mSequence, nOffset, nCount);
-
-    rtl_uString * pNew = 0;
-    rtl_uString_newFromStr
-        (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0]));
-
-    return OUString(pNew);
-}
-
-OUString WW8Font::get_altName()
-{
-    sal_uInt32 nOffset = 0x28 + get_ixchSzAlt();
-    sal_uInt32 nCount = get_cbFfnM1() - nOffset;
-
-    Sequence aSeq(mSequence, nOffset, nCount);
-
-    rtl_uString * pNew = 0;
-    rtl_uString_newFromStr
-        (&pNew, reinterpret_cast<const sal_Unicode *>(&aSeq[0]));
-
-    return OUString(pNew);
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 605b756..b5b8deb 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -3144,12 +3144,6 @@
         <!--Class FontTable-->
         <!--Class Font-->
         <UML:Class xmi.id="Font" name="Font">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="withindex"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>40</UML:TaggedValue.dataValue>


More information about the Libreoffice-commits mailing list