Get rid of _XBMPRIVATE

Change-Id: I4e2cd2d98299ee0b25e05b8a96fb8c3b8390b66d

2 files changed, 40 insertions, 45 deletions

diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index d34076fde8c6..a8a59a741891 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -17,11 +17,50 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _XBMPRIVATE
 #include <ctype.h>
 #include <comphelper/string.hxx>
 #include "xbmread.hxx"
 
+enum XBMFormat
+{
+    XBM10,
+    XBM11
+};
+
+enum ReadState
+{
+    XBMREAD_OK,
+    XBMREAD_ERROR,
+    XBMREAD_NEED_MORE
+};
+
+class XBMReader : public GraphicReader
+{
+    SvStream&           rIStm;
+    Bitmap              aBmp1;
+    BitmapWriteAccess*  pAcc1;
+    short*              pHexTable;
+    BitmapColor         aWhite;
+    BitmapColor         aBlack;
+    long                nLastPos;
+    long                nWidth;
+    long                nHeight;
+    bool                bStatus;
+
+    void            InitTable();
+    OString         FindTokenLine( SvStream* pInStm, const char* pTok1,
+                                       const char* pTok2 = nullptr, const char* pTok3 = nullptr );
+    long            ParseDefine( const sal_Char* pDefine );
+    bool            ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat );
+
+public:
+
+    explicit        XBMReader( SvStream& rStm );
+    virtual         ~XBMReader();
+
+    ReadState       ReadXBM( Graphic& rGraphic );
+};
+
 XBMReader::XBMReader( SvStream& rStm ) :
             rIStm           ( rStm ),
             pAcc1           ( nullptr ),
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
index 52082c22ada5..de95910e2eb9 100644
--- a/vcl/source/filter/ixbm/xbmread.hxx
+++ b/vcl/source/filter/ixbm/xbmread.hxx
@@ -23,50 +23,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/bitmapaccess.hxx>
 
-#ifdef _XBMPRIVATE
-
-enum XBMFormat
-{
-    XBM10,
-    XBM11
-};
-
-enum ReadState
-{
-    XBMREAD_OK,
-    XBMREAD_ERROR,
-    XBMREAD_NEED_MORE
-};
-
-class XBMReader : public GraphicReader
-{
-    SvStream&           rIStm;
-    Bitmap              aBmp1;
-    BitmapWriteAccess*  pAcc1;
-    short*              pHexTable;
-    BitmapColor         aWhite;
-    BitmapColor         aBlack;
-    long                nLastPos;
-    long                nWidth;
-    long                nHeight;
-    bool                bStatus;
-
-    void            InitTable();
-    OString         FindTokenLine( SvStream* pInStm, const char* pTok1,
-                                       const char* pTok2 = nullptr, const char* pTok3 = nullptr );
-    long            ParseDefine( const sal_Char* pDefine );
-    bool            ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat );
-
-public:
-
-    explicit        XBMReader( SvStream& rStm );
-    virtual         ~XBMReader();
-
-    ReadState       ReadXBM( Graphic& rGraphic );
-};
-
-#endif // _XBMPRIVATE
-
 VCL_DLLPUBLIC bool ImportXBM( SvStream& rStream, Graphic& rGraphic );
 
 #endif // INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX