[Libreoffice-commits] .: 2 commits - binfilter/bf_sw
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Mar 9 07:38:35 PST 2011
binfilter/bf_sw/source/core/attr/makefile.mk | 2 -
binfilter/bf_sw/source/core/attr/sw_format.cxx | 24 +++++++--------
binfilter/bf_sw/source/core/attr/sw_hints.cxx | 33 +++++++++++----------
binfilter/bf_sw/source/core/graphic/makefile.mk | 2 -
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 36 +++++++++++------------
5 files changed, 48 insertions(+), 49 deletions(-)
New commits:
commit 19017f14ecfad78432a966c0bf88fb630e2b7862
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 9 09:00:09 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/attr/makefile.mk b/binfilter/bf_sw/source/core/attr/makefile.mk
index ee8500f..4ee4096 100644
--- a/binfilter/bf_sw/source/core/attr/makefile.mk
+++ b/binfilter/bf_sw/source/core/attr/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/attr/sw_format.cxx b/binfilter/bf_sw/source/core/attr/sw_format.cxx
index ca5d7f4..ac238af 100644
--- a/binfilter/bf_sw/source/core/attr/sw_format.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_format.cxx
@@ -50,11 +50,11 @@ namespace binfilter {
/*N*/ const USHORT* pWhichRanges, SwFmt *pDrvdFrm, USHORT nFmtWhich )
/*N*/ : SwModify( pDrvdFrm ),
/*N*/ aSet( rPool, pWhichRanges ),
+/*N*/ nWhichId( nFmtWhich ),
+/*N*/ nFmtId( 0 ),
/*N*/ nPoolFmtId( USHRT_MAX ),
/*N*/ nPoolHelpId( USHRT_MAX ),
-/*N*/ nPoolHlpFileId( UCHAR_MAX ),
-/*N*/ nFmtId( 0 ),
-/*N*/ nWhichId( nFmtWhich )
+/*N*/ nPoolHlpFileId( UCHAR_MAX )
/*N*/ {
/*N*/ aFmtName.AssignAscii( pFmtNm );
/*N*/ bWritten = bFmtInDTOR = bAutoUpdateFmt = bLayerFmt = FALSE; // LAYER_IMPL
@@ -70,11 +70,11 @@ namespace binfilter {
/*N*/ : SwModify( pDrvdFrm ),
/*N*/ aFmtName( rFmtNm ),
/*N*/ aSet( rPool, pWhichRanges ),
+/*N*/ nWhichId( nFmtWhich ),
+/*N*/ nFmtId( 0 ),
/*N*/ nPoolFmtId( USHRT_MAX ),
/*N*/ nPoolHelpId( USHRT_MAX ),
-/*N*/ nPoolHlpFileId( UCHAR_MAX ),
-/*N*/ nFmtId( 0 ),
-/*N*/ nWhichId( nFmtWhich )
+/*N*/ nPoolHlpFileId( UCHAR_MAX )
/*N*/ {
/*N*/ bWritten = bFmtInDTOR = bAutoUpdateFmt = bLayerFmt = FALSE; // LAYER_IMPL
/*N*/ bAutoFmt = TRUE;
@@ -89,11 +89,11 @@ namespace binfilter {
/*?*/ : SwModify( pDrvdFrm ),
/*?*/ aFmtName( rFmtNm ),
/*?*/ aSet( rPool, nWhich1, nWhich2 ),
+/*?*/ nWhichId( nFmtWhich ),
+/*?*/ nFmtId( 0 ),
/*?*/ nPoolFmtId( USHRT_MAX ),
/*?*/ nPoolHelpId( USHRT_MAX ),
-/*?*/ nPoolHlpFileId( UCHAR_MAX ),
-/*?*/ nFmtId( 0 ),
-/*?*/ nWhichId( nFmtWhich )
+/*?*/ nPoolHlpFileId( UCHAR_MAX )
/*?*/ {
/*?*/ bWritten = bFmtInDTOR = bAutoUpdateFmt = bLayerFmt = FALSE; // LAYER_IMPL
/*?*/ bAutoFmt = TRUE;
@@ -106,11 +106,11 @@ namespace binfilter {
/*N*/ : SwModify( rFmt.DerivedFrom() ),
/*N*/ aFmtName( rFmt.aFmtName ),
/*N*/ aSet( rFmt.aSet ),
+/*N*/ nWhichId( rFmt.nWhichId ),
+/*N*/ nFmtId( 0 ),
/*N*/ nPoolFmtId( rFmt.GetPoolFmtId() ),
/*N*/ nPoolHelpId( rFmt.GetPoolHelpId() ),
-/*N*/ nPoolHlpFileId( rFmt.GetPoolHlpFileId() ),
-/*N*/ nFmtId( 0 ),
-/*N*/ nWhichId( rFmt.nWhichId )
+/*N*/ nPoolHlpFileId( rFmt.GetPoolHlpFileId() )
/*N*/ {
/*N*/ bWritten = bFmtInDTOR = bLayerFmt = FALSE; // LAYER_IMPL
/*N*/ bAutoFmt = rFmt.bAutoFmt;
diff --git a/binfilter/bf_sw/source/core/attr/sw_hints.cxx b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
index af352dc..c865f49 100644
--- a/binfilter/bf_sw/source/core/attr/sw_hints.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
@@ -91,18 +91,20 @@ namespace binfilter {
-/*N*/ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDocPos )
-/*N*/ : SwMsgPoolItem( RES_DOCPOS_UPDATE ),
-/*N*/ nDocPos(nDocPos)
+/*N*/ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nInDocPos )
+/*N*/ : SwMsgPoolItem( RES_DOCPOS_UPDATE )
+/*N*/ , nDocPos(nInDocPos)
/*N*/ {}
// SwTableFmlUpdate wird verschickt, wenn sich die Tabelle neu berechnen soll
/*N*/ SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
-/*N*/ : SwMsgPoolItem( RES_TABLEFML_UPDATE ),
-/*N*/ pTbl( pNewTbl ), pHistory( 0 ), eFlags( TBL_CALC ),
-/*N*/ nSplitLine( USHRT_MAX )
+/*N*/ : SwMsgPoolItem( RES_TABLEFML_UPDATE )
+/*N*/ , pTbl( pNewTbl )
+/*N*/ , pHistory( 0 )
+/*N*/ , nSplitLine( USHRT_MAX )
+/*N*/ , eFlags( TBL_CALC )
/*N*/ {
/*N*/ DATA.pDelTbl = 0;
/*N*/ bModified = bBehindSplitLine = FALSE;
@@ -111,23 +113,24 @@ namespace binfilter {
/*N*/ SwAutoFmtGetDocNode::SwAutoFmtGetDocNode( const SwNodes* pNds )
-/*N*/ : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ),
-/*N*/ pCntntNode( 0 ), pNodes( pNds )
+/*N*/ : SwMsgPoolItem( RES_AUTOFMT_DOCNODE )
+/*N*/ , pCntntNode( 0 )
+/*N*/ , pNodes( pNds )
/*N*/ {}
/*N*/ SwAttrSetChg::SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet )
-/*N*/ : SwMsgPoolItem( RES_ATTRSET_CHG ),
-/*N*/ pTheChgdSet( &rTheSet ),
-/*N*/ pChgSet( &rSet ),
-/*N*/ bDelSet( FALSE )
+/*N*/ : SwMsgPoolItem( RES_ATTRSET_CHG )
+/*N*/ , bDelSet( FALSE )
+/*N*/ , pChgSet( &rSet )
+/*N*/ , pTheChgdSet( &rTheSet )
/*N*/ {}
/*N*/ SwAttrSetChg::SwAttrSetChg( const SwAttrSetChg& rChgSet )
-/*N*/ : SwMsgPoolItem( RES_ATTRSET_CHG ),
-/*N*/ pTheChgdSet( rChgSet.pTheChgdSet ),
-/*N*/ bDelSet( TRUE )
+/*N*/ : SwMsgPoolItem( RES_ATTRSET_CHG )
+/*N*/ , bDelSet( TRUE )
+/*N*/ , pTheChgdSet( rChgSet.pTheChgdSet )
/*N*/ {
/*N*/ pChgSet = new SwAttrSet( *rChgSet.pChgSet );
/*N*/ }
commit 11226d86a3dbf6a22f1ee9a9fdefef9456f42b82
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 9 08:55:09 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/core/graphic/makefile.mk b/binfilter/bf_sw/source/core/graphic/makefile.mk
index e0dec07..393ea18 100644
--- a/binfilter/bf_sw/source/core/graphic/makefile.mk
+++ b/binfilter/bf_sw/source/core/graphic/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
index a653c10..6fe151f 100644
--- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
+++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx
@@ -474,7 +474,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
// are exported using the SvXMLGraphicObjectHelper class.
-/*N*/ BOOL SwGrfNode::StoreGraphics( SvStorage* pRoot )
+/*N*/ BOOL SwGrfNode::StoreGraphics( SvStorage* pInRoot )
/*N*/ {
/*N*/ if( !refLink.Is() )
/*N*/ {
@@ -485,19 +485,19 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ if( HasStreamName() )
/*N*/ bGraphic = GetStreamStorageNames( aSrcStrmName, aSrcPicStgName );
/*N*/ SvStorage* pDocStg = GetDoc()->GetDocStorage();
-/*N*/ if( !pRoot )
-/*N*/ pRoot = pDocStg;
-/*N*/ OSL_ENSURE( SOFFICE_FILEFORMAT_60 > pRoot->GetVersion(),
+/*N*/ if( !pInRoot )
+/*N*/ pInRoot = pDocStg;
+/*N*/ OSL_ENSURE( SOFFICE_FILEFORMAT_60 > pInRoot->GetVersion(),
/*N*/ "SwGrfNode::StoreGraphic called for 6.0+ file format" );
/*N*/
/*N*/ String aDstPicStgName(
/*N*/ RTL_CONSTASCII_USTRINGPARAM( "EmbeddedPictures" ) );
/*N*/ String aDstStrmName( aSrcStrmName );
-/*N*/ if( pRoot != pDocStg || !bGraphic )
+/*N*/ if( pInRoot != pDocStg || !bGraphic )
/*N*/ {
/*N*/ // If the stream does not contain a streamed graphic object,
/*N*/ // the graphic has to be stored again.
-/*N*/ OSL_ENSURE( pRoot != pDocStg || aSrcStrmName.Len(),
+/*N*/ OSL_ENSURE( pInRoot != pDocStg || aSrcStrmName.Len(),
/*N*/ "raw image data stream but no stream name" );
/*N*/ // Neuer Storage. Wenn die Grafik im DocStg drin ist,
/*N*/ // kann sie bequem per CopyTo() kopiert werden.
@@ -510,10 +510,10 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/
/*N*/ SvStorageStreamRef refStrm;
/*N*/
-/*N*/ BOOL bWriteNew = pDocStg->GetVersion() != pRoot->GetVersion() ||
+/*N*/ BOOL bWriteNew = pDocStg->GetVersion() != pInRoot->GetVersion() ||
/*N*/ !bGraphic;
/*N*/ if( !bWriteNew &&
-/*N*/ SOFFICE_FILEFORMAT_40 <= pRoot->GetVersion() )
+/*N*/ SOFFICE_FILEFORMAT_40 <= pInRoot->GetVersion() )
/*N*/ {
/*N*/ refStrm = refSrcPics->OpenStream( aSrcStrmName,
/*N*/ STREAM_READ | STREAM_SHARE_DENYWRITE );
@@ -527,7 +527,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ if( GRAPHIC_BITMAP == aGrfObj.GetType() &&
/*N*/ GetDoc()->GetInfo()->IsSaveGraphicsCompressed() )
/*N*/ nNewCmprsMode |= COMPRESSMODE_ZBITMAP;
-/*N*/ if( SOFFICE_FILEFORMAT_40 < pRoot->GetVersion() &&
+/*N*/ if( SOFFICE_FILEFORMAT_40 < pInRoot->GetVersion() &&
/*N*/ GetDoc()->GetInfo()->IsSaveOriginalGraphics() )
/*N*/ nNewCmprsMode |= COMPRESSMODE_NATIVE;
/*N*/
@@ -560,7 +560,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ }
/*N*/ // If the graphic is restored within the same storage,
/*N*/ // its storage has to be removed.
-/*N*/ if( pRoot == pDocStg )
+/*N*/ if( pInRoot == pDocStg )
/*N*/ {
{DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
@@ -569,7 +569,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ else
/*N*/ {
/*N*/ SvStorageRef refDstPics =
-/*N*/ pRoot->OpenStorage( aDstPicStgName,
+/*N*/ pInRoot->OpenStorage( aDstPicStgName,
/*N*/ STREAM_READWRITE | STREAM_SHARE_DENYALL );
/*N*/ if( refDstPics->IsContained( aDstStrmName ) )
/*N*/ // nur neu erzeugen, wenn Name schon vorhanden ist!
@@ -587,11 +587,11 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/
/*N*/ if( !aDstStrmName.Len() )
/*N*/ {
-/*N*/ OSL_ENSURE( pRoot, "Kein Storage gegeben" );
-/*N*/ if( pRoot )
+/*N*/ OSL_ENSURE( pInRoot, "Kein Storage gegeben" );
+/*N*/ if( pInRoot )
/*N*/ {
/*N*/ SvStorageRef refPics =
-/*N*/ pRoot->OpenStorage( aDstPicStgName,
+/*N*/ pInRoot->OpenStorage( aDstPicStgName,
/*N*/ STREAM_READWRITE | STREAM_SHARE_DENYALL );
/*N*/ if( SVSTREAM_OK == refPics->GetError() )
/*N*/ {
@@ -608,7 +608,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ if( bIsSwapOut && !aGrfObj.SwapIn() )
/*N*/ return FALSE;
/*N*/
-/*N*/ refStrm->SetVersion( pRoot->GetVersion() );
+/*N*/ refStrm->SetVersion( pInRoot->GetVersion() );
/*N*/
/*N*/ //JP 04.05.98: laut ChangesMail vom KA und Bug 49617
/*N*/ //JP 21.06.98: laut ChangesMail vom KA, natives Save
@@ -629,11 +629,11 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ refStrm->SetCompressMode( nComprMode );
/*N*/
/*N*/ BOOL bRes = FALSE;
-/*N*/ if( pRoot == pDocStg )
+/*N*/ if( pInRoot == pDocStg )
/*N*/ {
/*?*/ if( aGrfObj.SwapOut( refStrm ) &&
/*?*/ ( refStrm->Commit() | refPics->Commit()
-/*?*/ /*| pRoot->Commit()*/ ))
+/*?*/ /*| pInRoot->Commit()*/ ))
/*?*/ {
/*?*/ SetStreamName( aDstStrmName );
/*?*/ bRes = TRUE;
@@ -642,7 +642,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
/*N*/ else if( ((Graphic&)aGrfObj.GetGraphic()).
/*N*/ WriteEmbedded( *refStrm )
/*N*/ && ( refStrm->Commit() | refPics->Commit()
-/*N*/ /*| pRoot->Commit()*/ ))
+/*N*/ /*| pInRoot->Commit()*/ ))
/*N*/ {
/*N*/ if( bIsSwapOut )
/*?*/ aGrfObj.SwapOut();
More information about the Libreoffice-commits
mailing list