[PATCH 3/3] Remove unused code in XMLTextImportHelper

Catalin Iacob iacobcatalin at gmail.com
Fri Feb 10 14:10:44 PST 2012


---
 unusedcode.easy               |    3 ---
 xmloff/inc/xmloff/txtimp.hxx  |    7 -------
 xmloff/source/text/txtimp.cxx |   36 ------------------------------------
 3 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/unusedcode.easy b/unusedcode.easy
index db9233b..60da3ef 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -674,9 +674,6 @@ XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(char const*)
 XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(char const*, char const*, unsigned char, short)
 XMLPropertyBackpatcher<short>::XMLPropertyBackpatcher(rtl::OUString const&, rtl::OUString const&, unsigned char, short)
 XMLTextFieldExport::ProcessDate(xmloff::token::XMLTokenEnum, com::sun::star::util::Date const&, unsigned short)
-XMLTextImportHelper::GetRangeFor(rtl::OUString&)
-XMLTextImportHelper::HasDrawNameAttribute(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, SvXMLNamespaceMap&)
-XMLTextImportHelper::getCurrentFieldName()
 XMLTextListAutoStylePool::HasName(rtl::OUString const&) const
 XMLTextListAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
 XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 7a863e4..93a8ba2 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -570,11 +570,6 @@ public:
     static SvXMLImportPropertyMapper* CreateTableDefaultExtPropMapper(SvXMLImport&, XMLFontStylesContext* pFontDecls = NULL);
     static SvXMLImportPropertyMapper* CreateTableRowDefaultExtPropMapper(SvXMLImport&, XMLFontStylesContext* pFontDecls = NULL);
 
-    static sal_Bool HasDrawNameAttribute(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-        SvXMLNamespaceMap& rNamespaceMap );
-
     SvI18NMap& GetRenameMap();
 
     /// save the start of a range reference
@@ -596,13 +591,11 @@ public:
             o_rpRDFaAttributes);
 
     ::rtl::OUString FindActiveBookmarkName();
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetRangeFor(::rtl::OUString &sName);
 
     void pushFieldCtx( ::rtl::OUString name, ::rtl::OUString type );
     void popFieldCtx();
     void addFieldParam( ::rtl::OUString name, ::rtl::OUString value );
     void setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField);
-    ::rtl::OUString getCurrentFieldName();
     ::rtl::OUString getCurrentFieldType();
     bool hasCurrentFieldCtx();
 
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 276baaf..7d210ca 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2226,28 +2226,6 @@ const XMLFontStylesContext *XMLTextImportHelper::GetFontDecls() const
     return (XMLFontStylesContext *)&m_pImpl->m_xFontDecls;
 }
 
-sal_Bool XMLTextImportHelper::HasDrawNameAttribute(
-        const Reference< XAttributeList > & xAttrList,
-        SvXMLNamespaceMap& rNamespaceMap )
-{
-    sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-    for( sal_Int16 i=0; i < nAttrCount; i++ )
-    {
-        const OUString& rAttrName = xAttrList->getNameByIndex( i );
-
-        OUString aLocalName;
-        sal_uInt16 nPrefix =
-            rNamespaceMap.GetKeyByAttrName( rAttrName, &aLocalName );
-        if( XML_NAMESPACE_DRAW == nPrefix &&
-            IsXMLToken( aLocalName, XML_NAME ) )
-        {
-            return !xAttrList->getValueByIndex(i).isEmpty();
-        }
-    }
-
-    return sal_False;
-}
-
 SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         SvXMLImport& rImport,
         sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -2646,12 +2624,6 @@ sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
     } else return ::rtl::OUString(); // return the empty string on error...
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > XMLTextImportHelper::GetRangeFor(::rtl::OUString &sName)
-{
-    return m_pImpl->m_BookmarkStartRanges[sName].get<0>();
-}
-
-
 void XMLTextImportHelper::pushFieldCtx( ::rtl::OUString name, ::rtl::OUString type )
 {
     m_pImpl->m_FieldStack.push(Impl::field_stack_item_t(
@@ -2673,14 +2645,6 @@ void XMLTextImportHelper::addFieldParam( ::rtl::OUString name, ::rtl::OUString v
         FieldStackItem.second.push_back(Impl::field_param_t( name, value ));
     }
 }
-::rtl::OUString XMLTextImportHelper::getCurrentFieldName()
-{
-    DBG_ASSERT(!m_pImpl->m_FieldStack.empty(),
-        "stack is empty: not good! Do a pushFieldCtx before...");
-    if (!m_pImpl->m_FieldStack.empty()) {
-        return m_pImpl->m_FieldStack.top().first.first;
-    } else  return ::rtl::OUString();
-}
 
 ::rtl::OUString XMLTextImportHelper::getCurrentFieldType()
 {
-- 
1.7.8.3



More information about the LibreOffice mailing list