[Libreoffice-commits] .: basic/source

[Caolán McNamara]

 basic/source/classes/image.cxx |    4 ----
 basic/source/inc/filefmt.hxx   |    4 ----
 2 files changed, 8 deletions(-)

New commits:
commit 815b7b39f2b29db2d9e081b1ea098aaa6209c0e6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 20:27:09 2011 +0000

    EXTENDED_BINARY_MODULES is always defined

diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 2e24903..1208184 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -159,7 +159,6 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
                 aOUSource = aTmp;
                 break;
             }
-#ifdef EXTENDED_BINARY_MODULES
             case B_EXTSOURCE:
             {
                 for( sal_uInt16 j = 0 ; j < nCount ; j++ )
@@ -170,7 +169,6 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
                 }
                 break;
             }
-#endif
             case B_PCODE:
                 if( bBadVer ) break;
                 pCode = new char[ nLen ];
@@ -300,7 +298,6 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
         r.WriteByteString( aTmp, eCharSet );
         SbiCloseRecord( r, nPos );
 
-#ifdef EXTENDED_BINARY_MODULES
         if( nLen > STRING_MAXLEN )
         {
             sal_Int32 nRemainingLen = nLen - nMaxUnitSize;
@@ -316,7 +313,6 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
             }
             SbiCloseRecord( r, nPos );
         }
-#endif
     }
     // Binary data?
     if( pCode && SbiGood( r ) )
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index 2206106..672fcef 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -78,11 +78,7 @@ class SvStream;
 #define B_LINERANGES    0x524C      // LR line ranges for publics
 #define B_MODEND        0x454D      // ME module end
 #define B_SBXOBJECTS    0x5853      // SX SBX objects
-
-#define EXTENDED_BINARY_MODULES
-#ifdef  EXTENDED_BINARY_MODULES
 #define B_EXTSOURCE     0x5345      // ES extended source
-#endif
 
 // A library record contains only module records
 //  sal_uInt16 identifier BL