merge ScBiffReader and ScQProReader

Change-Id: I7267ffb4ad5c874d6c836a8d6ab823d63f8e2610
Reviewed-on: https://gerrit.libreoffice.org/30488
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 12 insertions, 52 deletions

diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
deleted file mode 100644
index 29735feb55b0..000000000000
--- a/sc/source/filter/inc/biff.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX
-#define INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX
-
-#include <sal/config.h>
-#include "filter.hxx"
-
-#include "flttypes.hxx"
-#include "ftools.hxx"
-
-// Stream wrapper class
-class ScBiffReader
-{
-protected:
-    sal_uInt16 mnId;
-    sal_uInt16 mnLength;
-    sal_uInt32 mnOffset;
-    SvStream *mpStream;
-    bool mbEndOfFile;
-
-public:
-    ScBiffReader( SfxMedium& rMedium );
-    ~ScBiffReader();
-    bool recordsLeft() { return mpStream && !mpStream->IsEof(); }
-    bool nextRecord();
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index b2b7c3e0c354..751ec859109b 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -27,22 +27,29 @@
 #include "flttypes.hxx"
 #include "ftools.hxx"
 #include "qprostyle.hxx"
-#include "biff.hxx"
 
 class ScDocument;
 
 // Stream wrapper class
-class ScQProReader : public ScBiffReader
+class ScQProReader
 {
-    public:
+    sal_uInt16 mnId;
+    sal_uInt16 mnLength;
+    sal_uInt32 mnOffset;
+    SvStream *mpStream;
+    bool mbEndOfFile;
+
+public:
+    ScQProReader( SfxMedium &rMedium );
+    ~ScQProReader();
+
     bool recordsLeft();
     void SetEof( bool bValue ){ mbEndOfFile = bValue; }
     bool nextRecord();
     sal_uInt16 getId() { return mnId; }
     sal_uInt16 getLength() { return mnLength; }
     void readString( OUString &rString, sal_uInt16 nLength );
-    ScQProReader( SfxMedium &rMedium );
-    ~ScQProReader(){ };
+
     FltError import( ScDocument *pDoc );
     FltError readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pStyle );
 };