[Libreoffice-commits] .: 2 commits - more_fonts/fonts more_fonts/prj ooo.lst.in unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jul 27 00:54:05 PDT 2012
more_fonts/fonts/ttf_liberation/makefile.mk | 44 ++++++--------
more_fonts/fonts/ttf_liberation_narrow/makefile.mk | 63 +++++++++++++++++++++
more_fonts/prj/build.lst | 1
more_fonts/prj/d.lst | 6 +-
ooo.lst.in | 1
unusedcode.easy | 44 --------------
6 files changed, 87 insertions(+), 72 deletions(-)
New commits:
commit eee01a685a53f2a6d0dc851beec3e770a4c916cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 27 08:52:18 2012 +0100
callcatcher: update unused code list post more stlificiation
Change-Id: I267233067c0b1efd18d8a78df5fb151f9b3c4993
diff --git a/unusedcode.easy b/unusedcode.easy
index 6935075..628563f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -18,20 +18,6 @@ ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short co
ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
ScDocument::GetFormattedAndUsedArea(short, short&, int&) const
ScDocument::InitializeAllNoteCaptions(bool)
-ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
-ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
-ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
-ScHTMLColOffset::Remove(unsigned long const&, unsigned short)
-ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
-ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
-ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
-ScRTFColTwips::Insert(unsigned long const&, unsigned short&)
-ScRTFColTwips::Insert(unsigned long const*, unsigned short)
-ScRTFColTwips::Remove(unsigned long const&, unsigned short)
-ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
-ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
-ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
ScTabView::HideCursor()
ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
@@ -40,12 +26,8 @@ ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Loca
ScXMLExport::HasDrawPages(com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheetDocument>&)
ScXMLImport::GetVisibleSheet()
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SmRtfExport::HandleUnaryOperation(SmUnHorNode const*, int)
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
SpinButton::SpinButton(Window*, ResId const&)
-SrchAttrItemList::Replace(SearchAttrItem const&, unsigned short)
-SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short)
-SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*)
StgCache::Pos2Page(int)
String::CreateFromAscii(char const*)
String::CreateFromAscii(char const*, unsigned short)
@@ -65,22 +47,11 @@ SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short)
SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned short)
SvxMSDffShapeInfos::Remove(SvxMSDffShapeInfo* const&, unsigned short)
SvxPositionSizeTabPage::GetRect()
-SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
-SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
-SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
-SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
-SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
-SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
SwBlockNames::Insert(SwBlockName const*&, unsigned short&)
SwBlockNames::Insert(SwBlockName const**, unsigned short)
SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short)
SwBlockNames::Remove(SwBlockName const*&, unsigned short)
SwBlockNames::Remove(unsigned short, unsigned short)
-SwRects::Replace(SwRect const&, unsigned short)
-SwRects::Replace(SwRect const*, unsigned short, unsigned short)
-SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*)
-SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
-SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
SwSortElements::Insert(SwSortElement* const&, unsigned short&)
SwSortElements::Insert(SwSortElement* const*, unsigned short)
SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
@@ -134,10 +105,6 @@ _CpyTabFrms::Remove(_CpyTabFrm const&, unsigned short)
_CpyTabFrms_SAR::Replace(_CpyTabFrm const&, unsigned short)
_CpyTabFrms_SAR::Replace(_CpyTabFrm const*, unsigned short, unsigned short)
_CpyTabFrms_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CpyTabFrm const&, void*), void*)
-_MapTblFrmFmts::Insert(_MapTblFrmFmts const*, unsigned short, unsigned short, unsigned short)
-_MapTblFrmFmts::Remove(unsigned short, unsigned short)
-_MapTblFrmFmts::Replace(_MapTblFrmFmt const&, unsigned short)
-_MapTblFrmFmts::Replace(_MapTblFrmFmt const*, unsigned short, unsigned short)
_MergePos::Insert(_CmpLPt const&, unsigned short&)
_MergePos::Insert(_CmpLPt const*, unsigned short)
_MergePos::Insert(_MergePos const*, unsigned short, unsigned short)
@@ -145,16 +112,6 @@ _MergePos::Remove(_CmpLPt const&, unsigned short)
_MergePos_SAR::Replace(_CmpLPt const&, unsigned short)
_MergePos_SAR::Replace(_CmpLPt const*, unsigned short, unsigned short)
_MergePos_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CmpLPt const&, void*), void*)
-_SwFtnIdxs::Insert(SwTxtFtn* const&, unsigned short&)
-_SwFtnIdxs::Insert(SwTxtFtn* const*, unsigned short)
-_SwFtnIdxs::Remove(SwTxtFtn* const&, unsigned short)
-_SwPamRanges::Insert(SwPamRange const&, unsigned short&)
-_SwPamRanges::Insert(SwPamRange const*, unsigned short)
-_SwPamRanges::Insert(_SwPamRanges const*, unsigned short, unsigned short)
-_SwPamRanges::Remove(SwPamRange const&, unsigned short)
-_SwPamRanges_SAR::Replace(SwPamRange const&, unsigned short)
-_SwPamRanges_SAR::Replace(SwPamRange const*, unsigned short, unsigned short)
-_SwPamRanges_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwPamRange const&, void*), void*)
_SwRedlineTbl::Insert(SwRedline* const*, unsigned short)
_SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short)
_SwRedlineTbl::Remove(SwRedline* const&, unsigned short)
@@ -173,7 +130,6 @@ binfilter::ScMyContentAction::~ScMyContentAction()
binfilter::ScMyDelAction::~ScMyDelAction()
binfilter::ScMyMoveAction::~ScMyMoveAction()
binfilter::ScMySharedData::~ScMySharedData()
-binfilter::ScRangeFindList::~ScRangeFindList()
binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SdrViewUserMarker::SdrViewUserMarker(binfilter::SdrPaintView*)
binfilter::ShellResource::~ShellResource()
commit cb2536da21dcbd63aecdbc5ec45933afeff61772
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 26 17:47:21 2012 +0100
bump liberation fonts to 2.0
The 2.0 fonts are rebased on the google fonts and are now OFL and have a
shed-load more glyphs in them. But note that current releases does not include
Liberation Sans Narrow font because that couldn't be relicensed to OFL, so we
retain the Narrow version from the old release.
Change-Id: Ibd71055eed804cfe7629fb8d2ea7b9c900ba5710
diff --git a/more_fonts/fonts/ttf_liberation/makefile.mk b/more_fonts/fonts/ttf_liberation/makefile.mk
index 3a77bc1..8669508 100644
--- a/more_fonts/fonts/ttf_liberation/makefile.mk
+++ b/more_fonts/fonts/ttf_liberation/makefile.mk
@@ -1,29 +1,20 @@
-#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
#
-# OpenOffice.org - a multi-platform office productivity suite
+# 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 is part of OpenOffice.org.
+# This file incorporates work covered by the following license notice:
#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
+# 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 .
#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
PRJ=..$/..
@@ -35,10 +26,12 @@ TARGET=ttf_liberation
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-
-TARFILE_NAME=liberation-fonts-ttf-1.07.1
-TARFILE_MD5=0be45d54cc5e1c2e3102e32b8c190346
-TARFILE_ROOTDIR=liberation-fonts-ttf-1.07.1
+# Note: Current release does not include Liberation Sans Narrow font because
+# that couldn't be relicensed to OFL, so we take the Narrow version from
+# the old release
+TARFILE_NAME=liberation-fonts-ttf-2.00.0
+TARFILE_MD5=cfbf1ac6f61bf6cf45342a0cc9381be5
+TARFILE_ROOTDIR=liberation-fonts-ttf-2.00.0
PATCH_FILES=
@@ -57,4 +50,3 @@ BUILD_FLAGS=
.IF "$(WITH_FONTS)"!="NO"
.INCLUDE : tg_ext.mk
.ENDIF
-
diff --git a/more_fonts/fonts/ttf_liberation_narrow/makefile.mk b/more_fonts/fonts/ttf_liberation_narrow/makefile.mk
new file mode 100644
index 0000000..3d8ea73
--- /dev/null
+++ b/more_fonts/fonts/ttf_liberation_narrow/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=more_fonts
+TARGET=ttf_liberation_narrow
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+# Note: Current release does not include Liberation Sans Narrow font because
+# that couldn't be relicensed to OFL, so we take the Narrow version from
+# the old release
+TARFILE_NAME=liberation-fonts-ttf-1.07.1
+TARFILE_MD5=0be45d54cc5e1c2e3102e32b8c190346
+TARFILE_ROOTDIR=liberation-fonts-ttf-1.07.1
+
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(WITH_FONTS)"!="NO"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/more_fonts/prj/build.lst b/more_fonts/prj/build.lst
index 94f4ec8..86d0861 100644
--- a/more_fonts/prj/build.lst
+++ b/more_fonts/prj/build.lst
@@ -1,6 +1,7 @@
bs more_fonts : solenv NULL
bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
bs more_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
+bs more_fonts\fonts\ttf_liberation_narrow nmake - all libe_fonts_narrow NULL
bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
bs more_fonts\fonts\ttf_linlibertineg nmake - all linl_fonts NULL
bs more_fonts\fonts\ttf_amt nmake - all amt_fonts NULL
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index f40f708..11cb588 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -3,8 +3,10 @@ mkdir: %COMMON_DEST%\pck
# TODO: replace explicit versions by wildcard when the build system learns to handle them
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf %COMMON_DEST%\pck\*.ttf
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE %COMMON_DEST%\pck\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*.ttf %COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt %COMMON_DEST%\pck\LICENSE_liberation
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*Narrow.ttf %COMMON_DEST%\pck\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt %COMMON_DEST%\pck\LICENSE_liberation_narrow
+..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/Liberation*.ttf %COMMON_DEST%\pck\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/License.txt %COMMON_DEST%\pck\LICENSE_liberation
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck\LICENSE_gentium
..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck\*.ttf
diff --git a/ooo.lst.in b/ooo.lst.in
index 7197b18..cc88ab1 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -15,6 +15,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
+cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
More information about the Libreoffice-commits
mailing list