1 files changed, 14 insertions, 21 deletions
diff --git a/oox/source/xls/scenariobuffer.cxx b/oox/source/xls/scenariobuffer.cxx
index a4a2627f3efb..8915f1ae0c7b 100644
--- a/oox/source/xls/scenariobuffer.cxx
+++ b/oox/source/xls/scenariobuffer.cxx
@@ -26,39 +26,33 @@
  ************************************************************************/
 
 #include "oox/xls/scenariobuffer.hxx"
+
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sheet/XScenario.hpp>
 #include <com/sun/star/sheet/XScenarios.hpp>
 #include <com/sun/star/sheet/XScenariosSupplier.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include "properties.hxx"
 #include "oox/helper/attributelist.hxx"
+#include "oox/helper/containerhelper.hxx"
 #include "oox/helper/propertyset.hxx"
-#include "oox/helper/recordinputstream.hxx"
 #include "oox/xls/addressconverter.hxx"
 #include "oox/xls/biffinputstream.hxx"
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::UNO_SET_THROW;
-using ::com::sun::star::container::XIndexAccess;
-using ::com::sun::star::container::XNameAccess;
-using ::com::sun::star::table::CellAddress;
-using ::com::sun::star::table::CellRangeAddress;
-using ::com::sun::star::table::XCell;
-using ::com::sun::star::sheet::XScenario;
-using ::com::sun::star::sheet::XScenarios;
-using ::com::sun::star::sheet::XScenariosSupplier;
-using ::com::sun::star::sheet::XSpreadsheet;
-
 namespace oox {
 namespace xls {
 
 // ============================================================================
 
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::sheet;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
 namespace {
 
 const sal_Int32 BIFF_SCENARIO_DELETED       = 0x4000;
@@ -108,7 +102,7 @@ void Scenario::importInputCells( const AttributeList& rAttribs )
     maCells.push_back( aModel );
 }
 
-void Scenario::importScenario( RecordInputStream& rStrm )
+void Scenario::importScenario( SequenceInputStream& rStrm )
 {
     rStrm.skip( 2 );    // cell count
     // two longs instead of flag field
@@ -117,7 +111,7 @@ void Scenario::importScenario( RecordInputStream& rStrm )
     rStrm >> maModel.maName >> maModel.maComment >> maModel.maUser;
 }
 
-void Scenario::importInputCells( RecordInputStream& rStrm )
+void Scenario::importInputCells( SequenceInputStream& rStrm )
 {
     // TODO: where is the deleted flag?
     ScenarioCellModel aModel;
@@ -238,7 +232,7 @@ void SheetScenarios::importScenarios( const AttributeList& rAttribs )
     maModel.mnShown   = rAttribs.getInteger( XML_show, 0 );
 }
 
-void SheetScenarios::importScenarios( RecordInputStream& rStrm )
+void SheetScenarios::importScenarios( SequenceInputStream& rStrm )
 {
     maModel.mnCurrent = rStrm.readuInt16();
     maModel.mnShown   = rStrm.readuInt16();
@@ -303,4 +297,3 @@ void ScenarioBuffer::finalizeImport()
 
 } // namespace xls
 } // namespace oox
-