diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-22 20:14:44 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-25 10:55:10 -0500 |
| commit | 8e5fd4a15ae2c7d55842b1b768b7807a2d3a298e (patch) | |
| tree | 0c127501c05f5be0ce405d92c76a93285083a035 | |
| parent | 136d57e9eb2a106ac4c22712027cc48ed6e4ad8d (diff) | |
A bit of cleanup.
Change-Id: I576a184ebc8422d760800c670f8d9070f66e9e78
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 3416dc7a8f50..dddc29c7e5a8 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -58,8 +58,6 @@ using ::com::sun::star::xml::dom::XDocumentBuilder; namespace oox { namespace core { -// ============================================================================ - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -74,12 +72,6 @@ using utl::MediaDescriptor; using ::sax_fastparser::FSHelperPtr; using ::sax_fastparser::FastSerializerHelper; - - - - -// ============================================================================ - namespace { 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 ); } -} // 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< Sequence< beans::Pair< OUString, sal_Int32 > >, NamespaceIds> @@ -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 ) : maFastParser( rxContext ), |