1 files changed, 13 insertions, 17 deletions
diff --git a/oox/source/xls/ooxformulaparser.cxx b/oox/source/xls/ooxformulaparser.cxx
index ec2668aef0f2..efa69abcb750 100644
--- a/oox/source/xls/ooxformulaparser.cxx
+++ b/oox/source/xls/ooxformulaparser.cxx
@@ -26,27 +26,24 @@
  ************************************************************************/
 
 #include "oox/xls/ooxformulaparser.hxx"
+
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include "oox/xls/formulaparser.hxx"
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::XComponentContext;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::table::CellAddress;
-using ::com::sun::star::sheet::FormulaToken;
-
 namespace oox {
 namespace xls {
 
 // ============================================================================
 
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sheet;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
 class OOXMLFormulaParserImpl : private FormulaFinalizer
 {
 public:
@@ -64,7 +61,7 @@ private:
 // ----------------------------------------------------------------------------
 
 OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxFactory ) :
-    FormulaFinalizer( OpCodeProvider( rxFactory, FILTER_OOX, BIFF_UNKNOWN, true ) ),
+    FormulaFinalizer( OpCodeProvider( rxFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ),
     maApiParser( rxFactory, *this )
 {
 }
@@ -127,7 +124,7 @@ private:
 // ----------------------------------------------------------------------------
 
 OOXMLFormulaPrinterImpl::OOXMLFormulaPrinterImpl( const Reference< XMultiServiceFactory >& rxFactory ) :
-    OpCodeProvider( rxFactory, FILTER_OOX, BIFF_UNKNOWN, false ),
+    OpCodeProvider( rxFactory, FILTER_OOXML, BIFF_UNKNOWN, false ),
     maApiParser( rxFactory, *this )
 {
 }
@@ -143,7 +140,7 @@ Sequence< OUString > OOXMLFormulaParser_getSupportedServiceNames()
 
 OUString OOXMLFormulaParser_getImplementationName()
 {
-    return CREATE_OUSTRING( "com.sun.star.comp.oox.OOXMLFormulaParser" );
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.xls.FormulaParser" );
 }
 
 Reference< XInterface > SAL_CALL OOXMLFormulaParser_createInstance( const Reference< XComponentContext >& ) throw( Exception )
@@ -222,4 +219,3 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula(
 
 } // namespace xls
 } // namespace oox
-