summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-12 11:34:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-12 16:54:19 +0100
commitd9f0e8db9aa9e914e22f07c046c74f0c83c6e81a (patch)
tree99d7fb6805111ae841501557cf699a0af973cf13 /xmloff
parent392d219b30d6e6e3e636673ed6aa528811356cd2 (diff)
loplugin:unusedmethods
Change-Id: I90d402a5c18ab16424a042bcea1470fa8a3a5839 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105629 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/Library_xo.mk1
-rw-r--r--xmloff/inc/txtfldi.hxx60
-rw-r--r--xmloff/source/core/namespacemap.cxx6
-rw-r--r--xmloff/source/forms/attriblistmerge.cxx142
-rw-r--r--xmloff/source/forms/attriblistmerge.hxx69
-rw-r--r--xmloff/source/forms/elementimport.cxx65
-rw-r--r--xmloff/source/forms/elementimport.hxx24
-rw-r--r--xmloff/source/forms/formlayerimport.cxx6
-rw-r--r--xmloff/source/text/txtimp.cxx88
9 files changed, 0 insertions, 461 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 7f5fad5f39b6..175bb834e37d 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -154,7 +154,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/draw/ximpshap \
xmloff/source/draw/ximpshow \
xmloff/source/draw/ximpstyl \
- xmloff/source/forms/attriblistmerge \
xmloff/source/forms/controlelement \
xmloff/source/forms/controlpropertyhdl \
xmloff/source/forms/controlpropertymap \
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index f19a34480c04..216c32ea677d 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -46,66 +46,6 @@ class SvXMLImport;
class XMLTextImportHelper;
class SvXMLTokenMap;
-enum XMLTextFieldAttrTokens
-{
- XML_TOK_TEXTFIELD_FIXED = 0,
- XML_TOK_TEXTFIELD_DESCRIPTION,
- XML_TOK_TEXTFIELD_HELP,
- XML_TOK_TEXTFIELD_HINT,
- XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE,
- XML_TOK_TEXTFIELD_TIME_ADJUST,
- XML_TOK_TEXTFIELD_DATE_ADJUST,
- XML_TOK_TEXTFIELD_PAGE_ADJUST,
- XML_TOK_TEXTFIELD_SELECT_PAGE,
- XML_TOK_TEXTFIELD_ACTIVE,
-
- XML_TOK_TEXTFIELD_NAME,
- XML_TOK_TEXTFIELD_FORMULA,
- XML_TOK_TEXTFIELD_NUM_FORMAT,
- XML_TOK_TEXTFIELD_NUM_LETTER_SYNC,
- XML_TOK_TEXTFIELD_DISPLAY_FORMULA,
- XML_TOK_TEXTFIELD_NUMBERING_LEVEL,
- XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR,
- XML_TOK_TEXTFIELD_DISPLAY,
- XML_TOK_TEXTFIELD_OUTLINE_LEVEL,
-
- XML_TOK_TEXTFIELD_VALUE_TYPE,
- XML_TOK_TEXTFIELD_VALUE,
- XML_TOK_TEXTFIELD_STRING_VALUE,
- XML_TOK_TEXTFIELD_DATE_VALUE,
- XML_TOK_TEXTFIELD_TIME_VALUE,
- XML_TOK_TEXTFIELD_BOOL_VALUE,
- XML_TOK_TEXTFIELD_CURRENCY,
- XML_TOK_TEXTFIELD_DATA_STYLE_NAME,
-
- XML_TOK_TEXTFIELD_DATABASE_NAME,
- XML_TOK_TEXTFIELD_TABLE_NAME,
- XML_TOK_TEXTFIELD_COLUMN_NAME,
- XML_TOK_TEXTFIELD_ROW_NUMBER,
- XML_TOK_TEXTFIELD_CONDITION,
- XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE,
- XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE,
- XML_TOK_TEXTFIELD_REVISION,
- XML_TOK_TEXTFIELD_IS_HIDDEN,
- XML_TOK_TEXTFIELD_CURRENT_VALUE,
-
- XML_TOK_TEXTFIELD_REFERENCE_FORMAT,
- XML_TOK_TEXTFIELD_REFERENCE_LANGUAGE,
- XML_TOK_TEXTFIELD_REF_NAME,
- XML_TOK_TEXTFIELD_CONNECTION_NAME,
-
- XML_TOK_TEXTFIELD_HREF,
- XML_TOK_TEXTFIELD_TARGET_FRAME,
-
- XML_TOK_TEXTFIELD_ANNOTATION,
- XML_TOK_TEXTFIELD_LANGUAGE,
-
- XML_TOK_TEXTFIELD_MEASURE_KIND,
- XML_TOK_TEXTFIELD_TABLE_TYPE,
-
- XML_TOK_TEXTFIELD_NOTE_CLASS,
-};
-
/// abstract class for text field import
class XMLTextFieldImportContext : public SvXMLImportContext
{
diff --git a/xmloff/source/core/namespacemap.cxx b/xmloff/source/core/namespacemap.cxx
index 6cd01efcd532..1fd9f9d70cbb 100644
--- a/xmloff/source/core/namespacemap.cxx
+++ b/xmloff/source/core/namespacemap.cxx
@@ -405,12 +405,6 @@ OUString SvXMLNamespaceMap::GetAttrNameByIndex( sal_uInt16 nIdx ) const
return GetAttrNameByKey( nIdx );
}
-OUString SvXMLNamespaceMap::GetQNameByIndex( sal_uInt16 nIdx,
- const OUString& rLocalName ) const
-{
- return GetQNameByKey( nIdx, rLocalName );
-}
-
const OUString& SvXMLNamespaceMap::GetPrefixByIndex( sal_uInt16 nIdx ) const
{
NameSpaceMap::const_iterator aIter = aNameMap.find (nIdx);
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
deleted file mode 100644
index 6990841c54e2..000000000000
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ /dev/null
@@ -1,142 +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 "attriblistmerge.hxx"
-
-#include <osl/diagnose.h>
-
-#include <numeric>
-
-namespace xmloff
-{
-
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
-
- //= OAttribListMerger
- void OAttribListMerger::addList(const Reference< xml::sax::XAttributeList >& _rxList)
- {
- OSL_ENSURE(_rxList.is(), "OAttribListMerger::addList: invalid list!");
- if (_rxList.is())
- m_aLists.push_back(_rxList);
- }
-
- bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
- {
- sal_Int16 nLeftOver = _nGlobalIndex;
- AttributeListArray::const_iterator aLookupSublist = m_aLists.begin();
-
- for ( ; (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength());
- ++aLookupSublist
- )
- nLeftOver = nLeftOver - (*aLookupSublist)->getLength();
-
- if (aLookupSublist == m_aLists.end())
- {
- OSL_FAIL("OAttribListMerger::seekToIndex: invalid index!");
- return false;
- }
- _rSubList = *aLookupSublist;
- _rLocalIndex = nLeftOver;
- return true;
- }
-
- bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
- {
- for ( const auto& rLookupSublist : m_aLists )
- for (sal_Int16 i=0; i<rLookupSublist->getLength(); ++i)
- if (rLookupSublist->getNameByIndex(i) == _rName)
- {
- _rSubList = rLookupSublist;
- _rLocalIndex = i;
- return true;
- }
-
- OSL_FAIL("OAttribListMerger::seekToName: did not find the name!");
- return false;
- }
-
- sal_Int16 SAL_CALL OAttribListMerger::getLength( )
- {
- return std::accumulate(m_aLists.begin(), m_aLists.end(), static_cast<sal_Int16>(0),
- [](sal_Int16 sum, AttributeListArray::value_type& rAccumulate) { return sum + rAccumulate->getLength(); });
- }
-
- OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i )
- {
- Reference< xml::sax::XAttributeList > xSubList;
- sal_Int16 nLocalIndex;
-
- if (!seekToIndex(i, xSubList, nLocalIndex))
- return OUString();
-
- return xSubList->getNameByIndex(nLocalIndex);
- }
-
- OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i )
- {
- Reference< xml::sax::XAttributeList > xSubList;
- sal_Int16 nLocalIndex;
-
- if (!seekToIndex(i, xSubList, nLocalIndex))
- return OUString();
-
- return xSubList->getTypeByIndex(nLocalIndex);
- }
-
- OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName )
- {
- Reference< xml::sax::XAttributeList > xSubList;
- sal_Int16 nLocalIndex;
-
- if (!seekToName(_rName, xSubList, nLocalIndex))
- return OUString();
-
- // though we're in getTypeByName here, we reroute this to the getTypeByIndex of the sub list,
- // assuming that this is faster
- return xSubList->getTypeByIndex(nLocalIndex);
- }
-
- OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i )
- {
- Reference< xml::sax::XAttributeList > xSubList;
- sal_Int16 nLocalIndex;
-
- if (!seekToIndex(i, xSubList, nLocalIndex))
- return OUString();
-
- return xSubList->getValueByIndex(nLocalIndex);
- }
-
- OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName )
- {
- Reference< xml::sax::XAttributeList > xSubList;
- sal_Int16 nLocalIndex;
-
- if (!seekToName(_rName, xSubList, nLocalIndex))
- return OUString();
-
- // though we're in getValueByName here, we reroute this to the getValueByIndex of the sub list,
- // assuming that this is faster
- return xSubList->getValueByIndex(nLocalIndex);
- }
-
-} // namespace xmloff
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
deleted file mode 100644
index e3d352a9d1f8..000000000000
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ /dev/null
@@ -1,69 +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_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
-#define INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
-
-#include <sal/config.h>
-
-#include <vector>
-
-#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-
-namespace xmloff
-{
-
- //= OAttribListMerger
- typedef ::cppu::WeakImplHelper < css::xml::sax::XAttributeList
- > OAttribListMerger_Base;
- /** implements the XAttributeList list by merging different source attribute lists
-
- <p>Currently, the time behaviour is O(n), though it would be possible to change it to O(log n).</p>
- */
- class OAttribListMerger : public OAttribListMerger_Base
- {
- typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray;
- AttributeListArray m_aLists;
-
- public:
- OAttribListMerger() { }
-
- // attribute list handling
- // (very thin at the moment... only adding lists is allowed... add more if you need it :)
- void addList(const css::uno::Reference< css::xml::sax::XAttributeList >& _rList);
-
- // XAttributeList
- virtual sal_Int16 SAL_CALL getLength( ) override;
- virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) override;
- virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) override;
- virtual OUString SAL_CALL getTypeByName( const OUString& aName ) override;
- virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) override;
- virtual OUString SAL_CALL getValueByName( const OUString& aName ) override;
-
- private:
- bool seekToIndex(sal_Int16 _nGlobalIndex, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex);
- bool seekToName(const OUString& _rName, css::uno::Reference< css::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex);
- };
-
-} // namespace xmloff
-
-#endif // INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 4c6640747ac0..3ebd9b765a95 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -22,7 +22,6 @@
#include <xmloff/namespacemap.hxx>
#include "strings.hxx"
#include "callbacks.hxx"
-#include "attriblistmerge.hxx"
#include <xmloff/xmlnamespace.hxx>
#include "eventimport.hxx"
#include <xmloff/txtstyli.hxx>
@@ -101,20 +100,6 @@ namespace xmloff
return _e;
}
- OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName)
- {
- if ( s_sElementTranslations.empty() )
- { // initialize
- for (ElementType eType=ElementType(0); eType<UNKNOWN; ++eType)
- s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType;
- }
- MapString2Element::const_iterator aPos = s_sElementTranslations.find(_rName);
- if (s_sElementTranslations.end() != aPos)
- return aPos->second;
-
- return UNKNOWN;
- }
-
OControlElement::ElementType OElementNameMap::getElementType(sal_Int32 nElement)
{
if ( s_sElementTranslations2.empty() )
@@ -482,56 +467,6 @@ namespace xmloff
});
}
- bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue )
- {
- // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers
- const AttributeDescription attribute( metadata::getAttributeDescription( _nNamespaceKey, _rLocalName ) );
- if ( attribute.attributeToken != XML_TOKEN_INVALID )
- {
- PropertyGroups propertyGroups;
- metadata::getPropertyGroupList( attribute, propertyGroups );
- const PropertyGroups::const_iterator pos = impl_matchPropertyGroup( propertyGroups );
- if ( pos == propertyGroups.end() )
- return false;
-
- do
- {
- const PropertyDescriptionList& rProperties( *pos );
- const PropertyDescription* first = *rProperties.begin();
- if ( !first )
- {
- SAL_WARN( "xmloff.forms", "OElementImport::handleAttribute: invalid property description!" );
- break;
- }
-
- const PPropertyHandler handler = (*first->factory)( first->propertyId );
- if ( !handler )
- {
- SAL_WARN( "xmloff.forms", "OElementImport::handleAttribute: invalid property handler!" );
- break;
- }
-
- PropertyValues aValues;
- for ( const auto& propDesc : rProperties )
- {
- aValues[ propDesc->propertyId ] = Any();
- }
- if ( handler->getPropertyValues( _rValue, aValues ) )
- {
- for ( const auto& propDesc : rProperties )
- {
- implPushBackPropertyValue( propDesc->propertyName, aValues[ propDesc->propertyId ] );
- }
- }
- }
- while ( false );
-
- // handled
- return true;
- }
- return false;
- }
-
bool OElementImport::tryGenericAttribute( sal_Int32 nElement, const OUString& _rValue )
{
// the generic approach (which I hope all props will be migrated to, on the medium term): property handlers
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 50fcd185c7da..67eebc2f2a7a 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -58,7 +58,6 @@ namespace xmloff
OElementNameMap() = delete;
public:
- static ElementType getElementType(const OUString& _rName);
static ElementType getElementType(sal_Int32 nToken);
};
@@ -144,11 +143,6 @@ namespace xmloff
/** to be called from within handleAttribute, checks whether the given attribute is covered by our generic
attribute handler mechanisms
*/
- bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue );
-
- /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic
- attribute handler mechanisms
- */
bool tryGenericAttribute( sal_Int32 nElement, const OUString& _rValue );
/** controls whether |handleAttribute| implicitly calls |tryGenericAttribute|, or whether the derived class
@@ -547,9 +541,6 @@ namespace xmloff
m_xColumnFactory;
public:
- OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_Int32 nElement,
- const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
- OControlElement::ElementType _eType);
OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager,
const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType);
@@ -638,10 +629,6 @@ namespace xmloff
virtual css::uno::Reference< css::beans::XPropertySet >
createElement() override;
- OControlImport* implCreateChildContext(
- sal_uInt16 _nPrefix, const OUString& _rLocalName,
- OControlElement::ElementType _eType );
-
virtual OUString determineDefaultServiceName() const override;
void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue);
@@ -661,17 +648,6 @@ namespace xmloff
template <class BASE>
OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport,
IEventAttacherManager& _rEventManager,
- sal_Int32 _nElement,
- const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
- OControlElement::ElementType _eType)
- :BASE(_rImport, _rEventManager, _nElement, _rxParentContainer, _eType)
- ,m_xColumnFactory(_rxParentContainer, css::uno::UNO_QUERY)
- {
- OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!");
- }
- template <class BASE>
- OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport,
- IEventAttacherManager& _rEventManager,
const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType)
:BASE(_rImport, _rEventManager, _rxParentContainer, _eType)
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 43cdf63f4c40..8fa8de921467 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -71,12 +71,6 @@ namespace xmloff
return OFormLayerXMLImport_Impl::createOfficeFormsContext(_rImport);
}
- SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext(
- SvXMLImport& _rImport)
- {
- return OFormLayerXMLImport_Impl::createOfficeFormsContext(_rImport);
- }
-
SvXMLImportContext* OFormLayerXMLImport::createContext(sal_Int32 nElement,
const Reference< xml::sax::XFastAttributeList >& _rxAttribs)
{
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 75e73c899171..0705ee7cc0fb 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -410,82 +410,6 @@ const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
-{
- { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
- { XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION },
- { XML_NAMESPACE_TEXT, XML_HELP, XML_TOK_TEXTFIELD_HELP },
- { XML_NAMESPACE_TEXT, XML_HINT, XML_TOK_TEXTFIELD_HINT },
- { XML_NAMESPACE_TEXT, XML_PLACEHOLDER_TYPE,
- XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE },
- { XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_TEXTFIELD_NAME },
- { XML_NAMESPACE_TEXT, XML_FORMULA, XML_TOK_TEXTFIELD_FORMULA },
- { XML_NAMESPACE_STYLE, XML_NUM_FORMAT, XML_TOK_TEXTFIELD_NUM_FORMAT },
- { XML_NAMESPACE_STYLE, XML_NUM_LETTER_SYNC,
- XML_TOK_TEXTFIELD_NUM_LETTER_SYNC },
- { XML_NAMESPACE_TEXT, XML_DISPLAY_FORMULA,
- XML_TOK_TEXTFIELD_DISPLAY_FORMULA },
- { XML_NAMESPACE_TEXT, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE }, // #i32362#: src680m48++ saves text:value-type
- { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE },
- { XML_NAMESPACE_TEXT, XML_VALUE, XML_TOK_TEXTFIELD_VALUE },
- { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TEXTFIELD_VALUE },
- { XML_NAMESPACE_TEXT, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE },
- { XML_NAMESPACE_OFFICE, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE },
- { XML_NAMESPACE_TEXT, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE },
- { XML_NAMESPACE_OFFICE, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE },
- { XML_NAMESPACE_TEXT, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE },
- { XML_NAMESPACE_OFFICE, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE },
- { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, XML_TOK_TEXTFIELD_BOOL_VALUE},
- { XML_NAMESPACE_OFFICE, XML_CURRENCY, XML_TOK_TEXTFIELD_CURRENCY},
- { XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME,
- XML_TOK_TEXTFIELD_DATA_STYLE_NAME },
- { XML_NAMESPACE_TEXT, XML_DISPLAY_OUTLINE_LEVEL,
- XML_TOK_TEXTFIELD_NUMBERING_LEVEL },
- { XML_NAMESPACE_TEXT, XML_SEPARATION_CHARACTER,
- XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR },
- { XML_NAMESPACE_TEXT, XML_DISPLAY, XML_TOK_TEXTFIELD_DISPLAY },
- { XML_NAMESPACE_TEXT, XML_TIME_ADJUST, XML_TOK_TEXTFIELD_TIME_ADJUST },
- { XML_NAMESPACE_TEXT, XML_DATE_ADJUST, XML_TOK_TEXTFIELD_DATE_ADJUST },
- { XML_NAMESPACE_TEXT, XML_PAGE_ADJUST, XML_TOK_TEXTFIELD_PAGE_ADJUST },
- { XML_NAMESPACE_TEXT, XML_SELECT_PAGE, XML_TOK_TEXTFIELD_SELECT_PAGE },
- { XML_NAMESPACE_TEXT, XML_DATABASE_NAME, XML_TOK_TEXTFIELD_DATABASE_NAME},
- { XML_NAMESPACE_TEXT, XML_TABLE_NAME, XML_TOK_TEXTFIELD_TABLE_NAME },
- { XML_NAMESPACE_TEXT, XML_COLUMN_NAME, XML_TOK_TEXTFIELD_COLUMN_NAME },
- { XML_NAMESPACE_TEXT, XML_ROW_NUMBER, XML_TOK_TEXTFIELD_ROW_NUMBER },
- { XML_NAMESPACE_TEXT, XML_CONDITION, XML_TOK_TEXTFIELD_CONDITION },
- { XML_NAMESPACE_TEXT, XML_STRING_VALUE_IF_TRUE,
- XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE },
- { XML_NAMESPACE_TEXT, XML_STRING_VALUE_IF_FALSE,
- XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE },
- { XML_NAMESPACE_TEXT, XML_EDITING_CYCLES, XML_TOK_TEXTFIELD_REVISION },
- { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, XML_TOK_TEXTFIELD_OUTLINE_LEVEL},
- { XML_NAMESPACE_TEXT, XML_ACTIVE, XML_TOK_TEXTFIELD_ACTIVE },
- { XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_TOK_TEXTFIELD_NOTE_CLASS },
- { XML_NAMESPACE_TEXT, XML_REFERENCE_FORMAT,
- XML_TOK_TEXTFIELD_REFERENCE_FORMAT },
- { XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME },
- { XML_NAMESPACE_TEXT, XML_CONNECTION_NAME,
- XML_TOK_TEXTFIELD_CONNECTION_NAME },
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXTFIELD_HREF },
- { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME,
- XML_TOK_TEXTFIELD_TARGET_FRAME },
- { XML_NAMESPACE_TEXT, XML_ANNOTATION, XML_TOK_TEXTFIELD_ANNOTATION },
- { XML_NAMESPACE_SCRIPT, XML_LANGUAGE, XML_TOK_TEXTFIELD_LANGUAGE },
- { XML_NAMESPACE_TEXT, XML_KIND, XML_TOK_TEXTFIELD_MEASURE_KIND },
- { XML_NAMESPACE_TEXT, XML_IS_HIDDEN, XML_TOK_TEXTFIELD_IS_HIDDEN },
- { XML_NAMESPACE_TEXT, XML_CURRENT_VALUE,
- XML_TOK_TEXTFIELD_CURRENT_VALUE },
- { XML_NAMESPACE_TEXT, XML_TABLE_TYPE, XML_TOK_TEXTFIELD_TABLE_TYPE },
- { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_NAME },
- { XML_NAMESPACE_LO_EXT, XML_REFERENCE_LANGUAGE,
- XML_TOK_TEXTFIELD_REFERENCE_LANGUAGE },
- { XML_NAMESPACE_TEXT, XML_REFERENCE_LANGUAGE,
- XML_TOK_TEXTFIELD_REFERENCE_LANGUAGE },
- { XML_NAMESPACE_LO_EXT, XML_RESOLVED, XML_TOK_TEXT_RESOLVED },
-
- XML_TOKEN_MAP_END
-};
-
// maximum allowed length of combined characters field
#define MAX_COMBINED_CHARACTERS 6
@@ -495,7 +419,6 @@ struct XMLTextImportHelper::Impl
std::unique_ptr<SvXMLTokenMap> m_xTextElemTokenMap;
std::unique_ptr<SvXMLTokenMap> m_xTextPElemTokenMap;
std::unique_ptr<SvXMLTokenMap> m_xTextPAttrTokenMap;
- std::unique_ptr<SvXMLTokenMap> m_xTextFieldAttrTokenMap;
std::unique_ptr<SvXMLTokenMap> m_xTextNumberedParagraphAttrTokenMap;
std::unique_ptr<SvXMLTokenMap> m_xTextListBlockAttrTokenMap;
std::unique_ptr<SvXMLTokenMap> m_xTextListBlockElemTokenMap;
@@ -803,17 +726,6 @@ const SvXMLTokenMap& XMLTextImportHelper::GetTextHyperlinkAttrTokenMap()
return *m_xImpl->m_xTextHyperlinkAttrTokenMap;
}
-const SvXMLTokenMap& XMLTextImportHelper::GetTextFieldAttrTokenMap()
-{
- if (!m_xImpl->m_xTextFieldAttrTokenMap)
- {
- m_xImpl->m_xTextFieldAttrTokenMap.reset(
- new SvXMLTokenMap( aTextFieldAttrTokenMap ));
- }
- return *m_xImpl->m_xTextFieldAttrTokenMap;
-}
-
-
namespace
{
class FieldParamImporter