connectivity/source/drivers/evoab2/NDriver.hxx | 2
connectivity/source/drivers/evoab2/NResultSet.hxx | 2
editeng/source/editeng/editobj2.hxx | 1
editeng/source/items/bulitem.cxx | 64 -
editeng/source/items/flditem.cxx | 288 ----
editeng/source/items/svdfield.cxx | 14
editeng/source/items/textitem.cxx | 105 -
editeng/source/rtf/rtfitem.cxx | 1
extensions/source/inc/componentmodule.hxx | 3
framework/source/accelerators/presethandler.cxx | 6
framework/source/inc/accelerators/presethandler.hxx | 1
idl/inc/basobj.hxx | 2
include/editeng/bulletitem.hxx | 3
include/editeng/colritem.hxx | 1
include/editeng/flditem.hxx | 5
include/editeng/fontitem.hxx | 2
include/editeng/fwdtitem.hxx | 84 -
include/editeng/memberids.h | 4
include/editeng/rsiditem.hxx | 1
include/sfx2/charwin.hxx | 1
include/sfx2/tbxctrl.hxx | 4
include/svl/itempool.hxx | 5
include/svtools/grfmgr.hxx | 2
include/svx/rulritem.hxx | 4
include/svx/svdfield.hxx | 29
include/tools/pstm.hxx | 135 --
include/unotools/intlwrapper.hxx | 2
sc/source/filter/xml/xmlimprt.cxx | 823 -------------
sc/source/filter/xml/xmlimprt.hxx | 47
sc/source/ui/app/scdll.cxx | 9
sd/source/ui/app/sddll.cxx | 4
sd/source/ui/inc/DrawViewShell.hxx | 1
sfx2/source/control/charwin.cxx | 5
sfx2/source/toolbox/tbxitem.cxx | 16
svl/source/inc/poolio.hxx | 3
svl/source/items/itempool.cxx | 6
svl/source/items/poolio.cxx | 41
svtools/source/graphic/grfmgr2.cxx | 5
svx/source/svdraw/svdotxfl.cxx | 19
sw/inc/editsh.hxx | 3
sw/inc/rdfhelper.hxx | 3
sw/source/core/doc/rdfhelper.cxx | 17
sw/source/filter/inc/msfilter.hxx | 13
sw/source/filter/ww8/ww8par5.cxx | 5
sw/source/uibase/app/swdll.cxx | 4
sw/source/uibase/inc/edtwin.hxx | 11
tools/Library_tl.mk | 1
tools/source/ref/pstm.cxx | 516 --------
xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 1
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 14
50 files changed, 22 insertions(+), 2316 deletions(-)
New commits:
commit c605c8d0787f93019722a4146750e01d63e81e07
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Aug 8 13:24:31 2017 +0200
SvPersistStream dead
since commit 1e4b1e4a1aca3b333820b0a865997e6f62e80064
"Removing unused SfxItemPool serialisation from editeng"
Change-Id: I8a3cd36a13b7d2322047c2035e0f23c70ca9cdf0
Reviewed-on: https://gerrit.libreoffice.org/40880
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 3ab2c2623df3..cbcb9ce9215c 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -224,7 +224,7 @@ SvxFieldData* SvxFieldData::Create(const
uno::Reference<text::XTextContent>& xTe
}
-SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase );
+SV_IMPL_PERSIST1( SvxFieldData );
SvxFieldData::SvxFieldData()
@@ -251,16 +251,6 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld )
const
}
-void SvxFieldData::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-
-void SvxFieldData::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
-
MetaAction* SvxFieldData::createBeginComment() const
{
return new MetaCommentAction( "FIELD_SEQ_BEGIN" );
@@ -314,7 +304,7 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem )
const
// The following are the derivatives of SvxFieldData ...
-SV_IMPL_PERSIST1( SvxDateField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxDateField );
SvxDateField::SvxDateField()
@@ -351,26 +341,6 @@ bool SvxDateField::operator==( const SvxFieldData& rOther
) const
}
-void SvxDateField::Load( SvPersistStream & rStm )
-{
- sal_uInt16 nType, nFormat;
-
- rStm.ReadInt32( nFixDate );
- rStm.ReadUInt16( nType );
- rStm.ReadUInt16( nFormat );
-
- eType = (SvxDateType)nType;
- eFormat= (SvxDateFormat)nFormat;
-}
-
-
-void SvxDateField::Save( SvPersistStream & rStm )
-{
- rStm.WriteInt32( nFixDate );
- rStm.WriteUInt16( (sal_uInt16)eType );
- rStm.WriteUInt16( eFormat );
-}
-
OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter,
LanguageType eLang ) const
{
@@ -448,7 +418,7 @@ MetaAction* SvxDateField::createBeginComment() const
return new MetaCommentAction( "FIELD_SEQ_BEGIN" );
}
-SV_IMPL_PERSIST1( SvxURLField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxURLField );
SvxURLField::SvxURLField()
@@ -483,58 +453,6 @@ bool SvxURLField::operator==( const SvxFieldData& rOther )
const
}
-static void write_unicode( SvPersistStream & rStm, const OUString& rString )
-{
- sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength());
- rStm.WriteUInt16( nL );
- //endian specific?, yipes!
- rStm.WriteBytes( rString.getStr(), nL*sizeof(sal_Unicode) );
-}
-
-static OUString read_unicode( SvPersistStream & rStm )
-{
- rtl_uString *pStr = nullptr;
- sal_uInt16 nL = 0;
- rStm.ReadUInt16( nL );
- const size_t nMaxRecords = rStm.remainingSize() / sizeof(sal_Unicode);
- if (nL > nMaxRecords)
- {
- SAL_WARN("editeng", "Parsing error: " << nMaxRecords <<
- " max possible entries, but " << nL << " claimed,
truncating");
- nL = nMaxRecords;
- }
- if (nL)
- {
- pStr = rtl_uString_alloc(nL);
- //endian specific?, yipes!
- rStm.ReadBytes(pStr->buffer, nL*sizeof(sal_Unicode));
- }
- //take ownership of buffer and return, otherwise return empty string
- return pStr ? OUString(pStr, SAL_NO_ACQUIRE) : OUString();
-}
-
-void SvxURLField::Load( SvPersistStream & rStm )
-{
- sal_uInt16 nFormat = 0;
-
- rStm.ReadUInt16( nFormat );
- eFormat= (SvxURLFormat)nFormat;
-
- aURL = read_unicode( rStm );
- aRepresentation = read_unicode( rStm );
- aTargetFrame = read_unicode( rStm );
-}
-
-
-void SvxURLField::Save( SvPersistStream & rStm )
-{
- rStm.WriteUInt16( eFormat );
-
- write_unicode( rStm, aURL );
- write_unicode( rStm, aRepresentation );
- write_unicode( rStm, aTargetFrame );
-}
-
MetaAction* SvxURLField::createBeginComment() const
{
// #i46618# Adding target URL to metafile comment
@@ -548,7 +466,7 @@ MetaAction* SvxURLField::createBeginComment() const
// SvxPageTitleField methods
//
-SV_IMPL_PERSIST1( SvxPageTitleField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxPageTitleField );
SvxPageTitleField::SvxPageTitleField() {}
@@ -562,14 +480,6 @@ bool SvxPageTitleField::operator==( const SvxFieldData&
rCmp ) const
return ( dynamic_cast< const SvxPageTitleField *>(&rCmp) != nullptr );
}
-void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxPageTitleField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
MetaAction* SvxPageTitleField::createBeginComment() const
{
return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageTitleField" );
@@ -581,7 +491,7 @@ MetaAction* SvxPageTitleField::createBeginComment() const
// The fields that were removed from Calc:
-SV_IMPL_PERSIST1( SvxPageField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxPageField );
SvxPageField::SvxPageField() {}
@@ -595,21 +505,13 @@ bool SvxPageField::operator==( const SvxFieldData& rCmp )
const
return ( dynamic_cast< const SvxPageField *>(&rCmp) != nullptr );
}
-void SvxPageField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxPageField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
MetaAction* SvxPageField::createBeginComment() const
{
return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageField" );
}
-SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxPagesField );
SvxPagesField::SvxPagesField() {}
@@ -623,15 +525,7 @@ bool SvxPagesField::operator==( const SvxFieldData& rCmp )
const
return ( dynamic_cast< const SvxPagesField *>(&rCmp) != nullptr);
}
-void SvxPagesField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxPagesField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
-SV_IMPL_PERSIST1( SvxTimeField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxTimeField );
SvxTimeField::SvxTimeField() {}
@@ -645,20 +539,12 @@ bool SvxTimeField::operator==( const SvxFieldData& rCmp )
const
return ( dynamic_cast< const SvxTimeField *>(&rCmp) != nullptr);
}
-void SvxTimeField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxTimeField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
MetaAction* SvxTimeField::createBeginComment() const
{
return new MetaCommentAction( "FIELD_SEQ_BEGIN" );
}
-SV_IMPL_PERSIST1( SvxFileField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxFileField );
SvxFileField::SvxFileField() {}
@@ -672,15 +558,7 @@ bool SvxFileField::operator==( const SvxFieldData& rCmp )
const
return ( dynamic_cast< const SvxFileField *>(&rCmp) != nullptr );
}
-void SvxFileField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxFileField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
-SV_IMPL_PERSIST1( SvxTableField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxTableField );
SvxTableField::SvxTableField() : mnTab(0) {}
@@ -705,19 +583,10 @@ bool SvxTableField::operator==( const SvxFieldData& rCmp
) const
return mnTab == static_cast<const SvxTableField&>(rCmp).mnTab;
}
-void SvxTableField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxTableField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
-
// SvxExtTimeField
-SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxExtTimeField );
SvxExtTimeField::SvxExtTimeField()
@@ -754,27 +623,6 @@ bool SvxExtTimeField::operator==( const SvxFieldData&
rOther ) const
}
-void SvxExtTimeField::Load( SvPersistStream & rStm )
-{
- sal_uInt16 nType, nFormat;
-
- rStm.ReadInt64(m_nFixTime);
- rStm.ReadUInt16( nType );
- rStm.ReadUInt16( nFormat );
-
- eType = (SvxTimeType) nType;
- eFormat= (SvxTimeFormat) nFormat;
-}
-
-
-void SvxExtTimeField::Save( SvPersistStream & rStm )
-{
- rStm.WriteInt64(m_nFixTime);
- rStm.WriteUInt16( eType );
- rStm.WriteUInt16( eFormat );
-}
-
-
OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter,
LanguageType eLang ) const
{
tools::Time aTime( tools::Time::EMPTY );
@@ -855,7 +703,7 @@ MetaAction* SvxExtTimeField::createBeginComment() const
// SvxExtFileField
-SV_IMPL_PERSIST1( SvxExtFileField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxExtFileField );
SvxExtFileField::SvxExtFileField()
@@ -891,31 +739,6 @@ bool SvxExtFileField::operator==( const SvxFieldData&
rOther ) const
}
-void SvxExtFileField::Load( SvPersistStream & rStm )
-{
- sal_uInt16 nType, nFormat;
-
- // UNICODE: rStm >> aFile;
- aFile = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
-
- rStm.ReadUInt16( nType );
- rStm.ReadUInt16( nFormat );
-
- eType = (SvxFileType) nType;
- eFormat= (SvxFileFormat) nFormat;
-}
-
-
-void SvxExtFileField::Save( SvPersistStream & rStm )
-{
- // UNICODE: rStm << aFile;
- rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet());
-
- rStm.WriteUInt16( eType );
- rStm.WriteUInt16( eFormat );
-}
-
-
OUString SvxExtFileField::GetFormatted() const
{
OUString aString;
@@ -995,7 +818,7 @@ OUString SvxExtFileField::GetFormatted() const
// SvxAuthorField
-SV_IMPL_PERSIST1( SvxAuthorField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxAuthorField );
SvxAuthorField::SvxAuthorField()
@@ -1038,33 +861,6 @@ bool SvxAuthorField::operator==( const SvxFieldData&
rOther ) const
}
-void SvxAuthorField::Load( SvPersistStream & rStm )
-{
- sal_uInt16 nType = 0, nFormat = 0;
-
- aName = read_unicode( rStm );
- aFirstName = read_unicode( rStm );
- aShortName = read_unicode( rStm );
-
- rStm.ReadUInt16( nType );
- rStm.ReadUInt16( nFormat );
-
- eType = (SvxAuthorType) nType;
- eFormat= (SvxAuthorFormat) nFormat;
-}
-
-
-void SvxAuthorField::Save( SvPersistStream & rStm )
-{
- write_unicode( rStm, aName );
- write_unicode( rStm, aFirstName );
- write_unicode( rStm, aShortName );
-
- rStm.WriteUInt16( eType );
- rStm.WriteUInt16( eFormat );
-}
-
-
OUString SvxAuthorField::GetFormatted() const
{
OUString aString;
@@ -1090,29 +886,7 @@ OUString SvxAuthorField::GetFormatted() const
return aString;
}
-static SvClassManager* pClassMgr=nullptr;
-
-SvClassManager& SvxFieldItem::GetClassManager()
-{
- if ( !pClassMgr )
- {
- pClassMgr = new SvClassManager;
- pClassMgr->Register(SvxFieldData::StaticClassId(),
SvxFieldData::CreateInstance);
- pClassMgr->Register(SvxURLField::StaticClassId(),
SvxURLField::CreateInstance);
- pClassMgr->Register(SvxDateField::StaticClassId(),
SvxDateField::CreateInstance);
- pClassMgr->Register(SvxPageField::StaticClassId(),
SvxPageField::CreateInstance);
- pClassMgr->Register(SvxPageTitleField::StaticClassId(),
SvxPageTitleField::CreateInstance);
- pClassMgr->Register(SvxTimeField::StaticClassId(),
SvxTimeField::CreateInstance);
- pClassMgr->Register(SvxExtTimeField::StaticClassId(),
SvxExtTimeField::CreateInstance);
- pClassMgr->Register(SvxExtFileField::StaticClassId(),
SvxExtFileField::CreateInstance);
- pClassMgr->Register(SvxAuthorField::StaticClassId(),
SvxAuthorField::CreateInstance);
- }
-
- return *pClassMgr;
-}
-
-
-SV_IMPL_PERSIST1( SvxHeaderField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxHeaderField );
SvxHeaderField::SvxHeaderField() {}
@@ -1126,16 +900,8 @@ bool SvxHeaderField::operator==( const SvxFieldData& rCmp
) const
return ( dynamic_cast< const SvxHeaderField *>(&rCmp) != nullptr );
}
-void SvxHeaderField::Load( SvPersistStream & /*rStm*/ )
-{
-}
+SV_IMPL_PERSIST1( SvxFooterField );
-void SvxHeaderField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
-
-SV_IMPL_PERSIST1( SvxFooterField, SvxFieldData );
SvxFooterField::SvxFooterField() {}
SvxFieldData* SvxFooterField::Clone() const
@@ -1148,16 +914,7 @@ bool SvxFooterField::operator==( const SvxFieldData& rCmp
) const
return ( dynamic_cast< const SvxFooterField *>(&rCmp) != nullptr );
}
-void SvxFooterField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxFooterField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
-
-SV_IMPL_PERSIST1( SvxDateTimeField, SvxFieldData );
+SV_IMPL_PERSIST1( SvxDateTimeField );
SvxFieldData* SvxDateTimeField::Clone() const
{
@@ -1169,14 +926,6 @@ bool SvxDateTimeField::operator==( const SvxFieldData&
rCmp ) const
return ( dynamic_cast< const SvxDateTimeField *>(&rCmp) != nullptr );
}
-void SvxDateTimeField::Load( SvPersistStream & /*rStm*/ )
-{
-}
-
-void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ )
-{
-}
-
SvxDateTimeField::SvxDateTimeField() {}
OUString SvxDateTimeField::GetFormatted(
diff --git a/editeng/source/items/svdfield.cxx
b/editeng/source/items/svdfield.cxx
index c0f91f1e2780..9ff72de11fdd 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -20,7 +20,7 @@
#include <editeng/measfld.hxx>
-SV_IMPL_PERSIST1(SdrMeasureField,SvxFieldData);
+SV_IMPL_PERSIST1(SdrMeasureField);
SdrMeasureField::~SdrMeasureField()
{
@@ -36,16 +36,4 @@ bool SdrMeasureField::operator==(const SvxFieldData& rSrc)
const
return eMeasureFieldKind == static_cast<const
SdrMeasureField&>(rSrc).GetMeasureFieldKind();
}
-void SdrMeasureField::Load(SvPersistStream& rIn)
-{
- sal_uInt16 nFieldKind;
- rIn.ReadUInt16( nFieldKind );
- eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
-}
-
-void SdrMeasureField::Save(SvPersistStream& rOut)
-{
- rOut.WriteUInt16( eMeasureFieldKind );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index cf205644ca17..a1ede771eee9 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -82,7 +82,7 @@ public:
}
};
-class SvMetaObject : public SvRttiBase
+class SvMetaObject : public SvRefBase
{
protected:
OString aName;
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index ed1a7edf020e..afafedb69b40 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -76,7 +76,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
const SvxFieldData* GetField() const { return mxField.get(); }
- static SvClassManager& GetClassManager();
};
diff --git a/include/svx/svdfield.hxx b/include/svx/svdfield.hxx
deleted file mode 100644
index 60c95e7ad212..000000000000
--- a/include/svx/svdfield.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SVDFIELD_HXX
-#define INCLUDED_SVX_SVDFIELD_HXX
-
-#include <svx/svxdllapi.h>
-
-void SVX_DLLPUBLIC SdrRegisterFieldClasses();
-
-#endif // INCLUDED_SVX_SVDFIELD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index 6292a52c897f..1f55c7c0fa0f 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -26,147 +26,18 @@
#include <map>
#include <unordered_map>
-#define ERRCODE_IO_NOFACTORY ERRCODE_IO_WRONGFORMAT
-
-class SvPersistBase;
-
-typedef void * (*SvCreateInstancePersist)( SvPersistBase ** );
-
-#define SV_CLASS_REGISTER( Class ) \
- Register( Class::StaticClassId(), Class::CreateInstance )
-
-class TOOLS_DLLPUBLIC SvClassManager
-{
- typedef std::unordered_map<sal_Int32, SvCreateInstancePersist> Map;
- Map aAssocTable;
-
-public:
- void Register( sal_Int32 nClassId, SvCreateInstancePersist pFunc );
- SvCreateInstancePersist Get( sal_Int32 nClassId );
-};
-
-class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase
-{
-public:
-};
-
#define SV_DECL_PERSIST1( Class, CLASS_ID ) \
static sal_Int32 StaticClassId() { return CLASS_ID; } \
- static void * CreateInstance( SvPersistBase ** ppBase ); \
- friend SvPersistStream& operator >> ( SvPersistStream & rStm, \
- Class *& rpObj); \
virtual sal_Int32 GetClassId() const override; \
- virtual void Load( SvPersistStream & ) override; \
- virtual void Save( SvPersistStream & ) override;
-#define SV_IMPL_PERSIST1( Class, Super1 ) \
- void * Class::CreateInstance( SvPersistBase ** ppBase )\
- { \
- Class * p = new Class(); \
- *ppBase = p; \
- return p; \
- } \
- sal_Int32 Class::GetClassId() const \
+#define SV_IMPL_PERSIST1( Class ) \
+ sal_Int32 Class::GetClassId() const \
{ return StaticClassId(); } \
- SvPersistStream& operator >> (SvPersistStream & rStm, Class *& rpObj)\
- { \
- SvPersistBase * pObj; \
- rStm >> pObj; \
- rpObj = dynamic_cast< Class*>( pObj ); \
- return rStm; \
- }
-
-class SvPersistStream;
-class SvPersistBase : public SvRttiBase
+class SvPersistBase : public SvRefBase
{
public:
virtual sal_Int32 GetClassId() const = 0;
- virtual void Load( SvPersistStream & ) = 0;
- virtual void Save( SvPersistStream & ) = 0;
- TOOLS_DLLPUBLIC friend SvPersistStream& operator >> ( SvPersistStream &
rStm,
- SvPersistBase *& rpObj );
-};
-
-class SvStream;
-
-/** Persistent Stream
-
- This class provides accessor to storing and loading runtime objects.
- All dependent objects have to be stored as well.
- In order to load objects automatically, every object class must
- provide a Factory method to read an object from stream.
- The list of all classes is stored in a <SvClassManager> object
- and is sent to SvPersistStream upon initialization.
- By using the Method SvPersistStream::WriteCompressed and
- SvPersistStream::ReadCompressed, compressed sal_uInt32 values may be
- written to / read from the Stream.
- Several helper methods exists for writing and reading
- object lengths to the stream: SvPersistStream::WriteDummyLen,
- SvPersistStream::WriteLen and SvPersistStream::ReadLen.
-
- [Example]
-
- One example is described in the constructor.
- Assume a ring-like dependency, where A references B,
- B itself references C, and C references to both D and A.
-
- The order of the objects upon saving and loading does not matter,
- as long objects are loaded in the same order they were stored.
-
- Saving: Loading:
- A,B,C,D A,B,C,D correct
- B,A,C,D B,A,C,D correct
- C,A,B,D A,B,C,D wrong
- A,B,C,D A,B,C wrong
-
- @note The file formats DBG_UTIL and !DBG_UTIL differ, but we can read from
- both versions.
-*/
-class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
-{
-public:
- typedef UniqueIndex<SvPersistBase>::Index Index;
-
-private:
- typedef std::map<SvPersistBase*, Index> PersistBaseMap;
-
- SvClassManager & rClassMgr;
- SvStream * pStm;
- PersistBaseMap aPTable; // reversed pointer and key
- UniqueIndex<SvPersistBase>
- aPUIdx;
- Index nStartIdx;
-
- virtual std::size_t GetData(void* pData, std::size_t nSize) override;
- virtual std::size_t PutData(const void* pData, std::size_t nSize) override;
- virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
- virtual void FlushData() override;
-
-protected:
- void WriteObj( sal_uInt8 nHdr, SvPersistBase * pObj );
- void ReadObj( SvPersistBase * & rpObj );
-
-public:
- virtual void ResetError() override;
-
- SvPersistStream( SvClassManager &, SvStream * pStream
);
- virtual ~SvPersistStream() override;
-
- SvPersistBase * GetObject( Index nIdx ) const;
- Index GetIndex( SvPersistBase * ) const;
-
- static void WriteCompressed( SvStream & rStm, sal_uInt32 nVal );
- static sal_uInt32 ReadCompressed( SvStream & rStm );
-
- sal_uInt32 WriteDummyLen();
- void WriteLen( sal_uInt32 nLenPos );
- sal_uInt32 ReadLen( sal_uInt32 * pTestPos );
-
- SvPersistStream& WritePointer( SvPersistBase * pObj );
- SvPersistStream& ReadPointer( SvPersistBase * & rpObj );
- TOOLS_DLLPUBLIC friend SvPersistStream& WriteSvPersistBase(SvPersistStream
&, SvPersistBase *);
- TOOLS_DLLPUBLIC friend SvPersistStream& operator >> (SvPersistStream &,
SvPersistBase * &);
};
#endif
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index daa0c7cf06ea..7c555111b6db 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -100,7 +100,6 @@
#include <svx/imapdlg.hxx>
#include "editutil.hxx"
-#include <svx/svdfield.hxx>
#include "dwfunctr.hxx"
#include "acredlin.hxx"
@@ -262,14 +261,6 @@ void ScDLL::Init()
sc::SearchResultsDlgWrapper::RegisterChildWindow(false, pMod);
ScCondFormatDlgWrapper::RegisterChildWindow(false, pMod);
- // EditEngine Field; insofar not already defined in OfficeApplication::Init
- SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
- rClassManager.Register(SvxPagesField::StaticClassId(),
SvxPagesField::CreateInstance);
- rClassManager.Register(SvxFileField::StaticClassId(),
SvxFileField::CreateInstance);
- rClassManager.Register(SvxTableField::StaticClassId(),
SvxTableField::CreateInstance);
-
- SdrRegisterFieldClasses(); // Register SvDraw fields
-
// Add 3DObject Factory
E3dObjFactory();
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 8b8430d32d56..b487624c151b 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -25,7 +25,6 @@
#include <unotools/configmgr.hxx>
#include <unotools/moduleoptions.hxx>
#include <svx/fmobjfac.hxx>
-#include <svx/svdfield.hxx>
#include <svx/objfac3d.hxx>
#include <vcl/svapp.hxx>
@@ -277,9 +276,6 @@ void SdDLL::Init()
// register your controllers here
RegisterControllers(pModule);
- // register SvDraw-Fields
- SdrRegisterFieldClasses();
-
// register 3D-object-factory
E3dObjFactory();
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index 154e7707d73a..4fe84291dc80 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -18,27 +18,8 @@
*/
#include <editeng/eeitem.hxx>
-
#include <editeng/measfld.hxx>
#include <svx/svdotext.hxx>
-#include <svx/svdfield.hxx>
-
-static bool bInit = false;
-
-// Do not remove this, it is still used in src536a!
-void SdrRegisterFieldClasses()
-{
- if ( !bInit )
- {
- SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SdrMeasureField);
- SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField);
- SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField);
- SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField);
- bInit = true;
- }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////
*/
bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_Int32
/*nPara*/, sal_uInt16 /*nPos*/,
bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, OUString&
/*rRet*/) const
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 201fa02d1384..d47a700af7a2 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -40,7 +40,6 @@
#include <comphelper/processfactory.hxx>
#include <svx/fmobjfac.hxx>
-#include <svx/svdfield.hxx>
#include <svx/objfac3d.hxx>
#include <editeng/acorrcfg.hxx>
@@ -110,9 +109,6 @@ SwDLL::SwDLL()
pDocFact->SetDocumentServiceName("com.sun.star.text.TextDocument");
}
- // register SvDraw-Fields
- SdrRegisterFieldClasses();
-
// register 3D-object-Factory
E3dObjFactory();
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index d0d9f4516c2b..9b3a9d984bd6 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/misc/cpuid \
tools/source/misc/extendapplicationenvironment \
tools/source/ref/globname \
- tools/source/ref/pstm \
tools/source/ref/ref \
tools/source/stream/stream \
tools/source/stream/vcompat \
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
deleted file mode 100644
index 41b8cacf3135..000000000000
--- a/tools/source/ref/pstm.cxx
+++ /dev/null
@@ -1,516 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <tools/pstm.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
-
-#define STOR_NO_OPTIMIZE
-
-void SvClassManager::Register( sal_Int32 nClassId, SvCreateInstancePersist
pFunc )
-{
-#ifdef DBG_UTIL
- SvCreateInstancePersist p;
- p = Get( nClassId );
- assert( (!p || p == pFunc) && "register class with same id");
-#endif
- aAssocTable.insert(Map::value_type(nClassId, pFunc));
-}
-
-SvCreateInstancePersist SvClassManager::Get( sal_Int32 nClassId )
-{
- Map::const_iterator i(aAssocTable.find(nClassId));
- return i == aAssocTable.end() ? nullptr : i->second;
-}
-
-/** Constructor
-
- @param rMgr Stores factories for objects that can persisted
- @param pStream This stream is used as the medium for PersistStream
- @param nStartIdxP Start value for object identifier (set > 0 )
-
- @warning Objects rMgr and pStream must not be manipulated while used in
- SvPersistStream. An Exception to this is pvStream
- (cf. <SvPersistStream::SetStream>).
- @see SvPersistStream::SetStream
-*/
-SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream )
- : rClassMgr( rMgr )
- , pStm( pStream )
- , aPUIdx( UniqueIndex<SvPersistBase>::Index(1) )
- , nStartIdx( 1 )
-{
- m_isWritable = true;
- if( pStm )
- {
- SetVersion( pStm->GetVersion() );
- SetError( pStm->GetError() );
- SyncSvStream( pStm->Tell() );
- }
-}
-
-SvPersistStream::~SvPersistStream()
-{
- if( pStm != nullptr )
- {
- SyncSysStream();
- pStm->SetError( GetError() );
- pStm = nullptr;
- }
-}
-
-void SvPersistStream::ResetError()
-{
- SvStream::ResetError();
- assert(pStm && "stream not set");
- pStm->ResetError();
-}
-
-std::size_t SvPersistStream::GetData( void* pData, std::size_t nSize )
-{
- assert(pStm && "stream not set");
- std::size_t const nRet = pStm->ReadBytes( pData, nSize );
- SetError( pStm->GetError() );
- return nRet;
-}
-
-std::size_t SvPersistStream::PutData( const void* pData, std::size_t nSize )
-{
- assert(pStm && "stream not set");
- std::size_t const nRet = pStm->WriteBytes( pData, nSize );
- SetError( pStm->GetError() );
- return nRet;
-}
-
-sal_uInt64 SvPersistStream::SeekPos(sal_uInt64 const nPos)
-{
- assert(pStm && "stream not set");
- sal_uInt64 nRet = pStm->Seek( nPos );
- SetError( pStm->GetError() );
- return nRet;
-}
-
-void SvPersistStream::FlushData()
-{
-}
-
-SvPersistStream::Index SvPersistStream::GetIndex( SvPersistBase * pObj ) const
-{
- PersistBaseMap::const_iterator it = aPTable.find( pObj );
- if( it == aPTable.end() )
- {
- return Index(0);
- }
- return it->second;
-}
-
-SvPersistBase * SvPersistStream::GetObject( Index nIdx ) const
-{
- if( nIdx >= nStartIdx )
- return aPUIdx.Get( nIdx );
- return nullptr;
-}
-
-#define LEN_1 0x80
-#define LEN_2 0x40
-#define LEN_4 0x20
-#define LEN_5 0x10
-
-/** Reads a compressed word from the stream.
-
- For details on what format is used for compression, see
- <SvPersistStream::WriteCompressed>.
-
- @param rStm Source to read compressed data from
-
- @return Uncompressed word
- @see SvPersistStream::WriteCompressed
-*/
-sal_uInt32 SvPersistStream::ReadCompressed( SvStream & rStm )
-{
- sal_uInt32 nRet(0);
- sal_uInt8 nMask;
- rStm.ReadUChar( nMask );
- if( nMask & LEN_1 )
- nRet = ~LEN_1 & nMask;
- else if( nMask & LEN_2 )
- {
- nRet = ~LEN_2 & nMask;
- nRet <<= 8;
- rStm.ReadUChar( nMask );
- nRet |= nMask;
- }
- else if( nMask & LEN_4 )
- {
- nRet = ~LEN_4 & nMask;
- nRet <<= 8;
- rStm.ReadUChar( nMask );
- nRet |= nMask;
- nRet <<= 16;
- sal_uInt16 n;
- rStm.ReadUInt16( n );
- nRet |= n;
- }
- else if( nMask & LEN_5 )
- {
- if( nMask & 0x0F )
- {
- rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- OSL_FAIL( "format error" );
- }
- rStm.ReadUInt32( nRet );
- }
- else
- {
- rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- OSL_FAIL( "format error" );
- }
- return nRet;
-}
-
-/** Writes compressed stream
-
- @param rStm Source for writing compressed data
- @param nVal This value will be compressed and written
-
- nVal is compressed and written to stream using the following algorithm
- nVal < 0x80 => 0x80 + nVal of size 1 Byte.
- nVal < 0x4000 => 0x4000 + nVal of size 2 Byte.
- nVal < 0x20000000 => 0x20000000 + nVal of size 4 Byte.
- nVal > 0x1FFFFFFF => 0x1000000000+ nVal of size 5 Byte.
-
- @see SvPersistStream::ReadCompressed
-*/
-void SvPersistStream::WriteCompressed( SvStream & rStm, sal_uInt32 nVal )
-{
-#ifdef STOR_NO_OPTIMIZE
- if( nVal < 0x80 )
- rStm.WriteUChar( LEN_1 | nVal );
- else if( nVal < 0x4000 )
- {
- rStm.WriteUChar( LEN_2 | (nVal >> 8) );
- rStm.WriteUChar( nVal );
- }
- else if( nVal < 0x20000000 )
- {
- // highest sal_uInt8
- rStm.WriteUChar( LEN_4 | (nVal >> 24) );
- // 2nd highest sal_uInt8
- rStm.WriteUChar( nVal >> 16 );
- rStm.WriteUInt16( nVal );
- }
- else
-#endif
- {
- rStm.WriteUChar( LEN_5 );
- rStm.WriteUInt32( nVal );
- }
-}
-
-/** This method writes length value of 4 Bytes to the stream and returns the
- stream position.
-
- Example:
- @code
- sal_uInt32 nObjPos = rStm.WriteDummyLen();
- ...
- // write data
- ...
- rStm.WriteLen( nObjPos );
- @endcode
-
- @return Position of stream behind length value
-
- @see SvPersistStream::ReadLen
- @see SvPersistStream::WriteLen
-*/
-sal_uInt32 SvPersistStream::WriteDummyLen()
-{
- WriteUInt32( 0 );
- return Tell();
-}
-
-/** Write difference between current position and nObjPos
- as sal_uInt32 to position nObjPos-4 in the stream.
-
- Afterwards, reset stream to old position.
-
- Example: Difference does not contain length value
- @code
- sal_uInt32 nObjPos = rStm.WriteDummyLen();
- ...
- // write data
- ...
- rStm.WriteLen( nObjPos );
- // write more data
- @endcode
-
- @param nObjPos Position+4, on which length is written to
-
- @see SvPersistStream::ReadLen
- @see SvPersistStream::WriteDummyLen
-*/
-void SvPersistStream::WriteLen( sal_uInt32 nObjPos )
-{
- sal_uInt32 nPos = Tell();
- sal_uInt32 nLen = nPos - nObjPos;
- // Length in stream must be 4 Bytes
- Seek( nObjPos - sizeof( sal_uInt32 ) );
- // write length
- WriteUInt32( nLen );
- Seek( nPos );
-}
-
-/** Read a length value written to stream
-
- @param pTestPos Position of the stream after reading length. May be NULL.
-
- @see SvPersistStream::WriteDummyLen
- @see SvPersistStream::WriteLen
-*/
-sal_uInt32 SvPersistStream::ReadLen( sal_uInt32 * pTestPos )
-{
- sal_uInt32 nLen;
- ReadUInt32( nLen );
- if( pTestPos )
- *pTestPos = Tell();
- return nLen;
-}
-
-// File format backward-compatible
-#ifdef STOR_NO_OPTIMIZE
-#define P_VER (sal_uInt8)0x00
-#else
-#define P_VER (sal_uInt8)0x01
-#endif
-#define P_VER_MASK (sal_uInt8)0x0F
-#define P_ID_0 (sal_uInt8)0x80
-#define P_OBJ (sal_uInt8)0x40
-#define P_DBGUTIL (sal_uInt8)0x20
-#define P_ID (sal_uInt8)0x10
-#ifdef STOR_NO_OPTIMIZE
-#define P_STD P_DBGUTIL
-#else
-#define P_STD 0
-#endif
-
-static void WriteId
-(
- SvStream & rStm,
- sal_uInt8 nHdr,
- sal_uInt32 nId,
- sal_uInt16 nClassId
-)
-{
-#ifdef STOR_NO_OPTIMIZE
- nHdr |= P_ID;
-#endif
- nHdr |= P_VER;
- if( nHdr & P_ID )
- {
- if( (nHdr & P_OBJ) || nId != 0 )
- { // Id set only for pointers or DBGUTIL
- rStm.WriteUChar( nHdr );
- SvPersistStream::WriteCompressed( rStm, nId );
- }
- else
- { // NULL Pointer
- rStm.WriteUChar( nHdr | P_ID_0 );
- return;
- }
- }
- else
- rStm.WriteUChar( nHdr );
-
- if( (nHdr & P_DBGUTIL) || (nHdr & P_OBJ) )
- // Objects always have a class id
- // Pointers only for DBG_UTIL and != NULL
- SvPersistStream::WriteCompressed( rStm, nClassId );
-}
-
-static void ReadId
-(
- SvStream & rStm,
- sal_uInt8 & nHdr,
- SvPersistStream::Index & nId,
- sal_uInt16 & nClassId
-)
-{
- nClassId = 0;
- rStm.ReadUChar( nHdr );
- if( nHdr & P_ID_0 )
- nId = SvPersistStream::Index(0);
- else
- {
- if( (nHdr & P_VER_MASK) == 0 )
- {
- if( (nHdr & P_DBGUTIL) || !(nHdr & P_OBJ) )
- nId = SvPersistStream::Index(SvPersistStream::ReadCompressed(
rStm ));
- else
- nId = SvPersistStream::Index(0);
- }
- else if( nHdr & P_ID )
- nId = SvPersistStream::Index(SvPersistStream::ReadCompressed( rStm
));
-
- if( (nHdr & P_DBGUTIL) || (nHdr & P_OBJ) )
- nClassId = (sal_uInt16)SvPersistStream::ReadCompressed( rStm );
- }
-}
-
-void SvPersistStream::WriteObj
-(
- sal_uInt8 nHdr,
- SvPersistBase * pObj
-)
-{
-#ifdef STOR_NO_OPTIMIZE
- sal_uInt32 nObjPos = 0;
- if( nHdr & P_DBGUTIL )
- // remember position for length value
- nObjPos = WriteDummyLen();
-#endif
- pObj->Save( *this );
-#ifdef STOR_NO_OPTIMIZE
- if( nHdr & P_DBGUTIL )
- WriteLen( nObjPos );
-#endif
-}
-
-SvPersistStream& SvPersistStream::WritePointer
-(
- SvPersistBase * pObj
-)
-{
- sal_uInt8 nP = P_STD;
-
- if( pObj )
- {
- Index nId = GetIndex( pObj );
- if( nId )
- nP |= P_ID;
- else
- {
- nId = aPUIdx.Insert( pObj );
- aPTable[ pObj ] = nId;
- nP |= P_OBJ;
- }
- WriteId( *this, nP, (sal_uInt32)nId, pObj->GetClassId() );
- if( nP & P_OBJ )
- WriteObj( nP, pObj );
- }
- else
- { // NULL Pointer
- WriteId( *this, nP | P_ID, 0, 0 );
- }
- return *this;
-}
-
-void SvPersistStream::ReadObj
-(
- SvPersistBase * & rpObj
-)
-{
- sal_uInt8 nHdr;
- Index nId(0);
- sal_uInt16 nClassId;
-
- rpObj = nullptr; // specification: 0 in case of error
- ReadId( *this, nHdr, nId, nClassId );
-
- // get version number through masking
- if( P_VER < (nHdr & P_VER_MASK) )
- {
- SetError( SVSTREAM_FILEFORMAT_ERROR );
- OSL_FAIL( "false version" );
- }
-
- if( !(nHdr & P_ID_0) && GetError() == ERRCODE_NONE )
- {
- if( P_OBJ & nHdr )
- { // read object, nId only set for P_DBGUTIL
- SAL_WARN_IF( (nHdr & P_DBGUTIL) && nullptr != aPUIdx.Get( nId ),
"tools","object already exists");
- SvCreateInstancePersist pFunc = rClassMgr.Get( nClassId );
-
- sal_uInt32 nObjLen(0), nObjPos(0);
- if( nHdr & P_DBGUTIL )
- nObjLen = ReadLen( &nObjPos );
- if( !pFunc )
- {
-#ifdef DBG_UTIL
- SAL_INFO( "tools", "no class with id: " << nClassId << "
registered" );
-#else
- (void)nObjLen;
-#endif
- SetError( ERRCODE_IO_NOFACTORY );
- return;
- }
- pFunc( &rpObj );
- // Save reference
- rpObj->AddFirstRef();
-
- // insert into table
- const Index nNewId = aPUIdx.Insert( rpObj );
- // in order to restore state after saving
- aPTable[ rpObj ] = nNewId;
- SAL_WARN_IF( (nHdr & P_DBGUTIL) && (nId != nNewId), "tools","read
write id conflict: not the same");
-
- rpObj->Load( *this );
- SAL_WARN_IF( nObjLen + nObjPos != Tell(), "tools", "false object
len: read = " << (Tell() - nObjPos)
- << ", should = " << nObjLen);
- rpObj->RestoreNoDelete();
- rpObj->ReleaseRef();
- }
- else
- {
- rpObj = GetObject( nId );
- SAL_WARN_IF(rpObj==nullptr,"tools","object does not exist");
- SAL_WARN_IF( rpObj->GetClassId() != nClassId , "tools" , "class
mismatch" );
- }
- }
-}
-
-SvPersistStream& SvPersistStream::ReadPointer
-(
- SvPersistBase * & rpObj
-)
-{
- ReadObj( rpObj );
- return *this;
-}
-
-SvPersistStream& WriteSvPersistBase
-(
- SvPersistStream & rStm,
- SvPersistBase * pObj
-)
-{
- return rStm.WritePointer( pObj );
-}
-
-SvPersistStream& operator >>
-(
- SvPersistStream & rStm,
- SvPersistBase * & rpObj
-)
-{
- return rStm.ReadPointer( rpObj );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 61d49afadb2badc7572b04c73ee682afde1d2e7b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Aug 8 13:01:54 2017 +0200
loplugin:unusedmethods
Change-Id: Id66cf12e3a59aeed1b9a7a111b841e30b248635b
Reviewed-on: https://gerrit.libreoffice.org/40876
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx
b/connectivity/source/drivers/evoab2/NDriver.hxx
index c0570e9186ce..788eed1d4b05 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -76,8 +76,6 @@ namespace connectivity
virtual sal_Int32 SAL_CALL getMinorVersion( ) override;
public:
- const css::uno::Reference< css::lang::XMultiServiceFactory >
- & getMSFactory() const { return m_xFactory; }
css::uno::Reference< css::uno::XComponentContext >
getComponentContext( ) const { return
comphelper::getComponentContext( m_xFactory ); }
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx
b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 2ed512817c12..692dd9f8a062 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -120,8 +120,6 @@ namespace connectivity
OEvoabResultSet( OCommonStatement *pStmt, OEvoabConnection
*pConnection );
void construct( const QueryData& _rData );
- OEvoabConnection * getConnection() { return m_pConnection; }
-
css::uno::Reference< css::uno::XInterface > operator *()
{
return css::uno::Reference< css::uno::XInterface
>(*static_cast<OResultSet_BASE*>(this));
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index 71ca353acae6..3091ddaadb65 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -268,7 +268,6 @@ public:
void SetMetric( sal_uInt16 n ) { nMetric = n; }
bool IsOwnerOfPool() const { return bOwnerOfPool;
}
- void StoreUnicodeStrings( bool b ) { bStoreUnicodeStrings = b; }
bool operator==( const EditTextObjectImpl& rCompare ) const;
bool Equals( const EditTextObjectImpl& rCompare, bool bComparePool ) const;
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 951e6b6be85b..af28642f87cf 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -29,70 +29,6 @@
#define BULITEM_VERSION ((sal_uInt16)2)
-void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont )
-{
- sal_uInt16 nTemp;
-
- WriteColor( rStream, rFont.GetColor() );
- nTemp = (sal_uInt16)rFont.GetFamilyType(); rStream.WriteUInt16( nTemp );
-
- nTemp = (sal_uInt16)GetSOStoreTextEncoding(rFont.GetCharSet());
- rStream.WriteUInt16( nTemp );
-
- nTemp = (sal_uInt16)rFont.GetPitch(); rStream.WriteUInt16( nTemp );
- nTemp = (sal_uInt16)rFont.GetAlignment(); rStream.WriteUInt16( nTemp );
- nTemp = (sal_uInt16)rFont.GetWeight(); rStream.WriteUInt16( nTemp );
- nTemp = (sal_uInt16)rFont.GetUnderline(); rStream.WriteUInt16( nTemp );
- nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp );
- nTemp = (sal_uInt16)rFont.GetItalic(); rStream.WriteUInt16( nTemp );
-
- // UNICODE: rStream << rFont.GetFamilyName();
- rStream.WriteUniOrByteString(rFont.GetFamilyName(),
rStream.GetStreamCharSet());
-
- rStream.WriteBool( rFont.IsOutline() );
- rStream.WriteBool( rFont.IsShadow() );
- rStream.WriteBool( rFont.IsTransparent() );
-}
-
-
-vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
-{
- vcl::Font aFont;
- Color aColor;
- ReadColor( rStream, aColor ); aFont.SetColor( aColor );
- sal_uInt16 nTemp;
- rStream.ReadUInt16( nTemp ); aFont.SetFamily((FontFamily)nTemp);
-
- rStream.ReadUInt16( nTemp );
- nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp);
- aFont.SetCharSet((rtl_TextEncoding)nTemp);
-
- rStream.ReadUInt16( nTemp ); aFont.SetPitch((FontPitch)nTemp);
- rStream.ReadUInt16( nTemp ); aFont.SetAlignment((FontAlign)nTemp);
- rStream.ReadUInt16( nTemp ); aFont.SetWeight((FontWeight)nTemp);
- rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontLineStyle)nTemp);
- rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
- rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp);
-
- // UNICODE: rStream >> aName; aFont.SetFamilyName( aName );
- OUString aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
- aFont.SetFamilyName( aName );
-
- if( nVer == 1 )
- {
- sal_Int32 nHeight(0), nWidth(0);
- rStream.ReadInt32( nHeight ); rStream.ReadInt32( nWidth ); Size aSize(
nWidth, nHeight );
- aFont.SetFontSize( aSize );
- }
-
- bool bTemp;
- rStream.ReadCharAsBool( bTemp ); aFont.SetOutline( bTemp );
- rStream.ReadCharAsBool( bTemp ); aFont.SetShadow( bTemp );
- rStream.ReadCharAsBool( bTemp ); aFont.SetTransparent( bTemp );
- return aFont;
-}
-
-
SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
{
SetDefaultFont_Impl();
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index c2bdb37ccbd8..3ab2c2623df3 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -272,13 +272,6 @@ MetaAction* SvxFieldData::createEndComment()
}
-SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
- SfxPoolItem( nId )
- , mxField( pFld ) // belongs directly to the item
-{
-}
-
-
SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId )
:
SfxPoolItem( nId )
, mxField( rField.Clone() )
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 4dbd8d708f88..24c33bc36aa2 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -67,7 +67,6 @@
#include <editeng/postitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <editeng/fwdtitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/shdditem.hxx>
@@ -419,11 +418,6 @@ bool SvxFontItem::GetPresentation
}
-void SvxFontItem::EnableStoreUnicodeNames( bool bEnable )
-{
- bEnableStoreUnicodeNames = bEnable;
-}
-
void SvxFontItem::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("SvxFontItem"));
@@ -1093,97 +1087,6 @@ void SvxFontHeightItem::dumpAsXml(xmlTextWriterPtr
pWriter) const
xmlTextWriterEndElement(pWriter);
}
-// class SvxFontWidthItem -----------------------------------------------
-
-SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16
nPrp, const sal_uInt16 nId ) :
- SfxPoolItem( nId )
-{
- nWidth = nSz;
- nProp = nPrp;
-}
-
-
-SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
-{
- return new SvxFontWidthItem( *this );
-}
-
-
-void SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
-{
- nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv );
-}
-
-
-bool SvxFontWidthItem::HasMetrics() const
-{
- return true;
-}
-
-
-bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
-{
- assert(SfxPoolItem::operator==(rItem));
- return GetWidth() == static_cast<const
SvxFontWidthItem&>(rItem).GetWidth() &&
- GetProp() == static_cast<const SvxFontWidthItem&>(rItem).GetProp();
-}
-
-bool SvxFontWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
-{
-// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
- nMemberId &= ~CONVERT_TWIPS;
- switch(nMemberId)
- {
- case MID_FONTWIDTH:
- rVal <<= (sal_Int16)(nWidth);
- break;
- case MID_FONTWIDTH_PROP:
- rVal <<= (sal_Int16)(nProp);
- break;
- }
- return true;
-}
-
-bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
-{
-// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
- nMemberId &= ~CONVERT_TWIPS;
- sal_Int16 nVal = sal_Int16();
- if(!(rVal >>= nVal))
- return false;
-
- switch(nMemberId)
- {
- case MID_FONTWIDTH:
- nProp = nVal;
- break;
- case MID_FONTWIDTH_PROP:
- nWidth = nVal;
- break;
- }
- return true;
-}
-
-
-bool SvxFontWidthItem::GetPresentation
-(
- SfxItemPresentation /*ePres*/,
- MapUnit eCoreUnit,
- MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper& rIntl
-) const
-{
- if ( 100 == nProp )
- {
- rText = GetMetricText( (long)nWidth,
- eCoreUnit, MapUnit::MapPoint, &rIntl ) +
- " " + EditResId(GetMetricId(MapUnit::MapPoint));
- }
- else
- rText = OUString::number( nProp ) + "%";
- return true;
-}
-
// class SvxTextLineItem ------------------------------------------------
SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16
nId )
@@ -1742,14 +1645,6 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const
Color& rCol,
{
}
-SvxBackgroundColorItem::SvxBackgroundColorItem(SvStream& rStrm, const
sal_uInt16 nId)
- : SvxColorItem(nId)
-{
- Color aColor;
- aColor.Read(rStrm);
- SetValue(aColor);
-}
-
SvxBackgroundColorItem::SvxBackgroundColorItem( const SvxBackgroundColorItem&
rCopy ) :
SvxColorItem( rCopy )
{
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 4ce7e8cfb5c0..6913497186f8 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -23,7 +23,6 @@
#include <editeng/postitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/fhgtitem.hxx>
-#include <editeng/fwdtitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/shdditem.hxx>
diff --git a/extensions/source/inc/componentmodule.hxx
b/extensions/source/inc/componentmodule.hxx
index 92bb52d1de5a..9a524fbfaec9 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -64,9 +64,6 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory
> (SAL_CALL *Facto
s_pFactoryFunctionPointers;
public:
- /// get the resource locale of the module
- static const std::locale& getResLocale();
-
/** register a component implementing a service with the given data.
@param _rImplementationName
the implementation name of the component
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index 65af45a5c3e0..7203a92d20d6 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -285,12 +285,6 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::getOrCreateRootStorag
return xStorage;
}
-css::uno::Reference< css::embed::XStorage >
PresetHandler::getWorkingStorageShare()
-{
- SolarMutexGuard g;
- return m_xWorkingStorageShare;
-}
-
css::uno::Reference< css::embed::XStorage >
PresetHandler::getWorkingStorageUser()
{
SolarMutexGuard g;
diff --git a/framework/source/inc/accelerators/presethandler.hxx
b/framework/source/inc/accelerators/presethandler.hxx
index da2d6b5b3736..115a3f8e7191 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -190,7 +190,6 @@ class PresetHandler
@return css::embed::XStorage
which the current working storage.
*/
- css::uno::Reference< css::embed::XStorage > getWorkingStorageShare();
css::uno::Reference< css::embed::XStorage > getWorkingStorageUser();
/** @short check if there is a parent storage well known for
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 9fb6b1091bcb..2b3109a4f6ed 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -89,9 +89,6 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& )
const override;
- static void StoreFont( SvStream&, const vcl::Font& );
- static vcl::Font CreateFont( SvStream&, sal_uInt16 nVer );
-
void CopyValidProperties( const SvxBulletItem& rCopyFrom );
};
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index dc6979e5c04a..0e4c60702d0c 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -78,7 +78,6 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public
SvxColorItem
SvxBackgroundColorItem(const sal_uInt16 nId);
SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId);
- SvxBackgroundColorItem(SvStream& rStrm, const sal_uInt16 nId);
SvxBackgroundColorItem(const SvxBackgroundColorItem& rCopy);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const
override;
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 728a1dddce61..ed1a7edf020e 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -66,11 +66,7 @@ public:
*/
class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
{
-private:
tools::SvRef<SvxFieldData> mxField;
-
- EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const sal_uInt16
nId );
-
public:
SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId );
SvxFieldItem( const SvxFieldItem& rItem );
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 558239f34f09..ddb974acbea5 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -108,8 +108,6 @@ public:
SvxFontItem& operator=(const SvxFontItem& rFont);
- static void EnableStoreUnicodeNames(bool bEnable);
-
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
deleted file mode 100644
index 801d353cc0e7..000000000000
--- a/include/editeng/fwdtitem.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_EDITENG_FWDTITEM_HXX
-#define INCLUDED_EDITENG_FWDTITEM_HXX
-
-#include <svl/poolitem.hxx>
-
-
-// class SvxFontWidthItem -----------------------------------------------
-
-
-/* [Description]
-
- This item describes the font width.
-*/
-
-class SvxFontWidthItem : public SfxPoolItem
-{
- sal_uInt16 nWidth; // 0 = default
- sal_uInt16 nProp; // default 100%
-public:
- SvxFontWidthItem( const sal_uInt16 nSz /*= 0*/,
- const sal_uInt16 nPropWidth /*= 100*/,
- const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
- virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
-
- virtual bool GetPresentation( SfxItemPresentation ePres,
- MapUnit eCoreMetric,
- MapUnit ePresMetric,
- OUString &rText, const IntlWrapper& ) const
override;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
- virtual void ScaleMetrics( long nMult, long nDiv ) override;
- virtual bool HasMetrics() const override;
-
- SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem )
- {
- SetWidthValue( rItem.GetWidth() );
- SetProp( rItem.GetProp() );
- return *this;
- }
-
- sal_uInt16 GetWidth() const { return nWidth; }
-
- void SetWidthValue( sal_uInt16 nNewWidth )
- {
- DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
- nWidth = nNewWidth;
- }
-
- void SetProp( const sal_uInt16 nNewProp )
- {
- DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
- nProp = nNewProp;
- }
-
- sal_uInt16 GetProp() const { return nProp; }
-};
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h
index 611b52620096..d7d0a538ee4d 100644
--- a/include/editeng/memberids.h
+++ b/include/editeng/memberids.h
@@ -80,10 +80,6 @@
#define MID_ESC_HEIGHT 1
#define MID_AUTO_ESC 2
-//SvxFontWidthItem
-#define MID_FONTWIDTH 0
-#define MID_FONTWIDTH_PROP 1
-
//SvxFontHeightItem
#define MID_FONTHEIGHT 1
#define MID_FONTHEIGHT_PROP 2
diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx
index 660314b63236..ab1e23a6c618 100644
--- a/include/editeng/rsiditem.hxx
+++ b/include/editeng/rsiditem.hxx
@@ -20,7 +20,6 @@ class EDITENG_DLLPUBLIC SvxRsidItem : public SfxUInt32Item
{
public:
SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId,
nRsid ) {}
- SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx
index ecfe66269466..fa0f58a55c4e 100644
--- a/include/sfx2/charwin.hxx
+++ b/include/sfx2/charwin.hxx
@@ -31,7 +31,6 @@ public:
void SetFont( const vcl::Font& rFont );
void SetText( const OUString& rText ) override;
void InsertCharToDoc();
- Point GetClickPosition() const;
void createContextMenu();
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 39a7997ac916..b75e9b10de5c 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -103,10 +103,6 @@ public:
const OString& rID, const OUString&
rUIXMLDescription,
const
css::uno::Reference<css::frame::XFrame> &rFrame =
css::uno::Reference<css::frame::XFrame>());
- SfxPopupWindow( sal_uInt16 nId,
- const css::uno::Reference<
css::frame::XFrame >& rFrame,
- vcl::Window* pParentWindow,
- WinBits nBits );
virtual ~SfxPopupWindow() override;
virtual void dispose() override;
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 37f8d535756a..822884868a83 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -175,8 +175,6 @@ public:
sal_uInt16 GetLastWhich() const;
bool IsInRange( sal_uInt16 nWhich ) const;
bool IsInVersionsRange( sal_uInt16 nWhich )
const;
- bool IsInStoringRange( sal_uInt16 nWhich )
const;
- void SetStoringRange( sal_uInt16 nFrom,
sal_uInt16 nTo );
void SetSecondaryPool( SfxItemPool *pPool );
SfxItemPool* GetSecondaryPool() const;
SfxItemPool* GetMasterPool() const;
@@ -205,14 +203,11 @@ public:
static bool IsSlot(sal_uInt16 nId) {
return nId && nId > SFX_WHICH_MAX; }
- static const SfxItemPool* GetStoringPool();
-
void dumpAsXml(struct _xmlTextWriter* pWriter)
const;
private:
const SfxItemPool& operator=(const SfxItemPool &) = delete;
- static const SfxItemPool* pStoringPool_;
//IDs below or equal are Which IDs, IDs above slot IDs
static const sal_uInt16 SFX_WHICH_MAX = 4999;
};
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 4edde4dcb503..f4a8bb5e9420 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -584,8 +584,6 @@ public:
void SetMaxCacheSize( sal_uLong nNewCacheSize );
sal_uLong GetMaxCacheSize() const;
- void SetMaxObjCacheSize( sal_uLong nNewMaxObjSize );
-
void SetCacheTimeout( sal_uLong nTimeoutSeconds );
bool IsInCache(
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index e8d8d0f5ba86..d35e0f23731a 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -218,7 +218,7 @@ private:
long nEndX; /* End in x direction */
long nStartY; /* Start in y direction */
long nEndY; /* Ende in y direction */
- bool bLimits; /* boundary limit control by the application */
+ bool bLimits; /* boundary limit control by the application */
protected:
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -241,8 +241,6 @@ public:
long nStartY, long nEndY);
SvxObjectItem(const SvxObjectItem& rCopy);
- bool HasLimits() const { return bLimits;}
-
long GetStartX() const { return nStartX;}
long GetEndX() const { return nEndX;}
long GetStartY() const { return nStartY;}
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 65f298f9c88e..8877a05dbd61 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -61,8 +61,6 @@ public:
IntlWrapper(const LanguageTag& rLanguageTag);
~IntlWrapper();
- const LanguageTag& getLanguageTag() const { return maLanguageTag;
}
-
const LocaleDataWrapper* getLocaleData() const
{
if ( !pLocaleData )
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index ee241d416a31..e2950bab64a1 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -512,200 +512,6 @@ const SvXMLTokenMap&
ScXMLImport::GetContentValidationMessageElemTokenMap()
return *pContentValidationMessageElemTokenMap;
}
-const SvXMLTokenMap& ScXMLImport::GetCondFormatsTokenMap()
-{
- if( !pCondFormatsTokenMap )
- {
- static const SvXMLTokenMapEntry aCondFormatsElemTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_CONDITIONAL_FORMAT,
XML_TOK_CONDFORMATS_CONDFORMAT },
- XML_TOKEN_MAP_END
- };
-
- pCondFormatsTokenMap = new SvXMLTokenMap( aCondFormatsElemTokenMap );
- }
-
- return *pCondFormatsTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCondFormatTokenMap()
-{
- if( !pCondFormatTokenMap )
- {
- static const SvXMLTokenMapEntry aCondFormatElemTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE,
XML_TOK_CONDFORMAT_COLORSCALE },
- { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, XML_TOK_CONDFORMAT_DATABAR
},
- { XML_NAMESPACE_CALC_EXT, XML_CONDITION,
XML_TOK_CONDFORMAT_CONDITION },
- { XML_NAMESPACE_CALC_EXT, XML_ICON_SET, XML_TOK_CONDFORMAT_ICONSET
},
- { XML_NAMESPACE_CALC_EXT, XML_DATE_IS, XML_TOK_CONDFORMAT_DATE },
- XML_TOKEN_MAP_END
- };
-
- pCondFormatTokenMap = new SvXMLTokenMap( aCondFormatElemTokenMap );
- }
-
- return *pCondFormatTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCondFormatAttrMap()
-{
- if( !pCondFormatAttrMap )
- {
- static const SvXMLTokenMapEntry aCondFormatAttrTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_TARGET_RANGE_ADDRESS,
XML_TOK_CONDFORMAT_TARGET_RANGE },
- XML_TOKEN_MAP_END
- };
-
- pCondFormatAttrMap = new SvXMLTokenMap( aCondFormatAttrTokenMap );
- }
-
- return *pCondFormatAttrMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCondDateAttrMap()
-{
- if( !pCondDateAttrMap )
- {
- static const SvXMLTokenMapEntry aCondDateAttrTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_DATE, XML_TOK_COND_DATE_VALUE },
- { XML_NAMESPACE_CALC_EXT, XML_STYLE, XML_TOK_COND_DATE_STYLE },
- XML_TOKEN_MAP_END
- };
-
- pCondDateAttrMap = new SvXMLTokenMap( aCondDateAttrTokenMap );
- }
-
- return *pCondDateAttrMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetConditionAttrMap()
-{
- if( !pConditionAttrMap )
- {
- static const SvXMLTokenMapEntry aConditionAttrTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_CONDITION_VALUE },
- { XML_NAMESPACE_CALC_EXT, XML_APPLY_STYLE_NAME,
XML_TOK_CONDITION_APPLY_STYLE_NAME },
- { XML_NAMESPACE_CALC_EXT, XML_BASE_CELL_ADDRESS,
XML_TOK_CONDITION_BASE_CELL_ADDRESS },
- XML_TOKEN_MAP_END
- };
-
- pConditionAttrMap = new SvXMLTokenMap( aConditionAttrTokenMap );
- }
-
- return *pConditionAttrMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetColorScaleTokenMap()
-{
- if( !pColorScaleTokenMap )
- {
- static const SvXMLTokenMapEntry aColorScaleElemTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY,
XML_TOK_COLORSCALE_COLORSCALEENTRY },
- XML_TOKEN_MAP_END
- };
-
- pColorScaleTokenMap = new SvXMLTokenMap( aColorScaleElemTokenMap );
- }
-
- return *pColorScaleTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetColorScaleEntryAttrMap()
-{
- if( !pColorScaleEntryAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aColorScaleAttrTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_TYPE, XML_TOK_COLORSCALEENTRY_TYPE },
- { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_COLORSCALEENTRY_VALUE
},
- { XML_NAMESPACE_CALC_EXT, XML_COLOR, XML_TOK_COLORSCALEENTRY_COLOR
},
- XML_TOKEN_MAP_END
- };
-
- pColorScaleEntryAttrTokenMap = new SvXMLTokenMap(
aColorScaleAttrTokenMap );
- }
-
- return *pColorScaleEntryAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetFormattingTokenMap()
-{
- if( !pDataBarTokenMap )
- {
- static const SvXMLTokenMapEntry aDataBarElemTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_DATA_BAR_ENTRY,
XML_TOK_DATABAR_DATABARENTRY },
- { XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY,
XML_TOK_FORMATTING_ENTRY },
- XML_TOKEN_MAP_END
- };
-
- pDataBarTokenMap = new SvXMLTokenMap( aDataBarElemTokenMap );
- }
-
- return *pDataBarTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataBarAttrMap()
-{
- if( !pDataBarAttrMap )
- {
- static const SvXMLTokenMapEntry aDataBarAttrTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR,
XML_TOK_DATABAR_POSITIVE_COLOR },
- { XML_NAMESPACE_CALC_EXT, XML_NEGATIVE_COLOR,
XML_TOK_DATABAR_NEGATIVE_COLOR },
- { XML_NAMESPACE_CALC_EXT, XML_GRADIENT, XML_TOK_DATABAR_GRADIENT },
- { XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION,
XML_TOK_DATABAR_AXISPOSITION },
- { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE,
XML_TOK_DATABAR_SHOWVALUE },
- { XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR,
XML_TOK_DATABAR_AXISCOLOR },
- { XML_NAMESPACE_CALC_EXT, XML_MIN_LENGTH,
XML_TOK_DATABAR_MINLENGTH },
- { XML_NAMESPACE_CALC_EXT, XML_MAX_LENGTH,
XML_TOK_DATABAR_MAXLENGTH },
- XML_TOKEN_MAP_END
- };
-
- pDataBarAttrMap = new SvXMLTokenMap( aDataBarAttrTokenMap );
- }
-
- return *pDataBarAttrMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetIconSetAttrMap()
-{
- if( !pIconSetAttrMap )
- {
- static const SvXMLTokenMapEntry aIconSetAttrTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_ICON_SET_TYPE, XML_TOK_ICONSET_TYPE
},
- { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE,
XML_TOK_ICONSET_SHOWVALUE },
- XML_TOKEN_MAP_END
- };
-
- pIconSetAttrMap = new SvXMLTokenMap( aIconSetAttrTokenMap );
- }
-
- return *pIconSetAttrMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataBarEntryAttrMap()
-{
- if( !pFormattingEntryAttrMap )
- {
- static const SvXMLTokenMapEntry aDataBarAttrEntryTokenMap[] =
- {
- { XML_NAMESPACE_CALC_EXT, XML_TYPE, XML_TOK_DATABARENTRY_TYPE },
- { XML_NAMESPACE_CALC_EXT, XML_VALUE, XML_TOK_DATABARENTRY_VALUE },
- XML_TOKEN_MAP_END
- };
-
- pFormattingEntryAttrMap = new SvXMLTokenMap( aDataBarAttrEntryTokenMap
);
- }
-
- return *pFormattingEntryAttrMap;
-}
const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
{
@@ -838,633 +644,6 @@ const SvXMLTokenMap&
ScXMLImport::GetTableAnnotationAttrTokenMap()
return *pTableAnnotationAttrTokenMap;
}
-const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap()
-{
- if( !pDetectiveElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDetectiveElemTokenMap[]=
- {
- { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE,
XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED },
- { XML_NAMESPACE_TABLE, XML_OPERATION,
XML_TOK_DETECTIVE_ELEM_OPERATION },
- XML_TOKEN_MAP_END
- };
-
- pDetectiveElemTokenMap = new SvXMLTokenMap( aDetectiveElemTokenMap );
- } // if( !pDetectiveElemTokenMap )
-
- return *pDetectiveElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap()
-{
- if( !pDetectiveHighlightedAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
- {
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE },
- { XML_NAMESPACE_TABLE, XML_DIRECTION,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION },
- { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR },
- { XML_NAMESPACE_TABLE, XML_MARKED_INVALID,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID },
- XML_TOKEN_MAP_END
- };
-
- pDetectiveHighlightedAttrTokenMap = new SvXMLTokenMap(
aDetectiveHighlightedAttrTokenMap );
- } // if( !pDetectiveHighlightedAttrTokenMap )
-
- return *pDetectiveHighlightedAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap()
-{
- if( !pDetectiveOperationAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]=
- {
- { XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DETECTIVE_OPERATION_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_INDEX,
XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX },
- XML_TOKEN_MAP_END
- };
-
- pDetectiveOperationAttrTokenMap = new SvXMLTokenMap(
aDetectiveOperationAttrTokenMap );
- } // if( !pDetectiveOperationAttrTokenMap )
-
- return *pDetectiveOperationAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap()
-{
- if( !pTableCellRangeSourceAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME },
- { XML_NAMESPACE_XLINK, XML_HREF,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_FILTER_NAME,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME },
- { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS },
- { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN },
- { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW },
- { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY },
- XML_TOKEN_MAP_END
- };
-
- pTableCellRangeSourceAttrTokenMap = new SvXMLTokenMap(
aTableCellRangeSourceAttrTokenMap );
- } // if( !pTableCellRangeSourceAttrTokenMap )
-
- return *pTableCellRangeSourceAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap()
-{
- if( !pDatabaseRangeSourceSQLAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME },
- { XML_NAMESPACE_XLINK, XML_HREF,
XML_TOK_SOURCE_SQL_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE,
XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESOURCE},
- { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT,
XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT },
- { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT,
XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT },
- XML_TOKEN_MAP_END
- };
-
- pDatabaseRangeSourceSQLAttrTokenMap = new SvXMLTokenMap(
aDatabaseRangeSourceSQLAttrTokenMap );
- } // if( !pDatabaseRangeSourceSQLAttrTokenMap )
-
- return *pDatabaseRangeSourceSQLAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap()
-{
- if( !pDatabaseRangeSourceTableAttrTokenMap )
- {
- static const SvXMLTokenMapEntry
aDatabaseRangeSourceTableAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
- { XML_NAMESPACE_XLINK, XML_HREF,
XML_TOK_SOURCE_TABLE_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE,
XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESOURCE },
- { XML_NAMESPACE_TABLE, XML_TABLE_NAME,
XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME },
- { XML_NAMESPACE_TABLE, XML_DATABASE_TABLE_NAME,
XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME },
- XML_TOKEN_MAP_END
- };
-
- pDatabaseRangeSourceTableAttrTokenMap = new SvXMLTokenMap(
aDatabaseRangeSourceTableAttrTokenMap );
- } // if( !pDatabaseRangeSourceTableAttrTokenMap )
-
- return *pDatabaseRangeSourceTableAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap()
-{
- if( !pDatabaseRangeSourceQueryAttrTokenMap )
- {
- static const SvXMLTokenMapEntry
aDatabaseRangeSourceQueryAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
- { XML_NAMESPACE_XLINK, XML_HREF,
XML_TOK_SOURCE_QUERY_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE,
XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESOURCE },
- { XML_NAMESPACE_TABLE, XML_QUERY_NAME,
XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME },
- XML_TOKEN_MAP_END
- };
-
- pDatabaseRangeSourceQueryAttrTokenMap = new SvXMLTokenMap(
aDatabaseRangeSourceQueryAttrTokenMap );
- } // if( !pDatabaseRangeSourceQueryAttrTokenMap )
-
- return *pDatabaseRangeSourceQueryAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap()
-{
- if( !pFilterElemTokenMap )
- {
- static const SvXMLTokenMapEntry aFilterTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND
},
- { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR
},
- { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION,
XML_TOK_FILTER_CONDITION },
- XML_TOKEN_MAP_END
- };
-
- pFilterElemTokenMap = new SvXMLTokenMap( aFilterTokenMap );
- } // if( !pFilterElemTokenMap )
-
- return *pFilterElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap()
-{
- if( !pFilterAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aFilterAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,
XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS,
XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE,
XML_TOK_FILTER_ATTR_CONDITION_SOURCE },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES,
XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES },
- XML_TOKEN_MAP_END
- };
-
- pFilterAttrTokenMap = new SvXMLTokenMap( aFilterAttrTokenMap );
- } // if( !pFilterAttrTokenMap )
-
- return *pFilterAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetFilterConditionElemTokenMap()
-{
- if( !pFilterConditionElemTokenMap )
- {
- static const SvXMLTokenMapEntry aTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_FILTER_SET_ITEM,
XML_TOK_CONDITION_FILTER_SET_ITEM },
- XML_TOKEN_MAP_END
- };
-
- pFilterConditionElemTokenMap = new SvXMLTokenMap( aTokenMap );
- }
-
- return *pFilterConditionElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap()
-{
- if( !pFilterConditionAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER,
XML_TOK_CONDITION_ATTR_FIELD_NUMBER },
- { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE,
XML_TOK_CONDITION_ATTR_CASE_SENSITIVE },
- { XML_NAMESPACE_TABLE, XML_DATA_TYPE,
XML_TOK_CONDITION_ATTR_DATA_TYPE },
- { XML_NAMESPACE_TABLE, XML_VALUE,
XML_TOK_CONDITION_ATTR_VALUE },
- { XML_NAMESPACE_TABLE, XML_OPERATOR,
XML_TOK_CONDITION_ATTR_OPERATOR },
- XML_TOKEN_MAP_END
- };
-
- pFilterConditionAttrTokenMap = new SvXMLTokenMap(
aFilterConditionAttrTokenMap );
- } // if( !pFilterConditionAttrTokenMap )
-
- return *pFilterConditionAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetFilterSetItemAttrTokenMap()
-{
- if( !pFilterSetItemAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_VALUE,
XML_TOK_FILTER_SET_ITEM_ATTR_VALUE },
- XML_TOKEN_MAP_END
- };
-
- pFilterSetItemAttrTokenMap = new SvXMLTokenMap( aTokenMap );
- }
-
- return *pFilterSetItemAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap()
-{
- if( !pSortElemTokenMap )
- {
- static const SvXMLTokenMapEntry aSortTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY },
- XML_TOKEN_MAP_END
- };
-
- pSortElemTokenMap = new SvXMLTokenMap( aSortTokenMap );
- } // if( !pSortElemTokenMap )
-
- return *pSortElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap()
-{
- if( !pSortSortByAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER,
XML_TOK_SORT_BY_ATTR_FIELD_NUMBER },
- { XML_NAMESPACE_TABLE, XML_DATA_TYPE,
XML_TOK_SORT_BY_ATTR_DATA_TYPE },
- { XML_NAMESPACE_TABLE, XML_ORDER,
XML_TOK_SORT_BY_ATTR_ORDER },
- XML_TOKEN_MAP_END
- };
-
- pSortSortByAttrTokenMap = new SvXMLTokenMap( aSortSortByAttrTokenMap );
- } // if( !pSortSortByAttrTokenMap )
-
- return *pSortSortByAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap()
-{
- if( !pDataPilotTablesElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE,
XML_TOK_DATA_PILOT_TABLE },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotTablesElemTokenMap = new SvXMLTokenMap(
aDataPilotTablesElemTokenMap );
- } // if( !pDataPilotTablesElemTokenMap )
-
- return *pDataPilotTablesElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap()
-{
- if( !pDataPilotTableAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATA_PILOT_TABLE_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA,
XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA },
- { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL,
XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL },
- { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS,
XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS },
- { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES,
XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES },
- { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,
XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_BUTTONS,
XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS },
- { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON,
XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON },
- { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK,
XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN },
- { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT,
XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotTableAttrTokenMap = new SvXMLTokenMap(
aDataPilotTableAttrTokenMap );
- } // if( !pDataPilotTableAttrTokenMap )
-
- return *pDataPilotTableAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
-{
- if( !pDataPilotTableElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL },
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL,
XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL },
- { XML_NAMESPACE_TABLE_EXT, XML_DATA_PILOT_GRAND_TOTAL,
XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL_EXT },
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY },
- { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE },
- { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD,
XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotTableElemTokenMap = new SvXMLTokenMap(
aDataPilotTableElemTokenMap );
- } // if( !pDataPilotTableElemTokenMap )
-
- return *pDataPilotTableElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
-{
- if( !pDataPilotTableSourceServiceAttrTokenMap )
- {
- static const SvXMLTokenMapEntry
aDataPilotTableSourceServiceAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_SOURCE_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME },
- { XML_NAMESPACE_TABLE, XML_OBJECT_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME },
- { XML_NAMESPACE_TABLE, XML_USER_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME },
- { XML_NAMESPACE_TABLE, XML_PASSWORD,
XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotTableSourceServiceAttrTokenMap = new SvXMLTokenMap(
aDataPilotTableSourceServiceAttrTokenMap );
- } // if( !pDataPilotTableSourceServiceAttrTokenMap )
-
- return *pDataPilotTableSourceServiceAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotGrandTotalAttrTokenMap()
-{
- if (!pDataPilotGrandTotalAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DISPLAY,
XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY },
- { XML_NAMESPACE_TABLE, XML_ORIENTATION,
XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME },
- { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY_NAME_EXT },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotGrandTotalAttrTokenMap = new SvXMLTokenMap(
aDataPilotGrandTotalAttrTokenMap );
- }
-
- return *pDataPilotGrandTotalAttrTokenMap;
-}
-
-const SvXMLTokenMap&
ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap()
-{
- if( !pDataPilotTableSourceCellRangeAttrTokenMap )
- {
- static const SvXMLTokenMapEntry
aDataPilotTableSourceCellRangeAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_SOURCE_CELL_RANGE_ATTR_NAME },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotTableSourceCellRangeAttrTokenMap = new SvXMLTokenMap(
aDataPilotTableSourceCellRangeAttrTokenMap );
- } // if( !pDataPilotTableSourceCellRangeAttrTokenMap )
-
- return *pDataPilotTableSourceCellRangeAttrTokenMap;
-}
-
-const SvXMLTokenMap&
ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap()
-{
- if( !pDataPilotTableSourceCellRangeElemTokenMap )
- {
- static const SvXMLTokenMapEntry
aDataPilotTableSourceCellRangeElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_FILTER,
XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER},
- XML_TOKEN_MAP_END
- };
-
- pDataPilotTableSourceCellRangeElemTokenMap = new SvXMLTokenMap(
aDataPilotTableSourceCellRangeElemTokenMap );
- } // if( !pDataPilotTableSourceCellRangeElemTokenMap )
-
- return *pDataPilotTableSourceCellRangeElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap()
-{
- if( !pDataPilotFieldAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME,
XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME },
- { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME_EXT },
- { XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD,
XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD },
- { XML_NAMESPACE_TABLE, XML_FUNCTION,
XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION },
- { XML_NAMESPACE_TABLE, XML_ORIENTATION,
XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION },
- { XML_NAMESPACE_TABLE, XML_SELECTED_PAGE,
XML_TOK_DATA_PILOT_FIELD_ATTR_SELECTED_PAGE },
- { XML_NAMESPACE_LO_EXT, XML_IGNORE_SELECTED_PAGE,
XML_TOK_DATA_PILOT_FIELD_ATTR_IGNORE_SELECTED_PAGE },
- { XML_NAMESPACE_TABLE, XML_USED_HIERARCHY,
XML_TOK_DATA_PILOT_FIELD_ATTR_USED_HIERARCHY },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotFieldAttrTokenMap = new SvXMLTokenMap(
aDataPilotFieldAttrTokenMap );
- } // if( !pDataPilotFieldAttrTokenMap )
-
- return *pDataPilotFieldAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap()
-{
- if( !pDataPilotFieldElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_GROUPS },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotFieldElemTokenMap = new SvXMLTokenMap(
aDataPilotFieldElemTokenMap );
- } // if( !pDataPilotFieldElemTokenMap )
-
- return *pDataPilotFieldElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap()
-{
- if( !pDataPilotLevelAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY,
XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY },
- { XML_NAMESPACE_CALC_EXT, XML_REPEAT_ITEM_LABELS,
XML_TOK_DATA_PILOT_LEVEL_ATTR_REPEAT_ITEM_LABELS },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotLevelAttrTokenMap = new SvXMLTokenMap(
aDataPilotLevelAttrTokenMap );
- } // if( !pDataPilotLevelAttrTokenMap )
-
- return *pDataPilotLevelAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap()
-{
- if( !pDataPilotLevelElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS,
XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS,
XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotLevelElemTokenMap = new SvXMLTokenMap(
aDataPilotLevelElemTokenMap );
- } // if( !pDataPilotLevelElemTokenMap )
-
- return *pDataPilotLevelElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap()
-{
- if( !pDataPilotSubTotalsElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL,
XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotSubTotalsElemTokenMap = new SvXMLTokenMap(
aDataPilotSubTotalsElemTokenMap );
- } // if( !pDataPilotSubTotalsElemTokenMap )
-
- return *pDataPilotSubTotalsElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap()
-{
- if( !pDataPilotSubTotalAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_FUNCTION,
XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME },
- { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME_EXT },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotSubTotalAttrTokenMap = new SvXMLTokenMap(
aDataPilotSubTotalAttrTokenMap );
- } // if( !pDataPilotSubTotalAttrTokenMap )
-
- return *pDataPilotSubTotalAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap()
-{
- if( !pDataPilotMembersElemTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotMembersElemTokenMap = new SvXMLTokenMap(
aDataPilotMembersElemTokenMap );
- } // if( !pDataPilotMembersElemTokenMap )
-
- return *pDataPilotMembersElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap()
-{
- if( !pDataPilotMemberAttrTokenMap )
- {
- static const SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
- {
- { XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME },
- { XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME_EXT },
- { XML_NAMESPACE_TABLE, XML_DISPLAY,
XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY },
- { XML_NAMESPACE_TABLE, XML_SHOW_DETAILS,
XML_TOK_DATA_PILOT_MEMBER_ATTR_SHOW_DETAILS },
- XML_TOKEN_MAP_END
- };
-
- pDataPilotMemberAttrTokenMap = new SvXMLTokenMap(
aDataPilotMemberAttrTokenMap );
- } // if( !pDataPilotMemberAttrTokenMap )
-
- return *pDataPilotMemberAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCellTextParaElemTokenMap()
-{
- if (!pCellTextParaElemTokenMap)
- {
- static const SvXMLTokenMapEntry aMap[] =
- {
- { XML_NAMESPACE_TEXT, XML_S, XML_TOK_CELL_TEXT_S },
- { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_CELL_TEXT_SPAN },
- { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_CELL_TEXT_SHEET_NAME
},
- { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_CELL_TEXT_DATE },
- { XML_NAMESPACE_TEXT, XML_TITLE, XML_TOK_CELL_TEXT_TITLE },
- { XML_NAMESPACE_TEXT, XML_A, XML_TOK_CELL_TEXT_URL },
- XML_TOKEN_MAP_END
- };
-
- pCellTextParaElemTokenMap = new SvXMLTokenMap(aMap);
- }
- return *pCellTextParaElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCellTextSpanElemTokenMap()
-{
- if (!pCellTextSpanElemTokenMap)
- {
- static const SvXMLTokenMapEntry aMap[] =
- {
- { XML_NAMESPACE_TEXT, XML_SHEET_NAME,
XML_TOK_CELL_TEXT_SPAN_ELEM_SHEET_NAME },
- { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_CELL_TEXT_SPAN_ELEM_DATE },
- { XML_NAMESPACE_TEXT, XML_TITLE, XML_TOK_CELL_TEXT_SPAN_ELEM_TITLE
},
- { XML_NAMESPACE_TEXT, XML_A, XML_TOK_CELL_TEXT_SPAN_ELEM_URL },
- { XML_NAMESPACE_TEXT, XML_S, XML_TOK_CELL_TEXT_SPAN_ELEM_S },
- XML_TOKEN_MAP_END
- };
-
- pCellTextSpanElemTokenMap = new SvXMLTokenMap(aMap);
- }
- return *pCellTextSpanElemTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCellTextSpanAttrTokenMap()
-{
- if (!pCellTextSpanAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aMap[] =
- {
- { XML_NAMESPACE_TEXT, XML_STYLE_NAME,
XML_TOK_CELL_TEXT_SPAN_ATTR_STYLE_NAME },
- XML_TOKEN_MAP_END
- };
-
- pCellTextSpanAttrTokenMap = new SvXMLTokenMap(aMap);
- }
- return *pCellTextSpanAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCellTextURLAttrTokenMap()
-{
- if (!pCellTextURLAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aMap[] =
- {
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CELL_TEXT_URL_ATTR_UREF },
- { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_CELL_TEXT_URL_ATTR_TYPE },
- { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME,
XML_TOK_CELL_TEXT_URL_TARGET_FRAME },
- XML_TOKEN_MAP_END
- };
-
- pCellTextURLAttrTokenMap = new SvXMLTokenMap(aMap);
- }
- return *pCellTextURLAttrTokenMap;
-}
-
-const SvXMLTokenMap& ScXMLImport::GetCellTextSAttrTokenMap()
-{
- if (!pCellTextSAttrTokenMap)
- {
- static const SvXMLTokenMapEntry aMap[] =
- {
- { XML_NAMESPACE_TEXT, XML_C, XML_TOK_CELL_TEXT_S_ATTR_C },
- XML_TOKEN_MAP_END
- };
-
- pCellTextSAttrTokenMap = new SvXMLTokenMap(aMap);
- }
- return *pCellTextSAttrTokenMap;
-}
void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p )
{
@@ -1555,7 +734,6 @@ ScXMLImport::ScXMLImport(
pDataBarTokenMap( nullptr ),
pDataBarAttrMap( nullptr ),
pFormattingEntryAttrMap( nullptr ),
- pIconSetAttrMap( nullptr ),
pTableElemTokenMap( nullptr ),
pTableRowsElemTokenMap( nullptr ),
pTableAttrTokenMap( nullptr ),
@@ -1582,7 +760,6 @@ ScXMLImport::ScXMLImport(
pDataPilotTableAttrTokenMap( nullptr ),
pDataPilotTableElemTokenMap( nullptr ),
pDataPilotTableSourceServiceAttrTokenMap( nullptr ),
- pDataPilotGrandTotalAttrTokenMap(nullptr),
pDataPilotTableSourceCellRangeElemTokenMap( nullptr ),
pDataPilotTableSourceCellRangeAttrTokenMap( nullptr ),
pDataPilotFieldAttrTokenMap( nullptr ),
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index b098995a5e45..3bf41105662b 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -845,7 +845,6 @@ class ScXMLImport: public SvXMLImport
SvXMLTokenMap *pDataBarTokenMap;
SvXMLTokenMap *pDataBarAttrMap;
SvXMLTokenMap *pFormattingEntryAttrMap;
- SvXMLTokenMap *pIconSetAttrMap;
SvXMLTokenMap *pTableElemTokenMap;
SvXMLTokenMap *pTableRowsElemTokenMap;
SvXMLTokenMap *pTableAttrTokenMap;
@@ -872,7 +871,6 @@ class ScXMLImport: public SvXMLImport
SvXMLTokenMap *pDataPilotTableAttrTokenMap;
SvXMLTokenMap *pDataPilotTableElemTokenMap;
SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap;
- SvXMLTokenMap *pDataPilotGrandTotalAttrTokenMap;
SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap;
SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap;
SvXMLTokenMap *pDataPilotFieldAttrTokenMap;
@@ -981,17 +979,6 @@ public:
const SvXMLTokenMap& GetDocElemTokenMap();
const SvXMLTokenMap& GetContentValidationElemTokenMap();
const SvXMLTokenMap& GetContentValidationMessageElemTokenMap();
- const SvXMLTokenMap& GetCondFormatsTokenMap();
- const SvXMLTokenMap& GetCondFormatTokenMap();
- const SvXMLTokenMap& GetCondFormatAttrMap();
- const SvXMLTokenMap& GetCondDateAttrMap();
- const SvXMLTokenMap& GetConditionAttrMap();
- const SvXMLTokenMap& GetColorScaleTokenMap();
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
