summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sal/qa/rtl/uri/rtl_Uri.cxx40
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx11
-rw-r--r--sc/source/ui/vba/vbaworkbook.hxx2
-rw-r--r--unotools/source/config/xmlaccelcfg.cxx9
-rwxr-xr-xunusedcode.easy29
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx50
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.hxx1
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx19
-rw-r--r--vcl/inc/generic/glyphcache.hxx2
9 files changed, 31 insertions, 132 deletions
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 7358099a7bb4..e142b1d5e901 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -41,52 +41,12 @@
namespace Stringtest
{
- rtl::OString toHex(unsigned char _c)
- {
- rtl::OStringBuffer sStrBuf;
- static char cHex[] = "0123456789ABCDEF";
-
- int nhigh = int(_c) >> 4 & 0xf;
- int nlow = int(_c) & 0xf;
- sStrBuf.append( cHex[nhigh] );
- sStrBuf.append( cHex[nlow] );
- return sStrBuf.makeStringAndClear();
- }
-
- rtl::OString escapeString(rtl::OString const& _sStr)
- {
- rtl::OStringBuffer sStrBuf;
- sal_Int32 nLength = _sStr.getLength();
- for(int i=0;i<nLength;++i)
- {
- unsigned char c = (unsigned char)_sStr[i];
- if (c > 127)
- {
- sStrBuf.append("%");
- sStrBuf.append(toHex(c));
- }
- else
- {
- sStrBuf.append((char)c);
- }
- }
- return sStrBuf.makeStringAndClear();
- }
-
// -----------------------------------------------------------------------------
class Convert : public CppUnit::TestFixture
{
rtl::OUString m_aStr;
public:
- /*
- rtl::OString toUTF8(rtl::OUString const& _suStr)
- {
- rtl::OString sStrAsUTF8 = rtl::OUStringToOString(_suStr, RTL_TEXTENCODING_UTF8);
- printf("%s\n", escapeString(sStrAsUTF8).getStr());
- return sStrAsUTF8;
- }
- */
rtl::OUString fromUTF8(rtl::OString const& _suStr)
{
rtl::OUString suStr = rtl::OStringToOUString(_suStr, RTL_TEXTENCODING_UTF8);
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 209facdef2b4..bccb701a7af2 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -190,17 +190,6 @@ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
init();
}
-namespace
-{
- class theScVbaWorkbookUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theScVbaWorkbookUnoTunnelId > {};
-}
-
-const uno::Sequence<sal_Int8>&
-ScVbaWorkbook::getUnoTunnelId()
-{
- return theScVbaWorkbookUnoTunnelId::get().getSeq();
-}
-
uno::Reference< excel::XWorksheet >
ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index 063d7c3e139d..7d32decd2f9f 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -50,8 +50,6 @@ public:
ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
virtual ~ScVbaWorkbook() {}
- static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
-
// Attributes
virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index 57ea43e4b4ce..543f3496599f 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -60,7 +60,6 @@ public:
public:
void addAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue );
- void clear();
private:
struct AttributeListImpl_impl *m_pImpl;
@@ -177,14 +176,6 @@ void AttributeListImpl::addAttribute( const OUString &sName ,
m_pImpl->vecAttribute.push_back( TagAttribute( sName , sType , sValue ) );
}
-void AttributeListImpl::clear()
-{
- ::std::vector<struct TagAttribute> dummy;
- m_pImpl->vecAttribute.swap( dummy );
-
- OSL_ASSERT( ! getLength() );
-}
-
} // anonymous namespace
Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException )
diff --git a/unusedcode.easy b/unusedcode.easy
index fab793529279..cdb8a53273e4 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,21 +1,44 @@
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
PopupMenu::SetSelectedEntry(unsigned short)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
+ScMenuFloatingWindow::getDoc()
ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
SvtSlideSorterBarOptions::AddListenerLink(Link const&)
SvtSlideSorterBarOptions::RemoveListenerLink(Link const&)
+SvtUserOptions::GetApartment() const
+SvtUserOptions::GetFathersName() const
+SvtUserOptions::SetApartment(rtl::OUString const&)
+SvtUserOptions::SetCity(rtl::OUString const&)
+SvtUserOptions::SetCompany(rtl::OUString const&)
+SvtUserOptions::SetCountry(rtl::OUString const&)
+SvtUserOptions::SetEmail(rtl::OUString const&)
+SvtUserOptions::SetFathersName(rtl::OUString const&)
+SvtUserOptions::SetFax(rtl::OUString const&)
+SvtUserOptions::SetFirstName(rtl::OUString const&)
+SvtUserOptions::SetID(rtl::OUString const&)
+SvtUserOptions::SetLastName(rtl::OUString const&)
+SvtUserOptions::SetPosition(rtl::OUString const&)
+SvtUserOptions::SetState(rtl::OUString const&)
+SvtUserOptions::SetStreet(rtl::OUString const&)
+SvtUserOptions::SetTelephoneHome(rtl::OUString const&)
+SvtUserOptions::SetTelephoneWork(rtl::OUString const&)
+SvtUserOptions::SetTitle(rtl::OUString const&)
+SvtUserOptions::SetZip(rtl::OUString const&)
TextEngine::GetLeftMargin() const
ThumbnailView::GetItemCount() const
ThumbnailView::ImplScroll(Point const&)
ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString const&, unsigned long)
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
+VbaFoundFiles::VbaFoundFiles(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
+VbaFoundFilesEnum::VbaFoundFilesEnum(com::sun::star::uno::Sequence<rtl::OUString>&)
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
+basctl::DbgName_DocShell()
binfilter::ImpSvtData::~ImpSvtData()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize()
@@ -70,8 +93,11 @@ dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString
formula::FormulaTokenIterator::First()
framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
+ooo::vba::excel::GetDocShellFromRanges(com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRangeContainer> const&)
+ooo::vba::excel::GetDocumentFromRange(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
oox::drawingml::TextParagraphProperties::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
+sax_fastparser::FastSaxSerializer::getSupportedServiceNames_Static()
sd::ClientBox::GetMinOutputSizePixel() const
sd::ClientBox::RemoveUnlocked()
sd::ClientBox::SetScrollHdl(Link const&)
@@ -88,3 +114,6 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
sd::ViewShellBase::RegisterFactory(unsigned short)
std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector()
+toolkit::ScrollableWrapper<Dialog>::getScrollVisibility()
+toolkit::ScrollableWrapper<GroupBox>::ScrollableWrapper(Window*, long)
+toolkit::ScrollableWrapper<GroupBox>::getScrollVisibility()
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 8ac55e40b28b..d4f2b02cfb5b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -341,8 +341,7 @@ FtFontInfo::~FtFontInfo()
delete mpChar2Glyph;
delete mpGlyph2Char;
#ifdef ENABLE_GRAPHITE
- if (mpGraphiteFace)
- delete mpGraphiteFace;
+ delete mpGraphiteFace;
#endif
}
@@ -416,7 +415,7 @@ bool FtFontInfo::HasExtraKerning() const
if( !mpExtraKernInfo )
return false;
// TODO: how to enable the line below without getting #i29881# back?
- // on the other hand being to optimistic doesn't cause problems
+ // on the other hand being too optimistic doesn't cause problems
// return mpExtraKernInfo->HasKernPairs();
return true;
}
@@ -432,19 +431,6 @@ int FtFontInfo::GetExtraKernPairs( ImplKernPairData** ppKernPairs ) const
// -----------------------------------------------------------------------
-int FtFontInfo::GetExtraGlyphKernValue( int nLeftGlyph, int nRightGlyph ) const
-{
- if( !mpExtraKernInfo )
- return 0;
- if( !mpGlyph2Char )
- return 0;
- sal_Unicode cLeftChar = (*mpGlyph2Char)[ nLeftGlyph ];
- sal_Unicode cRightChar = (*mpGlyph2Char)[ nRightGlyph ];
- return mpExtraKernInfo->GetUnscaledKernValue( cLeftChar, cRightChar );
-}
-
-// -----------------------------------------------------------------------
-
static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);}
//static signed GetSShort( const unsigned char* p ){ return((short)((p[0]<<8)+p[1]));}
@@ -1843,38 +1829,6 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c
}
// -----------------------------------------------------------------------
-// kerning stuff
-// -----------------------------------------------------------------------
-
-int ServerFont::GetGlyphKernValue( int nGlyphLeft, int nGlyphRight ) const
-{
- // if no kerning info is available from Freetype
- // then we may have to use extra info provided by e.g. psprint
- if( !FT_HAS_KERNING( maFaceFT ) || !FT_IS_SFNT( maFaceFT ) )
- {
- int nKernVal = mpFontInfo->GetExtraGlyphKernValue( nGlyphLeft, nGlyphRight );
- if( !nKernVal )
- return 0;
- // scale the kern value to match the font size
- const FontSelectPattern& rFSD = GetFontSelData();
- nKernVal *= rFSD.mnWidth ? rFSD.mnWidth : rFSD.mnHeight;
- return (nKernVal + 500) / 1000;
- }
-
- // when font faces of different sizes share the same maFaceFT
- // then we have to make sure that it uses the correct maSizeFT
- if( maSizeFT )
- pFTActivateSize( maSizeFT );
-
- // use Freetype's kerning info
- FT_Vector aKernVal;
- FT_Error rcFT = FT_Get_Kerning( maFaceFT, nGlyphLeft, nGlyphRight,
- FT_KERNING_DEFAULT, &aKernVal );
- int nResult = (rcFT == FT_Err_Ok) ? (aKernVal.x + 32) >> 6 : 0;
- return nResult;
-}
-
-// -----------------------------------------------------------------------
sal_uLong ServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) const
{
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 192704faaf1a..817b3d51ae53 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -102,7 +102,6 @@ public:
bool HasExtraKerning() const;
int GetExtraKernPairs( ImplKernPairData** ) const;
- int GetExtraGlyphKernValue( int nLeftGlyph, int nRightGlyph ) const;
private:
FT_FaceRec_* maFaceFT;
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 2ed37a79b14c..dc2f4e5ba00f 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -456,25 +456,6 @@ int ExtraKernInfo::GetUnscaledKernPairs( ImplKernPairData** ppKernPairs ) const
return nKernCount;
}
-//--------------------------------------------------------------------------
-
-int ExtraKernInfo::GetUnscaledKernValue( sal_Unicode cLeft, sal_Unicode cRight ) const
-{
- if( !mbInitialized )
- Initialize();
-
- if( maUnicodeKernPairs.empty() )
- return 0;
-
- ImplKernPairData aKernPair = { cLeft, cRight, 0 };
- UnicodeKernPairs::const_iterator it = maUnicodeKernPairs.find( aKernPair );
- if( it == maUnicodeKernPairs.end() )
- return 0;
-
- int nUnscaledValue = (*it).mnKern;
- return nUnscaledValue;
-}
-
// =======================================================================
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 6c6ca43a10c9..ff3eac78b124 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -208,7 +208,6 @@ public:
const unsigned char* GetTable( const char* pName, sal_uLong* pLength );
int GetEmUnits() const;
const FT_Size_Metrics& GetMetricsFT() const { return maSizeFT->metrics; }
- int GetGlyphKernValue( int, int ) const;
const ImplFontCharMap* GetImplFontCharMap() const;
bool GetFontCapabilities(vcl::FontCapabilities &) const;
@@ -402,7 +401,6 @@ public:
virtual ~ExtraKernInfo() {}
int GetUnscaledKernPairs( ImplKernPairData** ) const;
- int GetUnscaledKernValue( sal_Unicode cLeft, sal_Unicode cRight ) const;
protected:
mutable bool mbInitialized;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 00:11:23 +0000