[Libreoffice-commits] core.git: chart2/source compilerplugins/clang connectivity/source cui/source desktop/source drawinglayer/source editeng/source include/drawinglayer include/editeng include/formula include/sax include/sfx2 include/svtools include/svx include/tools include/vcl include/xmloff include/xmlreader l10ntools/inc sc/source sd/source sfx2/source starmath/inc starmath/source svx/source sw/inc sw/source tools/source vcl/inc vcl/unx xmloff/inc xmloff/source xmlreader/source xmlsecurity/inc xmlsecurity/source

Noel Grandin noel.grandin at collabora.co.uk
Tue Jul 25 10:04:58 UTC 2017


 chart2/source/inc/DataSeriesHelper.hxx                      |    4 
 chart2/source/tools/DataSeriesHelper.cxx                    |   38 
 compilerplugins/clang/unusedmethods.results                 |  428 +++++++--
 compilerplugins/clang/unusedmethods.unused-returns.results  |   62 -
 connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx    |    2 
 connectivity/source/drivers/evoab2/NResultSetMetaData.hxx   |    2 
 connectivity/source/drivers/evoab2/NStatement.hxx           |    1 
 cui/source/dialogs/hyphen.cxx                               |   17 
 cui/source/inc/hyphen.hxx                                   |    1 
 desktop/source/app/langselect.cxx                           |   25 
 desktop/source/app/langselect.hxx                           |    2 
 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx  |   10 
 editeng/source/rtf/svxrtf.cxx                               |   97 --
 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx |    4 
 include/editeng/svxrtf.hxx                                  |    1 
 include/formula/formdata.hxx                                |    1 
 include/sax/fastattribs.hxx                                 |    5 
 include/sfx2/app.hxx                                        |    3 
 include/sfx2/basedlgs.hxx                                   |    1 
 include/sfx2/charwin.hxx                                    |    1 
 include/sfx2/childwin.hxx                                   |    1 
 include/svtools/sampletext.hxx                              |    1 
 include/svx/deflt3d.hxx                                     |    4 
 include/svx/strarray.hxx                                    |   11 
 include/svx/svdotable.hxx                                   |    1 
 include/tools/unqidx.hxx                                    |    9 
 include/vcl/scheduler.hxx                                   |    3 
 include/xmloff/xmlimp.hxx                                   |    1 
 include/xmloff/xmltoken.hxx                                 |    4 
 include/xmlreader/xmlreader.hxx                             |    2 
 l10ntools/inc/export.hxx                                    |   74 -
 sc/source/filter/xml/xmlimprt.cxx                           |  536 ------------
 sc/source/filter/xml/xmlimprt.hxx                           |   28 
 sc/source/ui/inc/gridwin.hxx                                |    1 
 sc/source/ui/view/gridwin3.cxx                              |   13 
 sd/source/ui/dlg/navigatr.cxx                               |    9 
 sd/source/ui/docshell/docshel4.cxx                          |  105 --
 sd/source/ui/inc/DrawDocShell.hxx                           |    3 
 sd/source/ui/inc/navigatr.hxx                               |    1 
 sfx2/source/appl/app.cxx                                    |    6 
 sfx2/source/appl/childwin.cxx                               |    5 
 sfx2/source/appl/childwinimpl.cxx                           |    5 
 sfx2/source/control/charwin.cxx                             |    5 
 sfx2/source/inc/childwinimpl.hxx                            |    1 
 starmath/inc/smmod.hxx                                      |    2 
 starmath/source/smmod.cxx                                   |    7 
 svx/source/dialog/strarray.cxx                              |   18 
 svx/source/table/svdotable.cxx                              |    5 
 sw/inc/splargs.hxx                                          |    4 
 sw/source/core/text/txthyph.cxx                             |    1 
 sw/source/filter/html/svxcss1.hxx                           |    4 
 tools/source/memtools/unqidx.cxx                            |   27 
 vcl/inc/unx/fontmanager.hxx                                 |   18 
 vcl/inc/unx/printerjob.hxx                                  |    1 
 vcl/inc/unx/salbmp.h                                        |    4 
 vcl/inc/unx/salframe.h                                      |    1 
 vcl/unx/generic/print/printerjob.cxx                        |    6 
 xmloff/inc/prstylecond.hxx                                  |    1 
 xmloff/source/core/xmlimp.cxx                               |   10 
 xmloff/source/core/xmltoken.cxx                             |   11 
 xmloff/source/style/prstylecond.cxx                         |   38 
 xmlreader/source/xmlreader.cxx                              |   14 
 xmlsecurity/inc/xmlsignaturehelper.hxx                      |   27 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx            |   14 
 64 files changed, 357 insertions(+), 1390 deletions(-)

New commits:
commit 2fffaf6f05d829e345ad8b391646a6e8df9a9a26
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Jul 25 11:03:15 2017 +0200

    loplugin:unusedmethods
    
    Change-Id: Ia874baf21257e5fe41e104211068a2bcc50446eb
    Reviewed-on: https://gerrit.libreoffice.org/40391
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index b031d4a54ae8..3c6f369020ee 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -150,10 +150,6 @@ OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue(
     const OUString& rPropertyName,
     const css::uno::Any& rPropertyValue );
 
-OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis(
-        const css::uno::Reference< css::chart2::XChartType >& xChartType,
-        sal_Int32 & rOutAxisIndex );
-
 OOO_DLLPUBLIC_CHARTTOOLS bool hasUnhiddenData( const css::uno::Reference<
         css::chart2::XDataSeries >& xSeries );
 
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 97de8cde4f7b..657572f069eb 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -633,44 +633,6 @@ bool hasAttributedDataPointDifferentValue( const Reference< chart2::XDataSeries
     return false;
 }
 
-bool areAllSeriesAttachedToSameAxis( const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 & rOutAxisIndex )
-{
-    try
-    {
-        uno::Reference< chart2::XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY_THROW );
-        uno::Sequence< uno::Reference< chart2::XDataSeries > > aSeriesSeq( xDataSeriesContainer->getDataSeries());
-
-        const sal_Int32 nSeriesCount( aSeriesSeq.getLength());
-        // AxisIndex can only be 0 or 1
-        sal_Int32 nSeriesAtFirstAxis = 0;
-        sal_Int32 nSeriesAtSecondAxis = 0;
-
-        for( sal_Int32 nI = 0; nI < nSeriesCount; ++nI )
-        {
-            uno::Reference< chart2::XDataSeries > xSeries( aSeriesSeq[nI], uno::UNO_QUERY );
-            sal_Int32 nAxisIndex = DataSeriesHelper::getAttachedAxisIndex( xSeries );
-            if( nAxisIndex == 0 )
-                ++nSeriesAtFirstAxis;
-            else if( nAxisIndex == 1 )
-                ++nSeriesAtSecondAxis;
-        }
-        OSL_ENSURE( nSeriesAtFirstAxis + nSeriesAtSecondAxis == nSeriesCount, "Invalid axis index found" );
-
-        if( nSeriesAtFirstAxis == nSeriesCount )
-            rOutAxisIndex = 0;
-        else if( nSeriesAtSecondAxis == nSeriesCount )
-            rOutAxisIndex = 1;
-
-        return ( nSeriesAtFirstAxis == nSeriesCount ||
-                 nSeriesAtSecondAxis == nSeriesCount );
-    }
-    catch( const uno::Exception & ex )
-    {
-        ASSERT_EXCEPTION( ex );
-        return false;
-    }
-}
-
 namespace
 {
 
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 88ac2af8aa1c..8fdc4275e208 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,13 +1,21 @@
-basegfx/source/range/b2drangeclipper.cxx:699
+basegfx/source/range/b2drangeclipper.cxx:697
     type-parameter-?-? eraseFromList(type-parameter-?-? &,const type-parameter-?-? &)
+chart2/source/inc/DataSeriesHelper.hxx:153
+    _Bool areAllSeriesAttachedToSameAxis(const class com::sun::star::uno::Reference<class com::sun::star::chart2::XChartType> &,int &)
+connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx:88
+    class connectivity::evoab::OEvoabConnection * connectivity::evoab::OEvoabDatabaseMetaData::getOwnConnection() const
+connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:50
+    int connectivity::evoab::OEvoabResultSetMetaData::getFieldSize() const
+connectivity/source/drivers/evoab2/NStatement.hxx:60
+     connectivity::evoab::FieldSort::FieldSort()
 connectivity/source/drivers/mork/mork_helper.cxx:36
     int main(int,char **)
 connectivity/source/inc/odbc/OPreparedStatement.hxx:74
     void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,const type-parameter-?-?)
 connectivity/source/inc/odbc/OPreparedStatement.hxx:75
     void connectivity::odbc::OPreparedStatement::setScalarParameter(int,int,unsigned long,int,const type-parameter-?-?)
-connectivity/source/inc/OTypeInfo.hxx:52
-     connectivity::OTypeInfo::OTypeInfo()
+cui/source/inc/hyphen.hxx:70
+    unsigned short SvxHyphenWordDialog::GetHyphIndex_Impl()
 dbaccess/source/ui/inc/indexcollection.hxx:54
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > > dbaui::OIndexCollection::begin() const
 dbaccess/source/ui/inc/indexcollection.hxx:58
@@ -16,12 +24,22 @@ dbaccess/source/ui/inc/indexcollection.hxx:63
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > > dbaui::OIndexCollection::find(const class rtl::OUString &) const
 dbaccess/source/ui/inc/indexcollection.hxx:65
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const struct dbaui::OIndex *, class std::__cxx1998::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > >, class std::__debug::vector<struct dbaui::OIndex, class std::allocator<struct dbaui::OIndex> > > dbaui::OIndexCollection::findOriginal(const class rtl::OUString &) const
-desktop/inc/lib/init.hxx:41
+desktop/inc/lib/init.hxx:40
     void desktop::CallbackFlushHandler::setEventLatch(const _Bool)
-desktop/inc/lib/init.hxx:46
+desktop/inc/lib/init.hxx:45
     _Bool desktop::CallbackFlushHandler::isEventLatchOn() const
-desktop/inc/lib/init.hxx:48
+desktop/inc/lib/init.hxx:47
     _Bool desktop::CallbackFlushHandler::isPartTilePainting() const
+desktop/source/app/langselect.hxx:29
+    class rtl::OUString getEmergencyLocale()
+drawinglayer/source/tools/emfpbrush.hxx:123
+    unsigned int emfplushelper::EMFPBrush::GetType() const
+drawinglayer/source/tools/emfpcustomlinecap.hxx:37
+    void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &)
+drawinglayer/source/tools/emfppen.hxx:62
+    void emfplushelper::EMFPPen::SetStrokeWidth(struct com::sun::star::rendering::StrokeAttributes &,struct emfplushelper::EmfPlusHelperData &,const class basegfx::B2DHomMatrix &)
+drawinglayer/source/tools/emfppen.hxx:64
+    void emfplushelper::EMFPPen::SetStrokeAttributes(struct com::sun::star::rendering::StrokeAttributes &)
 include/basegfx/pixel/bpixel.hxx:57
      basegfx::BPixel::BPixel(unsigned char,unsigned char,unsigned char,unsigned char)
 include/basegfx/polygon/b3dpolypolygon.hxx:109
@@ -49,9 +67,9 @@ include/basegfx/tuple/b3ituple.hxx:49
 include/basic/sbxvar.hxx:121
     struct SbxValues * SbxValue::data()
 include/codemaker/global.hxx:58
-    class FileStream & operator<<(class FileStream &,class rtl::OString *)
+    class FileStream & operator<<(class FileStream &,const class rtl::OString *)
 include/codemaker/global.hxx:60
-    class FileStream & operator<<(class FileStream &,class rtl::OStringBuffer *)
+    class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer *)
 include/codemaker/global.hxx:61
     class FileStream & operator<<(class FileStream &,const class rtl::OStringBuffer &)
 include/comphelper/basicio.hxx:51
@@ -102,7 +120,7 @@ include/comphelper/lok.hxx:44
     _Bool isLocalRendering()
 include/comphelper/proparrhlp.hxx:87
     class cppu::IPropertyArrayHelper * comphelper::OAggregationArrayUsageHelper::createArrayHelper() const
-include/comphelper/sequence.hxx:336
+include/comphelper/sequence.hxx:342
     type-parameter-?-? sequenceToContainer(const Sequence<type-parameter-?-?> &)
 include/comphelper/unwrapargs.hxx:49
     void unwrapArgs(const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &,int,const class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> &)
@@ -120,12 +138,20 @@ include/desktop/crashreport.hxx:50
     void CrashReporter::storeExceptionHandler(class google_breakpad::ExceptionHandler *)
 include/desktop/crashreport.hxx:54
     void CrashReporter::updateMinidumpLocation()
+include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx:382
+     drawinglayer::primitive2d::PolyPolygonGraphicPrimitive2D::PolyPolygonGraphicPrimitive2D(const class basegfx::B2DPolyPolygon &,const class drawinglayer::attribute::FillGraphicAttribute &)
+include/editeng/svxrtf.hxx:257
+    void SvxRTFParser::ReadInfo()
 include/filter/msfilter/mstoolbar.hxx:98
      Indent::Indent(_Bool)
+include/formula/formdata.hxx:43
+    unsigned short formula::FormEditData::GetEdFocus() const
 include/i18nlangtag/languagetag.hxx:257
     enum LanguageTag::ScriptType LanguageTag::getScriptType() const
 include/o3tl/any.hxx:155
     class boost::optional<const struct o3tl::detail::Void> tryAccess(const class com::sun::star::uno::Any &)
+include/o3tl/array_view.hxx:67
+     o3tl::array_view::array_view<T>(const type-parameter-?-? *,unsigned long)
 include/o3tl/cow_wrapper.hxx:310
     type-parameter-?-? * o3tl::cow_wrapper::get()
 include/o3tl/string_view.hxx:178
@@ -200,14 +226,40 @@ include/oox/helper/propertymap.hxx:114
     void oox::PropertyMap::dumpData(const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &)
 include/opencl/OpenCLZone.hxx:42
     _Bool OpenCLZone::isInInitialTest()
+include/sax/fastattribs.hxx:161
+    const char * sax_fastparser::FastAttributeList::FastAttributeIter::toCString() const
+include/sfx2/app.hxx:137
+    class std::locale * SfxApplication::GetSfxResLocale()
+include/sfx2/basedlgs.hxx:66
+    class SfxItemSet * SfxModalDialog::GetItemSet()
+include/sfx2/charwin.hxx:39
+    void SvxCharView::setInsertCharHdl(const class Link<class SvxCharView *, void> &)
+include/sfx2/childwin.hxx:173
+    _Bool SfxChildWindow::CanGetFocus() const
 include/sfx2/msg.hxx:120
     const class std::type_info * SfxType0::Type() const
-include/svl/itempool.hxx:209
+include/svl/itempool.hxx:210
     void SfxItemPool::dumpAsXml(struct _xmlTextWriter *) const
 include/svl/macitem.hxx:96
     class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const unsigned short, class SvxMacro> >, class std::__debug::map<unsigned short, class SvxMacro, struct std::less<unsigned short>, class std::allocator<struct std::pair<const unsigned short, class SvxMacro> > > > SvxMacroTableDtor::begin() const
 include/svl/macitem.hxx:98
     class __gnu_debug::_Safe_iterator<struct std::_Rb_tree_const_iterator<struct std::pair<const unsigned short, class SvxMacro> >, class std::__debug::map<unsigned short, class SvxMacro, struct std::less<unsigned short>, class std::allocator<struct std::pair<const unsigned short, class SvxMacro> > > > SvxMacroTableDtor::end() const
+include/svtools/sampletext.hxx:25
+    _Bool isOpenSymbolFont(const class vcl::Font &)
+include/svx/deflt3d.hxx:79
+    _Bool E3dDefaultAttributes::GetDefaultCreateNormals() const
+include/svx/deflt3d.hxx:80
+    _Bool E3dDefaultAttributes::GetDefaultCreateTexture() const
+include/svx/deflt3d.hxx:85
+    enum CubeFaces E3dDefaultAttributes::GetDefaultCubeSideFlags() const
+include/svx/strarray.hxx:32
+     SvxStringArray::SvxStringArray(const char **,unsigned long)
+include/svx/strarray.hxx:33
+    const class rtl::OUString SvxStringArray::GetString(unsigned int) const
+include/svx/strarray.hxx:58
+    unsigned short SvxAttrNameTable::GetValue(unsigned int)
+include/svx/svdotable.hxx:144
+    void sdr::table::SdrTableObj::SetMergedItemSetAndBroadcastOnActiveCell(const class SfxItemSet &)
 include/tools/bigint.hxx:94
      BigInt::BigInt(unsigned short)
 include/tools/bigint.hxx:103
@@ -224,53 +276,139 @@ include/tools/date.hxx:83
     _Bool Date::IsEmpty() const
 include/tools/datetime.hxx:47
      DateTime::DateTime(const class tools::Time &)
-include/tools/datetime.hxx:93
-    class DateTime operator+(const class DateTime &,long)
-include/tools/datetime.hxx:94
-    class DateTime operator-(const class DateTime &,long)
-include/tools/datetime.hxx:96
+include/tools/datetime.hxx:87
+    class DateTime operator+(const class DateTime &,int)
+include/tools/datetime.hxx:88
+    class DateTime operator-(const class DateTime &,int)
+include/tools/datetime.hxx:90
     class DateTime operator-(const class DateTime &,double)
-include/tools/datetime.hxx:98
+include/tools/datetime.hxx:92
     class DateTime operator+(const class DateTime &,const class tools::Time &)
-include/tools/datetime.hxx:99
+include/tools/datetime.hxx:93
     class DateTime operator-(const class DateTime &,const class tools::Time &)
 include/tools/fract.hxx:74
     _Bool operator>=(const class Fraction &,const class Fraction &)
+include/tools/unqidx.hxx:48
+    struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType> UniqueIndexImpl::FirstIndex() const
+include/tools/unqidx.hxx:49
+    struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType> UniqueIndexImpl::LastIndex() const
+include/tools/unqidx.hxx:50
+    struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType> UniqueIndexImpl::NextIndex(struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType>) const
+include/tools/unqidx.hxx:64
+    type-parameter-?-? * UniqueIndex::Remove(struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType>)
+include/tools/unqidx.hxx:65
+    struct o3tl::strong_int<unsigned int, struct UniqueIndexImpl::IndexTagType> UniqueIndex::GetIndexOf(type-parameter-?-? *) const
 include/unotest/assertion_traits.hxx:25
     _Bool CppUnit::assertion_traits::equal(signed char,signed char)
 include/unotest/assertion_traits.hxx:27
     class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > CppUnit::assertion_traits::toString(signed char)
-include/vcl/commandevent.hxx:251
+include/vcl/commandevent.hxx:250
      CommandMediaData::CommandMediaData(enum MediaCommand)
-include/vcl/menu.hxx:476
-    class tools::Rectangle MenuBar::GetMenuBarButtonRectPixel(unsigned short)
 include/vcl/opengl/OpenGLContext.hxx:99
     void OpenGLContext::UseNoProgram()
 include/vcl/opengl/OpenGLHelper.hxx:93
     void OpenGLHelper::debugMsgStreamWarn(const class std::basic_ostringstream<char> &)
+include/vcl/pdfwriter.hxx:566
+     vcl::PDFWriter::PDFSignContext::PDFSignContext(class rtl::OStringBuffer &)
+include/vcl/pdfwriter.hxx:1235
+    _Bool vcl::PDFWriter::Sign(struct vcl::PDFWriter::PDFSignContext &)
+include/vcl/scheduler.hxx:35
+    _Bool Scheduler::HasPendingTasks(const struct ImplSchedulerContext &,const unsigned long)
 include/vcl/svapp.hxx:168
      ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &)
-include/vcl/syswin.hxx:194
+include/vcl/syswin.hxx:193
     void SystemWindow::SetIdleDebugName(const char *)
-include/vcl/threadex.hxx:101
+include/vcl/threadex.hxx:99
      vcl::solarthread::detail::GenericSolarThreadExecutor::GenericSolarThreadExecutor<type-parameter-?-?, void>(const type-parameter-?-? &)
 include/vcl/uitest/uiobject.hxx:243
-     TabPageUIObject::TabPageUIObject(class VclPtr<class TabPage>)
+     TabPageUIObject::TabPageUIObject(const class VclPtr<class TabPage> &)
 include/vcl/uitest/uiobject.hxx:251
     class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > TabPageUIObject::create(class vcl::Window *)
 include/vcl/uitest/uiobject.hxx:312
-     SpinUIObject::SpinUIObject(class VclPtr<class SpinButton>)
+     SpinUIObject::SpinUIObject(const class VclPtr<class SpinButton> &)
 include/vcl/uitest/uiobject.hxx:320
     class std::unique_ptr<class UIObject, struct std::default_delete<class UIObject> > SpinUIObject::create(class vcl::Window *)
 include/vcl/window.hxx:428
     const char * ImplDbgCheckWindow(const void *)
+include/xmloff/xmlimp.hxx:381
+    const class rtl::OUString SvXMLImport::getNamespaceURIFromToken(int)
+include/xmloff/xmltoken.hxx:3303
+    _Bool IsXMLToken(const char *,enum xmloff::token::XMLTokenEnum)
+include/xmlreader/xmlreader.hxx:41
+     xmlreader::XmlReader::XmlReader(const char *,unsigned long)
+l10ntools/inc/export.hxx:73
+    _Bool ResData::SetId(const class rtl::OString &,enum IdLevel)
+l10ntools/inc/export.hxx:107
+    void Export::WriteData(class ResData *,_Bool)
+l10ntools/inc/export.hxx:108
+    void Export::WriteExportList(class ResData *,class std::__debug::vector<class rtl::OString, class std::allocator<class rtl::OString> > &,const enum ExportListType)
+l10ntools/inc/export.hxx:110
+    class rtl::OString Export::FullId()
+l10ntools/inc/export.hxx:112
+    class rtl::OString Export::GetPairedListID(const class rtl::OString &)
+l10ntools/inc/export.hxx:113
+    class rtl::OString Export::GetPairedListString(const class rtl::OString &)
+l10ntools/inc/export.hxx:114
+    class rtl::OString Export::StripList(const class rtl::OString &)
+l10ntools/inc/export.hxx:116
+    void Export::InsertListEntry(const class rtl::OString &)
+l10ntools/inc/export.hxx:117
+    void Export::CleanValue(class rtl::OString &)
+l10ntools/inc/export.hxx:118
+    class rtl::OString Export::GetText(const class rtl::OString &,int)
+l10ntools/inc/export.hxx:120
+    void Export::ResData2Output(class MergeEntrys *,enum StringType,const class rtl::OString &)
+l10ntools/inc/export.hxx:121
+    void Export::MergeRest(class ResData *)
+l10ntools/inc/export.hxx:122
+    void Export::ConvertMergeContent(class rtl::OString &)
+l10ntools/inc/export.hxx:123
+    void Export::ConvertExportContent(class rtl::OString &)
+l10ntools/inc/export.hxx:125
+    void Export::WriteToMerged(const class rtl::OString &,_Bool)
+l10ntools/inc/export.hxx:126
+    void Export::SetChildWithText()
+l10ntools/inc/export.hxx:128
+    void Export::CutComment(class rtl::OString &)
+l10ntools/inc/export.hxx:131
+     Export::Export(const class rtl::OString &)
+l10ntools/inc/export.hxx:132
+     Export::Export(const class rtl::OString &,const class rtl::OString &,_Bool)
+l10ntools/inc/export.hxx:135
+    void Export::Init()
+l10ntools/inc/export.hxx:136
+    void Export::Execute(int,const char *)
+l10ntools/inc/export.hxx:138
+    void Export::SetError()
+l10ntools/inc/export.hxx:139
+    _Bool Export::GetError()
+l10ntools/inc/export.hxx:140
+    class ParserQueue * Export::GetParseQueue()
+l10ntools/inc/export.hxx:223
+    class __gnu_debug::_Safe_iterator<struct std::__detail::_Node_const_iterator<struct std::pair<const class rtl::OString, class MergeData *>, false, true>, class std::__debug::unordered_map<class rtl::OString, class MergeData *, struct rtl::OStringHash, struct std::equal_to<class rtl::OString>, class std::allocator<struct std::pair<const class rtl::OString, class MergeData *> > > > MergeDataHashMap::begin() const
+l10ntools/inc/export.hxx:224
+    class __gnu_debug::_Safe_iterator<struct std::__detail::_Node_const_iterator<struct std::pair<const class rtl::OString, class MergeData *>, false, true>, class std::__debug::unordered_map<class rtl::OString, class MergeData *, struct rtl::OStringHash, struct std::equal_to<class rtl::OString>, class std::allocator<struct std::pair<const class rtl::OString, class MergeData *> > > > MergeDataHashMap::end() const
+l10ntools/inc/export.hxx:279
+    const class MergeDataHashMap & MergeDataFile::getMap() const
+l10ntools/inc/export.hxx:292
+     QueueEntry::QueueEntry(int,const class rtl::OString &)
+l10ntools/inc/export.hxx:304
+     ParserQueue::ParserQueue(class Export &)
+l10ntools/inc/export.hxx:307
+    void ParserQueue::Push(const class QueueEntry &)
+l10ntools/inc/export.hxx:309
+    void ParserQueue::Close()
+l10ntools/inc/export.hxx:311
+    void ParserQueue::Pop(class std::queue<class QueueEntry, class std::__debug::deque<class QueueEntry, class std::allocator<class QueueEntry> > > &)
 oox/inc/drawingml/textliststyle.hxx:49
     void oox::drawingml::TextListStyle::dump() const
+sc/inc/columniterator.hxx:74
+    int sc::ColumnIterator::getType() const
 sc/inc/compressedarray.hxx:158
      ScBitMaskCompressedArray::ScBitMaskCompressedArray<A, D>(type-parameter-?-?,const type-parameter-?-? *,unsigned long)
 sc/inc/dpfilteredcache.hxx:144
     void ScDPFilteredCache::dump() const
-sc/inc/formulacell.hxx:433
+sc/inc/formulacell.hxx:443
     void ScFormulaCell::Dump() const
 sc/inc/formulagroup.hxx:140
     void sc::FormulaGroupInterpreter::enableOpenCL_UnitTestsOnly()
@@ -278,7 +416,7 @@ sc/inc/postit.hxx:47
      ScCaptionPtr::ScCaptionPtr(class SdrCaptionObj *)
 sc/inc/scdll.hxx:42
      ScDLL::ScDLL()
-sc/inc/table.hxx:292
+sc/inc/table.hxx:293
     _Bool ScTable::IsColRowTabValid(short,int,short) const
 sc/inc/userlist.hxx:86
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > *, class std::__cxx1998::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > >, class std::__debug::vector<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> >, class std::allocator<class std::unique_ptr<class ScUserListData, struct std::default_delete<class ScUserListData> > > > > ScUserList::begin() const
@@ -286,21 +424,21 @@ sc/qa/unit/helper/qahelper.hxx:201
     class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > print(const class ScAddress &)
 sc/qa/unit/ucalc.hxx:141
     void Test::testFormulaHashAndTag()
-sc/qa/unit/ucalc.hxx:170
+sc/qa/unit/ucalc.hxx:172
     void Test::testSingleCellCopyColumnLabel()
-sc/qa/unit/ucalc.hxx:222
+sc/qa/unit/ucalc.hxx:228
     void Test::testExternalRefUnresolved()
-sc/qa/unit/ucalc.hxx:361
+sc/qa/unit/ucalc.hxx:367
     void Test::testCopyPasteSkipEmptyConditionalFormatting()
-sc/qa/unit/ucalc.hxx:388
+sc/qa/unit/ucalc.hxx:394
     void Test::testSharedFormulaMoveBlock()
-sc/qa/unit/ucalc.hxx:495
+sc/qa/unit/ucalc.hxx:503
     void Test::testCondFormatUpdateMoveTab()
-sc/qa/unit/ucalc.hxx:496
+sc/qa/unit/ucalc.hxx:504
     void Test::testCondFormatUpdateDeleteTab()
-sc/qa/unit/ucalc.hxx:497
+sc/qa/unit/ucalc.hxx:505
     void Test::testCondFormatUpdateInsertTab()
-sc/qa/unit/ucalc.hxx:498
+sc/qa/unit/ucalc.hxx:506
     void Test::testCondFormatUpdateReference()
 sc/source/core/opencl/formulagroupcl.cxx:936
     _Bool sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction() const
@@ -328,36 +466,104 @@ sc/source/core/opencl/opbase.hxx:119
     void sc::opencl::DynamicKernelArgument::GenNumDeclRef(class std::basic_stringstream<char> &) const
 sc/source/core/opencl/opbase.hxx:121
     void sc::opencl::DynamicKernelArgument::GenStringDeclRef(class std::basic_stringstream<char> &) const
-sc/source/ui/inc/dataprovider.hxx:54
-     sc::ExternalDataMapper::ExternalDataMapper(class ScDocShell *,const class rtl::OUString &,const class rtl::OUString &,short,short,int,short,int,_Bool &)
-sc/source/ui/inc/dataprovider.hxx:59
-    void sc::ExternalDataMapper::StartImport()
-sc/source/ui/inc/dataprovider.hxx:107
-    _Bool sc::CSVFetchThread::IsRequestedTerminate()
-sc/source/ui/inc/dataprovider.hxx:108
+sc/source/filter/inc/tokstack.hxx:216
+    _Bool TokenPool::GrowTripel(unsigned short)
+sc/source/filter/xml/xmlimprt.hxx:1009
+    const class SvXMLTokenMap & ScXMLImport::GetBodyElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1010
+    const class SvXMLTokenMap & ScXMLImport::GetContentValidationsElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1012
+    const class SvXMLTokenMap & ScXMLImport::GetContentValidationAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1014
+    const class SvXMLTokenMap & ScXMLImport::GetContentValidationHelpMessageAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1015
+    const class SvXMLTokenMap & ScXMLImport::GetContentValidationErrorMessageAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1016
+    const class SvXMLTokenMap & ScXMLImport::GetContentValidationErrorMacroAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1028
+    const class SvXMLTokenMap & ScXMLImport::GetLabelRangesElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1029
+    const class SvXMLTokenMap & ScXMLImport::GetLabelRangeAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1031
+    const class SvXMLTokenMap & ScXMLImport::GetTableProtectionAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1033
+    const class SvXMLTokenMap & ScXMLImport::GetTableColsElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1034
+    const class SvXMLTokenMap & ScXMLImport::GetTableAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1035
+    const class SvXMLTokenMap & ScXMLImport::GetTableScenarioAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1036
+    const class SvXMLTokenMap & ScXMLImport::GetTableColAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1046
+    const class SvXMLTokenMap & ScXMLImport::GetNamedExpressionsElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1047
+    const class SvXMLTokenMap & ScXMLImport::GetNamedRangeAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1048
+    const class SvXMLTokenMap & ScXMLImport::GetNamedExpressionAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1049
+    const class SvXMLTokenMap & ScXMLImport::GetDatabaseRangesElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1050
+    const class SvXMLTokenMap & ScXMLImport::GetDatabaseRangeElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1051
+    const class SvXMLTokenMap & ScXMLImport::GetDatabaseRangeAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1061
+    const class SvXMLTokenMap & ScXMLImport::GetSortAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1063
+    const class SvXMLTokenMap & ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1064
+    const class SvXMLTokenMap & ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1065
+    const class SvXMLTokenMap & ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1066
+    const class SvXMLTokenMap & ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1067
+    const class SvXMLTokenMap & ScXMLImport::GetSubTotalRulesSubTotalRuleAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1068
+    const class SvXMLTokenMap & ScXMLImport::GetSubTotalRuleSubTotalFieldAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1084
+    const class SvXMLTokenMap & ScXMLImport::GetConsolidationAttrTokenMap()
+sc/source/filter/xml/xmlimprt.hxx:1090
+    const class SvXMLTokenMap & ScXMLImport::GetDataStreamAttrTokenMap()
+sc/source/ui/inc/dataprovider.hxx:115
     void sc::CSVFetchThread::Terminate()
-sc/source/ui/inc/dataprovider.hxx:110
+sc/source/ui/inc/dataprovider.hxx:117
     void sc::CSVFetchThread::EmptyLineQueue(class std::queue<class std::__debug::vector<struct sc::Line, class std::allocator<struct sc::Line> > *, class std::__debug::deque<class std::__debug::vector<struct sc::Line, class std::allocator<struct sc::Line> > *, class std::allocator<class std::__debug::vector<struct sc::Line, class std::allocator<struct sc::Line> > *> > > &)
-sc/source/ui/inc/dataprovider.hxx:122
+sc/source/ui/inc/dataprovider.hxx:134
     class ScRange sc::DataProvider::GetRange() const
-sc/source/ui/inc/dataprovider.hxx:123
+sc/source/ui/inc/dataprovider.hxx:135
     const class rtl::OUString & sc::DataProvider::GetURL() const
+sc/source/ui/inc/dataprovider.hxx:159
+    struct sc::Line sc::CSVDataProvider::GetLine()
+sc/source/ui/inc/dataprovider.hxx:183
+    void sc::ScDBDataManager::SetDatabase(class ScDBData *)
+sc/source/ui/inc/dataprovider.hxx:188
+    class ScRange & sc::ScDBDataManager::GetSourceRange()
+sc/source/ui/inc/gridwin.hxx:254
+    class SdrObject * ScGridWindow::GetEditObject()
 sc/source/ui/inc/impex.hxx:92
      ScImportExport::ScImportExport(class ScDocument *,const class rtl::OUString &)
 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:69
-    void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const short,const class boost::optional<signed char>)
+    void ScRandomNumberGeneratorDialog::GenerateNumbers(type-parameter-?-? &,const char *,const class boost::optional<signed char>)
 sd/inc/sddll.hxx:50
      SdDLL::SdDLL()
-sd/source/filter/ppt/pptinanimations.hxx:110
+sd/source/filter/ppt/pptinanimations.hxx:109
     void ppt::AnimationImporter::dump(const char *,long)
+sd/source/ui/inc/DrawDocShell.hxx:134
+    _Bool sd::DrawDocShell::IsMarked(class SdrObject *)
+sd/source/ui/inc/DrawDocShell.hxx:136
+    _Bool sd::DrawDocShell::GetObjectIsmarked(const class rtl::OUString &,_Bool)
 sd/source/ui/inc/filedlg.hxx:54
     _Bool SdOpenSoundFileDialog::IsInsertAsLinkSelected()
+sd/source/ui/inc/navigatr.hxx:145
+    class sd::DrawDocShell * SdNavigatorWin::GetDrawDocShell(const class SdDrawDocument *)
 sd/source/ui/remotecontrol/ZeroconfService.hxx:39
      sd::ZeroconfService::ZeroconfService(const class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > &,unsigned int)
 sd/source/ui/remotecontrol/ZeroconfService.hxx:43
     const class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > & sd::ZeroconfService::getName() const
 sd/source/ui/remotecontrol/ZeroconfService.hxx:44
     void sd::ZeroconfService::setName(const char *)
+sfx2/source/inc/childwinimpl.hxx:78
+    unsigned long SfxFrameArr_Impl::size() const
 slideshow/source/engine/activities/activitiesfactory.cxx:173
     void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation()
 slideshow/source/engine/activities/activitiesfactory.cxx:241
@@ -380,67 +586,67 @@ slideshow/source/engine/activities/activitiesfactory.cxx:567
     void slideshow::internal::(anonymous namespace)::ValuesActivity::perform(unsigned int,unsigned int) const
 slideshow/source/engine/activities/activitiesfactory.cxx:582
     void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd()
-slideshow/source/engine/animationfactory.cxx:444
+slideshow/source/engine/animationfactory.cxx:442
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &)
-slideshow/source/engine/animationfactory.cxx:448
+slideshow/source/engine/animationfactory.cxx:446
     void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &)
-slideshow/source/engine/animationfactory.cxx:549
+slideshow/source/engine/animationfactory.cxx:547
     typename type-parameter-?-?::ValueType slideshow::internal::(anonymous namespace)::GenericAnimation::getUnderlyingValue() const
 slideshow/source/engine/opengl/TransitionImpl.hxx:180
     void OGLTransitionImpl::finish(double,double,double,double,double)
 slideshow/source/inc/shapeattributelayer.hxx:391
     void slideshow::internal::ShapeAttributeLayer::setCharRotationAngle(const double &)
-sw/inc/dbgoutsw.hxx:54
+starmath/inc/smmod.hxx:94
+    class SmLocalizedSymbolData & SmModule::GetLocSymbolData()
+sw/inc/dbgoutsw.hxx:53
     const char * dbg_out(const void *)
-sw/inc/dbgoutsw.hxx:56
+sw/inc/dbgoutsw.hxx:55
     const char * dbg_out(const class SwRect &)
-sw/inc/dbgoutsw.hxx:57
+sw/inc/dbgoutsw.hxx:56
     const char * dbg_out(const class SwFrameFormat &)
-sw/inc/dbgoutsw.hxx:60
+sw/inc/dbgoutsw.hxx:59
     const char * dbg_out(const class SwContentNode *)
-sw/inc/dbgoutsw.hxx:61
+sw/inc/dbgoutsw.hxx:60
     const char * dbg_out(const class SwTextNode *)
-sw/inc/dbgoutsw.hxx:62
+sw/inc/dbgoutsw.hxx:61
     const char * dbg_out(const class SwTextAttr &)
-sw/inc/dbgoutsw.hxx:63
+sw/inc/dbgoutsw.hxx:62
     const char * dbg_out(const class SwpHints &)
-sw/inc/dbgoutsw.hxx:64
+sw/inc/dbgoutsw.hxx:63
     const char * dbg_out(const class SfxPoolItem &)
-sw/inc/dbgoutsw.hxx:65
+sw/inc/dbgoutsw.hxx:64
     const char * dbg_out(const class SfxPoolItem *)
-sw/inc/dbgoutsw.hxx:66
+sw/inc/dbgoutsw.hxx:65
     const char * dbg_out(const class SfxItemSet &)
-sw/inc/dbgoutsw.hxx:67
+sw/inc/dbgoutsw.hxx:66
     const char * dbg_out(class SwNodes &)
-sw/inc/dbgoutsw.hxx:68
+sw/inc/dbgoutsw.hxx:67
     const char * dbg_out(const struct SwPosition &)
-sw/inc/dbgoutsw.hxx:69
+sw/inc/dbgoutsw.hxx:68
     const char * dbg_out(const class SwPaM &)
-sw/inc/dbgoutsw.hxx:70
+sw/inc/dbgoutsw.hxx:69
     const char * dbg_out(const class SwNodeNum &)
-sw/inc/dbgoutsw.hxx:71
+sw/inc/dbgoutsw.hxx:70
     const char * dbg_out(const class SwUndo &)
-sw/inc/dbgoutsw.hxx:72
+sw/inc/dbgoutsw.hxx:71
     const char * dbg_out(class SwOutlineNodes &)
-sw/inc/dbgoutsw.hxx:73
-    const char * dbg_out(const class SwRewriter &)
-sw/inc/dbgoutsw.hxx:74
+sw/inc/dbgoutsw.hxx:72
     const char * dbg_out(const class SwNumRule &)
-sw/inc/dbgoutsw.hxx:75
+sw/inc/dbgoutsw.hxx:73
     const char * dbg_out(const class SwTextFormatColl &)
-sw/inc/dbgoutsw.hxx:76
+sw/inc/dbgoutsw.hxx:74
     const char * dbg_out(const class SwFrameFormats &)
-sw/inc/dbgoutsw.hxx:77
+sw/inc/dbgoutsw.hxx:75
     const char * dbg_out(const class SwNumRuleTable &)
-sw/inc/dbgoutsw.hxx:78
+sw/inc/dbgoutsw.hxx:76
     const char * dbg_out(const class SwNodeRange &)
-sw/inc/dbgoutsw.hxx:81
+sw/inc/dbgoutsw.hxx:79
     class rtl::OUString lcl_dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &)
-sw/inc/dbgoutsw.hxx:105
+sw/inc/dbgoutsw.hxx:103
     const char * dbg_out(const unordered_map<type-parameter-?-?, type-parameter-?-?, type-parameter-?-?, equal_to<type-parameter-?-?>, allocator<pair<const type-parameter-?-?, type-parameter-?-?> > > &)
-sw/inc/dbgoutsw.hxx:109
+sw/inc/dbgoutsw.hxx:107
     const char * dbg_out(const struct SwFormToken &)
-sw/inc/dbgoutsw.hxx:110
+sw/inc/dbgoutsw.hxx:108
     const char * dbg_out(const class std::__debug::vector<struct SwFormToken, class std::allocator<struct SwFormToken> > &)
 sw/inc/docary.hxx:143
     void SwVectorModifyBase::dumpAsXml(struct _xmlTextWriter *)
@@ -464,45 +670,49 @@ sw/inc/pagedesc.hxx:427
     class SwPageDesc *const & SwPageDescs::back() const
 sw/inc/ring.hxx:204
      sw::RingIterator::RingIterator<value_type>()
+sw/inc/splargs.hxx:139
+    _Bool SwInterHyphInfo::IsCheck() const
+sw/inc/swatrset.hxx:236
+    const class SvxNoHyphenItem & SwAttrSet::GetNoHyphenHere(_Bool) const
 sw/inc/swrect.hxx:105
     class SvStream & WriteSwRect(class SvStream &,const class SwRect &)
 sw/qa/extras/inc/swmodeltestbase.hxx:523
     class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const
-sw/qa/extras/uiwriter/uiwriter.cxx:4894
+sw/qa/extras/uiwriter/uiwriter.cxx:5067
     int main()
-sw/source/core/inc/flowfrm.hxx:171
-    class SwFlowFrame * SwFlowFrame::GetPrecede()
-sw/source/core/inc/frame.hxx:1187
+sw/source/core/inc/frame.hxx:1184
     class Size SwRectFnSet::GetSize(const class SwRect &) const
-sw/source/core/inc/frame.hxx:1218
+sw/source/core/inc/frame.hxx:1215
     long SwRectFnSet::LeftDist(const class SwRect &,long) const
-sw/source/core/inc/frame.hxx:1219
+sw/source/core/inc/frame.hxx:1216
     long SwRectFnSet::RightDist(const class SwRect &,long) const
-sw/source/core/inc/frame.hxx:1227
+sw/source/core/inc/frame.hxx:1224
     long SwRectFnSet::XInc(long,long) const
 sw/source/core/text/porlin.hxx:127
     _Bool SwLinePortion::IsTabRightPortion() const
 sw/source/core/text/txtpaint.hxx:73
      DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle &,const _Bool,unsigned int)
+sw/source/filter/html/svxcss1.hxx:164
+     SvxCSS1MapEntry::SvxCSS1MapEntry(class SfxItemPool &,const unsigned short *)
 sw/source/filter/ww8/ww8struc.hxx:241
      WW8_BRCVer6::WW8_BRCVer6()
 ucb/source/inc/regexpmap.hxx:378
     RegexpMapConstIter<type-parameter-?-?> ucb_impl::RegexpMap::begin() const
 ucb/source/inc/regexpmap.hxx:382
     RegexpMapConstIter<type-parameter-?-?> ucb_impl::RegexpMap::end() const
-ucb/source/ucp/ftp/ftpurl.hxx:113
+ucb/source/ucp/ftp/ftpurl.hxx:112
     class rtl::OUString ftp::FTPURL::child() const
 vcl/inc/opengl/BufferObject.hxx:50
     void vcl::BufferObject::unbind()
 vcl/inc/opengl/PackedTextureAtlas.hxx:44
      PackedTextureAtlasManager::PackedTextureAtlasManager(int,int)
 vcl/inc/opengl/PackedTextureAtlas.hxx:46
-    class OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int,int,int,int,unsigned char *)
+    class OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int,int,int,int,const unsigned char *)
 vcl/inc/opengl/PackedTextureAtlas.hxx:48
     class std::__debug::vector<unsigned int, class std::allocator<unsigned int> > PackedTextureAtlasManager::ReduceTextureNumber(int)
 vcl/inc/opengl/salbmp.hxx:86
     const class BitmapPalette & OpenGLSalBitmap::GetBitmapPalette() const
-vcl/inc/opengl/texture.hxx:113
+vcl/inc/opengl/texture.hxx:114
     void OpenGLTexture::SaveToFile(const class rtl::OUString &)
 vcl/inc/opengl/zone.hxx:41
     void OpenGLZone::relaxWatchdogTimings()
@@ -513,25 +723,37 @@ vcl/inc/openglgdiimpl.hxx:116
 vcl/inc/openglgdiimpl.hxx:141
     void OpenGLSalGraphicsImpl::DrawMask(class OpenGLTexture &,unsigned int,const struct SalTwoRect &)
 vcl/inc/openglgdiimpl.hxx:145
-    void OpenGLSalGraphicsImpl::DeferredTextDraw(class OpenGLTexture &,const unsigned int,const struct SalTwoRect &)
+    void OpenGLSalGraphicsImpl::DeferredTextDraw(const class OpenGLTexture &,const unsigned int,const struct SalTwoRect &)
 vcl/inc/regionband.hxx:27
     const char * ImplDbgTestRegionBand(const void *)
 vcl/inc/salmenu.hxx:46
      SalMenuButtonItem::SalMenuButtonItem()
-vcl/inc/salwtype.hxx:117
+vcl/inc/salwtype.hxx:114
      SalMenuEvent::SalMenuEvent()
+vcl/inc/schedulerimpl.hxx:35
+    const char * ImplSchedulerData::GetDebugName() const
+vcl/inc/unx/fontmanager.hxx:108
+     psp::CharacterMetric::CharacterMetric()
+vcl/inc/unx/fontmanager.hxx:251
+    unsigned short psp::PrintFontManager::getFontEncoding(int) const
 vcl/inc/unx/glyphcache.hxx:71
     void GlyphCache::ClearFontOptions()
-vcl/inc/unx/gtk/gtkdata.hxx:181
+vcl/inc/unx/gtk/gtkdata.hxx:179
     void GtkSalDisplay::RefreshMenusUnity()
 vcl/inc/unx/gtk/gtkinst.hxx:120
     void GtkDropTarget::fire_dragExit(const struct com::sun::star::datatransfer::dnd::DropTargetEvent &)
+vcl/inc/unx/printerjob.hxx:89
+    class osl::File * psp::PrinterJob::GetCurrentPageHeader()
+vcl/inc/unx/salbmp.h:200
+    unsigned long ImplSalDDB::ImplGetMemSize() const
 vcl/inc/unx/saldata.hxx:68
     void X11SalData::initNWF()
-vcl/inc/unx/saldisp.hxx:365
+vcl/inc/unx/saldisp.hxx:361
     class SalXLib * SalDisplay::GetXLib() const
-vcl/inc/unx/salframe.h:192
+vcl/inc/unx/salframe.h:189
     enum SalFrameStyleFlags X11SalFrame::GetStyle() const
+vcl/inc/unx/salframe.h:201
+    _Bool X11SalFrame::isMapped() const
 vcl/source/edit/textdat2.hxx:85
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class TETextPortion *const *, class std::__cxx1998::vector<class TETextPortion *, class std::allocator<class TETextPortion *> > >, class std::__debug::vector<class TETextPortion *, class std::allocator<class TETextPortion *> > > TETextPortionList::begin() const
 vcl/source/edit/textdat2.hxx:87
@@ -546,25 +768,25 @@ vcl/source/fontsubset/xlat.hxx:34
     unsigned short TranslateChar15(unsigned short)
 vcl/source/fontsubset/xlat.hxx:35
     unsigned short TranslateChar16(unsigned short)
-vcl/source/gdi/pdfwriter_impl.hxx:1282
+vcl/source/gdi/pdfwriter_impl.hxx:1279
     void vcl::PDFWriterImpl::setAutoAdvanceTime(unsigned int,int)
-workdir/LexTarget/l10ntools/source/srclex.cxx:1380
+workdir/LexTarget/l10ntools/source/xrmlex.cxx:730
     void YYWarning()
+workdir/LexTarget/l10ntools/source/xrmlex.cxx:2226
+    void YYWarning(const char *)
 writerfilter/source/ooxml/OOXMLPropertySet.hxx:160
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> > > > writerfilter::ooxml::OOXMLPropertySet::begin() const
 writerfilter/source/ooxml/OOXMLPropertySet.hxx:161
     class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<const class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> *, class std::__cxx1998::vector<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> > > >, class std::__debug::vector<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty>, class std::allocator<class std::shared_ptr<class writerfilter::ooxml::OOXMLProperty> > > > writerfilter::ooxml::OOXMLPropertySet::end() const
-xmlsecurity/inc/xmlsignaturehelper.hxx:57
-     XMLSignatureCreationResult::XMLSignatureCreationResult(int,enum com::sun::star::xml::crypto::SecurityOperationStatus)
-xmlsecurity/inc/xmlsignaturehelper.hxx:69
-     XMLSignatureVerifyResult::XMLSignatureVerifyResult(int,enum com::sun::star::xml::crypto::SecurityOperationStatus)
-xmlsecurity/inc/xmlsignaturehelper.hxx:112
+xmloff/inc/prstylecond.hxx:21
+    class rtl::OUString GetParaStyleCondInternal(const class rtl::OUString &)
+xmlsecurity/inc/xmlsignaturehelper.hxx:56
+     XMLSignatureCreationResult::XMLSignatureCreationResult(enum com::sun::star::xml::crypto::SecurityOperationStatus)
+xmlsecurity/inc/xmlsignaturehelper.hxx:66
+     XMLSignatureVerifyResult::XMLSignatureVerifyResult(enum com::sun::star::xml::crypto::SecurityOperationStatus)
+xmlsecurity/inc/xmlsignaturehelper.hxx:108
     void XMLSignatureHelper::SignatureCreationResultListener(struct XMLSignatureCreationResult &)
-xmlsecurity/inc/xmlsignaturehelper.hxx:113
+xmlsecurity/inc/xmlsignaturehelper.hxx:109
     void XMLSignatureHelper::SignatureVerifyResultListener(struct XMLSignatureVerifyResult &)
-xmlsecurity/source/gpg/CertificateImpl.hxx:83
-    const class GpgME::Key * CertificateImpl::getCertificate() const
 xmlsecurity/source/gpg/XMLEncryption.hxx:27
      XMLEncryptionGpg::XMLEncryptionGpg()
-xmlsecurity/source/gpg/XMLSignature.hxx:27
-     XMLSignatureGpg::XMLSignatureGpg()
diff --git a/compilerplugins/clang/unusedmethods.unused-returns.results b/compilerplugins/clang/unusedmethods.unused-returns.results
index 021e57ebeae4..821a9991879b 100644
--- a/compilerplugins/clang/unusedmethods.unused-returns.results
+++ b/compilerplugins/clang/unusedmethods.unused-returns.results
@@ -28,20 +28,10 @@ chart2/source/view/main/OpenGLRender.hxx:104
     int OpenGLRender::RenderSymbol2DShape(float,float,int)
 chart2/source/view/main/OpenGLRender.hxx:121
     int OpenGLRender::Create2DCircle(int)
-compilerplugins/clang/test/externvar.hxx:23
-    int f(int)
-compilerplugins/clang/test/redundantinline.hxx:35
-    int S3::operator int()
-compilerplugins/clang/test/redundantinline.hxx:64
-    int S4::operator int()
-compilerplugins/clang/test/redundantinline.hxx:68
-    int S4::f5()
-compilerplugins/clang/test/redundantinline.hxx:70
-    int S4::f6()
-compilerplugins/clang/test/redundantinline.hxx:73
-    int f5()
-compilerplugins/clang/test/redundantinline.hxx:75
-    int f6()
+connectivity/source/drivers/evoab2/NResultSet.hxx:125
+    class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> connectivity::evoab::OEvoabResultSet::operator*()
+connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:53
+    class com::sun::star::uno::Reference<class com::sun::star::sdbc::XResultSetMetaData> connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
 connectivity/source/inc/java/lang/Object.hxx:118
     int connectivity::java_lang_Object::callIntMethodWithIntArg_ThrowRuntime(const char *,struct _jmethodID *&,int) const
 connectivity/source/inc/OColumn.hxx:131
@@ -50,7 +40,7 @@ connectivity/source/inc/OColumn.hxx:133
     const class rtl::OUString & connectivity::OColumn::getCatalogName() const
 connectivity/source/inc/odbc/OConnection.hxx:82
     short connectivity::odbc::OConnection::Construct(const class rtl::OUString &,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &)
-dbaccess/source/ui/browser/genericcontroller.cxx:1267
+dbaccess/source/ui/browser/genericcontroller.cxx:1266
     const type-parameter-?-? & dbaui::(anonymous namespace)::SGI_identity::operator()(const type-parameter-?-? &) const
 i18nlangtag/source/languagetag/languagetag.cxx:275
     const class rtl::OUString & LanguageTagImpl::getBcp47() const
@@ -142,14 +132,16 @@ include/canvas/rendering/isurfaceproxymanager.hxx:58
     class std::shared_ptr<struct canvas::ISurfaceProxy> canvas::ISurfaceProxyManager::createSurfaceProxy(const class std::shared_ptr<struct canvas::IColorBuffer> &) const
 include/canvas/rendering/isurfaceproxymanager.hxx:64
     class std::shared_ptr<struct canvas::ISurfaceProxyManager> createSurfaceProxyManager(const class std::shared_ptr<struct canvas::IRenderModule> &)
-include/canvas/vclwrapper.hxx:135
+include/canvas/vclwrapper.hxx:134
     type-parameter-?-? & canvas::vcltools::VCLObject::get()
-include/canvas/vclwrapper.hxx:136
+include/canvas/vclwrapper.hxx:135
     const type-parameter-?-? & canvas::vcltools::VCLObject::get() const
-include/comphelper/unique_disposing_ptr.hxx:46
+include/comphelper/unique_disposing_ptr.hxx:45
     type-parameter-?-? & comphelper::unique_disposing_ptr::operator*() const
 include/connectivity/FValue.hxx:327
     unsigned short connectivity::ORowSetValue::operator unsigned short() const
+include/editeng/editview.hxx:191
+    class ErrCode EditView::Read(class SvStream &,enum EETextFormat,class SvKeyValueIterator *)
 include/LibreOfficeKit/LibreOfficeKit.hxx:63
     struct _LibreOfficeKitDocument * lok::Document::get()
 include/LibreOfficeKit/LibreOfficeKit.hxx:71
@@ -178,6 +170,8 @@ include/LibreOfficeKit/LibreOfficeKit.hxx:543
     char * lok::Office::getFilterTypes()
 include/LibreOfficeKit/LibreOfficeKit.hxx:593
     char * lok::Office::getVersionInfo()
+include/o3tl/array_view.hxx:158
+    unsigned long std::hash::operator()(array_view<type-parameter-?-?>)
 include/o3tl/enumarray.hxx:100
     typename type-parameter-?-?::value_type * o3tl::enumarray_iterator::operator->()
 include/o3tl/string_view.hxx:844
@@ -188,6 +182,8 @@ include/o3tl/string_view.hxx:854
     unsigned long std::hash::operator()(class o3tl::basic_string_view<char32_t, struct std::char_traits<char32_t> >)
 include/o3tl/string_view.hxx:859
     unsigned long std::hash::operator()(class o3tl::basic_string_view<wchar_t, struct std::char_traits<wchar_t> >)
+include/oox/dump/dumperbase.hxx:637
+    long oox::dump::FlagsList::getIgnoreFlags() const
 include/oox/dump/dumperbase.hxx:1392
     type-parameter-?-? oox::dump::InputObjectBase::dumpName(const class oox::dump::String &,const class oox::dump::NameListWrapper &)
 include/oox/dump/dumperbase.hxx:1398
@@ -244,12 +240,14 @@ include/oox/helper/binaryoutputstream.hxx:79
     class oox::BinaryOutputStream & oox::BinaryOutputStream::WriteUInt16(unsigned short)
 include/oox/helper/containerhelper.hxx:113
     typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::reference oox::Matrix::operator()(typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type,typename vector<type-parameter-?-?, allocator<type-parameter-?-?> >::size_type)
-include/sax/fshelper.hxx:127
+include/sax/fshelper.hxx:205
     class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(int)
-include/sax/fshelper.hxx:128
+include/sax/fshelper.hxx:206
     class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::write(long)
-include/sax/fshelper.hxx:131
+include/sax/fshelper.hxx:209
     class sax_fastparser::FastSerializerHelper * sax_fastparser::FastSerializerHelper::writeEscaped(const char *)
+include/svtools/treelistbox.hxx:536
+    short SvTreeListBox::GetHeightOffset(const class Image &,class Size &)
 include/test/sheet/xnamedrange.hxx:22
     class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface> apitest::XNamedRange::init()
 include/test/sheet/xsheetannotation.hxx:36
@@ -270,10 +268,8 @@ include/vcl/fontcharmap.hxx:48
     class tools::SvRef<class FontCharMap> FontCharMap::GetDefaultMap(_Bool)
 include/vcl/gdimtf.hxx:185
     class SvStream & GDIMetaFile::Read(class SvStream &)
-include/vcl/graphicfilter.hxx:261
-    unsigned short GraphicFilter::ExportGraphic(const class Graphic &,const class INetURLObject &,unsigned short,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *)
-include/vcl/menu.hxx:468
-    unsigned short MenuBar::AddMenuBarButton(const class Image &,const class Link<struct MenuBar::MenuBarButtonCallbackArg &, _Bool> &,const class rtl::OUString &)
+include/vcl/graphicfilter.hxx:259
+    class ErrCode GraphicFilter::ExportGraphic(const class Graphic &,const class INetURLObject &,unsigned short,const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> *)
 lotuswordpro/source/filter/lwpsvstream.hxx:76
     class LwpSvStream & LwpSvStream::ReadUInt8(unsigned char &)
 lotuswordpro/source/filter/lwpsvstream.hxx:77
@@ -284,9 +280,9 @@ sc/source/core/opencl/formulagroupcl.cxx:968
     unsigned long sc::opencl::DynamicKernelSlidingArgument::GenReductionLoopHeader(class std::basic_stringstream<char> &,_Bool &)
 sc/source/core/opencl/formulagroupcl.cxx:1413
     unsigned long sc::opencl::ParallelReductionVectorRef::GenReductionLoopHeader(class std::basic_stringstream<char> &,int,_Bool &)
-sc/source/core/tool/scmatrix.cxx:2209
+sc/source/core/tool/scmatrix.cxx:2213
     type-parameter-?-? * wrapped_iterator::operator->() const
-sc/source/core/tool/scmatrix.cxx:3175
+sc/source/core/tool/scmatrix.cxx:3179
     const class svl::SharedString & matop::COp::operator()(char,type-parameter-?-?,double,double,const class svl::SharedString &) const
 sc/source/ui/vba/vbaformat.hxx:69
     class com::sun::star::uno::Any ScVbaFormat::getAddIndent()
@@ -320,17 +316,23 @@ sc/source/ui/vba/vbaformat.hxx:145
     class com::sun::star::uno::Any ScVbaFormat::getMergeCells()
 sc/source/ui/vba/vbaformat.hxx:151
     class com::sun::star::uno::Any ScVbaFormat::getReadingOrder()
-sd/source/filter/eppt/pptx-epptooxml.cxx:118
+sd/source/filter/eppt/pptx-epptooxml.cxx:126
     class oox::drawingml::ShapeExport & oox::core::PowerPointShapeExport::WritePageShape(const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,enum PageType,_Bool)
+sd/source/ui/inc/OutlineViewShell.hxx:114
+    class ErrCode sd::OutlineViewShell::ReadRtf(class SvStream &)
 sd/source/ui/remotecontrol/IBluetoothSocket.hxx:37
     int sd::IBluetoothSocket::write(const void *,unsigned int)
-sw/inc/calc.hxx:111
+sfx2/source/inc/childwinimpl.hxx:75
+    class SfxFrame * SfxFrameArr_Impl::operator[](unsigned long)
+sw/inc/calc.hxx:112
     class SwSbxValue & SwSbxValue::MakeDouble()
+sw/inc/editsh.hxx:617
+    const class GraphicAttr * SwEditShell::GetGraphicAttr(class GraphicAttr &) const
 sw/source/uibase/inc/fldmgr.hxx:114
     const class com::sun::star::uno::Reference<class com::sun::star::text::XNumberingTypeInfo> & SwFieldMgr::GetNumberingInfo() const
 vcl/inc/PhysicalFontFace.hxx:79
     int PhysicalFontFace::GetWidth() const
-vcl/inc/unx/gtk/gtkdata.hxx:155
+vcl/inc/unx/gtk/gtkdata.hxx:153
     int GtkSalDisplay::CaptureMouse(class SalFrame *)
 vcl/source/filter/FilterConfigCache.hxx:89
     class rtl::OUString FilterConfigCache::GetImportFormatMediaType(unsigned short)
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index fdefba79eb8b..52ef3b0eed16 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -85,8 +85,6 @@ namespace connectivity
 
             virtual ~OEvoabDatabaseMetaData() override;
         public:
-            OEvoabConnection* getOwnConnection() const { return m_pConnection; }
-
             explicit OEvoabDatabaseMetaData(OEvoabConnection* _pCon);
 
             // as I mentioned before this interface is really BIG
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index eaa28e4b44af..9c309aaddb67 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -47,8 +47,6 @@ namespace connectivity
           void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns);
           sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
                         { return m_aEvoabFields[columnIndex - 1]; }
-          sal_Int32 getFieldSize() const
-            {return m_aEvoabFields.size();}
           /// Avoid ambiguous cast error from the compiler.
           operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
           { return this; }
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 7c9711cc03a2..87ede6f43ed9 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -57,7 +57,6 @@ namespace connectivity
             sal_Int32       nField;
             bool            bAscending;
 
-            FieldSort() : nField(0), bAscending( true ) { }
             FieldSort( const sal_Int32 _nField, const bool _bAscending ) : nField( _nField ), bAscending( _bAscending ) { }
         };
         typedef std::vector< FieldSort >  SortDescriptor;
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index c7f02a1f51d7..1ac7417e3627 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -274,23 +274,6 @@ void SvxHyphenWordDialog::ContinueHyph_Impl( sal_Int32 nInsPos )
 }
 
 
-sal_uInt16 SvxHyphenWordDialog::GetHyphIndex_Impl()
-{
-    sal_uInt16 nPos = 0;
-    const OUString aTxt( m_pWordEdit->GetText() );
-
-    for ( sal_Int32 i=0; i < aTxt.getLength(); ++i )
-    {
-        sal_Unicode cChar = aTxt[ i ];
-        if ( cChar == CUR_HYPH_POS_CHAR )
-            break;
-        if ( cChar != HYPH_POS_CHAR )
-            nPos++;
-    }
-    return nPos;
-}
-
-
 void SvxHyphenWordDialog::SelLeft()
 {
     DBG_ASSERT( m_nOldPos > 0, "invalid hyphenation position" );
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 88a6e3c2b46f..5670fa18610e 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -67,7 +67,6 @@ class SvxHyphenWordDialog : public SfxModalDialog
 
     void            InitControls_Impl();
     void            ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default
-    sal_uInt16      GetHyphIndex_Impl();
 
     DECL_LINK(Left_Impl, Button*, void);
     DECL_LINK(Right_Impl, Button*, void);
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index ea3f605c6bcc..3af3652de083 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -70,31 +70,6 @@ void setMsLangIdFallback(OUString const & locale) {
 
 }
 
-OUString getEmergencyLocale() {
-    if (!foundLocale.isEmpty()) {
-        return foundLocale;
-    }
-    try {
-        css::uno::Sequence<OUString> inst(
-            officecfg::Setup::Office::InstalledLocales::get()->
-            getElementNames());
-        OUString locale(
-            getInstalledLocaleForLanguage(
-                inst,
-                officecfg::Office::Linguistic::General::UILocale::get()));
-        if (!locale.isEmpty()) {
-            return locale;
-        }
-        locale = getInstalledLocaleForSystemUILanguage(inst);
-        if (!locale.isEmpty()) {
-            return locale;
-        }
-    } catch (css::uno::Exception & e) {
-        SAL_WARN("desktop.app", "ignoring Exception \"" << e.Message << "\"");
-    }
-    return OUString();
-}
-
 bool prepareLocale() {
     // #i42730# Get the windows 16Bit locale, it should be preferred over the UI
     // locale:
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx
index 84e701e29144..617e635e63f5 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -26,8 +26,6 @@
 
 namespace desktop { namespace langselect {
 
-OUString getEmergencyLocale();
-
 bool prepareLocale();
 
 } }
diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
index 5494c4f811ac..581435dd153a 100644
--- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
@@ -483,16 +483,6 @@ namespace drawinglayer
 
         PolyPolygonGraphicPrimitive2D::PolyPolygonGraphicPrimitive2D(
             const basegfx::B2DPolyPolygon& rPolyPolygon,
-            const attribute::FillGraphicAttribute& rFillGraphic)
-        :   BufferedDecompositionPrimitive2D(),
-            maPolyPolygon(rPolyPolygon),
-            maDefinitionRange(rPolyPolygon.getB2DRange()),
-            maFillGraphic(rFillGraphic)
-        {
-        }
-
-        PolyPolygonGraphicPrimitive2D::PolyPolygonGraphicPrimitive2D(
-            const basegfx::B2DPolyPolygon& rPolyPolygon,
             const basegfx::B2DRange& rDefinitionRange,
             const attribute::FillGraphicAttribute& rFillGraphic)
         :   BufferedDecompositionPrimitive2D(),
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 419482a91903..188e545d3ac6 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -633,103 +633,6 @@ util::DateTime SvxRTFParser::GetDateTimeStamp( )
     return aDT;
 }
 
-void SvxRTFParser::ReadInfo()
-{
-    int _nOpenBrakets = 1;  // the first was already detected earlier!!
-    DBG_ASSERT(m_xDocProps.is(),
-        "SvxRTFParser::ReadInfo: no DocumentProperties");
-    OUString sStr, sComment;
-
-    while( _nOpenBrakets && IsParserWorking() )
-    {
-        int nToken = GetNextToken();
-        switch( nToken )
-        {
-        case '}':       --_nOpenBrakets;    break;
-        case '{':
-            {
-                if( RTF_IGNOREFLAG != GetNextToken() )
-                    SkipToken();
-                else if( RTF_UNKNOWNCONTROL != GetNextToken() )
-                    SkipToken( -2 );
-                else
-                {
-                    // filter out at once
-                    ReadUnknownData();
-                    nToken = GetNextToken();
-                    if( '}' != nToken )
-                        eState = SvParserState::Error;
-                    break;
-                }
-                ++_nOpenBrakets;
-            }
-            break;
-
-        case RTF_TITLE:
-            m_xDocProps->setTitle( GetTextToEndGroup( sStr ) );
-            break;
-        case RTF_SUBJECT:
-            m_xDocProps->setSubject( GetTextToEndGroup( sStr ) );
-            break;
-        case RTF_AUTHOR:
-            m_xDocProps->setAuthor( GetTextToEndGroup( sStr ) );
-            break;
-        case RTF_OPERATOR:
-            m_xDocProps->setModifiedBy( GetTextToEndGroup( sStr ) );
-            break;
-        case RTF_KEYWORDS:
-            {
-                OUString sTemp = GetTextToEndGroup( sStr );
-                m_xDocProps->setKeywords(
-                    ::comphelper::string::convertCommaSeparated(sTemp) );
-                break;
-            }
-        case RTF_DOCCOMM:
-            m_xDocProps->setDescription( GetTextToEndGroup( sStr ) );
-            break;
-
-        case RTF_HLINKBASE:
-            sBaseURL = GetTextToEndGroup( sStr ) ;
-            break;
-
-        case RTF_CREATIM:
-            m_xDocProps->setCreationDate( GetDateTimeStamp() );
-            break;
-
-        case RTF_REVTIM:
-            m_xDocProps->setModificationDate( GetDateTimeStamp() );
-            break;
-
-        case RTF_PRINTIM:
-            m_xDocProps->setPrintDate( GetDateTimeStamp() );
-            break;
-
-        case RTF_COMMENT:
-            GetTextToEndGroup( sComment );
-            break;
-
-        case RTF_BUPTIM:
-            SkipGroup();
-            break;
-
-        case RTF_VERN:
-            break;
-
-        case RTF_EDMINS:
-        case RTF_ID:
-        case RTF_VERSION:
-        case RTF_NOFPAGES:
-        case RTF_NOFWORDS:
-        case RTF_NOFCHARS:
-            NextToken( nToken );
-            break;
-        }
-    }
-
-    SkipToken();        // the closing brace is evaluated "above"
-}
-
-
 void SvxRTFParser::ClearColorTbl()
 {
     while ( !aColorTbl.empty() )
diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index 2cbc032e775d..e659a2184324 100644
--- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -378,10 +378,6 @@ namespace drawinglayer
             virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
 
         public:
-            /// constructors. The one without definition range will use output range as definition range
-            PolyPolygonGraphicPrimitive2D(
-                const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const attribute::FillGraphicAttribute& rFillGraphic);
             PolyPolygonGraphicPrimitive2D(
                 const basegfx::B2DPolyPolygon& rPolyPolygon,
                 const basegfx::B2DRange& rDefinitionRange,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index cec918130ec2..e2c05b6dbcae 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -254,7 +254,6 @@ protected:
     // Read Document-Info
     css::util::DateTime GetDateTimeStamp( );
     OUString& GetTextToEndGroup( OUString& rStr );
-    void ReadInfo();
 
     inline SfxItemSet& GetAttrSet();
     // no text yet inserted? (SttPos from the top stack entry!)
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index 39b7aecdb8dc..651ebbe43445 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -40,7 +40,6 @@ public:
     sal_uInt16       GetMode() const     { return nMode; }
     sal_Int32        GetFStart() const   { return nFStart; }
     sal_uInt16       GetOffset() const   { return nOffset; }
-    sal_uInt16       GetEdFocus() const  { return nEdFocus; }
     const OUString&  GetUndoStr() const  { return aUndoStr; }
     bool             GetMatrixFlag()const{ return bMatrix;}
     const VclPtr<vcl::Window>& GetFocusWindow()const  { return xFocusWin; }
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index a7b34dd36dff..9c1db656e36c 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -158,11 +158,6 @@ public:
                             RTL_TEXTENCODING_UTF8);
         }
 
-        const char* toCString() const
-        {
-            assert(mnIdx < mrList.maAttributeTokens.size());
-            return mrList.getFastAttributeValue(mnIdx);
-        }
         bool isString(const char *str) const
         {
             assert(mnIdx < mrList.maAttributeTokens.size());
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 54735e437f6e..f0200fcfce31 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -133,9 +133,6 @@ public:
     static SfxApplication*      GetOrCreate();
     static SfxApplication*      Get();
 
-    // Resource Locale
-    static std::locale*         GetSfxResLocale();
-
     // DDE
 #if defined(_WIN32)
     static long                 DdeExecute( const OUString& rCmd );
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 227a53f5054b..cb403c78a075 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -63,7 +63,6 @@ protected:
     OUString&           GetExtraData()      { return aExtraData; }
     sal_uInt32          GetUniqId() const   { return nUniqId; }
     void                SetUniqId(sal_uInt32 nSettingsId)  { nUniqId = nSettingsId; }
-    SfxItemSet*         GetItemSet()        { return pOutputSet; }
     void                CreateOutputItemSet( SfxItemPool& rPool );
     void                CreateOutputItemSet( const SfxItemSet& rInput );
     void                SetInputSet( const SfxItemSet* pInSet ) { pInputSet = pInSet; }
diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx
index 563d6ac54959..2b58f5a0e9e1 100644
--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -36,7 +36,6 @@ public:
 
     virtual Size    GetOptimalSize() const override;
 
-    void setInsertCharHdl(const Link<SvxCharView*,void> &rLink);
     void setMouseClickHdl(const Link<SvxCharView*,void> &rLink);
 
 protected:
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index cf908713bdf8..f68fa9fbf740 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -170,7 +170,6 @@ public:
                         { return pWindow->GetSizePixel(); }
     virtual void        Hide();
     virtual void        Show( ShowFlags nFlags );
-    bool                CanGetFocus() const;
     sal_uInt16          GetPosition();
     sal_uInt16          GetType()
                         { return nType; }
diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx
index 20dc592596e5..1f68e108b3bf 100644
--- a/include/svtools/sampletext.hxx
+++ b/include/svtools/sampletext.hxx
@@ -22,7 +22,6 @@ namespace vcl { class Font; }
 SVT_DLLPUBLIC UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage);
 
 SVT_DLLPUBLIC bool isSymbolFont(const vcl::Font &rFont);
-SVT_DLLPUBLIC bool isOpenSymbolFont(const vcl::Font &rFont);
 
 SVT_DLLPUBLIC bool canRenderNameOfSelectedFont(OutputDevice const &rDevice);
 
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index 7641727e3cc4..56ddcd034543 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -76,13 +76,9 @@ public:
     // Compound object
     const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
 
-    bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
-    bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
-
     // Cube object
     const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
     const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
-    CubeFaces GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
     bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
 
     // Sphere object
diff --git a/include/svx/strarray.hxx b/include/svx/strarray.hxx
index a5dca6b84101..04d9a64958e2 100644
--- a/include/svx/strarray.hxx
+++ b/include/svx/strarray.hxx
@@ -23,16 +23,6 @@
 #include <svx/svxdllapi.h>
 #include <vector>
 
-//  class SvxStringArray -------------------------------------------------
-
-class SVX_DLLPUBLIC SvxStringArray
-{
-    std::vector<OUString> m_aTranslations;
-public:
-    SvxStringArray(const char** pResId, size_t nLength);
-    const OUString GetString(sal_uInt32 nPos) const;
-};
-
 class SVX_DLLPUBLIC SvxFieldUnitTable
 {
 public:
@@ -55,7 +45,6 @@ class SVX_DLLPUBLIC SvxAttrNameTable
 public:
     static OUString GetString(sal_uInt32 i);
     static sal_uInt32 Count();
-    static sal_uInt16 GetValue(sal_uInt32 i);
     static sal_uInt32 FindIndex(int nValue);
 };
 
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 29495ab5524b..7537e2184d00 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -141,7 +141,6 @@ public:
     void getCellBounds( const sdr::table::CellPos& rPos, ::tools::Rectangle& rCellRect );
 
     const SfxItemSet& GetActiveCellItemSet() const;
-    void SetMergedItemSetAndBroadcastOnActiveCell(const SfxItemSet& rSet);
 
      void setTableStyle( const css::uno::Reference< css::container::XIndexAccess >& xAutoFormatStyle );
      const css::uno::Reference< css::container::XIndexAccess >& getTableStyle() const;
diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 7b059adccbb7..44ba98ae623b 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -45,9 +45,6 @@ public:
     void* Get( Index aIndex ) const;
 
     Index GetIndexOf( void const* p ) const;
-    Index FirstIndex() const;
-    Index LastIndex() const;
-    Index NextIndex( Index aCurrIndex ) const;
 };
 
 template<typename T>
@@ -61,12 +58,6 @@ public:
 
     Index Insert(T* p) { return UniqueIndexImpl::Insert(p); }
     T*    Get(Index idx) const { return static_cast<T*>( UniqueIndexImpl::Get(idx) ); }
-    T*    Remove(Index idx) { return static_cast<T*>( UniqueIndexImpl::Remove(idx) ); }
-    Index GetIndexOf(T* p) const { return UniqueIndexImpl::GetIndexOf(p); }
-
-    using UniqueIndexImpl::FirstIndex;
-    using UniqueIndexImpl::LastIndex;
-    using UniqueIndexImpl::NextIndex;
 };
 
 #endif
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index ff5885edb36f..370c367be04f 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -32,9 +32,6 @@ class VCL_DLLPUBLIC Scheduler final
     friend class Task;
     Scheduler() = delete;
 
-    static inline bool HasPendingTasks( const ImplSchedulerContext &rSchedCtx,
-                                        const sal_uInt64 nTime );
-
     static inline void UpdateSystemTimer( ImplSchedulerContext &rSchedCtx,
                                           sal_uInt64 nMinPeriod,
                                           bool bForce, sal_uInt64 nTime );
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 983375b45684..36b70f88a4f7 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -378,7 +378,6 @@ public:
 
     static const OUString getNameFromToken( sal_Int32 nToken );
     static const OUString getNamespacePrefixFromToken( sal_Int32 nToken );
-    static const OUString getNamespaceURIFromToken( sal_Int32 nToken );
 
     SvXMLNamespaceMap& GetNamespaceMap() { return *mpNamespaceMap; }
     const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; }
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 976ffeea583f..02037f101b8c 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3301,10 +3301,6 @@ namespace xmloff { namespace token {
         enum XMLTokenEnum eToken );
 
     XMLOFF_DLLPUBLIC bool IsXMLToken(
-        const char* pCString,
-        enum XMLTokenEnum eToken );
-
-    XMLOFF_DLLPUBLIC bool IsXMLToken(
         const sax_fastparser::FastAttributeList::FastAttributeIter& aIter,
         enum XMLTokenEnum eToken );
 } }
diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx
index 364590b05243..6c363d209b55 100644
--- a/include/xmlreader/xmlreader.hxx
+++ b/include/xmlreader/xmlreader.hxx
@@ -38,8 +38,6 @@ namespace xmlreader {
 
 class OOO_DLLPUBLIC_XMLREADER XmlReader {
 public:
-    XmlReader(char const *sStr, size_t nLength);
-
     explicit XmlReader(OUString const & fileUrl);
 
     ~XmlReader();
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index cbc4819f80b9..8127305423c7 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -70,7 +70,6 @@ class ResData
 public:
     ResData( const OString &rGId );
     ResData( const OString &rGId , const OString &rFilename );
-    bool SetId(const OString &rId, IdLevel nLevel);
 
     OString sResTyp;
     OString sId;
@@ -96,51 +95,6 @@ enum class StringType {
 typedef ::std::vector< ResData* > ResStack;
 class ParserQueue;
 
-/// Purpose: syntax check and export of *.src, called from lexer
-class Export
-{
-private:
-    bool bError;                        // any errors while export?
-
-    ParserQueue* pParseQueue;
-
-    void WriteData( ResData *pResData, bool bCreateNew = false ); ///< called before dest. cur ResData
-    void WriteExportList( ResData *pResData, ExportList& rExportList, const ExportListType nTyp );
-
-    OString FullId();                    ///< creates cur. GID
-
-    static OString GetPairedListID(const OString & rText);
-    static OString GetPairedListString(const OString& rText);
-    static OString StripList(const OString& rText);
-
-    void InsertListEntry(const OString &rLine);
-    static void CleanValue( OString &rValue );
-    static OString GetText(const OString &rSource, int nToken);
-
-    void ResData2Output( MergeEntrys *pEntry, StringType nType, const OString& rTextType );
-    void MergeRest( ResData *pResData );
-    static void ConvertMergeContent( OString &rText );
-    static void ConvertExportContent( OString &rText );
-
-    void WriteToMerged(const OString &rText , bool bSDFContent);
-    void SetChildWithText();
-
-    static void CutComment( OString &rText );
-
-public:
-    Export( const OString &rOutput );
-    Export(const OString &rMergeSource, const OString &rOutput, bool bUTF8BOM);
-    ~Export();
-
-    void Init();
-    void Execute( int nToken, const char * pToken ); ///< called from lexer
-
-    void SetError() { bError = true; }
-    bool GetError() { return bError; }
-    ParserQueue* GetParseQueue() { return pParseQueue; }
-};
-
-
 // class MergeEntrys
 
 
@@ -220,9 +174,6 @@ class MergeDataHashMap
         iterator begin() {return m_aHashMap.begin();}
         iterator end() {return m_aHashMap.end();}
 
-        const_iterator begin() const {return m_aHashMap.begin();}
-        const_iterator end() const {return m_aHashMap.end();}
-
     private:
         bool bFirstSearch;
         HashMap_t m_aHashMap;
@@ -276,7 +227,6 @@ class MergeDataFile
 
 
         std::vector<OString> GetLanguages() const;
-        const MergeDataHashMap& getMap() const { return aMap; }
 
         MergeEntrys *GetMergeEntrys( ResData *pResData );
         MergeEntrys *GetMergeEntrysCaseSensitive( ResData *pResData );
@@ -286,30 +236,6 @@ class MergeDataFile
 };
 
 
-class QueueEntry
-{
-public:
-    QueueEntry(int nTypVal, const OString &rLineVal)
-        : nTyp(nTypVal), sLine(rLineVal)
-    {
-    }
-    int nTyp;
-    OString sLine;
-};
-
-class ParserQueue
-{
-public:
-
-    ParserQueue( Export& aExportObj );
-    ~ParserQueue();
-
-    inline void Push( const QueueEntry& aEntry );
-
-    void Close();
-private:
-    inline void Pop( std::queue<QueueEntry>& aQueue );
-};
 #endif // INCLUDED_L10NTOOLS_INC_EXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index cb30edbf7645..6df7017b9b6d 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -477,49 +477,6 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap()
     return *pDocElemTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap()
-{
-    if( !pBodyElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aBodyTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES,         XML_TOK_BODY_TRACKED_CHANGES        },
-            { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS,    XML_TOK_BODY_CALCULATION_SETTINGS   },
-            { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS,     XML_TOK_BODY_CONTENT_VALIDATIONS    },
-            { XML_NAMESPACE_TABLE, XML_LABEL_RANGES,            XML_TOK_BODY_LABEL_RANGES           },
-            { XML_NAMESPACE_TABLE, XML_TABLE,                   XML_TOK_BODY_TABLE                  },
-            { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS,       XML_TOK_BODY_NAMED_EXPRESSIONS      },
-            { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES,         XML_TOK_BODY_DATABASE_RANGES        },
-            { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE,          XML_TOK_BODY_DATABASE_RANGE         },
-            { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES,       XML_TOK_BODY_DATA_PILOT_TABLES      },
-            { XML_NAMESPACE_TABLE, XML_CONSOLIDATION,           XML_TOK_BODY_CONSOLIDATION          },
-            { XML_NAMESPACE_TABLE, XML_DDE_LINKS,               XML_TOK_BODY_DDE_LINKS              },
-            { XML_NAMESPACE_CALC_EXT, XML_DATA_STREAM_SOURCE,   XML_TOK_BODY_DATA_STREAM_SOURCE     },
-            XML_TOKEN_MAP_END
-        };
-
-        pBodyElemTokenMap = new SvXMLTokenMap( aBodyTokenMap );
-    } // if( !pBodyElemTokenMap )
-
-    return *pBodyElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetContentValidationsElemTokenMap()
-{
-    if( !pContentValidationsElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aContentValidationsElemTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION,  XML_TOK_CONTENT_VALIDATION  },
-            XML_TOKEN_MAP_END
-        };
-
-        pContentValidationsElemTokenMap = new SvXMLTokenMap( aContentValidationsElemTokenMap );
-    } // if( !pContentValidationsElemTokenMap )
-
-    return *pContentValidationsElemTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetContentValidationElemTokenMap()
 {
     if( !pContentValidationElemTokenMap )
@@ -539,26 +496,6 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationElemTokenMap()
     return *pContentValidationElemTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetContentValidationAttrTokenMap()
-{
-    if( !pContentValidationAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_NAME,                XML_TOK_CONTENT_VALIDATION_NAME                 },
-            { XML_NAMESPACE_TABLE, XML_CONDITION,           XML_TOK_CONTENT_VALIDATION_CONDITION            },
-            { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,   XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS    },
-            { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL,    XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL     },
-            { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST,        XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST         },
-            XML_TOKEN_MAP_END
-        };
-
-        pContentValidationAttrTokenMap = new SvXMLTokenMap( aContentValidationAttrTokenMap );
-    } // if( !pContentValidationAttrTokenMap )
-
-    return *pContentValidationAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap()
 {
     if( !pContentValidationMessageElemTokenMap )
@@ -575,58 +512,6 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap()
     return *pContentValidationMessageElemTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetContentValidationHelpMessageAttrTokenMap()
-{
-    if( !pContentValidationHelpMessageAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_TITLE,   XML_TOK_HELP_MESSAGE_ATTR_TITLE     },
-            { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY   },
-            XML_TOKEN_MAP_END
-        };
-
-        pContentValidationHelpMessageAttrTokenMap = new SvXMLTokenMap( aContentValidationHelpMessageAttrTokenMap );
-    } // if( !pContentValidationHelpMessageAttrTokenMap )
-
-    return *pContentValidationHelpMessageAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMessageAttrTokenMap()
-{
-    if( !pContentValidationErrorMessageAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_TITLE,           XML_TOK_ERROR_MESSAGE_ATTR_TITLE        },
-            { XML_NAMESPACE_TABLE, XML_DISPLAY,         XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY      },
-            { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE,    XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE },
-            XML_TOKEN_MAP_END
-        };
-
-        pContentValidationErrorMessageAttrTokenMap = new SvXMLTokenMap( aContentValidationErrorMessageAttrTokenMap );
-    } // if( !pContentValidationErrorMessageAttrTokenMap )
-
-    return *pContentValidationErrorMessageAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMacroAttrTokenMap()
-{
-    if( !pContentValidationErrorMacroAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_NAME,    XML_TOK_ERROR_MACRO_ATTR_NAME       },
-            { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE    },
-            XML_TOKEN_MAP_END
-        };
-
-        pContentValidationErrorMacroAttrTokenMap = new SvXMLTokenMap( aContentValidationErrorMacroAttrTokenMap );
-    } // if( !pContentValidationErrorMacroAttrTokenMap )
-
-    return *pContentValidationErrorMacroAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetCondFormatsTokenMap()
 {
     if( !pCondFormatsTokenMap )
@@ -822,40 +707,6 @@ const SvXMLTokenMap& ScXMLImport::GetDataBarEntryAttrMap()
     return *pFormattingEntryAttrMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetLabelRangesElemTokenMap()
-{
-    if( !pLabelRangesElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aLabelRangesElemTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM    },
-            XML_TOKEN_MAP_END
-        };
-
-        pLabelRangesElemTokenMap = new SvXMLTokenMap( aLabelRangesElemTokenMap );
-    } // if( !pLabelRangesElemTokenMap )
-
-    return *pLabelRangesElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetLabelRangeAttrTokenMap()
-{
-    if( !pLabelRangeAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS,    XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE    },
-            { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS,     XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE     },
-            { XML_NAMESPACE_TABLE, XML_ORIENTATION,                 XML_TOK_LABEL_RANGE_ATTR_ORIENTATION    },
-            XML_TOKEN_MAP_END
-        };
-
-        pLabelRangeAttrTokenMap = new SvXMLTokenMap( aLabelRangeAttrTokenMap );
-    } // if( !pLabelRangeAttrTokenMap )
-
-    return *pLabelRangeAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
 {
     if( !pTableElemTokenMap )
@@ -890,30 +741,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
     return *pTableElemTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
-{
-    if (!pTableProtectionElemTokenMap)
-    {
-        static const SvXMLTokenMapEntry aTableProtectionTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS,      XML_TOK_TABLE_SELECT_PROTECTED_CELLS    },
-            { XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS,    XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS  },
-            { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT    },
-            { XML_NAMESPACE_LO_EXT, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT    },
-            { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT  },
-            { XML_NAMESPACE_LO_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT  },
-            { XML_NAMESPACE_LO_EXT, XML_INSERT_COLUMNS, XML_TOK_TABLE_INSERT_COLUMNS_EXT, },
-            { XML_NAMESPACE_LO_EXT, XML_INSERT_ROWS, XML_TOK_TABLE_INSERT_ROWS_EXT, },
-            { XML_NAMESPACE_LO_EXT, XML_DELETE_COLUMNS, XML_TOK_TABLE_DELETE_COLUMNS_EXT, },
-            { XML_NAMESPACE_LO_EXT, XML_DELETE_ROWS, XML_TOK_TABLE_DELETE_ROWS_EXT, },
-            XML_TOKEN_MAP_END
-        };
-        pTableProtectionElemTokenMap = new SvXMLTokenMap(aTableProtectionTokenMap);
-    }
-
-    return *pTableProtectionElemTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
 {
     if( !pTableRowsElemTokenMap )
@@ -933,92 +760,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
     return *pTableRowsElemTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetTableColsElemTokenMap()
-{
-    if( !pTableColsElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aTableColsElemTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP,      XML_TOK_TABLE_COLS_COL_GROUP    },
-            { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS,    XML_TOK_TABLE_COLS_HEADER_COLS  },
-            { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS,           XML_TOK_TABLE_COLS_COLS         },
-            { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN,            XML_TOK_TABLE_COLS_COL          },
-            XML_TOKEN_MAP_END
-        };
-
-        pTableColsElemTokenMap = new SvXMLTokenMap( aTableColsElemTokenMap );
-    } // if( !pTableColsElemTokenMap )
-
-    return *pTableColsElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap()
-{
-    if( !pTableAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aTableAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE,     XML_NAME,           XML_TOK_TABLE_NAME          },
-            { XML_NAMESPACE_TABLE,     XML_STYLE_NAME,     XML_TOK_TABLE_STYLE_NAME    },
-            { XML_NAMESPACE_TABLE, XML_PROTECTED,                   XML_TOK_TABLE_PROTECTED         },
-            { XML_NAMESPACE_TABLE,     XML_PRINT_RANGES,   XML_TOK_TABLE_PRINT_RANGES  },
-            { XML_NAMESPACE_TABLE,     XML_PROTECTION_KEY, XML_TOK_TABLE_PASSWORD      },
-            { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, XML_TOK_TABLE_PASSHASH      },
-            { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, XML_TOK_TABLE_PASSHASH_2  },
-            { XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, XML_TOK_TABLE_PASSHASH_2  },
-            { XML_NAMESPACE_TABLE,     XML_PRINT,          XML_TOK_TABLE_PRINT         },
-            XML_TOKEN_MAP_END
-        };
-
-        pTableAttrTokenMap = new SvXMLTokenMap( aTableAttrTokenMap );
-    } // if( !pTableAttrTokenMap )
-
-    return *pTableAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetTableScenarioAttrTokenMap()
-{
-    if( !pTableScenarioAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER,      XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER  },
-            { XML_NAMESPACE_TABLE, XML_BORDER_COLOR,        XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR    },
-            { XML_NAMESPACE_TABLE, XML_COPY_BACK,           XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK       },
-            { XML_NAMESPACE_TABLE, XML_COPY_STYLES,         XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES     },
-            { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS,       XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS   },
-            { XML_NAMESPACE_TABLE, XML_IS_ACTIVE,           XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE       },
-            { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES,     XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES },
-            { XML_NAMESPACE_TABLE, XML_COMMENT,             XML_TOK_TABLE_SCENARIO_ATTR_COMMENT         },
-            { XML_NAMESPACE_TABLE, XML_PROTECTED,           XML_TOK_TABLE_SCENARIO_ATTR_PROTECTED       },
-            XML_TOKEN_MAP_END
-        };
-
-        pTableScenarioAttrTokenMap = new SvXMLTokenMap( aTableScenarioAttrTokenMap );
-    } // if( !pTableScenarioAttrTokenMap )
-
-    return *pTableScenarioAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetTableColAttrTokenMap()
-{
-    if( !pTableColAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aTableColAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_STYLE_NAME,                  XML_TOK_TABLE_COL_ATTR_STYLE_NAME       },
-            { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,     XML_TOK_TABLE_COL_ATTR_REPEATED         },
-            { XML_NAMESPACE_TABLE, XML_VISIBILITY,                  XML_TOK_TABLE_COL_ATTR_VISIBILITY       },
-            { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME,    XML_TOK_TABLE_COL_ATTR_DEFAULT_CELL_STYLE_NAME },
-            XML_TOKEN_MAP_END
-        };
-
-        pTableColAttrTokenMap = new SvXMLTokenMap( aTableColAttrTokenMap );
-    } // if( !pTableColAttrTokenMap )
-
-    return *pTableColAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetTableRowElemTokenMap()
 {
     if( !pTableRowElemTokenMap )
@@ -1172,122 +913,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap()
     return *pTableCellRangeSourceAttrTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetNamedExpressionsElemTokenMap()
-{
-    if( !pNamedExpressionsElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aNamedExpressionsTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_NAMED_RANGE,             XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE           },
-            { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION,        XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION  },
-            XML_TOKEN_MAP_END
-        };
-
-        pNamedExpressionsElemTokenMap = new SvXMLTokenMap( aNamedExpressionsTokenMap );
-    } // if( !pNamedExpressionsElemTokenMap )
-
-    return *pNamedExpressionsElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetNamedRangeAttrTokenMap()
-{
-    if( !pNamedRangeAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_NAME,                XML_TOK_NAMED_RANGE_ATTR_NAME               },
-            { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,  XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS },
-            { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,   XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS  },
-            { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS,     XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS    },
-            XML_TOKEN_MAP_END
-        };
-
-        pNamedRangeAttrTokenMap = new SvXMLTokenMap( aNamedRangeAttrTokenMap );
-    } // if( !pNamedRangeAttrTokenMap )
-
-    return *pNamedRangeAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetNamedExpressionAttrTokenMap()
-{
-    if( !pNamedExpressionAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_NAME,                XML_TOK_NAMED_EXPRESSION_ATTR_NAME              },
-            { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,   XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS },
-            { XML_NAMESPACE_TABLE, XML_EXPRESSION,          XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION        },
-            XML_TOKEN_MAP_END
-        };
-
-        pNamedExpressionAttrTokenMap = new SvXMLTokenMap( aNamedExpressionAttrTokenMap );
-    } // if( !pNamedExpressionAttrTokenMap )
-
-    return *pNamedExpressionAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangesElemTokenMap()
-{
-    if( !pDatabaseRangesElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aDatabaseRangesTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE,  XML_TOK_DATABASE_RANGE      },
-            XML_TOKEN_MAP_END
-        };
-
-        pDatabaseRangesElemTokenMap = new SvXMLTokenMap( aDatabaseRangesTokenMap );
-    } // if( !pDatabaseRangesElemTokenMap )
-
-    return *pDatabaseRangesElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeElemTokenMap()
-{
-    if( !pDatabaseRangeElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL,     XML_TOK_DATABASE_RANGE_SOURCE_SQL       },
-            { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE,   XML_TOK_DATABASE_RANGE_SOURCE_TABLE     },
-            { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY,   XML_TOK_DATABASE_RANGE_SOURCE_QUERY     },
-            { XML_NAMESPACE_TABLE, XML_FILTER,                  XML_TOK_FILTER                          },
-            { XML_NAMESPACE_TABLE, XML_SORT,                    XML_TOK_SORT                            },
-            { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES,          XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES   },
-            XML_TOKEN_MAP_END
-        };
-
-        pDatabaseRangeElemTokenMap = new SvXMLTokenMap( aDatabaseRangeTokenMap );
-    } // if( !pDatabaseRangeElemTokenMap )
-
-    return *pDatabaseRangeElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeAttrTokenMap()
-{
-    if( !pDatabaseRangeAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_NAME,                    XML_TOK_DATABASE_RANGE_ATTR_NAME                    },
-            { XML_NAMESPACE_TABLE, XML_IS_SELECTION,            XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION            },
-            { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES,   XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES   },
-            { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE,     XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE     },
-            { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA,     XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA     },
-            { XML_NAMESPACE_TABLE, XML_ORIENTATION,         XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION             },
-            { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER,     XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER         },
-            { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS,  XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS  },
-            { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,    XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS    },
-            { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY,           XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY           },
-            XML_TOKEN_MAP_END
-        };
-
-        pDatabaseRangeAttrTokenMap = new SvXMLTokenMap( aDatabaseRangeAttrTokenMap );
-    } // if( !pDatabaseRangeAttrTokenMap )
-
-    return *pDatabaseRangeAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap()
 {
     if( !pDatabaseRangeSourceSQLAttrTokenMap )
@@ -1452,29 +1077,6 @@ const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap()
     return *pSortElemTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetSortAttrTokenMap()
-{
-    if( !pSortAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aSortAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT,  XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT    },
-            { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,    XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS      },
-            { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE,          XML_TOK_SORT_ATTR_CASE_SENSITIVE            },
-            { XML_NAMESPACE_TABLE, XML_RFC_LANGUAGE_TAG,        XML_TOK_SORT_ATTR_RFC_LANGUAGE_TAG          },
-            { XML_NAMESPACE_TABLE, XML_LANGUAGE,                XML_TOK_SORT_ATTR_LANGUAGE                  },
-            { XML_NAMESPACE_TABLE, XML_SCRIPT,                  XML_TOK_SORT_ATTR_SCRIPT                    },
-            { XML_NAMESPACE_TABLE, XML_COUNTRY,                 XML_TOK_SORT_ATTR_COUNTRY                   },
-            { XML_NAMESPACE_TABLE, XML_ALGORITHM,               XML_TOK_SORT_ATTR_ALGORITHM                 },
-            XML_TOKEN_MAP_END
-        };
-
-        pSortAttrTokenMap = new SvXMLTokenMap( aSortAttrTokenMap );
-    } // if( !pSortAttrTokenMap )
-
-    return *pSortAttrTokenMap;
-}
-
 const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap()
 {
     if( !pSortSortByAttrTokenMap )
@@ -1493,107 +1095,6 @@ const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap()
     return *pSortSortByAttrTokenMap;
 }
 
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap()
-{
-    if( !pDatabaseRangeSubTotalRulesElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_SORT_GROUPS,     XML_TOK_SUBTOTAL_RULES_SORT_GROUPS      },
-            { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE,   XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE    },
-            XML_TOKEN_MAP_END
-        };
-
-        pDatabaseRangeSubTotalRulesElemTokenMap = new SvXMLTokenMap( aDatabaseRangeSubTotalRulesTokenMap );
-    } // if( !pDatabaseRangeSubTotalRulesElemTokenMap )
-
-    return *pDatabaseRangeSubTotalRulesElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap()
-{
-    if( !pDatabaseRangeSubTotalRulesAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT,          XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT      },
-            { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE,                  XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE              },
-            { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE },
-            XML_TOKEN_MAP_END
-        };
-
-        pDatabaseRangeSubTotalRulesAttrTokenMap = new SvXMLTokenMap( aDatabaseRangeSubTotalRulesAttrTokenMap );
-    } // if( !pDatabaseRangeSubTotalRulesAttrTokenMap )
-
-    return *pDatabaseRangeSubTotalRulesAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap()
-{
-    if( !pSubTotalRulesSortGroupsAttrTokenMap )
-    {
-        static const SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_DATA_TYPE,   XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE  },
-            { XML_NAMESPACE_TABLE, XML_ORDER,       XML_TOK_SORT_GROUPS_ATTR_ORDER      },
-            XML_TOKEN_MAP_END
-        };
-
-        pSubTotalRulesSortGroupsAttrTokenMap = new SvXMLTokenMap( aSubTotalRulesSortGroupsAttrTokenMap );
-    } // if( !pSubTotalRulesSortGroupsAttrTokenMap )
-
-    return *pSubTotalRulesSortGroupsAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap()
-{
-    if( !pSubTotalRulesSubTotalRuleElemTokenMap )
-    {
-        static const SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] =
-        {
-            { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD,  XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD    },
-            XML_TOKEN_MAP_END
-        };
-

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list