Kaydet (Commit) 8e5fd4a1 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

A bit of cleanup.

Change-Id: I576a184ebc8422d760800c670f8d9070f66e9e78
üst 136d57e9
...@@ -58,8 +58,6 @@ using ::com::sun::star::xml::dom::XDocumentBuilder; ...@@ -58,8 +58,6 @@ using ::com::sun::star::xml::dom::XDocumentBuilder;
namespace oox { namespace oox {
namespace core { namespace core {
// ============================================================================
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::beans; using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
...@@ -74,12 +72,6 @@ using utl::MediaDescriptor; ...@@ -74,12 +72,6 @@ using utl::MediaDescriptor;
using ::sax_fastparser::FSHelperPtr; using ::sax_fastparser::FSHelperPtr;
using ::sax_fastparser::FastSerializerHelper; using ::sax_fastparser::FastSerializerHelper;
// ============================================================================
namespace { namespace {
bool lclHasSuffix( const OUString& rFragmentPath, const OUString& rSuffix ) bool lclHasSuffix( const OUString& rFragmentPath, const OUString& rSuffix )
...@@ -88,27 +80,6 @@ bool lclHasSuffix( const OUString& rFragmentPath, const OUString& rSuffix ) ...@@ -88,27 +80,6 @@ bool lclHasSuffix( const OUString& rFragmentPath, const OUString& rSuffix )
return (nSuffixPos >= 0) && rFragmentPath.match( rSuffix, nSuffixPos ); return (nSuffixPos >= 0) && rFragmentPath.match( rSuffix, nSuffixPos );
} }
} // namespace
// ============================================================================
struct XmlFilterBaseImpl
{
typedef RefMap< OUString, Relations > RelationsMap;
FastParser maFastParser;
const OUString maBinSuffix;
const OUString maVmlSuffix;
RelationsMap maRelationsMap;
TextFieldStack maTextFieldStack;
explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
};
// ----------------------------------------------------------------------------
namespace {
struct NamespaceIds: public rtl::StaticWithInit< struct NamespaceIds: public rtl::StaticWithInit<
Sequence< beans::Pair< OUString, sal_Int32 > >, Sequence< beans::Pair< OUString, sal_Int32 > >,
NamespaceIds> NamespaceIds>
...@@ -172,9 +143,20 @@ struct NamespaceIds: public rtl::StaticWithInit< ...@@ -172,9 +143,20 @@ struct NamespaceIds: public rtl::StaticWithInit<
} }
}; };
} } // namespace
// ---------------------------------------------------------------------------- struct XmlFilterBaseImpl
{
typedef RefMap< OUString, Relations > RelationsMap;
FastParser maFastParser;
const OUString maBinSuffix;
const OUString maVmlSuffix;
RelationsMap maRelationsMap;
TextFieldStack maTextFieldStack;
explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
};
XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
maFastParser( rxContext ), maFastParser( rxContext ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment