From 1110315ea427c77a9ca630fc80d1f9e15242f29e Mon Sep 17 00:00:00 2001 From: Daniel Rentz Date: Wed, 14 Apr 2010 19:14:53 +0200 Subject: npower13_objectmodules: compiler errors --- oox/inc/oox/helper/binarystreambase.hxx | 2 +- oox/source/dump/dffdumper.cxx | 6 +++--- oox/source/dump/oledumper.cxx | 20 ++++++++++---------- oox/source/helper/binarystreambase.cxx | 2 +- oox/source/ole/vbacontrol.cxx | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/oox/inc/oox/helper/binarystreambase.hxx b/oox/inc/oox/helper/binarystreambase.hxx index 5cebdc681e8d..abe4c5f1c274 100644 --- a/oox/inc/oox/helper/binarystreambase.hxx +++ b/oox/inc/oox/helper/binarystreambase.hxx @@ -69,7 +69,7 @@ public: inline void seekToEnd() { seek( getLength() ); } /** Seeks the stream forward to a position that is a multiple of the passed block size, relative to the passed stream position, if stream is seekable. */ - void align( sal_Int32 nBlockSize, sal_Int64 nAnchorPos = 0 ); + void alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos = 0 ); protected: inline explicit BinaryStreamBase() : mbEof( false ) {} diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index 1b93d9b213c4..8730698561ce 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -138,10 +138,10 @@ void DffStreamObject::implDumpRecordBody() dumpDec< sal_uInt32 >( "shape-count" ); dumpDec< sal_uInt32 >( "drawing-count" ); mxOut->resetItemIndex( 1 ); - TableGuard aTabGuard( *mxOut, 15, 16 ); + TableGuard aTabGuard( mxOut, 15, 16 ); for( sal_uInt32 nCluster = 1; !mxStrm->isEof() && (nCluster < nClusters); ++nCluster ) { - MultiItemsGuard aMultiGuard( *mxOut ); + MultiItemsGuard aMultiGuard( mxOut ); writeEmptyItem( "#cluster" ); dumpDec< sal_uInt32 >( "drawing-id" ); dumpHex< sal_uInt32 >( "next-free-id", "CONV-DEC" ); @@ -287,7 +287,7 @@ void DffStreamObject::dumpDffOpt() writeEmptyItem( "#complex-data" ); writeHexItem( "id", aIt->mnId, "DFFOPT-PROPERTY-NAMES" ); mxOut->endMultiItems(); - IndentGuard aIndent( *mxOut ); + IndentGuard aIndent( mxOut ); switch( aIt->meType ) { case PROPTYPE_BINARY: diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index 9c3e00fdcf30..4e358801a513 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -1098,7 +1098,7 @@ sal_uInt32 AxPropertyObjectBase::dumpFlagsProperty( sal_uInt32 nDefault, const s return nDefault; } -sal_uInt32 OcxPropertyObjectBase::dumpColorProperty( sal_uInt32 nDefault ) +sal_uInt32 AxPropertyObjectBase::dumpColorProperty( sal_uInt32 nDefault ) { if( startNextProperty() ) { @@ -1108,7 +1108,7 @@ sal_uInt32 OcxPropertyObjectBase::dumpColorProperty( sal_uInt32 nDefault ) return nDefault; } -sal_Unicode OcxPropertyObjectBase::dumpUnicodeProperty() +sal_Unicode AxPropertyObjectBase::dumpUnicodeProperty() { if( startNextProperty() ) { @@ -1783,11 +1783,11 @@ void VbaFormDesignExtObject::implDumpShortProperties() namespace { -const sal_uInt32 OCX_FORM_HASDESIGNEXTENDER = 0x00004000; -const sal_uInt32 OCX_FORM_SKIPCLASSTABLE = 0x00008000; +const sal_uInt32 AX_FORM_HASDESIGNEXTENDER = 0x00004000; +const sal_uInt32 AX_FORM_SKIPCLASSTABLE = 0x00008000; -const sal_uInt8 OCX_FORM_SITECOUNTTYPE_COUNT = 0x80; -const sal_uInt8 OCX_FORM_SITECOUNTTYPE_MASK = 0x7F; +const sal_uInt8 AX_FORM_SITECOUNTTYPE_COUNT = 0x80; +const sal_uInt8 AX_FORM_SITECOUNTTYPE_MASK = 0x7F; } // namespace @@ -1841,7 +1841,7 @@ void VbaFStreamObject::implDumpExtended() void VbaFStreamObject::dumpClassInfos() { - if( ensureValid() && !getFlag( mnFlags, OCX_FORM_SKIPCLASSTABLE ) ) + if( ensureValid() && !getFlag( mnFlags, AX_FORM_SKIPCLASSTABLE ) ) { mxOut->emptyLine(); sal_uInt16 nCount = dumpDec< sal_uInt16 >( "class-info-count" ); @@ -1887,10 +1887,10 @@ void VbaFStreamObject::dumpSiteData() IndentGuard aIndGuard( mxOut ); dumpDec< sal_uInt8 >( "depth" ); sal_uInt8 nTypeCount = dumpHex< sal_uInt8 >( "type-count", "VBA-FORM-SITE-TYPECOUNT" ); - if( getFlag( nTypeCount, OCX_FORM_SITECOUNTTYPE_COUNT ) ) + if( getFlag( nTypeCount, AX_FORM_SITECOUNTTYPE_COUNT ) ) { dumpDec< sal_uInt8 >( "repeated-type" ); - nSiteIdx += (nTypeCount & OCX_FORM_SITECOUNTTYPE_MASK); + nSiteIdx += (nTypeCount & AX_FORM_SITECOUNTTYPE_MASK); } else { @@ -1906,7 +1906,7 @@ void VbaFStreamObject::dumpSiteData() void VbaFStreamObject::dumpDesignExtender() { - if( ensureValid() && getFlag( mnFlags, OCX_FORM_HASDESIGNEXTENDER ) ) + if( ensureValid() && getFlag( mnFlags, AX_FORM_HASDESIGNEXTENDER ) ) { mxOut->emptyLine(); writeEmptyItem( "design-extender" ); diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index 86eae793a3c1..a8f9320ffc94 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -67,7 +67,7 @@ sal_Int64 BinaryStreamBase::getRemaining() const return ((nPos >= 0) && (nLen >= 0)) ? ::std::max< sal_Int64 >( nLen - nPos, 0 ) : -1; } -void BinaryStreamBase::align( sal_Int32 nBlockSize, sal_Int64 nAnchorPos ) +void BinaryStreamBase::alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos ) { sal_Int64 nStrmPos = tell(); // nothing to do, if stream is at anchor position diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 2674c30d9a73..b43e8289a592 100755 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -525,7 +525,7 @@ bool VbaFormControl::importEmbeddedSiteModels( BinaryInputStream& rInStrm ) } } // align the stream to 32bit, relative to start of entire site info - rInStrm.align( 4, nAnchorPos ); + rInStrm.alignToBlock( 4, nAnchorPos ); // import the site models for all embedded controls maControls.clear(); -- cgit