INTEGRATION: CWS dr20 (1.5.12); FILE MERGED

2004/08/11 14:24:04 dr 1.5.12.2: RESYNC: (1.5-1.6); FILE MERGED
2004/06/15 16:37:36 dr 1.5.12.1: #i30205# Excel filter code cleanup
- rowlimit changes: SCCOL/SCROW/SCTAB usage
- type correctness: USHORT vs. sal_uInt16, ULONG/size_t vs. sal_uInt32
- removed compiler warnings

1 files changed, 8 insertions, 14 deletions

diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index fd9f5e6a97e1..1e6b33e35865 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xepage.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2004-08-20 09:12:46 $
+ *  last change: $Author: hr $ $Date: 2004-09-08 15:35:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,6 @@
  *
  ************************************************************************/
 
-// ============================================================================
-
 #ifndef SC_XEPAGE_HXX
 #include "xepage.hxx"
 #endif
@@ -117,9 +115,10 @@
 #include "xehelper.hxx"
 #endif
 
-
 // Page settings records ======================================================
 
+// Header/footer --------------------------------------------------------------
+
 XclExpHeaderFooter::XclExpHeaderFooter( sal_uInt16 nRecId, const String& rHdrString ) :
     XclExpRecord( nRecId ),
     maHdrString( rHdrString )
@@ -139,8 +138,7 @@ void XclExpHeaderFooter::WriteBody( XclExpStream& rStrm )
     }
 }
 
-
-// ----------------------------------------------------------------------------
+// General page settings ------------------------------------------------------
 
 XclExpSetup::XclExpSetup( const XclPageData& rPageData ) :
     XclExpRecord( EXC_ID_SETUP, 34 ),
@@ -177,7 +175,6 @@ void XclExpSetup::WriteBody( XclExpStream& rStrm )
     }
 }
 
-
 // Manual page breaks ---------------------------------------------------------
 
 XclExpPageBreaks::XclExpPageBreaks( sal_uInt16 nRecId, const ScfUInt16Vec& rPageBreaks, sal_uInt16 nMaxPos ) :
@@ -209,7 +206,6 @@ void XclExpPageBreaks::WriteBody( XclExpStream& rStrm )
     }
 }
 
-
 // Background bitmap ----------------------------------------------------------
 
 XclExpBitmap::XclExpBitmap( const Graphic& rGraphic ) :
@@ -258,7 +254,6 @@ void XclExpBitmap::Save( XclExpStream& rStrm )
     }
 }
 
-
 // Page settings ==============================================================
 
 XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
@@ -318,7 +313,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
             maData.mbFitToPages = false;
         }
 
-        maData.mpBrushItem.reset( new SvxBrushItem( GETITEM( rItemSet, SvxBrushItem, ATTR_BACKGROUND ) ) );
+        maData.mxBrushItem.reset( new SvxBrushItem( GETITEM( rItemSet, SvxBrushItem, ATTR_BACKGROUND ) ) );
 
         // *** header and footer ***
 
@@ -391,11 +386,10 @@ void XclExpPageSettings::Save( XclExpStream& rStrm )
     XclExpDoubleRecord( EXC_ID_BOTTOMMARGIN, maData.mfBottomMargin ).Save( rStrm );
     XclExpSetup( maData ).Save( rStrm );
 
-    if( (GetBiff() >= xlBiff8) && maData.mpBrushItem.get() )
-        if( const Graphic* pGraphic = maData.mpBrushItem->GetGraphic() )
+    if( (GetBiff() >= xlBiff8) && maData.mxBrushItem.get() )
+        if( const Graphic* pGraphic = maData.mxBrushItem->GetGraphic() )
             XclExpBitmap( *pGraphic ).Save( rStrm );
 }
 
-
 // ============================================================================