[Libreoffice-commits] .: 2 commits - basegfx/Library_basegfx.mk basegfx/source basegfx/StaticLibrary_basegfx_s.mk sot/source sw/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 5 06:37:19 PST 2012
basegfx/Library_basegfx.mk | 1
basegfx/StaticLibrary_basegfx_s.mk | 1
basegfx/source/polygon/b3dpolygonclipper.cxx | 132 ---------------------------
sot/source/sdstor/stgavl.cxx | 5 -
sot/source/sdstor/stgavl.hxx | 1
sot/source/sdstor/stgdir.hxx | 1
sw/source/filter/ww8/ww8par.cxx | 5 -
unusedcode.easy | 11 +-
8 files changed, 9 insertions(+), 148 deletions(-)
New commits:
commit b1bb3821f47cc5031798e62e2fecad3bb5dfd6ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 5 14:35:39 2012 +0000
Related: rhbz#799630 survive unknown/broken nIdctHint values
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7f7354f..f417f3d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2844,9 +2844,9 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
else if (nScript == MSASCII) //Force weak chars in ascii range to use LATIN font
nLclIdctHint = 0;
+ sal_uInt16 nForceFromFontId = 0;
if (nLclIdctHint != 0xFF)
{
- sal_uInt16 nForceFromFontId = 0;
switch (nLclIdctHint)
{
case 0:
@@ -2861,7 +2861,10 @@ void SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString& rAddS
default:
break;
}
+ }
+ if (nForceFromFontId != 0)
+ {
//Now we know that word would use the nForceFromFontId font for this range
//Try and determine what script writer would assign this range to
commit 273960e01f814656e12c960599fc49b5a4c4416e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 5 13:40:48 2012 +0000
callcatcher: update list
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 74c1412..0dc5f90 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/polygon/b3dpolygontools \
basegfx/source/polygon/b2dlinegeometry \
basegfx/source/polygon/b3dpolypolygontools \
- basegfx/source/polygon/b3dpolygonclipper \
basegfx/source/polygon/b2dpolygonclipper \
basegfx/source/polygon/b2dpolypolygoncutter \
basegfx/source/polygon/b2dpolygon \
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 62ecf98..001417f 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -98,7 +98,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/polygon/b3dpolygontools \
CustomTarget/basegfx/source/polygon/b2dlinegeometry \
CustomTarget/basegfx/source/polygon/b3dpolypolygontools \
- CustomTarget/basegfx/source/polygon/b3dpolygonclipper \
CustomTarget/basegfx/source/polygon/b2dpolygonclipper \
CustomTarget/basegfx/source/polygon/b2dpolypolygoncutter \
CustomTarget/basegfx/source/polygon/b2dpolygon \
diff --git a/basegfx/source/polygon/b3dpolygonclipper.cxx b/basegfx/source/polygon/b3dpolygonclipper.cxx
deleted file mode 100644
index 728fc46..0000000
--- a/basegfx/source/polygon/b3dpolygonclipper.cxx
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include <basegfx/polygon/b3dpolygonclipper.hxx>
-#include <osl/diagnose.h>
-#include <basegfx/polygon/b3dpolygontools.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/matrix/b3dhommatrix.hxx>
-#include <basegfx/polygon/b3dpolygontools.hxx>
-#include <basegfx/range/b3drange.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <basegfx/color/bcolor.hxx>
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace basegfx
-{
- namespace
- {
- inline bool impIsInside(const B3DPoint& rCandidate, double fPlaneOffset, tools::B3DOrientation ePlaneOrthogonal)
- {
- if(tools::B3DORIENTATION_X == ePlaneOrthogonal)
- {
- return fTools::moreOrEqual(rCandidate.getX(), fPlaneOffset);
- }
- else if(tools::B3DORIENTATION_Y == ePlaneOrthogonal)
- {
- return fTools::moreOrEqual(rCandidate.getY(), fPlaneOffset);
- }
- else
- {
- return fTools::moreOrEqual(rCandidate.getZ(), fPlaneOffset);
- }
- }
-
- inline double impGetCut(const B3DPoint& rCurrent, const B3DPoint& rNext, double fPlaneOffset, tools::B3DOrientation ePlaneOrthogonal)
- {
- if(tools::B3DORIENTATION_X == ePlaneOrthogonal)
- {
- return ((fPlaneOffset - rCurrent.getX())/(rNext.getX() - rCurrent.getX()));
- }
- else if(tools::B3DORIENTATION_Y == ePlaneOrthogonal)
- {
- return ((fPlaneOffset - rCurrent.getY())/(rNext.getY() - rCurrent.getY()));
- }
- else
- {
- return ((fPlaneOffset - rCurrent.getZ())/(rNext.getZ() - rCurrent.getZ()));
- }
- }
-
- void impAppendCopy(B3DPolygon& rDest, const B3DPolygon& rSource, sal_uInt32 nIndex)
- {
- rDest.append(rSource.getB3DPoint(nIndex));
-
- if(rSource.areBColorsUsed())
- {
- rDest.setBColor(rDest.count() - 1L, rSource.getBColor(nIndex));
- }
-
- if(rSource.areNormalsUsed())
- {
- rDest.setNormal(rDest.count() - 1L, rSource.getNormal(nIndex));
- }
-
- if(rSource.areTextureCoordinatesUsed())
- {
- rDest.setTextureCoordinate(rDest.count() - 1L, rSource.getTextureCoordinate(nIndex));
- }
- }
-
- void impAppendInterpolate(B3DPolygon& rDest, const B3DPolygon& rSource, sal_uInt32 nIndA, sal_uInt32 nIndB, double fCut)
- {
- const B3DPoint aCurrPoint(rSource.getB3DPoint(nIndA));
- const B3DPoint aNextPoint(rSource.getB3DPoint(nIndB));
- rDest.append(interpolate(aCurrPoint, aNextPoint, fCut));
-
- if(rSource.areBColorsUsed())
- {
- const BColor aCurrBColor(rSource.getBColor(nIndA));
- const BColor aNextBColor(rSource.getBColor(nIndB));
- rDest.setBColor(rDest.count() - 1L, interpolate(aCurrBColor, aNextBColor, fCut));
- }
-
- if(rSource.areNormalsUsed())
- {
- const B3DVector aCurrVector(rSource.getNormal(nIndA));
- const B3DVector aNextVector(rSource.getNormal(nIndB));
- rDest.setNormal(rDest.count() - 1L, interpolate(aCurrVector, aNextVector, fCut));
- }
-
- if(rSource.areTextureCoordinatesUsed())
- {
- const B2DPoint aCurrTxCo(rSource.getTextureCoordinate(nIndA));
- const B2DPoint aNextTxCo(rSource.getTextureCoordinate(nIndB));
- rDest.setTextureCoordinate(rDest.count() - 1L, interpolate(aCurrTxCo, aNextTxCo, fCut));
- }
- }
- }
-} // end of namespace basegfx
-
-//////////////////////////////////////////////////////////////////////////////
-
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx
index 4557212..554236a 100644
--- a/sot/source/sdstor/stgavl.cxx
+++ b/sot/source/sdstor/stgavl.cxx
@@ -406,9 +406,4 @@ StgAvlNode* StgAvlIterator::Next()
return Find( ++nCur );
}
-StgAvlNode* StgAvlIterator::Prev()
-{
- return Find( --nCur );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx
index 23e9d27..cadc676 100644
--- a/sot/source/sdstor/stgavl.hxx
+++ b/sot/source/sdstor/stgavl.hxx
@@ -71,7 +71,6 @@ public:
StgAvlIterator( StgAvlNode* );
StgAvlNode* First();
StgAvlNode* Next();
- StgAvlNode* Prev();
};
#endif
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index 8aaa359..8a4cf68 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -125,7 +125,6 @@ public:
StgIterator( StgDirEntry& rStg ) : StgAvlIterator( rStg.pDown ) {}
StgDirEntry* First() { return (StgDirEntry*) StgAvlIterator::First(); }
StgDirEntry* Next() { return (StgDirEntry*) StgAvlIterator::Next(); }
- StgDirEntry* Prev() { return (StgDirEntry*) StgAvlIterator::Prev(); }
};
#endif
diff --git a/unusedcode.easy b/unusedcode.easy
index 52a52e8..a628a35 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -78,6 +78,8 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
ScDBCollection::AnonDBs::size() const
+ScDPCache::GetDimensionIndex(rtl::OUString const&) const
+ScDPCache::GetIdByItemData(long, rtl::OUString const&) const
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
@@ -484,6 +486,8 @@ _ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
+basegfx::(anonymous namespace)::impAppendCopy(basegfx::B3DPolygon&, basegfx::B3DPolygon const&, unsigned int)
+basegfx::(anonymous namespace)::impAppendInterpolate(basegfx::B3DPolygon&, basegfx::B3DPolygon const&, unsigned int, unsigned int, double)
basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&, double const&)
basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, double const&)
basegfx::tools::getSignedArea(basegfx::B3DPolygon const&)
@@ -520,14 +524,10 @@ binfilter::ByteString::SearchAndReplaceAll(char const*, binfilter::ByteString co
binfilter::ByteString::SearchAndReplaceAll(char, char)
binfilter::ByteString::SetChar(unsigned short, char)
binfilter::ByteString::SetToken(unsigned short, char, binfilter::ByteString const&, unsigned short)
-binfilter::ByteString::ToUpperAscii()
binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short, unsigned short, unsigned short)
binfilter::CharPosArray::Replace(int const&, unsigned short)
binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-binfilter::Container::GetCurObject() const
-binfilter::Container::Insert(void*)
-binfilter::Container::Remove()
binfilter::Dictionary::~Dictionary()
binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueBucketMemArr const*, unsigned short, unsigned short, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
@@ -953,6 +953,7 @@ oox::AttributeConversion::decodeHyperHex(rtl::OUString const&)
oox::AttributeConversion::decodeUnsignedHex(rtl::OUString const&)
oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const
+oox::core::PowerPointExport::WriteTextStyle(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, int, int)
oox::core::XmlFilterBase::getChartConverter()
oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
@@ -1035,8 +1036,6 @@ sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Refe
sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*)
sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&)
sd::slidesorter::model::VisualState::SetVisualStateBlend(double)
-sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double)
-sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double)
sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const
sd::slidesorter::view::Button::IsDown() const
sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
More information about the Libreoffice-commits
mailing list