[Libreoffice-commits] .: 8 commits - svl/inc svl/source svx/inc svx/source sw/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source vcl/win xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 12 04:44:58 PDT 2012
svl/inc/svl/nranges.hxx | 4 -
svl/source/items/itemset.cxx | 6 -
svl/source/items/nranges.cxx | 24 ------
svx/inc/svx/charmap.hxx | 3
svx/source/dialog/charmap.cxx | 6 +
sw/source/filter/inc/msfilter.hxx | 26 ------
sw/source/filter/rtf/swparrtf.cxx | 41 +---------
sw/source/filter/rtf/swparrtf.hxx | 2
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par.hxx | 2
sw/source/filter/ww8/ww8par4.cxx | 27 +------
unotools/inc/unotools/confignode.hxx | 16 ----
unotools/source/config/confignode.cxx | 5 -
unusedcode.easy | 24 ++----
vcl/inc/outdev.h | 4 -
vcl/inc/outfont.hxx | 11 +-
vcl/source/gdi/outdev3.cxx | 38 +++-------
vcl/win/source/gdi/salgdi3.cxx | 17 +++-
xmloff/Library_xo.mk | 1
xmloff/Package_inc.mk | 1
xmloff/inc/xmloff/VisAreaContext.hxx | 67 -----------------
xmloff/source/style/VisAreaContext.cxx | 125 ---------------------------------
23 files changed, 67 insertions(+), 387 deletions(-)
New commits:
commit 80e33b0cf3dbb5cfec90daf22068a71fb2669c4a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 12 11:00:24 2012 +0000
ditch SfxULongRanges
diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx
index badb3e9..84f0716 100644
--- a/svl/inc/svl/nranges.hxx
+++ b/svl/inc/svl/nranges.hxx
@@ -41,9 +41,6 @@
#include <svl/nranges.hxx>
#undef NUMTYPE
-#define NUMTYPE sal_uLong
-#define SfxNumRanges SfxULongRanges
-#include <svl/nranges.hxx>
#define _SFXNRANGES_HXX
@@ -62,7 +59,6 @@ public:
SfxNumRanges() : _pRanges( 0 ) {}
SfxNumRanges( const SfxNumRanges &rOrig );
SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2 );
- SfxNumRanges( NUMTYPE_ARG nWh1, NUMTYPE_ARG nWh2, NUMTYPE_ARG nNull, ... );
SfxNumRanges( const NUMTYPE* nNumTable );
~SfxNumRanges()
{ delete [] _pRanges; }
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index b526749..9eba806 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -58,12 +58,6 @@ DBG_NAME(SfxItemSet)
#undef NUMTYPE
#undef SfxNumRanges
-#define NUMTYPE sal_uLong
-#define SfxNumRanges SfxULongRanges
-#include "nranges.cxx"
-#undef NUMTYPE
-#undef SfxNumRanges
-
//========================================================================
#ifdef DBG_UTIL
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index c3d89d8..c7bf2e8 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -190,30 +190,6 @@ SfxNumRanges::SfxNumRanges( NUMTYPE nWhich1, NUMTYPE nWhich2 )
//------------------------------------------------------------------------
-SfxNumRanges::SfxNumRanges( NUMTYPE_ARG nWh0, NUMTYPE_ARG nWh1, NUMTYPE_ARG nNull, ... )
-
-/** <H3>Description</H3>
-
- Constructs an SfxNumRanges-instance from more than one sorted ranges of
- NUMTYPEs terminated with one 0.
-
- precondition: for each n >= 0 && n < nArgs
- nWh(2n) <= nWh(2n+1) && ( nWh(2n+2)-nWh(2n+1) ) > 1
-*/
-
-{
- va_list pArgs;
- va_start( pArgs, nNull );
- InitializeRanges_Impl(
- _pRanges, pArgs, sal::static_int_cast< NUMTYPE >(nWh0),
- sal::static_int_cast< NUMTYPE >(nWh1),
- sal::static_int_cast< NUMTYPE >(nNull));
- va_end(pArgs);
- DBG_CHECK_RANGES(NUMTYPE, _pRanges);
-}
-
-//------------------------------------------------------------------------
-
SfxNumRanges::SfxNumRanges( const NUMTYPE* pArr )
/** <H3>Description</H3>
diff --git a/unusedcode.easy b/unusedcode.easy
index 0a39eb2..b591d6a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -143,11 +143,6 @@ SfxUINT32s::Remove(unsigned short, unsigned short)
SfxUINT32s::Replace(unsigned int const&, unsigned short)
SfxUINT32s::Replace(unsigned int const*, unsigned short, unsigned short)
SfxUINT32s::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-SfxULongRanges::SfxULongRanges(int, int, int, ...)
-SfxULongRanges::SfxULongRanges(unsigned long const*)
-SfxULongRanges::SfxULongRanges(unsigned long, unsigned long)
-SfxULongRangesItem::SfxULongRangesItem(unsigned short, unsigned int const*)
-SfxUShortRanges::SfxUShortRanges(int, int, int, ...)
SfxUShortRangesItem::SfxUShortRangesItem(unsigned short, unsigned short const*)
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
commit da91ce535e51c814d56a6b1eddb44b5d71989261
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 12 10:41:35 2012 +0000
remove unused FontFamily argument in ImplFindByAttributes
move ImplFindByLocale to windows only code, rename to
findDevFontListByLocale
diff --git a/unusedcode.easy b/unusedcode.easy
index 26788bb..0a39eb2 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -21,7 +21,6 @@ HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
HTMLControls::Remove(HTMLControl const*&, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
ImpSvtData::~ImpSvtData()
-ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 8434aa5..090fd88 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -86,8 +86,8 @@ friend class ImplDevFontList; // TODO: remove soon
String maName; // Fontname (original font family name)
String maSearchName; // normalized font family name
String maMapNames; // fontname aliases
- sal_uIntPtr mnTypeFaces; // Typeface Flags
- sal_uIntPtr mnMatchType; // MATCH - Type
+ sal_uIntPtr mnTypeFaces; // Typeface Flags
+ sal_uIntPtr mnMatchType; // MATCH - Type
String maMatchFamilyName; // MATCH - FamilyName
FontWeight meMatchWeight; // MATCH - Weight
FontWidth meMatchWidth; // MATCH - Width
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 75871da..19c2c3a 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -228,18 +228,17 @@ public:
ImplGetDevFontList* GetDevFontList() const;
ImplGetDevSizeList* GetDevSizeList( const String& rFontName ) const;
- //used by 2-level font fallback
- ImplDevFontListData* ImplFindByLocale( com::sun::star::lang::Locale& ) const;
+ ImplDevFontListData* ImplFindByTokenNames(const rtl::OUString& rTokenStr) const;
protected:
void InitMatchData() const;
bool AreMapNamesAvailable() const { return mbMapNames; }
- ImplDevFontListData* ImplFindByTokenNames( const String& ) const;
- ImplDevFontListData* ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const;
+ ImplDevFontListData* ImplFindByAliasName(const rtl::OUString& rSearchName,
+ const rtl::OUString& rShortName) const;
ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
- ImplDevFontListData* ImplFindByAttributes( sal_uLong nSearchType, FontWeight, FontWidth,
- FontFamily, FontItalic, const String& rSearchFamily ) const;
+ ImplDevFontListData* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth,
+ FontItalic, const rtl::OUString& rSearchFamily) const;
ImplDevFontListData* FindDefaultFont() const;
private:
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 768f1e8..67ef1fe 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1543,14 +1543,15 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySearchName( const String& rSearc
// -----------------------------------------------------------------------
-ImplDevFontListData* ImplDevFontList::ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const
+ImplDevFontListData* ImplDevFontList::ImplFindByAliasName(const rtl::OUString& rSearchName,
+ const rtl::OUString& rShortName) const
{
// short circuit for impossible font name alias
- if( !rSearchName.Len() )
+ if (rSearchName.isEmpty())
return NULL;
// short circuit if no alias names are available
- if( !mbMapNames )
+ if (!mbMapNames)
return NULL;
// use the font's alias names to find the font
@@ -1563,7 +1564,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAliasName( const String& rSearch
continue;
// if one alias name matches we found a matching font
- String aTempName;
+ rtl::OUString aTempName;
xub_StrLen nIndex = 0;
do
{
@@ -1591,7 +1592,7 @@ ImplDevFontListData* ImplDevFontList::FindFontFamily( const String& rFontName )
// -----------------------------------------------------------------------
-ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames( const String& rTokenStr ) const
+ImplDevFontListData* ImplDevFontList::ImplFindByTokenNames(const rtl::OUString& rTokenStr) const
{
ImplDevFontListData* pFoundData = NULL;
@@ -1635,10 +1636,9 @@ ImplDevFontListData* ImplDevFontList::ImplFindBySubstFontAttr( const utl::FontNa
const FontWeight eSearchWeight = rFontAttr.Weight;
const FontWidth eSearchWidth = rFontAttr.Width;
const FontItalic eSearchSlant = ITALIC_DONTKNOW;
- const FontFamily eSearchFamily = FAMILY_DONTKNOW;
const String aSearchName;
pFoundData = ImplFindByAttributes( nSearchType,
- eSearchWeight, eSearchWidth, eSearchFamily, eSearchSlant, aSearchName );
+ eSearchWeight, eSearchWidth, eSearchSlant, aSearchName );
if( pFoundData )
return pFoundData;
}
@@ -1668,20 +1668,11 @@ void ImplDevFontList::InitMatchData() const
}
}
-//----------------------------------------------------------------------------
-ImplDevFontListData* ImplDevFontList::ImplFindByLocale( com::sun::star::lang::Locale& rLocale ) const
-{
- // get the default font for a specified locale
- const DefaultFontConfiguration& rDefaults = DefaultFontConfiguration::get();
- const String aDefault = rDefaults.getUserInterfaceFont( rLocale );
- return ImplFindByTokenNames( aDefault );
-}
-
// -----------------------------------------------------------------------
ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchType,
- FontWeight eSearchWeight, FontWidth eSearchWidth, FontFamily /*eSearchFamily*/,
- FontItalic eSearchItalic, const String& rSearchFamilyName ) const
+ FontWeight eSearchWeight, FontWidth eSearchWidth,
+ FontItalic eSearchItalic, const rtl::OUString& rSearchFamilyName ) const
{
if( (eSearchItalic != ITALIC_NONE) && (eSearchItalic != ITALIC_DONTKNOW) )
nSearchType |= IMPL_FONT_ATTR_ITALIC;
@@ -1789,7 +1780,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchTyp
nTestMatch -= 10000;
// match stripped family name
- if( rSearchFamilyName.Len() && (rSearchFamilyName == pData->maMatchFamilyName) )
+ if( !rSearchFamilyName.isEmpty() && (rSearchFamilyName.equals(pData->maMatchFamilyName)) )
nTestMatch += 1000000*3;
// match ALLSCRIPT? attribute
@@ -1882,8 +1873,8 @@ ImplDevFontListData* ImplDevFontList::ImplFindByAttributes( sal_uLong nSearchTyp
// test font name substrings
// TODO: calculate name matching score using e.g. Levenstein distance
- if( (rSearchFamilyName.Len() >= 4) && (pData->maMatchFamilyName.Len() >= 4)
- && ((rSearchFamilyName.Search( pData->maMatchFamilyName ) != STRING_NOTFOUND)
+ if( (rSearchFamilyName.getLength() >= 4) && (pData->maMatchFamilyName.Len() >= 4)
+ && ((rSearchFamilyName.indexOf( pData->maMatchFamilyName ) != -1)
|| (pData->maMatchFamilyName.Search( rSearchFamilyName ) != STRING_NOTFOUND)) )
nTestMatch += 5000;
@@ -2715,7 +2706,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD,
ImplCalcType( nSearchType, eSearchWeight, eSearchWidth, rFSD.meFamily, pFontAttr );
ImplDevFontListData* pFoundData = ImplFindByAttributes( nSearchType,
- eSearchWeight, eSearchWidth, rFSD.meFamily, rFSD.meItalic, aSearchFamilyName );
+ eSearchWeight, eSearchWidth, rFSD.meItalic, aSearchFamilyName );
if( pFoundData )
{
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 2cea959..3e24d75 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -544,6 +544,19 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const ImplFontData* pFace,
return bHasMatches;
}
+namespace
+{
+ //used by 2-level font fallback
+ ImplDevFontListData* findDevFontListByLocale(const ImplDevFontList &rDevFontList,
+ const com::sun::star::lang::Locale& rLocale )
+ {
+ // get the default font for a specified locale
+ const DefaultFontConfiguration& rDefaults = DefaultFontConfiguration::get();
+ const rtl::OUString aDefault = rDefaults.getUserInterfaceFont(rLocale);
+ return rDevFontList.ImplFindByTokenNames(aDefault);
+ }
+}
+
// find a fallback font for missing characters
// TODO: should stylistic matches be searched and prefered?
bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, rtl::OUString& rMissingChars ) const
@@ -571,7 +584,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
// first level fallback:
// try use the locale specific default fonts defined in VCL.xcu
const ImplDevFontList* pDevFontList = ImplGetSVData()->maGDIData.mpScreenFontList;
- /*const*/ ImplDevFontListData* pDevFont = pDevFontList->ImplFindByLocale( aLocale );
+ /*const*/ ImplDevFontListData* pDevFont = findDevFontListByLocale(*pDevFontList, aLocale);
if( pDevFont )
{
const ImplFontData* pFace = pDevFont->FindBestFontFace( rFontSelData );
@@ -585,7 +598,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
// are the missing characters symbols?
pDevFont = pDevFontList->ImplFindByAttributes( IMPL_FONT_ATTR_SYMBOL,
rFontSelData.meWeight, rFontSelData.meWidthType,
- rFontSelData.meFamily, rFontSelData.meItalic, rFontSelData.maSearchName );
+ rFontSelData.meItalic, rFontSelData.maSearchName );
if( pDevFont )
{
const ImplFontData* pFace = pDevFont->FindBestFontFace( rFontSelData );
commit 7e16ec0347453851ef2f8870cfcf9fdbbc6bb99f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 12 09:58:10 2012 +0000
pointless comparison
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index ac507af..768f1e8 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1674,10 +1674,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByLocale( com::sun::star::lang::Lo
// get the default font for a specified locale
const DefaultFontConfiguration& rDefaults = DefaultFontConfiguration::get();
const String aDefault = rDefaults.getUserInterfaceFont( rLocale );
- ImplDevFontListData* pFontData = ImplFindByTokenNames( aDefault );
- if( pFontData )
- return pFontData;
- return NULL;
+ return ImplFindByTokenNames( aDefault );
}
// -----------------------------------------------------------------------
commit e939c272a092546de0793523146e80f7d032d5dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 12 09:47:39 2012 +0000
remove unused VisAreaContext.[c|h]xx
diff --git a/unusedcode.easy b/unusedcode.easy
index 7634899..26788bb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -403,7 +403,6 @@ XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
-XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, short)
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
_CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&)
_CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short)
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 68070d5..fe3d146 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -222,7 +222,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/style/SinglePropertySetInfoCache \
xmloff/source/style/StyleMap \
xmloff/source/style/TransGradientStyle \
- xmloff/source/style/VisAreaContext \
xmloff/source/style/WordWrapPropertyHdl \
xmloff/source/style/XMLBackgroundImageContext \
xmloff/source/style/XMLBackgroundImageExport \
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
index fc7f921..c1c142c 100644
--- a/xmloff/Package_inc.mk
+++ b/xmloff/Package_inc.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLExportHelper.hxx,x
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SchXMLImportHelper.hxx,xmloff/SchXMLImportHelper.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SettingsExportHelper.hxx,xmloff/SettingsExportHelper.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/SinglePropertySetInfoCache.hxx,xmloff/SinglePropertySetInfoCache.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/VisAreaContext.hxx,xmloff/VisAreaContext.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/WordWrapPropertyHdl.hxx,xmloff/WordWrapPropertyHdl.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLBase64ImportContext.hxx,xmloff/XMLBase64ImportContext.hxx))
$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/XMLCharContext.hxx,xmloff/XMLCharContext.hxx))
diff --git a/xmloff/inc/xmloff/VisAreaContext.hxx b/xmloff/inc/xmloff/VisAreaContext.hxx
deleted file mode 100644
index 0f9e7bd..0000000
--- a/xmloff/inc/xmloff/VisAreaContext.hxx
+++ /dev/null
@@ -1,67 +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.
- *
- ************************************************************************/
-
-#ifndef _XMLOFF_VISAREACONTEXT_HXX
-#define _XMLOFF_VISAREACONTEXT_HXX
-
-#include <xmloff/xmlictxt.hxx>
-
-class Rectangle;
-
-namespace com { namespace sun { namespace star { namespace awt {
- struct Rectangle;
-} } } }
-
-class XMLVisAreaContext : public SvXMLImportContext
-{
-public:
- // read all attributes and set the values in rRect
- XMLVisAreaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- Rectangle& rRect,
- const sal_Int16 eMeasureUnit);
-
- virtual ~XMLVisAreaContext();
-
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
- virtual void EndElement();
-
-private:
- void process( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
- ::com::sun::star::awt::Rectangle& rRect,
- const sal_Int16 nMeasureUnit );
-
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx
deleted file mode 100644
index cbb5f3a..0000000
--- a/xmloff/source/style/VisAreaContext.cxx
+++ /dev/null
@@ -1,125 +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 ---------------------------------------------------------------
-#include "xmloff/VisAreaContext.hxx"
-#include <xmloff/xmltoken.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmlimp.hxx>
-#include <sax/tools/converter.hxx>
-#include <tools/gen.hxx>
-
-using namespace com::sun::star;
-using namespace ::xmloff::token;
-
-//------------------------------------------------------------------
-
-XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& xAttrList,
- Rectangle& rRect,
- const sal_Int16 eMeasureUnit )
-:
- SvXMLImportContext( rImport, nPrfx, rLName )
-{
- awt::Rectangle rAwtRect( rRect.getX(), rRect.getY(), rRect.getWidth(), rRect.getHeight() );
- process( xAttrList, rAwtRect, eMeasureUnit );
-
- rRect.setX( rAwtRect.X );
- rRect.setY( rAwtRect.Y );
- rRect.setWidth( rAwtRect.Width );
- rRect.setHeight( rAwtRect.Height );
-}
-
-XMLVisAreaContext::~XMLVisAreaContext()
-{
-}
-
-void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList>& xAttrList, awt::Rectangle& rRect, const sal_Int16 nMeasureUnit )
-{
- sal_Int32 nX(0);
- sal_Int32 nY(0);
- sal_Int32 nWidth(0);
- sal_Int32 nHeight(0);
- sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- for( sal_Int16 i=0; i < nAttrCount; i++ )
- {
- rtl::OUString sAttrName = xAttrList->getNameByIndex( i );
- rtl::OUString aLocalName;
- sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
- rtl::OUString sValue = xAttrList->getValueByIndex( i );
-
- if (nPrefix == XML_NAMESPACE_OFFICE)
- {
- if (IsXMLToken( aLocalName, XML_X ))
- {
- ::sax::Converter::convertMeasure(nX, sValue, nMeasureUnit);
- rRect.X = nX;
- }
- else if (IsXMLToken( aLocalName, XML_Y ))
- {
- ::sax::Converter::convertMeasure(nY, sValue, nMeasureUnit);
- rRect.Y = nY;
- }
- else if (IsXMLToken( aLocalName, XML_WIDTH ))
- {
- ::sax::Converter::convertMeasure(nWidth, sValue, nMeasureUnit);
- rRect.Width = nWidth;
- }
- else if (IsXMLToken( aLocalName, XML_HEIGHT ))
- {
- ::sax::Converter::convertMeasure(nHeight, sValue, nMeasureUnit);
- rRect.Height = nHeight;
- }
- }
- }
-}
-
-SvXMLImportContext *XMLVisAreaContext::CreateChildContext( sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::sax::XAttributeList>& )
-{
- // here is no context
- SvXMLImportContext *pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
- return pContext;
-}
-
-void XMLVisAreaContext::EndElement()
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9a46b626c5e8bfbc478fe765aaaee61d1e56d037
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 12 09:36:09 2012 +0000
fix SvxShowCharSetItem leak
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 7e86391..f5bb08b 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -33,6 +33,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/metric.hxx>
#include <vcl/scrbar.hxx>
+#include <boost/shared_ptr.hpp>
#include <map>
#include <tools/shl.hxx>
#include "svx/svxdllapi.h"
@@ -106,7 +107,7 @@ protected:
private:
- typedef ::std::map<sal_Int32, ::svx::SvxShowCharSetItem*> ItemsMap;
+ typedef ::std::map<sal_Int32, boost::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap;
ItemsMap m_aItems;
Link aDoubleClkHdl;
Link aSelectHdl;
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index e3a40b2..8a1974b 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -677,7 +677,9 @@ void SvxShowCharSet::ReleaseAccessible()
if ( aFind == m_aItems.end() )
{
OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?");
- aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< sal_uInt16 >(_nPos)))).first;
+ boost::shared_ptr<svx::SvxShowCharSetItem> xItem(new svx::SvxShowCharSetItem(*this,
+ m_pAccessible->getTable(), sal::static_int_cast< sal_uInt16 >(_nPos)));
+ aFind = m_aItems.insert(ItemsMap::value_type(_nPos, xItem)).first;
rtl::OUStringBuffer buf;
buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) );
aFind->second->maText = buf.makeStringAndClear();
@@ -685,7 +687,7 @@ void SvxShowCharSet::ReleaseAccessible()
aFind->second->maRect = Rectangle( Point( pix.X() + 1, pix.Y() + 1 ), Size(nX-1,nY-1) );
}
- return aFind->second;
+ return aFind->second.get();
}
// -----------------------------------------------------------------------------
diff --git a/unusedcode.easy b/unusedcode.easy
index 9ee4a9b..7634899 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1023,7 +1023,6 @@ std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector()
std::__cxx1998::vector<ServiceInfo*, std::allocator<ServiceInfo*> >::~vector()
std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
svt::FrameStatusListener::removeStatusListener(rtl::OUString const&)
-svx::SvxShowCharSetItem::~SvxShowCharSetItem()
svxform::DataNavigatorManager::GetChildWindowId()
svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
svxform::NavigatorFrameManager::GetChildWindowId()
commit 4be58b0b9d2817be716a0271320c70064d2b3d88
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 10 20:54:06 2012 +0000
this massive rigmarole is just to map a msword author id to a writer author id
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index e24dab4..3958f74 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -141,30 +141,8 @@ namespace sw
namespace util
{
- struct AuthorInfo;
- typedef AuthorInfo* AuthorInfo_Ptr;
-
- /// Redlining Authors
- struct AuthorInfo
- {
- sal_uInt16 nWWAuthorId;
- sal_uInt16 nOurId;
-
- AuthorInfo(sal_uInt16 nWWAuthorId_, sal_uInt16 nOurId_ = 0):
- nWWAuthorId( nWWAuthorId_ ),
- nOurId( nOurId_ )
- {}
- bool operator==(const AuthorInfo& rEntry) const
- {
- return (nWWAuthorId == rEntry.nWWAuthorId);
- }
- bool operator<(const AuthorInfo& rEntry) const
- {
- return (nWWAuthorId < rEntry.nWWAuthorId);
- }
- };
-
- SV_DECL_PTRARR_SORT_DEL(AuthorInfos, AuthorInfo_Ptr,16)
+ /// Redlining Authors, map word author key to writer author value
+ typedef std::map<sal_uInt16, sal_uInt16> AuthorInfos;
/** Clips a value to MAX/MIN 16bit value to make it safe for use
as a position value to give to writer. i.e. +-57.8cm. Sometimes
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 2f6ee4d..8367a4a 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -235,7 +235,6 @@ SwRTFParser::SwRTFParser(SwDoc* pD,
aTblFmts(0),
mpBookmarkStart(0),
mpRedlineStack(0),
- pAuthorInfos(0),
pGrfAttrSet(0),
pTableNode(0),
pOldTblNd(0),
@@ -1151,8 +1150,6 @@ SwRTFParser::~SwRTFParser()
if (pGrfAttrSet)
DELETEZ( pGrfAttrSet );
-
- DELETEZ( pAuthorInfos );
}
//i19718
@@ -1591,11 +1588,7 @@ sal_uInt16 SwRTFParser::ReadRevTbl()
sal_uInt16 nSWId = pDoc->InsertRedlineAuthor(aToken);
// Store matchpair
- if( !pAuthorInfos )
- pAuthorInfos = new sw::util::AuthorInfos;
- sw::util::AuthorInfo* pAutorInfo = new sw::util::AuthorInfo( nAuthorTableIndex, nSWId );
- if( 0 == pAuthorInfos->Insert( pAutorInfo ) )
- delete pAutorInfo;
+ m_aAuthorInfos[nAuthorTableIndex] = nSWId;
aRevTbl.push_back(aToken);
nAuthorTableIndex++;
@@ -1840,38 +1833,18 @@ void SwRTFParser::NextToken( int nToken )
break;
case RTF_REVAUTH:
+ if (pRedlineInsert)
{
- sw::util::AuthorInfo aEntry( static_cast< sal_uInt16 >(nTokenValue) );
- sal_uInt16 nPos;
-
- if(pRedlineInsert)
- {
- if (pAuthorInfos && pAuthorInfos->Seek_Entry(&aEntry, &nPos))
- {
- if (const sw::util::AuthorInfo* pAuthor = pAuthorInfos->GetObject(nPos))
- {
- pRedlineInsert->nAutorNo = pAuthor->nOurId;
- }
- }
- }
+ sal_uInt16 nRevAuth = static_cast<sal_uInt16>(nTokenValue);
+ pRedlineInsert->nAutorNo = m_aAuthorInfos[nRevAuth];
}
break;
case RTF_REVAUTHDEL:
+ if(pRedlineDelete)
{
- sw::util::AuthorInfo aEntry( static_cast< short >(nTokenValue) );
- sal_uInt16 nPos;
-
- if(pRedlineDelete)
- {
- if (pAuthorInfos && pAuthorInfos->Seek_Entry(&aEntry, &nPos))
- {
- if (const sw::util::AuthorInfo* pAuthor = pAuthorInfos->GetObject(nPos))
- {
- pRedlineDelete->nAutorNo = pAuthor->nOurId;
- }
- }
- }
+ sal_uInt16 nRevAuthDel = static_cast<sal_uInt16>(nTokenValue);
+ pRedlineDelete->nAutorNo = m_aAuthorInfos[nRevAuthDel];
}
break;
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index 31c2bae..feab408 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -294,7 +294,7 @@ class SwRTFParser : public SvxRTFParser
SvPtrarr aRubyCharFmts;
BookmarkPosition* mpBookmarkStart;
sw::util::RedlineStack *mpRedlineStack;
- sw::util::AuthorInfos* pAuthorInfos;
+ sw::util::AuthorInfos m_aAuthorInfos;
SfxItemSet* pGrfAttrSet;
SwTableNode* pTableNode, *pOldTblNd; // fuers Lesen von Tabellen: akt. Tab
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 2442722..e96dfaa 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -324,8 +324,6 @@ namespace sw
namespace util
{
- SV_IMPL_OP_PTRARR_SORT(AuthorInfos, AuthorInfo_Ptr)
-
SwTwips MakeSafePositioningValue(SwTwips nIn)
{
if (nIn > SHRT_MAX)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9b79d23..99db4da 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3623,7 +3623,6 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
maTxtNodesHavingLeftIndentSet(), // #i105414#
pMSDffManager(0),
mpAtnNames(0),
- pAuthorInfos(0),
sBaseURL(rBaseURL),
m_bRegardHindiDigits( false ),
mbNewDoc(bNewDoc),
@@ -4721,7 +4720,6 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
delete pWDop;
DELETEZ( pFonts );
delete mpAtnNames;
- DELETEZ( pAuthorInfos );
delete mpSprmParser;
::EndProgress(mpDocShell);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 32cfe03..cdc495d 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1113,7 +1113,7 @@ private:
std::vector<String>* mpAtnNames;
- sw::util::AuthorInfos* pAuthorInfos;
+ sw::util::AuthorInfos m_aAuthorInfos;
String sBaseURL;
// Ini-Flags:
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 6b44d82..083fbd2 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -466,11 +466,7 @@ void SwWW8ImplReader::ReadRevMarkAuthorStrTabl( SvStream& rStrm,
// Store author in doc
sal_uInt16 nSWId = rDocOut.InsertRedlineAuthor(aAuthorNames[nAuthor]);
// Store matchpair
- if( !pAuthorInfos )
- pAuthorInfos = new sw::util::AuthorInfos;
- sw::util::AuthorInfo* pAutorInfo = new sw::util::AuthorInfo( nAuthor, nSWId );
- if( 0 == pAuthorInfos->Insert( pAutorInfo ) )
- delete pAutorInfo;
+ m_aAuthorInfos[nAuthor] = nSWId;
}
}
@@ -524,21 +520,12 @@ void SwWW8ImplReader::Read_CRevisionMark(RedlineType_t eType,
else
{
// start of new revision mark, if not there default to first entry
- sal_uInt16 nWWAutNo = pSprmCIbstRMark ? SVBT16ToShort( pSprmCIbstRMark ) : 0;
- sw::util::AuthorInfo aEntry(nWWAutNo);
- sal_uInt16 nPos;
- if (pAuthorInfos && pAuthorInfos->Seek_Entry(&aEntry, &nPos))
- {
- if (const sw::util::AuthorInfo* pAuthor = pAuthorInfos->GetObject(nPos))
- {
- sal_uInt32 nWWDate = pSprmCDttmRMark ? SVBT32ToUInt32(pSprmCDttmRMark): 0;
- DateTime aStamp(sw::ms::DTTM2DateTime(nWWDate));
- sal_uInt16 nAutorNo = pAuthor->nOurId;
- SwFltRedline aNewAttr(eType, nAutorNo, aStamp);
-
- NewAttr(aNewAttr);
- }
- }
+ sal_uInt16 nWWAutNo = pSprmCIbstRMark ? SVBT16ToShort(pSprmCIbstRMark) : 0;
+ sal_uInt32 nWWDate = pSprmCDttmRMark ? SVBT32ToUInt32(pSprmCDttmRMark): 0;
+ DateTime aStamp(sw::ms::DTTM2DateTime(nWWDate));
+ sal_uInt16 nAuthorNo = m_aAuthorInfos[nWWAutNo];
+ SwFltRedline aNewAttr(eType, nAuthorNo, aStamp);
+ NewAttr(aNewAttr);
}
}
diff --git a/unusedcode.easy b/unusedcode.easy
index 7c230cf..9ee4a9b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1033,9 +1033,4 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short)
svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray const*, unsigned short, unsigned short)
svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const&, unsigned short)
sw::mark::MarkManager::dumpFieldmarks() const
-sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const&, unsigned short&)
-sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const*, unsigned short)
-sw::util::AuthorInfos::Insert(sw::util::AuthorInfos const*, unsigned short, unsigned short)
-sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const&, unsigned short)
-sw::util::AuthorInfos::Remove(unsigned short, unsigned short)
vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
commit a43bd907062a3925c12b3ba3909bf974e9f2914b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 10 20:36:56 2012 +0000
callcatcher: remove some unused code
diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx
index f1567a6..3ed478b 100644
--- a/unotools/inc/unotools/confignode.hxx
+++ b/unotools/inc/unotools/confignode.hxx
@@ -126,22 +126,6 @@ namespace utl
return createNode( ::rtl::OUString::createFromAscii( _pAsciiName ) );
}
- /** appends a node under a new name
-
- If the object represents a set node, this method may be used to create a new child. For non-set-nodes, the
- method will fail.<br/>
- Unless the respective operations on the pure configuration API, the to-be-created node immediately
- becomes a part of it's hierarchy, no explicit insertion is necessary.
- @param _rName name for the new child. Must be level-1-depth.
- @param _aNewNode the node which should be appended
- */
- OConfigurationNode appendNode(const ::rtl::OUString& _rName,const OConfigurationNode& _aNewNode) const throw();
-
- OConfigurationNode appendNode( const sal_Char* _pAsciiName, const OConfigurationNode& _aNewNode ) const
- {
- return appendNode( ::rtl::OUString::createFromAscii( _pAsciiName ), _aNewNode );
- }
-
/** remove an existent child nod
If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes,
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 12c6ad0..68f6e92 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -297,11 +297,6 @@ namespace utl
}
//------------------------------------------------------------------------
- OConfigurationNode OConfigurationNode::appendNode(const ::rtl::OUString& _rName,const OConfigurationNode& _aNewNode) const throw()
- {
- return insertNode(_rName,_aNewNode.m_xDirectAccess);
- }
- //------------------------------------------------------------------------
OConfigurationNode OConfigurationNode::openNode(const ::rtl::OUString& _rPath) const throw()
{
OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::openNode: object is invalid!");
diff --git a/unusedcode.easy b/unusedcode.easy
index 1d9bf46..7c230cf 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -77,6 +77,7 @@ ScDPCache::ClearGroupFields()
ScDPCache::GetGroupDimMemberValues(long) const
ScDPCache::GetGroupFieldCount() const
ScDPInitState::GetNameIdForIndex(long) const
+ScDPItemData::ScDPItemData(double)
ScDPItemData::SetGroupValue(int, int)
ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
ScDPResultData::IsInGroup(ScDPItemData const&, long, long, long) const
@@ -1037,5 +1038,4 @@ sw::util::AuthorInfos::Insert(sw::util::AuthorInfo* const*, unsigned short)
sw::util::AuthorInfos::Insert(sw::util::AuthorInfos const*, unsigned short, unsigned short)
sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const&, unsigned short)
sw::util::AuthorInfos::Remove(unsigned short, unsigned short)
-utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
commit 2371d13d3f03a11577492918a2dfcc9447283a43
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 10 14:55:24 2012 +0000
callcatcher: update list
diff --git a/unusedcode.easy b/unusedcode.easy
index 38f62a8..1d9bf46 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -73,8 +73,13 @@ 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
+ScDPCache::ClearGroupFields()
+ScDPCache::GetGroupDimMemberValues(long) const
+ScDPCache::GetGroupFieldCount() const
+ScDPInitState::GetNameIdForIndex(long) const
+ScDPItemData::SetGroupValue(int, int)
+ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
+ScDPResultData::IsInGroup(ScDPItemData const&, long, long, long) 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)
More information about the Libreoffice-commits
mailing list