[Libreoffice-commits] .: 30 commits - binfilter/bf_sc binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff binfilter/inc filter/source hwpfilter/source lotuswordpro/source oox/source writerfilter/source writerperfect/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 6 07:42:16 PST 2011
binfilter/bf_sc/source/core/data/sc_document.cxx | 4
binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx | 2
binfilter/bf_sd/source/ui/view/sd_frmview.cxx | 2
binfilter/bf_sfx2/source/appl/makefile.mk | 2
binfilter/bf_sfx2/source/appl/sfx2_app.cxx | 8
binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx | 20 -
binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx | 16 -
binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx | 5
binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx | 5
binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx | 4
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 7
binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx | 10
binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx | 6
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 79 +++---
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 20 -
binfilter/bf_sfx2/source/bastyp/makefile.mk | 2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 26 +-
binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx | 10
binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx | 4
binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx | 33 --
binfilter/bf_sfx2/source/config/makefile.mk | 2
binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx | 2
binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx | 28 +-
binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx | 17 -
binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx | 8
binfilter/bf_sfx2/source/control/makefile.mk | 2
binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx | 26 +-
binfilter/bf_sfx2/source/control/sfx2_shell.cxx | 4
binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx | 38 +--
binfilter/bf_sfx2/source/doc/makefile.mk | 2
binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx | 9
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 147 +++++-------
binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx | 20 -
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 45 +--
binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx | 105 --------
binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx | 22 -
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx | 22 -
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 60 ++--
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx | 40 +--
binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx | 8
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 78 +++---
binfilter/bf_sfx2/source/doc/sfx2_objuno.cxx | 22 -
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx | 21 -
binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx | 14 -
binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx | 48 +--
binfilter/bf_sfx2/source/inc/namecont.hxx | 4
binfilter/bf_sfx2/source/view/makefile.mk | 2
binfilter/bf_starmath/util/makefile.mk | 2
binfilter/bf_svtools/source/uno/svt_unoimap.cxx | 10
binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx | 4
binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx | 2
binfilter/inc/bf_sfx2/docinf.hxx | 2
binfilter/inc/bf_sfx2/frmdescr.hxx | 35 +-
binfilter/inc/bf_sfx2/minarray.hxx | 8
binfilter/inc/bf_sfx2/progress.hxx | 2
filter/source/flash/swfwriter2.cxx | 8
filter/source/msfilter/svdfppt.cxx | 10
filter/source/xsltdialog/typedetectionexport.cxx | 4
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
hwpfilter/source/list.hxx | 4
lotuswordpro/source/filter/lwpchangemgr.cxx | 8
lotuswordpro/source/filter/lwpidxmgr.cxx | 2
lotuswordpro/source/filter/lwpobjfactory.cxx | 2
lotuswordpro/source/filter/lwpstory.cxx | 10
lotuswordpro/source/filter/xfilter/xfcolumns.cxx | 2
lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 10
lotuswordpro/source/filter/xfilter/xfindex.cxx | 4
lotuswordpro/source/filter/xfilter/xfstylecont.cxx | 10
oox/source/ppt/commonbehaviorcontext.cxx | 2
oox/source/ppt/pptgraphicshapecontext.cxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 8
writerperfect/source/filter/OdgExporter.cxx | 16 -
75 files changed, 544 insertions(+), 696 deletions(-)
New commits:
commit 54c59100f9ccf697f57af8c5ba4eb4e34558089c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:14:13 2011 +0000
cppunit: prefer prefix variant
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5dc8b62..c025a5e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1219,7 +1219,7 @@ void DomainMapper_Impl::CheckRedline( uno::Reference< text::XTextRange > xRange
{
vector<RedlineParamsPtr>::iterator pIt = m_aRedlines.begin( );
vector< RedlineParamsPtr > aCleaned;
- for (; pIt != m_aRedlines.end( ); pIt++ )
+ for (; pIt != m_aRedlines.end( ); ++pIt )
{
CreateRedline( xRange, *pIt );
commit 0d00e8354a5876a55242db828ffd88648ab86ef0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:13:00 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_svtools/source/uno/svt_unoimap.cxx b/binfilter/bf_svtools/source/uno/svt_unoimap.cxx
index fd78095..fff9470 100644
--- a/binfilter/bf_svtools/source/uno/svt_unoimap.cxx
+++ b/binfilter/bf_svtools/source/uno/svt_unoimap.cxx
@@ -660,7 +660,7 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 Index, const Any& Element
{
std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
for( sal_Int32 n = 0; n < Index; n++ )
- aIter++;
+ ++aIter;
maObjectList.insert( aIter, pObject );
}
@@ -681,7 +681,7 @@ void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 Index ) throw(IndexOutOfBo
{
std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
for( sal_Int32 n = 0; n < Index; n++ )
- aIter++;
+ ++aIter;
(*aIter)->release();
maObjectList.erase( aIter );
@@ -698,7 +698,7 @@ void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 Index, const Any& Element
std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
for( sal_Int32 n = 0; n < Index; n++ )
- aIter++;
+ ++aIter;
(*aIter)->release();
*aIter = pObject;
@@ -719,7 +719,7 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
for( sal_Int32 n = 0; n < Index; n++ )
- aIter++;
+ ++aIter;
Reference< XPropertySet > xObj( *aIter );
return makeAny( xObj );
@@ -778,7 +778,7 @@ sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const
rMap.InsertIMapObject( *pNewMapObject );
delete pNewMapObject;
- aIter++;
+ ++aIter;
}
return sal_True;
commit 92e9578f17423a323520fed0952044025ac69929
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:12:33 2011 +0000
cppunit: prefer prefix variant
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index 6ccf226..3bbcf0a 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -205,7 +205,7 @@ void XFColumns::ToXml(IXFStream *pStrm)
if(!(m_nFlag&XFCOLUMNS_FLAG_GAP) )
{
std::vector<XFColumn>::iterator it;
- for( it = m_aColumns.begin(); it != m_aColumns.end(); it++ )
+ for( it = m_aColumns.begin(); it != m_aColumns.end(); ++it )
{
(*it).ToXml(pStrm);
}
commit 6c5d78c462c36714d5c2d8b3e678f16d54bf824c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:11:53 2011 +0000
cppunit: prefer prefix variant
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 9a6bf05..103f732 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -156,7 +156,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->endElement( sNode );
- aIter++;
+ ++aIter;
}
xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -215,7 +215,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS, const XML
addProperty( xHandler, sData, sValue );
xHandler->ignorableWhitespace ( sWhiteSpace );
xHandler->endElement( sNode );
- aIter++;
+ ++aIter;
}
xHandler->endElement( sNode );
commit cccd6361fcf41954479ea53116ca7f16990a0358
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:11:25 2011 +0000
cppunit: prefer prefix variant
diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx
index 278783c..da9ca4f 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.cxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.cxx
@@ -85,7 +85,7 @@ LwpIndexManager::~LwpIndexManager()
//Clear m_ObjectKeys
std::vector<LwpKey*>::iterator it;
- for( it = m_ObjectKeys.begin(); it != m_ObjectKeys.end(); it++ )
+ for( it = m_ObjectKeys.begin(); it != m_ObjectKeys.end(); ++it )
{
LwpKey* pKey = *it;
if( pKey )
commit 6867c515cb5f6e5ca9ca001fd1be3366ef8d02c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:10:19 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
index 79a18cf..ab4f5de 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unomtabl.cxx
@@ -223,7 +223,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
maItemSetVector.erase( aIter );
return;
}
- aIter++;
+ ++aIter;
}
if( !hasByName( Name ) )
@@ -264,7 +264,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
(*aIter)->Put( aStartMarker, XATTR_LINESTART );
return;
}
- aIter++;
+ ++aIter;
}
// if it is not in our own sets, modify the pool!
commit bc5c108e8fb5e2e76f82764bf16285e713334851
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:09:55 2011 +0000
cppunit: prefer prefix variant
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index eeb718c..06436ad 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -381,7 +381,7 @@ Sprite::Sprite( sal_uInt16 nId )
Sprite::~Sprite()
{
- for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); i++)
+ for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i)
delete *i;
}
@@ -390,7 +390,7 @@ Sprite::~Sprite()
void Sprite::write( SvStream& out )
{
SvMemoryStream aTmp;
- for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); i++)
+ for(vector< Tag* >::iterator i = maTags.begin(); i != maTags.end(); ++i)
(*i)->write( aTmp );
if( !mnFrames )
@@ -516,7 +516,7 @@ void FlashFont::write( SvStream& out )
sal_uInt16 nGlyphs = _uInt16( maGlyphOffsets.size() );
sal_uInt16 nOffset = nGlyphs * sizeof( sal_uInt16 );
- for(vector< sal_uInt16 >::iterator i = maGlyphOffsets.begin(); i != maGlyphOffsets.end(); i++)
+ for(vector< sal_uInt16 >::iterator i = maGlyphOffsets.begin(); i != maGlyphOffsets.end(); ++i)
aTag.addUI16( nOffset + (*i) );
aTag.addBits( maGlyphData );
@@ -684,7 +684,7 @@ void FillStyle::Impl_addGradient( Tag* pTag ) const
pTag->addUI8( static_cast<sal_uInt8>( aGradientRecords.size() ) );
- for(std::vector< GradRecord >::iterator i = aGradientRecords.begin(); i != aGradientRecords.end(); i++)
+ for(std::vector< GradRecord >::iterator i = aGradientRecords.begin(); i != aGradientRecords.end(); ++i)
{
pTag->addUI8( (*i).mnRatio );
pTag->addRGBA( (*i).maColor );
commit 74690825cabdeae2e5ef6cc32e7c006058bbacc6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:09:26 2011 +0000
cppunit: prefer prefix variant
diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx
index 7ea5702..87b31aa 100644
--- a/lotuswordpro/source/filter/lwpchangemgr.cxx
+++ b/lotuswordpro/source/filter/lwpchangemgr.cxx
@@ -120,7 +120,7 @@ OUString LwpChangeMgr::GetChangeID(LwpFrib* pFrib)
void LwpChangeMgr::ConvertAllChange(IXFStream* pStream)
{
std::map<LwpFrib*,OUString>::iterator iter;
- for (iter=m_DocFribMap.begin();iter !=m_DocFribMap.end();iter++)
+ for (iter=m_DocFribMap.begin();iter !=m_DocFribMap.end();++iter)
{
if (iter->first->GetRevisionType() == LwpFrib::REV_INSERT)
{
@@ -147,14 +147,14 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream)
pStream->GetAttrList()->AddAttribute( A2OUSTR("text:track-changes"),A2OUSTR("false"));
//Add end
pStream->StartElement( A2OUSTR("text:tracked-changes") );
- for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();iter1++)
+ for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1)
(*iter1)->ToXml(pStream);
pStream->EndElement(A2OUSTR("text:tracked-changes"));
// m_DocFribMap.clear();
- for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();iter1++)
+ for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1)
{
delete *iter1;
*iter1=NULL;
@@ -177,7 +177,7 @@ void LwpChangeMgr::SetHeadFootChange(XFContentContainer* pCont)
std::map<LwpFrib*,OUString>::iterator iter;
XFChangeList* pChangeList = new XFChangeList;
- for (iter=m_HeadFootFribMap.begin();iter !=m_HeadFootFribMap.end();iter++)
+ for (iter=m_HeadFootFribMap.begin();iter !=m_HeadFootFribMap.end();++iter)
{
if (iter->first->GetRevisionType() == LwpFrib::REV_INSERT)
{
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index 077a65e..0f53e28 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -145,7 +145,7 @@ void LwpObjectFactory::ClearObjectMap()
{
delete (*it).second;
(*it).second = NULL;
- it++;
+ ++it;
}
m_ObjList.clear();
}
commit 36b5fc0638d6d7062cb2203883510602dd5a0d56
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:08:35 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index 46517c5..fd7fc6b 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -461,7 +461,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
PropertyValue* pValue = &(rValues.getArray()[nOldLength]);
std::vector< std::pair< OUString, Any > >::iterator aIter( aUserData.begin() );
- for( ; aIter != aUserData.end(); aIter++, pValue++ )
+ for( ; aIter != aUserData.end(); aIter++, ++pValue )
{
pValue->Name = (*aIter).first;
pValue->Value = (*aIter).second;
commit 1ff1e5b49b085584367a826d3891ba73ff9808ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:08:16 2011 +0000
cppunit: prefer prefix variant
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 0f70702..e64bc65 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7272,8 +7272,8 @@ void GetRowPositions( const Rectangle& rSnapRect, const std::set< sal_Int32 >& r
if ( nFlags & LinePositionRight )
rPositions.push_back( ( ( nRow * rColumns.size() ) + ( nColumn - 1 ) ) | LinePositionRight );
- nRow++;
- aRow++;
+ ++nRow;
+ ++aRow;
}
}
}
@@ -7293,8 +7293,8 @@ void GetColumnPositions( const Rectangle& rSnapRect, const std::set< sal_Int32 >
if ( nFlags & LinePositionBottom )
rPositions.push_back( ( ( ( nRow - 1 ) * rColumns.size() ) + nColumn ) | LinePositionBottom );
- nColumn++;
- aColumn++;
+ ++nColumn;
+ ++aColumn;
}
}
}
@@ -7593,7 +7593,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl
xPropSet->setPropertyValue( sDiagonalTLBR, Any( sal_True ) );
if ( nFlags & LinePositionBLTR )
xPropSet->setPropertyValue( sDiagonalBLTR, Any( sal_True ) );
- aIter++;
+ ++aIter;
}
}
catch( Exception& )
commit d1ee6ad5849296c00da8ec0a6b58232c481faf16
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:06:50 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
index fba4896..7eb99c5 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLDDELinksContext.cxx
@@ -174,7 +174,7 @@ void ScXMLDDELinkContext::EndElement()
sal_Int32 nCol(0);
sal_Int32 nRow(-1);
sal_Int32 nIndex(0);
- for (ScDDELinkCells::iterator aItr = aDDELinkTable.begin(); aItr != aDDELinkTable.end(); aItr++)
+ for (ScDDELinkCells::iterator aItr = aDDELinkTable.begin(); aItr != aDDELinkTable.end(); ++aItr)
{
if (nIndex % nColumns == 0)
{
commit 37d2eb922e0c81087348e8c5f477d7ffd73ed720
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:01:14 2011 +0000
cppunit: prefer prefix variant
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 82e403a..18316eb 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1359,7 +1359,7 @@ const application_info_impl* getApplicationInfo( const OUString& rServiceName )
{
return (*aIter);
}
- aIter++;
+ ++aIter;
}
return NULL;
}
commit 75edcf123f0360849cec4c8e8006d2878a1ebefb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 14:00:58 2011 +0000
cppunit: prefer prefix variant
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index 6f2fd3e..043a214 100644
--- a/hwpfilter/source/list.hxx
+++ b/hwpfilter/source/list.hxx
@@ -198,8 +198,8 @@ int LinkedList<T>::remove( T* pItem )
typename list_t::iterator aEnd = maList.end();
while( aIter != aEnd && *aIter != pItem )
{
- i++;
- aIter++;
+ ++i;
+ ++aIter;
}
if( aIter != aEnd )
commit 2836514d2e27ea6e599ab94b95c5b8ef1793ef59
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:59:27 2011 +0000
cppunit: prefer prefix variant
diff --git a/writerperfect/source/filter/OdgExporter.cxx b/writerperfect/source/filter/OdgExporter.cxx
index 429fc8d..6baa2d6 100644
--- a/writerperfect/source/filter/OdgExporter.cxx
+++ b/writerperfect/source/filter/OdgExporter.cxx
@@ -48,26 +48,26 @@ OdgExporter::OdgExporter(DocumentHandlerInterface *pHandler):
OdgExporter::~OdgExporter()
{
- for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++)
+ for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); ++iterBody)
{
delete (*iterBody);
(*iterBody) = NULL;
}
for (std::vector<DocumentElement *>::iterator iterGraphicsAutomaticStyles = mGraphicsAutomaticStyles.begin();
- iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); iterGraphicsAutomaticStyles++)
+ iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); ++iterGraphicsAutomaticStyles)
{
delete((*iterGraphicsAutomaticStyles));
}
for (std::vector<DocumentElement *>::iterator iterGraphicsStrokeDashStyles = mGraphicsStrokeDashStyles.begin();
- iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); iterGraphicsStrokeDashStyles++)
+ iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); ++iterGraphicsStrokeDashStyles)
{
delete((*iterGraphicsStrokeDashStyles));
}
for (std::vector<DocumentElement *>::iterator iterGraphicsGradientStyles = mGraphicsGradientStyles.begin();
- iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); iterGraphicsGradientStyles++)
+ iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); ++iterGraphicsGradientStyles)
{
delete((*iterGraphicsGradientStyles));
}
@@ -146,13 +146,13 @@ void OdgExporter::endGraphics()
TagOpenElement("office:styles").write(mpHandler);
for (std::vector<DocumentElement *>::const_iterator iterGraphicsStrokeDashStyles = mGraphicsStrokeDashStyles.begin();
- iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); iterGraphicsStrokeDashStyles++)
+ iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); ++iterGraphicsStrokeDashStyles)
{
(*iterGraphicsStrokeDashStyles)->write(mpHandler);
}
for (std::vector<DocumentElement *>::const_iterator iterGraphicsGradientStyles = mGraphicsGradientStyles.begin();
- iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); iterGraphicsGradientStyles++)
+ iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); ++iterGraphicsGradientStyles)
{
(*iterGraphicsGradientStyles)->write(mpHandler);
}
@@ -163,7 +163,7 @@ void OdgExporter::endGraphics()
// writing out the graphics automatic styles
for (std::vector<DocumentElement *>::iterator iterGraphicsAutomaticStyles = mGraphicsAutomaticStyles.begin();
- iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); iterGraphicsAutomaticStyles++)
+ iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); ++iterGraphicsAutomaticStyles)
{
(*iterGraphicsAutomaticStyles)->write(mpHandler);
}
@@ -228,7 +228,7 @@ void OdgExporter::endGraphics()
tmpDrawPageOpenElement.write(mpHandler);
for (std::vector<DocumentElement *>::const_iterator bodyIter = mBodyElements.begin();
- bodyIter != mBodyElements.end(); bodyIter++)
+ bodyIter != mBodyElements.end(); ++bodyIter)
{
(*bodyIter)->write(mpHandler);
}
commit 688af5da787b315538b63f1b41794d2463eaf00b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:58:38 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index b18f209..694ad44 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -1792,12 +1792,12 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ ScDefaultAttrSet::iterator aDefaultItr = aSet.begin();
/*N*/ aItr = aDefaultItr;
-/*N*/ aItr++;
+/*N*/ ++aItr;
/*N*/ while (aItr != aSet.end())
/*N*/ {
/*N*/ if (aItr->nCount > aDefaultItr->nCount)
/*N*/ aDefaultItr = aItr;
-/*N*/ aItr++;
+/*N*/ ++aItr;
/*N*/ }
/*N*/ nDefault = aDefaultItr->nFirst;
/*N*/ bRet = TRUE;
commit eb8f710b7eafc5e4f046009df5d888ea6baf918c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:57:30 2011 +0000
cppunit: prefer prefix variant
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 112c186..29b0d4e 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -81,7 +81,7 @@ static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlacehol
aShapePtr = findPlaceholder( nMasterPlaceholder, rChildren );
if ( aShapePtr.get() )
break;
- aRevIter++;
+ ++aRevIter;
}
return aShapePtr;
}
@@ -101,7 +101,7 @@ static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, st
aShapePtr = findPlaceholderByIndex( nIdx, rChildren );
if ( aShapePtr.get() )
break;
- aRevIter++;
+ ++aRevIter;
}
return aShapePtr;
}
commit 65e9087dd9d6cae7ed7597e7bb7f48448a0ebd94
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:55:21 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx
index 2987df1..e308ba6 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlerror.cxx
@@ -228,7 +228,7 @@ void XMLErrors::ThrowErrorAsSAXException(sal_Int32 nIdMask)
// search first error/warning that matches the nIdMask
for( ErrorList::iterator aIter = aErrors.begin();
aIter != aErrors.end();
- aIter++ )
+ ++aIter )
{
if ( (aIter->nId & nIdMask) != 0 )
{
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
index 909f594..5d0c98b 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
@@ -777,7 +777,7 @@ void ShapeSortContext::moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos )
DBG_ASSERT( (*aIter).nIs >= nDestPos, "Shape sorting failed" );
(*aIter).nIs++;
}
- aIter++;
+ ++aIter;
}
aIter = maUnsortedList.begin();
@@ -790,7 +790,7 @@ void ShapeSortContext::moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos )
DBG_ASSERT( (*aIter).nIs >= nDestPos, "shape sorting failed" );
(*aIter).nIs++;
}
- aIter++;
+ ++aIter;
}
}
}
commit 64f706c9932993f4f25c4410cf50fb42386f172a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:53:50 2011 +0000
cppunit: prefer prefix variant
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index a9a53e3..89bf0b9 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -90,7 +90,7 @@ XFStyleContainer& XFStyleContainer::operator=(const XFStyleContainer& other)
XFStyleContainer::~XFStyleContainer()
{
std::vector<IXFStyle*>::iterator it;
- for( it = m_aStyles.begin(); it != m_aStyles.end(); it++ )
+ for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it )
{
IXFStyle *pStyle = *it;
if( pStyle )
@@ -103,7 +103,7 @@ void XFStyleContainer::Reset()
{
std::vector<IXFStyle*>::iterator it;
- for( it = m_aStyles.begin(); it != m_aStyles.end(); it++ )
+ for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it )
{
IXFStyle *pStyle = *it;
if( pStyle )
@@ -159,7 +159,7 @@ IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle)
IXFStyle* XFStyleContainer::FindSameStyle(IXFStyle *pStyle)
{
std::vector<IXFStyle*>::iterator it;
- for( it = m_aStyles.begin(); it != m_aStyles.end(); it++ )
+ for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it )
{
IXFStyle *pConStyle = *it;
if( !pConStyle )
@@ -175,7 +175,7 @@ IXFStyle* XFStyleContainer::FindSameStyle(IXFStyle *pStyle)
IXFStyle* XFStyleContainer::FindStyle(rtl::OUString name)
{
std::vector<IXFStyle*>::iterator it;
- for( it = m_aStyles.begin(); it != m_aStyles.end(); it++ )
+ for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it )
{
IXFStyle *pConStyle = *it;
if( !pConStyle )
@@ -202,7 +202,7 @@ void XFStyleContainer::ToXml(IXFStream *pStrm)
{
std::vector<IXFStyle*>::iterator it;
- for( it = m_aStyles.begin(); it != m_aStyles.end(); it++ )
+ for( it = m_aStyles.begin(); it != m_aStyles.end(); ++it )
{
IXFStyle *pStyle = *it;
commit 77fb456f7036ef9f935c031b523235e02276dbfd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:51:11 2011 +0000
cppunit: prefer prefix variant
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index 98ca088..ac922f7 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -82,7 +82,7 @@ namespace oox { namespace ppt {
{
OUStringBuffer sAttributes;
std::list< Attribute >::const_iterator iter;
- for(iter = maAttributes.begin(); iter != maAttributes.end(); iter++)
+ for(iter = maAttributes.begin(); iter != maAttributes.end(); ++iter)
{
if( sAttributes.getLength() )
{
commit 17cac9bfa6800274f574b14d7b2ac3e1b44fd226
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:50:13 2011 +0000
cppunit: prefer prefix variant
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index 5f3de14..9e9109d 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -202,7 +202,7 @@ void LwpStory::AddPageLayout(LwpPageLayout * pObject)
LwpPageLayout* LwpStory::GetNextPageLayout()
{
std::vector<LwpPageLayout*>::iterator it;
- for( it = m_LayoutList.begin(); it != m_LayoutList.end(); it++ )
+ for( it = m_LayoutList.begin(); it != m_LayoutList.end(); ++it )
{
if(m_pCurrentLayout == *it)
{
@@ -243,9 +243,9 @@ void LwpStory::SortPageLayout()
LwpPageLayout* pTemp = NULL;
std::vector<LwpPageLayout*>::iterator aIt;
std::vector<LwpPageLayout*>::iterator bIt;
- for( aIt = aLayoutList.begin(); aIt != aLayoutList.end() -1; aIt++)
+ for( aIt = aLayoutList.begin(); aIt != aLayoutList.end() -1; ++aIt)
{
- for( bIt = aIt +1; bIt != aLayoutList.end(); bIt ++)
+ for( bIt = aIt +1; bIt != aLayoutList.end(); ++bIt )
{
if(**aIt < **bIt)
{
@@ -263,7 +263,7 @@ void LwpStory::SortPageLayout()
//put all the sorted layouts into list
m_LayoutList.clear();
- for( aIt = aLayoutList.begin(); aIt != aLayoutList.end(); aIt++)
+ for( aIt = aLayoutList.begin(); aIt != aLayoutList.end(); ++aIt)
{
m_LayoutList.push_back(*aIt);
}
@@ -537,7 +537,7 @@ OUString LwpStory::RegisterFirstFribStyle()
sal_Bool LwpStory::IsBullStyleUsedBefore(const rtl::OUString& rStyleName, const sal_uInt8& nPos)
{
std::vector <NamePosPair>::reverse_iterator rIter;
- for (rIter = m_vBulletStyleNameList.rbegin(); rIter != m_vBulletStyleNameList.rend(); rIter++)
+ for (rIter = m_vBulletStyleNameList.rbegin(); rIter != m_vBulletStyleNameList.rend(); ++rIter)
{
rtl::OUString aName = (*rIter).first;
sal_uInt8 nPosition = (*rIter).second;
commit 7c79e51952aacc4eb9c89692b7216476e2c2d9ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:49:27 2011 +0000
cppunit: prefer prefix variant
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx
index 48b3326..1473c55 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlimppr.cxx
@@ -551,7 +551,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
i = 0;
for( PropertyPairs::iterator aIter = aPropertyPairs.begin();
aIter != aPropertyPairs.end();
- aIter++ )
+ ++aIter )
{
pNamesArray[i] = *(aIter->first);
pValuesArray[i++] = *(aIter->second);
commit a62439136401133621d26c0d560a8b60d7d47bfc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:48:51 2011 +0000
cppunit: prefer prefix variant
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 8a5fd65..16aa286 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -442,7 +442,7 @@ void OOXMLPropertySetImpl::resolve(Properties & rHandler)
}
#endif
- aIt++;
+ ++aIt;
}
}
@@ -498,7 +498,7 @@ void OOXMLPropertySetImpl::add(OOXMLPropertySet::Pointer_t pPropertySet)
{
mProperties.resize(mProperties.size() + pSet->mProperties.size());
for (OOXMLProperties_t::iterator aIt = pSet->mProperties.begin();
- aIt != pSet->mProperties.end(); aIt++)
+ aIt != pSet->mProperties.end(); ++aIt)
add(*aIt);
}
}
@@ -525,7 +525,7 @@ string OOXMLPropertySetImpl::toString()
OOXMLProperties_t::iterator aItBegin = begin();
OOXMLProperties_t::iterator aItEnd = end();
- for (OOXMLProperties_t::iterator aIt = aItBegin; aIt != aItEnd; aIt++)
+ for (OOXMLProperties_t::iterator aIt = aItBegin; aIt != aItEnd; ++aIt)
{
if (aIt != aItBegin)
sResult += ", ";
@@ -718,7 +718,7 @@ void OOXMLTableImpl::resolve(Table & rTable)
pTable->entry(nPos, pProperties);
++nPos;
- it++;
+ ++it;
}
}
commit 76f265c50ed15ce0be29ba5f8d49a81d5bb85564
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:48:35 2011 +0000
cppunit: prefer prefix variant
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
index 9910657..61b7504 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
@@ -73,7 +73,7 @@ XFContentContainer::XFContentContainer(const XFContentContainer& other)
{
std::vector<IXFContent*>::const_iterator it;
- for( it = other.m_aContents.begin(); it != other.m_aContents.end(); it++ )
+ for( it = other.m_aContents.begin(); it != other.m_aContents.end(); ++it )
{
IXFContent *pContent = *it;
if( pContent )
@@ -89,7 +89,7 @@ XFContentContainer& XFContentContainer::operator=(const XFContentContainer& othe
{
std::vector<IXFContent*>::const_iterator it;
- for( it = other.m_aContents.begin(); it != other.m_aContents.end(); it++ )
+ for( it = other.m_aContents.begin(); it != other.m_aContents.end(); ++it )
{
IXFContent *pContent = *it;
if( pContent )
@@ -106,7 +106,7 @@ XFContentContainer::~XFContentContainer()
{
std::vector<IXFContent*>::iterator it;
- for( it = m_aContents.begin(); it != m_aContents.end(); it++ )
+ for( it = m_aContents.begin(); it != m_aContents.end(); ++it )
{
IXFContent *pContent = *it;
if( pContent )
@@ -143,7 +143,7 @@ void XFContentContainer::Reset()
{
std::vector<IXFContent*>::iterator it;
- for( it = m_aContents.begin(); it != m_aContents.end(); it++ )
+ for( it = m_aContents.begin(); it != m_aContents.end(); ++it )
{
IXFContent *pContent = *it;
if( pContent )
@@ -190,7 +190,7 @@ void XFContentContainer::ToXml(IXFStream *pStrm)
{
std::vector<IXFContent*>::iterator it;
- for( it = m_aContents.begin(); it != m_aContents.end(); it++ )
+ for( it = m_aContents.begin(); it != m_aContents.end(); ++it )
{
IXFContent *pContent = *it;
if( pContent )
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index a3cb907..e8b166b 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -299,7 +299,7 @@ void XFIndex::ToXml(IXFStream *pStrm)
//entry templates:
std::vector<XFIndexTemplate *>::iterator it;
- for (it = m_aTemplates.begin(); it != m_aTemplates.end(); it++)
+ for (it = m_aTemplates.begin(); it != m_aTemplates.end(); ++it)
{
(*it)->SetTagName( strTplName);
(*it)->ToXml(pStrm);
@@ -321,7 +321,7 @@ void XFIndex::ToXml(IXFStream *pStrm)
pStrm->StartElement( A2OUSTR("text:index-source-styles") );
std::vector<rtl::OUString>::iterator it_str;
- for (it_str = m_aTOCSource[i].begin(); it_str != m_aTOCSource[i].end(); it++)
+ for (it_str = m_aTOCSource[i].begin(); it_str != m_aTOCSource[i].end(); ++it)
{
pAttrList->Clear();
pAttrList->AddAttribute( A2OUSTR("text:style-name"), *it_str);
commit 6f6231ec8ea9f5d4e7fea29980cc0310d7cfbfa1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:39:50 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_starmath/util/makefile.mk b/binfilter/bf_starmath/util/makefile.mk
index 95e6c21..86fef7b 100644
--- a/binfilter/bf_starmath/util/makefile.mk
+++ b/binfilter/bf_starmath/util/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..
BFPRJ=..
commit 1efa07c9ab17f57b5dbd31f4cee836a7fbeda944
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:34:28 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sfx2/source/view/makefile.mk b/binfilter/bf_sfx2/source/view/makefile.mk
index 3c71d36..91e1551 100644
--- a/binfilter/bf_sfx2/source/view/makefile.mk
+++ b/binfilter/bf_sfx2/source/view/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
commit a8ef555fe07fa9dfa8066ce880d658df2ccf9fc0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:30:58 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sfx2/source/appl/makefile.mk b/binfilter/bf_sfx2/source/appl/makefile.mk
index 145e051..8807c19 100644
--- a/binfilter/bf_sfx2/source/appl/makefile.mk
+++ b/binfilter/bf_sfx2/source/appl/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_app.cxx b/binfilter/bf_sfx2/source/appl/sfx2_app.cxx
index f75bb1d..55c358a 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_app.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_app.cxx
@@ -97,15 +97,15 @@ SfxApplication* SfxApplication::pApp = NULL;
/*N*/ }
/*N*/ SfxApplication::SfxApplication()
-/*N*/ : _nFeatures( ULONG_MAX )
-/*N*/ , pImp( 0 )
-/*N*/ , pAppData_Impl( 0 )
+/*N*/ : pImp( 0 )
+/*N*/ , _nFeatures( ULONG_MAX )
/*N*/ , pCfgMgr( 0 )
+/*N*/ , pOptions( 0 )
+/*N*/ , pAppData_Impl( 0 )
/*N*/ , bInInit( sal_False )
/*N*/ , bInExit( sal_False )
/*N*/ , bDowning( sal_True )
/*N*/ , bCreatedExternal( sal_False )
-/*N*/ , pOptions( 0 )
/*N*/ {
/*N*/
/*N*/ pImp = new SfxApplication_Impl;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx
index f44c29d..6b08e02 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx
@@ -40,22 +40,22 @@
namespace binfilter {
/*N*/ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
-/*N*/ pProgress(0),
+ pSfxFrameObjectFactoryPtr(0),
+/*N*/ pInitLinkList(0),
+/*N*/ pMatcher( 0 ),
+/*N*/ pCancelMgr( 0 ),
/*N*/ pPool(0),
/*N*/ pEventConfig(0),
+/*N*/ pMiscConfig(0),
+ pThisDocument(0),
+/*N*/ pProgress(0),
/*N*/ nBasicCallLevel(0),
/*N*/ nRescheduleLocks(0),
/*N*/ nInReschedule(0),
-/*N*/ pInitLinkList(0),
- pSfxFrameObjectFactoryPtr(0),
- pThisDocument(0),
-/*N*/ pMatcher( 0 ),
-/*N*/ pCancelMgr( 0 ),
-/*N*/ pMiscConfig(0),
-/*N*/ bInQuit(sal_False),
-/*N*/ bInException( sal_False ),
/*N*/ m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(
-/*N*/ *pApp, ::legacy_binfilters::getLegacyProcessServiceFactory()))
+/*N*/ *pApp, ::legacy_binfilters::getLegacyProcessServiceFactory())),
+/*N*/ bInQuit(sal_False),
+/*N*/ bInException( sal_False )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx
index 4740dd6..1588888 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx
@@ -46,7 +46,7 @@ namespace binfilter {
/*?*/ long SfxObjectShell::DdeExecute
/*?*/ (
-/*?*/ const String& rCmd // in unserer BASIC-Syntax formuliert
+/*?*/ const String& /*rCmd*/ // in unserer BASIC-Syntax formuliert
/*?*/ )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
@@ -56,9 +56,9 @@ namespace binfilter {
/*?*/ long SfxObjectShell::DdeGetData
/*?*/ (
-/*?*/ const String& rItem, // das anzusprechende Item
-/*?*/ const String& rMimeType, // in: Format
-/*?*/ ::com::sun::star::uno::Any & rValue // out: angeforderte Daten
+/*?*/ const String& /*rItem*/, // das anzusprechende Item
+/*?*/ const String& /*rMimeType*/, // in: Format
+/*?*/ ::com::sun::star::uno::Any & /*rValue*/ // out: angeforderte Daten
/*?*/ )
{DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
/*?*/ }
@@ -67,9 +67,9 @@ namespace binfilter {
/*?*/ long SfxObjectShell::DdeSetData
/*?*/ (
-/*?*/ const String& rItem, // das anzusprechende Item
-/*?*/ const String& rMimeType, // in: Format
-/*?*/ const ::com::sun::star::uno::Any & rValue // out: angeforderte Daten
+/*?*/ const String& /*rItem*/, // das anzusprechende Item
+/*?*/ const String& /*rMimeType*/, // in: Format
+/*?*/ const ::com::sun::star::uno::Any & /*rValue*/ // out: angeforderte Daten
/*?*/ )
/*?*/
/* [Beschreibung]
@@ -88,7 +88,7 @@ namespace binfilter {
/*?*/ ::binfilter::SvLinkSource* SfxObjectShell::DdeCreateLinkSource
/*?*/ (
-/*?*/ const String& rItem // das zu erzeugende Item
+/*?*/ const String& /*rItem*/ // das zu erzeugende Item
/*?*/ )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index f13b3fd..5b609a5 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -111,11 +111,11 @@ public:
virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException );
};
-/*N*/ void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& Source ) throw( RuntimeException )
+/*N*/ void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& /*Source*/ ) throw( RuntimeException )
/*N*/ {
/*N*/ }
-/*N*/ void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& aEvent ) throw(TerminationVetoException, RuntimeException )
+/*N*/ void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& /*aEvent*/ ) throw(TerminationVetoException, RuntimeException )
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
index 5bef3b3..3db4210 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
@@ -100,11 +100,6 @@ static SfxVoidItem aStaticDefault(1);
#pragma code_seg()
#endif
-static SfxPoolItem* aStaticDefaults[1] =
-{
- &aStaticDefault
-};
-
#ifdef TF_POOLABLE
static SfxItemInfo const aItemInfos[] =
{
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
index 98a7366..087a28e 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
@@ -110,8 +110,8 @@ using namespace ::cppu;
/*N*/ sal_uInt32 CheckPasswd_Impl
/*N*/ (
/*N*/ //Window *pWin, // Parent des Dialogs
-/*N*/ SfxObjectShell* pDoc,
-/*N*/ SfxItemPool &rPool, // Pool, falls ein Set erzeugt werden mus
+/*N*/ SfxObjectShell* /*pDoc*/,
+/*N*/ SfxItemPool & /*rPool*/, // Pool, falls ein Set erzeugt werden mus
/*N*/ SfxMedium *pFile // das Medium, dessen Passwort gfs. erfragt werden soll
/*N*/ )
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index 77b20ff..3814ff3 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -82,9 +82,8 @@ TYPEINIT1(SfxUsrAnyItem, SfxPoolItem);
/*N*/ aValue = rAny;
/*N*/ }
-/*N*/ int SfxUsrAnyItem::operator==( const SfxPoolItem &rItem ) const
+/*N*/ int SfxUsrAnyItem::operator==( const SfxPoolItem & /*rItem*/ ) const
/*N*/ {
-/*N*/ // return rItem.ISA( SfxUsrAnyItem ) && ((SfxUsrAnyItem&)rItem).aValue == aValue;
/*N*/ return sal_False;
/*N*/ }
@@ -890,7 +889,7 @@ static const String sUnpacked = String::CreateFromAscii( "Unpacked" );
extern "C" {
/*N*/
-/*N*/ sal_Bool SAL_CALL sfx2_component_writeInfo( void* pServiceManager ,
+/*N*/ sal_Bool SAL_CALL sfx2_component_writeInfo( void* /*pServiceManager*/ ,
/*N*/ void* pRegistryKey )
/*N*/ {
/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) ) ;
@@ -943,7 +942,7 @@ extern "C" {
/*N*/
/*N*/ void* SAL_CALL sfx2_component_getFactory( const sal_Char* pImplementationName ,
/*N*/ void* pServiceManager ,
-/*N*/ void* pRegistryKey )
+/*N*/ void* /*pRegistryKey*/ )
/*N*/ {
/*N*/ // Set default return value for this operation - if it failed.
/*N*/ void* pReturn = NULL ;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
index 06f3701..638b480 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
@@ -116,7 +116,7 @@ SfxDialogLibraryContainer::SfxDialogLibraryContainer( void )
/*?*/ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
/*?*/ (
/*?*/ Any aElement,
-/*?*/ const OUString& aElementName,
+/*?*/ const OUString& /*aElementName*/,
/*?*/ Reference< XOutputStream > xOutput
/*?*/ )
/*?*/ throw(Exception)
@@ -143,11 +143,11 @@ SfxDialogLibraryContainer::SfxDialogLibraryContainer( void )
/*?*/ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
-/*?*/ ( const OUString& aFile, SotStorageStreamRef xElementStream )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Any aAny; return aAny;//STRIP001
+/*?*/ ( const OUString& /*aFile*/, SotStorageStreamRef /*xElementStream*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Any aAny; return aAny;
/*?*/ }
-/*?*/ void SAL_CALL SfxDialogLibraryContainer::importFromOldStorage( const ::rtl::OUString& aFile )
+/*?*/ void SAL_CALL SfxDialogLibraryContainer::importFromOldStorage( const ::rtl::OUString& /*aFile*/ )
/*?*/ {
/*?*/ // Nothing to do here, old dialogs cannot be imported
/*?*/ }
@@ -210,7 +210,7 @@ OUString SfxDialogLibraryContainer::impl_getStaticImplementationName()
}
Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::impl_createInstance
- ( const Reference< XMultiServiceFactory >& xServiceManager )
+ ( const Reference< XMultiServiceFactory >& /*xServiceManager*/ )
throw( Exception )
{
Reference< XInterface > xRet =
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx b/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
index dae1a17..7516dc1 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_imestatuswindow.cxx
@@ -60,7 +60,7 @@ void ImeStatusWindow::init()
if (Application::CanToggleImeStatusWindow())
try
{
- sal_Bool bShow;
+ sal_Bool bShow(sal_False);
if (getConfig()->getPropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"ShowStatusWindow")))
@@ -91,7 +91,7 @@ ImeStatusWindow::~ImeStatusWindow()
}
}
-void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & rSource)
+void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & /*rSource*/)
throw (css::uno::RuntimeException)
{
osl::MutexGuard aGuard(m_aMutex);
@@ -100,7 +100,7 @@ void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & rSource)
}
void SAL_CALL
-ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & rEvent)
+ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & /*rEvent*/)
throw (css::uno::RuntimeException)
{
}
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 4e55234..0ad8605 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -200,9 +200,9 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ }
-/*?*/ void NameContainer_Impl::removeByName( const OUString& Name )
+/*?*/ void NameContainer_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
@@ -584,8 +584,8 @@ namespace SfxContainer_Impl
/*N*/ // Write new index file immediately because otherwise
/*N*/ // the library elements will be lost when storing into
/*N*/ // the new info format
- SotStorageRef xStorage;
- implStoreLibraryIndexFile( pImplLib, rLib, xStorage );
+ SotStorageRef xLclStorage;
+ implStoreLibraryIndexFile( pImplLib, rLib, xLclStorage );
/*N*/ }
/*N*/
/*N*/ implImportLibDescriptor( pImplLib, rLib );
@@ -724,14 +724,14 @@ namespace SfxContainer_Impl
// Storing with password encryption
// Empty implementation, avoids unneccesary implementation in dlgcont.cxx
-/*?*/ sal_Bool SfxLibraryContainer_Impl::implStorePasswordLibrary( SfxLibrary_Impl* pLib,
-/*?*/ const OUString& aName, SotStorageRef xStorage )
+/*?*/ sal_Bool SfxLibraryContainer_Impl::implStorePasswordLibrary( SfxLibrary_Impl* /*pLib*/,
+/*?*/ const OUString& /*aName*/, SotStorageRef /*xStorage*/ )
/*?*/ {
/*?*/ return sal_False;
/*?*/ }
/*?*/ sal_Bool SfxLibraryContainer_Impl::implLoadPasswordLibrary
-/*?*/ ( SfxLibrary_Impl* pLib, const OUString& Name, sal_Bool bVerifyPasswordOnly )
+/*?*/ ( SfxLibrary_Impl* /*pLib*/, const OUString& /*Name*/, sal_Bool /*bVerifyPasswordOnly*/ )
/*?*/ throw(WrappedTargetException, RuntimeException)
/*?*/ {
/*?*/ return sal_True;
@@ -980,26 +980,23 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ else
/*N*/ {
/*N*/ // Create Input stream
-/*N*/ String aLibInfoPath;
+/*N*/ String aLclLibInfoPath;
/*N*/
-/*N*/ if( pLib )
-/*N*/ {
-/*N*/ createAppLibraryFolder( pLib, rLib.aName );
-/*N*/ aLibInfoPath = pLib->maLibInfoFileURL;
-/*N*/ }
-/*N*/ else
-/*?*/ aLibInfoPath = aIndexFileName;
+/*N*/ if( pLib )
+/*N*/ {
+/*N*/ createAppLibraryFolder( pLib, rLib.aName );
+/*N*/ aLclLibInfoPath = pLib->maLibInfoFileURL;
+/*N*/ }
+/*N*/ else
+/*?*/ aLclLibInfoPath = aIndexFileName;
/*N*/
/*N*/ try
/*N*/ {
-/*N*/ xInput = mxSFI->openFileRead( aLibInfoPath );
+/*N*/ xInput = mxSFI->openFileRead( aLclLibInfoPath );
/*N*/ }
/*N*/ catch( Exception& )
/*N*/ {
/*N*/ xInput.clear();
-//*N*/ SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
-//*N*/ ULONG nErrorCode = ERRCODE_IO_GENERAL;
-//*N*/ ErrorHandler::HandleError( nErrorCode );
/*N*/ }
/*N*/ }
/*N*/ if( !xInput.is() )
@@ -1143,7 +1140,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ // Can we copy the storage?
if( !mbOldInfoFormat && !pImplLib->mbModified && xSourceLibrariesStor.Is() )
{
- BOOL bRet = xSourceLibrariesStor->CopyTo
+ /*BOOL bRet =*/ xSourceLibrariesStor->CopyTo
( rLib.aName, xLibrariesStor, rLib.aName );
}
else
@@ -1341,7 +1338,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ OUString aInitFileName;
/*N*/ SotStorageRef xDummyStor;
/*N*/ ::xmlscript::LibDescriptor aLibDesc;
-/*N*/ sal_Bool bReadIndexFile = implLoadLibraryIndexFile( pNewLib, aLibDesc, xDummyStor, aInitFileName );
+/*N*/ /*sal_Bool bReadIndexFile =*/ implLoadLibraryIndexFile( pNewLib, aLibDesc, xDummyStor, aInitFileName );
/*N*/ implImportLibDescriptor( pNewLib, aLibDesc );
/*N*/
/*N*/ Reference< XNameAccess > xRet = static_cast< XNameAccess* >( pNewLib );
@@ -1352,9 +1349,9 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ return xRet;
/*N*/ }
-/*?*/ void SAL_CALL SfxLibraryContainer_Impl::removeLibrary( const OUString& Name )
+/*?*/ void SAL_CALL SfxLibraryContainer_Impl::removeLibrary( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*N*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLoaded( const OUString& Name )
@@ -1468,9 +1465,9 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLink( const OUString& Name
return bRet;
}
-/*?*/ OUString SAL_CALL SfxLibraryContainer_Impl::getLibraryLinkURL( const OUString& Name )
+/*?*/ OUString SAL_CALL SfxLibraryContainer_Impl::getLibraryLinkURL( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;
/*?*/ }
sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& Name )
@@ -1481,36 +1478,36 @@ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& N
return bRet;
}
-/*?*/ void SAL_CALL SfxLibraryContainer_Impl::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
+/*?*/ void SAL_CALL SfxLibraryContainer_Impl::setLibraryReadOnly( const OUString& /*Name*/, sal_Bool /*bReadOnly*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
-/*?*/ void SAL_CALL SfxLibraryContainer_Impl::renameLibrary( const OUString& Name, const OUString& NewName )
+/*?*/ void SAL_CALL SfxLibraryContainer_Impl::renameLibrary( const OUString& /*Name*/, const OUString& /*NewName*/ )
/*?*/ throw (NoSuchElementException, ElementExistException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// Methods XLibraryContainerPassword
-/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordProtected( const OUString& Name )
+/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordProtected( const OUString& /*Name*/ )
/*?*/ throw (NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
/*?*/ }
-/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordVerified( const OUString& Name )
+/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordVerified( const OUString& /*Name*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
/*?*/ }
/*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::verifyLibraryPassword
-/*?*/ ( const OUString& Name, const OUString& Password )
+/*?*/ ( const OUString& /*Name*/, const OUString& /*Password*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;
/*?*/ }
-/*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& Name,
-/*?*/ const OUString& OldPassword, const OUString& NewPassword )
+/*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& /*Name*/,
+/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
@@ -1700,7 +1697,7 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*N*/ }
// Methods XNameReplace
-/*?*/ void SfxLibrary_Impl::replaceByName( const OUString& aName, const Any& aElement )
+/*?*/ void SfxLibrary_Impl::replaceByName( const OUString& /*aName*/, const Any& /*aElement*/ )
/*?*/ throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*?*/ }
@@ -1717,9 +1714,9 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*N*/ mbModified = sal_True;
/*N*/ }
-/*?*/ void SfxLibrary_Impl::removeByName( const OUString& Name )
+/*?*/ void SfxLibrary_Impl::removeByName( const OUString& /*Name*/ )
/*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// XTypeProvider
@@ -1727,7 +1724,6 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*?*/ throw( RuntimeException )
/*?*/ {
static OTypeCollection * s_pTypes_NameContainer = 0;
- static OTypeCollection * s_pTypes_NameAccess = 0;
{
if( !s_pTypes_NameContainer )
{
@@ -1751,7 +1747,6 @@ Any SfxLibrary_Impl::getByName( const OUString& aName )
/*?*/ throw( RuntimeException )
/*?*/ {
static OImplementationId * s_pId_NameContainer = 0;
- static OImplementationId * s_pId_NameAccess = 0;
{
if( !s_pId_NameContainer )
{
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 7bb4783..4d49be9 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -272,7 +272,7 @@ void SfxScriptLibraryContainer::setLibraryPassword(
/*N*/ }
-/*?*/ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const ::rtl::OUString& aFile )
+/*?*/ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const ::rtl::OUString& /*aFile*/ )
/*?*/ {
DBG_ERROR("Strip");
/*?*/ }
@@ -335,25 +335,25 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
return bSuccess;
/*?*/ }
-/*?*/ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name,
-/*?*/ const OUString& OldPassword, const OUString& NewPassword )
+/*?*/ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& /*Name*/,
+/*?*/ const OUString& /*OldPassword*/, const OUString& /*NewPassword*/ )
/*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
// Impl methods
-/*?*/ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary_Impl* pLib,
-/*?*/ const ::rtl::OUString& aName, SotStorageRef xStorage )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary_Impl* /*pLib*/,
+/*?*/ const ::rtl::OUString& /*aName*/, SotStorageRef /*xStorage*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
/*?*/ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
-/*?*/ ( SfxLibrary_Impl* pLib, const OUString& Name, sal_Bool bVerifyPasswordOnly )
+/*?*/ ( SfxLibrary_Impl* /*pLib*/, const OUString& /*Name*/, sal_Bool /*bVerifyPasswordOnly*/ )
/*?*/ throw(WrappedTargetException, RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
@@ -420,7 +420,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ }
/*N*/ Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::impl_createInstance
-/*N*/ ( const Reference< XMultiServiceFactory >& xServiceManager )
+/*N*/ ( const Reference< XMultiServiceFactory >& /*xServiceManager*/ )
/*N*/ throw( Exception )
/*N*/ {
/*N*/ Reference< XInterface > xRet =
commit 7ab25e046f7c5db4897681c92b1fc931c6a88fbe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:12:55 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index 0ffabb5..f13b3fd 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -152,7 +152,6 @@ public:
/*N*/ // Wrapper angelegt werden
/*N*/ pAppData_Impl->pSfxFrameObjectFactoryPtr = new SfxFrameObjectFactoryPtr;
/*N*/ pAppData_Impl->pSfxFrameObjectFactoryPtr->pSfxFrameObjectFactory = SfxFrameObject::ClassFactory();
-/*N*/ SvBindStatusCallback::SetProgressCallback( STATIC_LINK( 0, SfxProgress, DefaultBindingProgress ) );
/*N*/
/*N*/ pImp->pEventHdl = new UniqueIndex( 1, 4, 4 );
/*N*/
diff --git a/binfilter/bf_sfx2/source/bastyp/makefile.mk b/binfilter/bf_sfx2/source/bastyp/makefile.mk
index 5955120..780940c 100644
--- a/binfilter/bf_sfx2/source/bastyp/makefile.mk
+++ b/binfilter/bf_sfx2/source/bastyp/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index 07fb77e..0971092 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -150,7 +150,7 @@ public:
kann.
*/
/*N*/ {
-/*N*/ const INetURLObject& rObj = rMed.GetURLObject();
+/*N*/ /*const INetURLObject& rObj =*/ rMed.GetURLObject();
/*N*/ String aName = rMed.GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
/*N*/ // Hier noch pruefen, ob das Doc im Browser dargestellt werden soll
/*N*/ SFX_ITEMSET_ARG( rMed.GetItemSet(), pTargetItem, SfxStringItem,
@@ -179,8 +179,8 @@ public:
//----------------------------------------------------------------
-/*?*/ ULONG SfxFilterContainer::Execute( SfxMedium& rMedium, SfxFrame*& pFrame) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*?*/ ULONG SfxFilterContainer::Execute( SfxMedium& /*rMedium*/, SfxFrame*& /*pFrame*/) const
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
//----------------------------------------------------------------
@@ -317,11 +317,11 @@ public:
//----------------------------------------------------------------
/*N*/ void SfxFilterContainer::LoadFilters(
-/*N*/ const String& rGroup, // ConfigGruppe, aus der gelesen werden soll
-/*N*/ sal_Bool bInstallIni, // Falls sal_True aus install.ini lesen,
+/*N*/ const String& /*rGroup*/, // ConfigGruppe, aus der gelesen werden soll
+/*N*/ sal_Bool /*bInstallIni*/, // Falls sal_True aus install.ini lesen,
/*N*/ // sonst soffice3.ini
-/*N*/ SfxFilterFlags nOrFlags, // Flags zusaetzlich zu denen in der Ini
-/*N*/ SfxFilterFlags nNotFlags ) // Flags, die nicht aus der ini genommen werden
+/*N*/ SfxFilterFlags /*nOrFlags*/, // Flags zusaetzlich zu denen in der Ini
+/*N*/ SfxFilterFlags /*nNotFlags*/ ) // Flags, die nicht aus der ini genommen werden
/* [Beschreibung]
Stoesst das Laden eines FilterContainers an. Das eigentliche
@@ -336,7 +336,7 @@ public:
//-------------------------------------------------------------------------
/*?*/ ULONG SfxFilterContainer::GetFilter4Content(
-/*?*/ SfxMedium& rMedium, const SfxFilter** ppFilter,
+/*?*/ SfxMedium& /*rMedium*/, const SfxFilter** /*ppFilter*/,
/*?*/ SfxFilterFlags, SfxFilterFlags ) const
/*?*/ {
/*?*/ return 0;
@@ -365,6 +365,7 @@ public:
/*N*/ {
/*N*/ SFX_ITEMSET_ARG( rMedium.GetItemSet(), pTargetItem, SfxStringItem,
/*N*/ SID_TARGETNAME, sal_False);
+/*N*/ (void)pTargetItem;
/*N*/
/*N*/ if ( *ppFilter && ( (*ppFilter)->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) )
/*N*/ return 0;
@@ -468,7 +469,7 @@ public:
/*N*/ if( !pFilter )
/*N*/ {
/*N*/ // Falls Medium Remote, Zunaechst ueber Mimetypen pruefen ( nicht bei ExternBrowser, sofern dabei angeladen wird )
-/*N*/ if( !pFilter && rMedium.SupportsMIME_Impl() && ( !bCheckExternBrowser || rObj.GetProtocol() != INET_PROT_HTTP && rObj.GetProtocol() != INET_PROT_HTTPS ) )
+/*N*/ if( !pFilter && rMedium.SupportsMIME_Impl() && ( !bCheckExternBrowser || (rObj.GetProtocol() != INET_PROT_HTTP && rObj.GetProtocol() != INET_PROT_HTTPS) ) )
/*N*/ {
/*N*/ // Mime Typen holen
/*N*/ String aMime;
@@ -664,7 +665,6 @@ if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \
/*?*/ }
/*N*/ }
/*N*/
-/*N*/ const SfxFilter* pTmpFilter = pFilter;
/*N*/ nErr = pFilter->GetFilterContainer()->GetFilter4Content( rMedium, &pFilter, nMust, nDont );
/*N*/ CHECKERROR();
/*N*/
@@ -699,9 +699,9 @@ if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \
/*N*/
/*N*/ *ppFilter = pFilter;
/*N*/
-/*N*/ if ( ( ( pOldFilter && pOldFilter!=pFilter &&
+/*N*/ if ( (( ( pOldFilter && pOldFilter!=pFilter &&
/*N*/ ( !pOldFilter->IsOwnTemplateFormat() || !pFilter->IsOwnFormat() ) ) ) &&
-/*N*/ nErr != ERRCODE_SFX_FORCEQUIET || bConsultUser )
+/*N*/ nErr != ERRCODE_SFX_FORCEQUIET) || bConsultUser )
/*N*/ return ERRCODE_SFX_CONSULTUSER;
/*N*/
/*N*/ if( !pOldFilter )
@@ -1282,7 +1282,7 @@ static const sal_Char* sFilterNamesForTextDocument[SFILTERNAMESFORTEXTDOCUMENT]
/*N*/ nCachePos = GetFilterCount();
/*N*/
/*N*/ SfxFilter* pFilter = this->GetFilter4FilterName(sFilterName,0,0);
-/*N*/ const SfxFilter* pCheck = this->GetFilter4FilterName(sFilterName,0,0);
+/*N*/ /*const SfxFilter* pCheck =*/ this->GetFilter4FilterName(sFilterName,0,0);
/*N*/ BOOL bNew = FALSE;
/*N*/ if (!pFilter)
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx
index ed0f970..8d91419 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx
@@ -129,15 +129,15 @@ using namespace ::com::sun::star;
/*N*/ }
/*?*/ SfxFilterListener::~SfxFilterListener()
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
-/*?*/ void SAL_CALL SfxFilterListener::flushed( const lang::EventObject& aSource ) throw( uno::RuntimeException )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001
+/*?*/ void SAL_CALL SfxFilterListener::flushed( const lang::EventObject& /*aSource*/ ) throw( uno::RuntimeException )
+/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }
/*?*/ }
-/*?*/ void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) throw( uno::RuntimeException )
-/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001
+/*?*/ void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& /*aSource*/ ) throw( uno::RuntimeException )
+/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }
/*?*/ }
}
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index 40cc898..b91e763 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -151,8 +151,8 @@ namespace binfilter {
// -----------------------------------------------------------------------
-/*?*/ BOOL SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ BOOL SfxPtrArr::Replace( void* /*aOldElem*/, void* /*aNewElem*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
// -----------------------------------------------------------------------
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
index deee51d..0d0ab63 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
@@ -107,7 +107,7 @@ inline ULONG Get10ThSec()
//#endif
// -----------------------------------------------------------------------
-/*N*/ void SfxProgress_Impl::Enable_Impl( BOOL bEnable )
+/*N*/ void SfxProgress_Impl::Enable_Impl( BOOL /*bEnable*/ )
/*N*/ {
/*N*/ SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
/*N*/
@@ -115,7 +115,7 @@ inline ULONG Get10ThSec()
/*N*/ {
/*N*/ }
/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SFX_APP()->LockDispatcher( !bEnable );
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
// -----------------------------------------------------------------------
@@ -155,9 +155,9 @@ inline ULONG Get10ThSec()
Fortschritts-Anzeige angezeigt.
*/
-/*N*/ : nVal(0),
-/*N*/ bSuspended(TRUE),
-/*N*/ pImp( new SfxProgress_Impl( rText ) )
+/*N*/ : pImp( new SfxProgress_Impl( rText ) )
+/*N*/ , nVal(0)
+/*N*/ , bSuspended(TRUE)
/*N*/ {
/*N*/ pImp->bRunning = TRUE;
/*N*/ pImp->bAllowRescheduling = Application::IsInExecute();;
@@ -201,7 +201,6 @@ inline ULONG Get10ThSec()
/*N*/
/*N*/ if( pImp->bIsStatusText == TRUE )
/*?*/ GetpApp()->HideStatusText( );
-/*N*/ SfxObjectShell* pDoc = pImp->xObjSh;
/*N*/ delete pImp;
/*N*/ }
@@ -240,7 +239,7 @@ inline ULONG Get10ThSec()
/*?*/ void SfxProgress::SetText
/*?*/ (
-/*?*/ const String& rText /* neuer Text */
+/*?*/ const String& /*rText*/ /* neuer Text */
/*?*/ )
/* [Beschreibung]
@@ -254,26 +253,6 @@ inline ULONG Get10ThSec()
// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
-// muss in AppDaten
-static ULONG nLastTime = 0;
-
-
-// -----------------------------------------------------------------------
-
-/*N*/ IMPL_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg*, pArg )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*N*/ return 0;
-/*N*/ }
-
-// -----------------------------------------------------------------------
-
-
-// -----------------------------------------------------------------------
-
/*N*/ BOOL SfxProgress::SetState
/*N*/ (
/*N*/ ULONG nNewVal, /* neuer Wert f"ur die Fortschritts-Anzeige */
diff --git a/binfilter/inc/bf_sfx2/progress.hxx b/binfilter/inc/bf_sfx2/progress.hxx
index 7c8c2d8..43867fe 100644
--- a/binfilter/inc/bf_sfx2/progress.hxx
+++ b/binfilter/inc/bf_sfx2/progress.hxx
@@ -74,8 +74,6 @@ public:
#if _SOLAR__PRIVATE
DECL_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
- DECL_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
- bool StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
#endif
};
commit 3bed53653a00a2abf1acde7da6f7c89441fc76e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 13:03:58 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sfx2/source/config/makefile.mk b/binfilter/bf_sfx2/source/config/makefile.mk
index d67d96b..7efeb25 100644
--- a/binfilter/bf_sfx2/source/config/makefile.mk
+++ b/binfilter/bf_sfx2/source/config/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx
index ce5c455..fe7f685 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx
@@ -100,7 +100,7 @@ namespace binfilter {
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001
/*?*/ }
-/*?*/ String SfxConfigItem::GetStreamName( USHORT nType )
+/*?*/ String SfxConfigItem::GetStreamName( USHORT /*nType*/ )
/*?*/ {
/*?*/ return String();
/*?*/ }
diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
index ba5891b..a566f95 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx
@@ -159,7 +159,7 @@ static const char pStorageName[] = "Configurations";
/*?*/ return pDocStor->OpenSotStorage( String::CreateFromAscii(pStorageName), STREAM_STD_READWRITE );
/*?*/ }
-/*?*/ void SfxConfigManager::SetModified(BOOL bMod)
+/*?*/ void SfxConfigManager::SetModified(BOOL /*bMod*/)
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*?*/ }
@@ -232,7 +232,7 @@ static const char pStorageName[] = "Configurations";
/*N*/ if ( m_xStorage.Is() )
/*N*/ {
/*N*/ // first update own storage
-/*N*/ bRet = !bModified || StoreConfiguration_Impl( m_xStorage ) && m_xStorage->Commit();
+/*N*/ bRet = !bModified || (StoreConfiguration_Impl( m_xStorage ) && m_xStorage->Commit());
/*N*/ bOwnSaveDone = TRUE;
/*N*/ if ( !pStorage && pObjShell )
/*N*/ {
@@ -267,7 +267,7 @@ static const char pStorageName[] = "Configurations";
/*?*/ }
/*N*/ }
/*N*/
-/*N*/ if ( bRet && !pStorage || pStorage == (SotStorage*) m_xStorage )
+/*N*/ if ( (bRet && !pStorage) || pStorage == (SotStorage*) m_xStorage )
/*N*/ {
/*N*/ // only storing into own storage was requested
/*N*/ bModified = FALSE;
@@ -306,8 +306,8 @@ static const char pStorageName[] = "Configurations";
/*?*/ return bRet;
/*N*/ }
-/*?*/ BOOL SfxConfigManager::StoreConfiguration_Impl( SotStorage* pStorage )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ BOOL SfxConfigManager::StoreConfiguration_Impl( SotStorage* /*pStorage*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ BOOL bRet = TRUE;
/*?*/ return bRet;
/*?*/ }
@@ -429,8 +429,8 @@ static const char pStorageName[] = "Configurations";
/*N*/ return FALSE;
/*N*/ }
-/*?*/ BOOL SfxConfigManager::StoreConfigItem( SfxConfigItem& rCItem )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;//STRIP001
+/*?*/ BOOL SfxConfigManager::StoreConfigItem( SfxConfigItem& /*rCItem*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;
/*?*/ }
/*N*/ static const char pHeader[] = "Star Framework Config File";
@@ -482,7 +482,7 @@ static const char pStorageName[] = "Configurations";
/*N*/ }
/*N*/
/*N*/ // get position of directory
-/*N*/ long lDirPos, lStart = pStream->Tell();
+/*N*/ long lDirPos;
/*N*/ (*pStream) >> lDirPos;
/*N*/ pStream->Seek(lDirPos);
/*N*/
@@ -520,9 +520,9 @@ static const char pStorageName[] = "Configurations";
/*N*/ // check for correct type id, inequality is allowed for userdef toolboxes
/*N*/ USHORT nType;
/*N*/ (*pStream) >> nType;
-/*N*/ BOOL bOk = ( nType == pItem->nType ||
-/*N*/ 1294 <= nType && nType <= 1301 &&
-/*N*/ 1294 <= pItem->nType && pItem->nType <= 1301 );
+/*N*/ BOOL bOk = ( (nType == pItem->nType) ||
+/*N*/ (1294 <= nType && nType <= 1301 &&
+/*N*/ 1294 <= pItem->nType && pItem->nType <= 1301) );
/*N*/
/*N*/ if ( !bOk || !ImportItem( pItem, pStream, pStorage ) )
/*N*/ {
@@ -550,7 +550,7 @@ static const char pStorageName[] = "Configurations";
/*N*/ return nRet;
/*N*/ }
-/*N*/ BOOL SfxConfigManagerImExport_Impl::ImportItem( SfxConfigItem_Impl* pItem, SvStream* pStream, SotStorage* pStor )
+/*N*/ BOOL SfxConfigManagerImExport_Impl::ImportItem( SfxConfigItem_Impl* pItem, SvStream* pStream, SotStorage* /*pStor*/ )
/*N*/ {
/*N*/ BOOL bRet = TRUE;
/*N*/ if ( pItem->nType == SFX_ITEMTYPE_DOCEVENTCONFIG )
@@ -563,8 +563,8 @@ static const char pStorageName[] = "Configurations";
return bRet;
/*N*/ }
-/*?*/ USHORT SfxConfigManagerImExport_Impl::Export( SotStorage* pStor, SotStorage *pOut )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*?*/ USHORT SfxConfigManagerImExport_Impl::Export( SotStorage* /*pStor*/, SotStorage* /*pOut*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
/*N*/ String SfxConfigManagerImExport_Impl::GetStreamName( USHORT nType )
diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
index 4b9b87e..f332f44 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
@@ -91,8 +91,8 @@ static const USHORT nVersion = 5;
//==========================================================================
/*N*/ SfxEventConfiguration::SfxEventConfiguration()
-/*N*/ : pDocEventConfig( NULL )
-/*N*/ , pAppEventConfig( NULL )
+/*N*/ : pAppEventConfig( NULL )
+/*N*/ , pDocEventConfig( NULL )
/*N*/ {
/*N*/ bIgnoreConfigure = sal_False;
/*N*/
@@ -240,12 +240,12 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*N*/ pEvConfig->PropagateEvents_Impl( pObjShell, aMacroTable );
/*N*/ }
-/*?*/ int SfxEventConfigItem_Impl::Load( SotStorage& rStorage )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*?*/ int SfxEventConfigItem_Impl::Load( SotStorage& /*rStorage*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
-/*?*/ BOOL SfxEventConfigItem_Impl::Store( SotStorage& rStorage )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ BOOL SfxEventConfigItem_Impl::Store( SotStorage& /*rStorage*/ )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
@@ -444,7 +444,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*N*/ int nCompVal = 1;
/*N*/ long nStart = 0;
/*N*/ long nEnd = gp_Id_SortList->Count() - 1;
-/*N*/ long nMid;
+/*N*/ long nMid(0);
/*N*/
/*N*/ EventNames_Impl* pMid;
/*N*/
@@ -490,7 +490,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*N*/ int nCompVal = 1;
/*N*/ long nStart = 0;
/*N*/ long nEnd = gp_Name_SortList->Count() - 1;
-/*N*/ long nMid;
+/*N*/ long nMid(0);
/*N*/
/*N*/ EventNames_Impl* pMid;
/*N*/
@@ -601,6 +601,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*N*/ {
/*N*/ // load events, they are automatically propagated to the document
/*N*/ DBG_ASSERT( !pOutStream, "DocEventConfig must not be converted!" );
+/*N*/ (void)pOutStream;
/*N*/ SfxEventConfigItem_Impl* pCfg = pDoc->GetEventConfig_Impl( TRUE );
/*N*/ if ( pCfg )
/*N*/ return ( pCfg->Load( rInStream ) == SfxConfigItem::ERR_OK );
diff --git a/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx b/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx
index 6d9fca7..e057809 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx
@@ -50,10 +50,10 @@ using namespace ::com::sun::star::uno;
--------------------------------------------------------------------*/
/*N*/ SfxMiscCfg::SfxMiscCfg() :
/*N*/ ConfigItem(C2U("Office.Common") ),
-/*N*/ nYear2000( SvNumberFormatter::GetYear2000Default() ),
-/*N*/ bNotFound (FALSE),
/*N*/ bPaperSize(FALSE),
-/*N*/ bPaperOrientation (FALSE)
+/*N*/ bPaperOrientation (FALSE),
+/*N*/ bNotFound (FALSE),
+/*N*/ nYear2000( SvNumberFormatter::GetYear2000Default() )
/*N*/ {
/*N*/ Load();
/*N*/ }
@@ -116,7 +116,7 @@ using namespace ::com::sun::star::uno;
/* -----------------------------02.03.01 15:31--------------------------------
---------------------------------------------------------------------------*/
-/*?*/ void SfxMiscCfg::Notify( const ::com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames)
+/*?*/ void SfxMiscCfg::Notify( const ::com::sun::star::uno::Sequence<rtl::OUString>& /*aPropertyNames*/)
/*?*/ {
/*?*/ Load();
/*?*/ }
commit dc6d4c1c710324f2b9eee39ca501ce6b62ec9f5a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 12:58:31 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sfx2/source/control/makefile.mk b/binfilter/bf_sfx2/source/control/makefile.mk
index b3ad2bc..fa4771c 100644
--- a/binfilter/bf_sfx2/source/control/makefile.mk
+++ b/binfilter/bf_sfx2/source/control/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
index 18e435d..f4925eb 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx
@@ -66,10 +66,10 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
//==========================================================================
/*?*/ SfxMacroInfo::SfxMacroInfo( SfxObjectShell *pDoc ) :
-/*?*/ bAppBasic(pDoc == NULL),
-/*?*/ nSlotId(0),
+/*?*/ pHelpText(0),
/*?*/ nRefCnt(0),
-/*?*/ pHelpText(0)
+/*?*/ bAppBasic(pDoc == NULL),
+/*?*/ nSlotId(0)
/*?*/ {}
//==========================================================================
@@ -81,8 +81,8 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
//==========================================================================
-/*?*/ sal_Bool SfxMacroInfo::operator==(const SfxMacroInfo& rOther) const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*?*/ sal_Bool SfxMacroInfo::operator==(const SfxMacroInfo&) const
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*?*/ }
//==========================================================================
@@ -94,7 +94,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
//==========================================================================
/*?*/ String SfxMacroInfo::GetBasicName() const
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String();//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String();
/*?*/ }
//==========================================================================
@@ -178,21 +178,21 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL;
//==========================================================================
-/*?*/ IMPL_LINK( SfxMacroConfig, CallbackHdl_Impl, SfxMacroConfig*, pConfig )
+/*?*/ IMPL_LINK( SfxMacroConfig, CallbackHdl_Impl, SfxMacroConfig*, EMPTYARG )
/*?*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImp->bWaitingForCallback = sal_False;
+ DBG_BF_ASSERT(0, "STRIP");
/*?*/ return 0;
/*?*/ }
-/*?*/ IMPL_LINK( SfxMacroConfig, EventHdl_Impl, SfxMacroInfo*, pInfo )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*?*/ IMPL_LINK( SfxMacroConfig, EventHdl_Impl, SfxMacroInfo*, EMPTYARG )
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ pImp->nEventId = 0;
/*?*/ return 0;
/*?*/ }
-/*?*/ ErrCode SfxMacroConfig::Call( SbxObject* pVCtrl,
-/*?*/ const String& rCode, BasicManager* pMgr, SbxArray *pArgs, SbxValue *pRet )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*?*/ ErrCode SfxMacroConfig::Call(SbxObject*,
+/*?*/ const String&, BasicManager*, SbxArray *, SbxValue *)
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*?*/ }
}
diff --git a/binfilter/bf_sfx2/source/control/sfx2_shell.cxx b/binfilter/bf_sfx2/source/control/sfx2_shell.cxx
index e0fca28..1287fa0 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_shell.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_shell.cxx
@@ -50,8 +50,8 @@ namespace binfilter {
/*N*/ };
/*N*/ SfxShell::SfxShell()
-/*N*/ : pPool(0),
-/*N*/ pImp(0)
+/*N*/ : pImp(0)
+/*N*/ , pPool(0)
/*N*/ {
/*N*/ pImp = new SfxShell_Impl;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
index 8a8b759..0608c58 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
@@ -110,15 +110,15 @@ using namespace ::com::sun::star::uno;
/*N*/ Locale(),
/*N*/ 2, 2, 2,
/*N*/ TransliterationModules_IGNORE_CASE ),
+/*N*/ eFamily ( SFX_STYLE_FAMILY_PARA ),
/*N*/ nCommand ( 0 ),
+/*N*/ nCellType ( SVX_SEARCHIN_FORMULA ),
+/*N*/ nAppFlag ( SVX_SEARCHAPP_WRITER ),
+/*N*/ bRowDirection ( sal_True ),
+/*N*/ bAllTables ( sal_False ),
/*N*/ bBackward ( sal_False ),
/*N*/ bPattern ( sal_False ),
/*N*/ bContent ( sal_False ),
-/*N*/ eFamily ( SFX_STYLE_FAMILY_PARA ),
-/*N*/ bRowDirection ( sal_True ),
-/*N*/ bAllTables ( sal_False ),
-/*N*/ nCellType ( SVX_SEARCHIN_FORMULA ),
-/*N*/ nAppFlag ( SVX_SEARCHAPP_WRITER ),
/*N*/ bAsianOptions ( FALSE )
/*N*/ {
/*N*/ EnableNotification( lcl_GetNotifyNames() );
@@ -185,15 +185,15 @@ using namespace ::com::sun::star::uno;
/*N*/ ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
/*N*/
/*N*/ aSearchOpt ( rItem.aSearchOpt ),
+/*N*/ eFamily ( rItem.eFamily ),
/*N*/ nCommand ( rItem.nCommand ),
+/*N*/ nCellType ( rItem.nCellType ),
+/*N*/ nAppFlag ( rItem.nAppFlag ),
+/*N*/ bRowDirection ( rItem.bRowDirection ),
+/*N*/ bAllTables ( rItem.bAllTables ),
/*N*/ bBackward ( rItem.bBackward ),
/*N*/ bPattern ( rItem.bPattern ),
/*N*/ bContent ( rItem.bContent ),
-/*N*/ eFamily ( rItem.eFamily ),
-/*N*/ bRowDirection ( rItem.bRowDirection ),
-/*N*/ bAllTables ( rItem.bAllTables ),
-/*N*/ nCellType ( rItem.nCellType ),
-/*N*/ nAppFlag ( rItem.nAppFlag ),
/*N*/ bAsianOptions ( rItem.bAsianOptions )
/*N*/ {
/*N*/ EnableNotification( lcl_GetNotifyNames() );
@@ -206,7 +206,7 @@ using namespace ::com::sun::star::uno;
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *pPool) const
+/*N*/ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool * /*pPool*/) const
/*N*/ {
/*N*/ return new SvxSearchItem(*this);
/*N*/ }
@@ -250,27 +250,27 @@ using namespace ::com::sun::star::uno;
/*N*/ SfxItemPresentation SvxSearchItem::GetPresentation
/*N*/ (
-/*N*/ SfxItemPresentation ePres,
-/*N*/ SfxMapUnit eCoreUnit,
-/*N*/ SfxMapUnit ePresUnit,
-/*N*/ XubString& rText,
+/*N*/ SfxItemPresentation /*ePres*/,
+/*N*/ SfxMapUnit /*eCoreUnit*/,
+/*N*/ SfxMapUnit /*ePresUnit*/,
+/*N*/ XubString& /*rText*/,
/*N*/ const ::IntlWrapper *
/*N*/ ) const
/*N*/ {
/*N*/ return SFX_ITEM_PRESENTATION_NONE;
/*N*/ }
-/*N*/ void SvxSearchItem::Notify( const Sequence< OUString > &rPropertyNames )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SvxSearchItem::Notify( const Sequence< OUString > & /*rPropertyNames*/ )
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+/*N*/ bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMemberId*/ ) const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return true;
/*N*/ }
// -----------------------------------------------------------------------
-/*N*/ bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+/*N*/ bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMemberId*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return true;
/*N*/ }
commit 2dfbcacb35ee9ff8d33face25ef1993a964d9af6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 6 12:40:41 2011 +0000
WaE: this dir is now warning free
diff --git a/binfilter/bf_sfx2/source/doc/makefile.mk b/binfilter/bf_sfx2/source/doc/makefile.mk
index 82f6935..a8d239d 100644
--- a/binfilter/bf_sfx2/source/doc/makefile.mk
+++ b/binfilter/bf_sfx2/source/doc/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
index 5a1601f..e6fb2f3 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
@@ -192,15 +192,14 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008;
/*N*/ CreateInstanceType funcCIT
/*N*/ )
/*N*/ : SvFactory( rName, rClassName, funcCIT ),
-/*N*/ fnCreate( 0 ),
/*N*/ nId( 0 ),
-/*N*/ // pIniMgr( 0 ),
+/*N*/ fnCreate( 0 ),
/*N*/ pShortName( 0 ),
/*N*/ pImpl( new SfxObjectFactory_Impl )
/*N*/ {
-/*N*/ DBG_CTOR(SfxObjectFactory, 0);
+/*N*/ DBG_CTOR(SfxObjectFactory, 0);
/*N*/
-/*N*/ SfxApplication* pApp = SFX_APP();
+/*N*/ /*SfxApplication* pApp =*/ SFX_APP();
/*N*/ RegisterObjectFactory_Impl(*this);
/*N*/ }
@@ -262,7 +261,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008;
/*N*/ // Etwaige Parameter abschneiden
/*N*/ aFact.Erase( nPos, aFact.Len() );
/*N*/
-/*N*/ SfxApplication *pApp = SFX_APP();
+/*N*/ /*SfxApplication *pApp =*/ SFX_APP();
/*N*/
/*N*/ // "swriter4" durch "swriter" ersetzen, zum Vergleichen uppercase verwenden
/*N*/ WildCard aSearchedFac( aFact.EraseAllChars('4').ToUpperAscii() );
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index e51424e..f851992 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -127,8 +127,8 @@ namespace binfilter {
/*N*/ ::osl::Mutex m_aMutex;
/*N*/ public:
/*N*/ SfxLockBytesHandler_Impl( SfxMedium* pMedium )
-/*N*/ : m_pMedium( pMedium )
-/*N*/ , m_nAcquireCount( 0 )
+/*N*/ : m_nAcquireCount( 0 )
+/*N*/ , m_pMedium( pMedium )
/*N*/ {}
/*N*/
/*N*/ virtual void Handle( ::utl::UcbLockBytesHandler::LoadHandlerItem nWhich, ::utl::UcbLockBytesRef xLockBytes );
@@ -200,9 +200,9 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-/*N*/ void SAL_CALL SfxMediumHandler_Impl::handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest )
+/*N*/ void SAL_CALL SfxMediumHandler_Impl::handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& /*xRequest*/ )
/*N*/ throw( ::com::sun::star::uno::RuntimeException )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*?*/ String ConvertDateTime_Impl(const SfxStamp &rTime, const LocaleDataWrapper& rWrapper);
@@ -234,7 +234,7 @@ namespace binfilter {
//----------------------------------------------------------------
-/*N*/ void SfxPoolCancelManager::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+/*N*/ void SfxPoolCancelManager::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/ )
/*N*/ {
/*N*/ if( !GetCancellableCount() ) SetManager( 0 );
/*N*/ else if( !GetManager() )
@@ -362,19 +362,28 @@ namespace binfilter {
//------------------------------------------------------------------
/*N*/ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP )
/*N*/ :
-/*N*/ SvCompatWeakBase( pAntiImplP ),
-/*N*/ bUpdatePickList(sal_True), bIsTemp( sal_False ), pOrigFilter( 0 ),
-/*N*/ bUsesCache(sal_True), pCancellable( 0 ),
-/*N*/ nPrio( 99 ), aExpireTime( Date() + 10, Time() ),
-/*N*/ bForceSynchron( sal_False ), bStreamReady( sal_False ), bIsStorage( sal_False ),
-/*N*/ pAntiImpl( pAntiImplP ),
-/*N*/ bDontCreateCancellable( sal_False ), pTempDir( NULL ), bIsDiskSpannedJAR( sal_False ),
-/*N*/ bDownloadDone( sal_True ), bDontCallDoneLinkOnSharingError( sal_False ),nFileVersion( 0 ),
-/*N*/ pTempFile( NULL ),
-/*N*/ nLastStorageError( 0 ),
-/*N*/ bIsCharsetInitialized( sal_False ),
+/*N*/ SvCompatWeakBase( pAntiImplP ),
+/*N*/ bUpdatePickList(sal_True), bIsTemp( sal_False ),
+/*N*/ bUsesCache(sal_True),
+/*N*/ bForceSynchron( sal_False ),
+/*N*/ bDontCreateCancellable( sal_False ),
+/*N*/ bDownloadDone( sal_True ),
+/*N*/ bDontCallDoneLinkOnSharingError( sal_False ),
+/*N*/ bStreamReady( sal_False ),
+/*N*/ bIsStorage( sal_False ),
/*N*/ bUseInteractionHandler( sal_True ),
/*N*/ bAllowDefaultIntHdl( sal_False ),
+/*N*/ bIsDiskSpannedJAR( sal_False ),
+/*N*/ bIsCharsetInitialized( sal_False ),
+/*N*/ nPrio( 99 ),
+/*N*/ pCancellable( 0 ),
+/*N*/ pAntiImpl( pAntiImplP ),
+/*N*/ nFileVersion( 0 ),
+/*N*/ pOrigFilter( 0 ),
+/*N*/ aExpireTime( Date() + 10, Time() ),
+/*N*/ pTempDir( NULL ),
+/*N*/ pTempFile( NULL ),
+/*N*/ nLastStorageError( 0 ),
/*N*/ m_bRemoveBackup( sal_False )
/*N*/ {
/*N*/ aHandler = new SfxLockBytesHandler_Impl( pAntiImpl );
@@ -403,17 +412,6 @@ namespace binfilter {
//================================================================
-/*?*/ #define IMPL_CTOR() \
-/*?*/ eError( SVSTREAM_OK ), \
-/*?*/ \
-/*?*/ bDirect( sal_False ), \
-/*?*/ bTriedStorage( sal_False ), \
-/*?*/ bSetFilter( sal_False ), \
-/*?*/ \
-/*?*/ nStorOpenMode( SFX_STREAM_READWRITE ), \
-/*?*/ pInStream(0), \
-/*?*/ pOutStream( 0 )
-
//------------------------------------------------------------------
/*N*/ void SfxMedium::ResetError()
/*N*/ {
@@ -1057,7 +1055,7 @@ namespace binfilter {
/*N*/
/*N*/ ::utl::UcbLockBytesHandler* pHandler = pImp->aHandler;
/*N*/ INetProtocol eProt = GetURLObject().GetProtocol();
-/*N*/ if ( eProt != INET_PROT_HTTP && eProt != INET_PROT_FTP || aName.Len() )
+/*N*/ if ( (eProt != INET_PROT_HTTP && eProt != INET_PROT_FTP) || aName.Len() )
/*N*/ pHandler = NULL;
/*N*/ BOOL bSynchron = pImp->bForceSynchron || ! pImp->aDoneLink.IsSet();
/*N*/ SFX_ITEMSET_ARG( pSet, pStreamItem, SfxUnoAnyItem, SID_INPUTSTREAM, sal_False);
@@ -1143,8 +1141,8 @@ namespace binfilter {
/*N*/ pImp->bDontCallDoneLinkOnSharingError = sal_False;
/*N*/ Done_Impl( ERRCODE_IO_NOTEXISTS );
/*N*/ }
-/*N*/ else if ( pImp->xLockBytes->GetError() == ERRCODE_IO_ACCESSDENIED && bIsWritable && bAllowReadOnlyMode ||
-/*N*/ pImp->xLockBytes->GetError() == ERRCODE_IO_NOTSUPPORTED && bIsWritable )
+/*N*/ else if ( (pImp->xLockBytes->GetError() == ERRCODE_IO_ACCESSDENIED && bIsWritable && bAllowReadOnlyMode) ||
+/*N*/ (pImp->xLockBytes->GetError() == ERRCODE_IO_NOTSUPPORTED && bIsWritable) )
/*N*/ {
/*?*/ if ( pImp->xLockBytes->GetError() == ERRCODE_IO_ACCESSDENIED )
/*?*/ {
@@ -1299,13 +1297,19 @@ namespace binfilter {
//------------------------------------------------------------------
/*N*/ SfxMedium::SfxMedium()
-/*N*/ : IMPL_CTOR(),
+/*N*/ :
+/*?*/ eError( SVSTREAM_OK ),
+/*?*/ bDirect( sal_False ),
/*N*/ bRoot( sal_False ),
+/*?*/ bSetFilter( sal_False ),
+/*?*/ bTriedStorage( sal_False ),
+/*?*/ nStorOpenMode( SFX_STREAM_READWRITE ),
/*N*/ pURLObj(0),
-/*N*/
+/*?*/ pInStream(0),
+/*?*/ pOutStream( 0 ),
+/*N*/ pFilter(0),
/*N*/ pSet(0),
-/*N*/ pImp(new SfxMedium_Impl( this )),
-/*N*/ pFilter(0)
+/*N*/ pImp(new SfxMedium_Impl( this ))
/*N*/ {
/*N*/ Init_Impl();
/*N*/ }
@@ -1361,7 +1365,7 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-/*N*/ void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool bResetOrig )
+/*N*/ void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool /*bResetOrig*/ )
/*N*/ {
/*N*/ pFilter = pFilterP;
/*N*/ pImp->nFileVersion = 0;
@@ -1445,7 +1449,7 @@ namespace binfilter {
//----------------------------------------------------------------
-/*N*/ void SfxMedium::SetPhysicalName_Impl( const String& rNameP )
+/*N*/ void SfxMedium::SetPhysicalName_Impl( const String& /*rNameP*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
@@ -1481,13 +1485,19 @@ namespace binfilter {
/*N*/ (
/*N*/ const String &rName, StreamMode nOpenMode, sal_Bool bDirectP,
/*N*/ const SfxFilter *pFlt, SfxItemSet *pInSet
-/*N*/ )
-/*N*/ : IMPL_CTOR(),
+/*N*/ ) :
+/*?*/ eError( SVSTREAM_OK ),
+/*?*/ bDirect( sal_False ),
/*N*/ bRoot( sal_False ),
-/*N*/ pFilter(pFlt),
+/*?*/ bSetFilter( sal_False ),
+/*?*/ bTriedStorage( sal_False ),
+/*?*/ nStorOpenMode( SFX_STREAM_READWRITE ),
/*N*/ pURLObj(0),
-/*N*/ pImp(new SfxMedium_Impl( this )),
-/*N*/ pSet( pInSet )
+/*?*/ pInStream(0),
+/*?*/ pOutStream( 0 ),
+/*N*/ pFilter(pFlt),
+/*N*/ pSet( pInSet ),
+/*N*/ pImp(new SfxMedium_Impl( this ))
/*N*/ {
/*N*/ aLogicName = rName;
/*N*/ nStorOpenMode = nOpenMode;
@@ -1497,12 +1507,18 @@ namespace binfilter {
//------------------------------------------------------------------
/*N*/ SfxMedium::SfxMedium( SvStorage *pStorage, sal_Bool bRootP )
-/*N*/ : IMPL_CTOR(),
-/*N*/ bRoot( bRootP ),
-/*N*/ aStorage(pStorage),
-/*N*/ pURLObj(0),
-/*N*/ pImp( new SfxMedium_Impl( this )),
-/*N*/ pSet(0)
+/*?*/ : eError( SVSTREAM_OK )
+/*?*/ , bDirect( sal_False )
+/*N*/ , bRoot( bRootP )
+/*?*/ , bSetFilter( sal_False )
+/*?*/ , bTriedStorage( sal_False )
+/*?*/ , nStorOpenMode( SFX_STREAM_READWRITE )
+/*N*/ , pURLObj(0)
+/*?*/ , pInStream(0)
+/*?*/ , pOutStream( 0 )
+/*N*/ , aStorage(pStorage)
+/*N*/ , pSet(0)
+/*N*/ , pImp( new SfxMedium_Impl( this ))
/*N*/ {
/*N*/ SfxApplication* pApp = SFX_APP();
/*N*/ sal_uInt32 nFormat = pStorage->GetFormat();
@@ -1585,35 +1601,8 @@ namespace binfilter {
//----------------------------------------------------------------
-/*N*/ sal_uInt32 SfxMedium::GetMIMEAndRedirect( String &rName )
-/*N*/ {
-/* dv !!!! not needed any longer ?
- INetProtocol eProt = GetURLObject().GetProtocol();
- if( eProt == INET_PROT_FTP && SvBinding::ShouldUseFtpProxy( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
- {
- Any aAny( UCB_Helper::GetProperty( GetContent(), WID_FLAG_IS_FOLDER ) );
- sal_Bool bIsFolder = FALSE;
- if ( ( aAny >>= bIsFolder ) && bIsFolder )
- return ERRCODE_NONE;
- }
-
- GetMedium_Impl();
- if( !eError && pImp->xBinding.Is() )
- {
- eError = pImp->xBinding->GetMimeType( rName );
-
- // Wir koennen keine Parameter wie CharSets usw.
- rName = rName.GetToken( 0, ';' );
- if( !eError )
- {
- if( !pImp->aPreRedirectionURL.Len() )
- pImp->aPreRedirectionURL = aLogicName;
- SetName( pImp->xBinding->GetRedirectedURL() );
- }
- pImp->aExpireTime = pImp->xBinding->GetExpireDateTime();
- }
- return eError;
-*/
+/*N*/ sal_uInt32 SfxMedium::GetMIMEAndRedirect( String & /*rName*/ )
+/*N*/ {
/*N*/ return 0;
/*N*/ }
@@ -1885,12 +1874,12 @@ namespace binfilter {
/*?*/ SvStream& SfxVersionTableDtor::Read( SvStream& rStrm )
/*?*/ {
-/*?*/ sal_uInt16 nCount = 0, nVersion = 0;
+/*?*/ sal_uInt16 nLclCount = 0, nVersion = 0;
/*?*/
/*?*/ rStrm >> nVersion;
-/*?*/ rStrm >> nCount;
+/*?*/ rStrm >> nLclCount;
/*?*/
-/*?*/ for( sal_uInt16 i=0; i<nCount; ++i )
+/*?*/ for( sal_uInt16 i=0; i<nLclCount; ++i )
/*?*/ {
/*?*/ SfxVersionInfo *pNew = new SfxVersionInfo;
/*?*/ rStrm.ReadByteString( pNew->aComment, RTL_TEXTENCODING_UTF8 );
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
index 6464e55..1b261bb 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
@@ -59,17 +59,17 @@ namespace binfilter {
/*N*/ const String &rMimeType,
/*N*/ const SfxFilterContainer* pContainerP,
/*N*/ const String &rUsrDat ):
-/*N*/ lFormat(lFmt),
-/*N*/ nFormatType(nType),
+/*N*/ aName( rName ),
/*N*/ aWildCard(rWildCard, ';'),
+/*N*/ lFormat(lFmt),
/*N*/ aMacType(rMacTyp),
/*N*/ aTypeName(rTypNm),
-/*N*/ nDocIcon(nIcon),
/*N*/ aUserData(rUsrDat),
-/*N*/ aName( rName ),
+/*N*/ nFormatType(nType),
+/*N*/ nDocIcon(nIcon),
+/*N*/ pContainer( pContainerP ),
/*N*/ aMimeType( rMimeType ),
-/*N*/ aFilterName( rName ),
-/*N*/ pContainer( pContainerP )
+/*N*/ aFilterName( rName )
/*N*/ {
/*N*/ InitMembers_Impl();
/*N*/ pContainer = pContainerP;
@@ -136,10 +136,10 @@ namespace binfilter {
/*N*/ String SfxFilter::GetFilterNameWithPrefix() const
/*N*/ {
-/*N*/ String aName = pContainer->GetName();
-/*N*/ aName += DEFINE_CONST_UNICODE( ": " );
-/*N*/ aName += aFilterName;
-/*N*/ return aName;
+/*N*/ String aLclName = pContainer->GetName();
+/*N*/ aLclName += DEFINE_CONST_UNICODE( ": " );
+/*N*/ aLclName += aFilterName;
+/*N*/ return aLclName;
/*N*/ }
}
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 0e5a313..bfe1383 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -155,8 +155,10 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ BOOL bIsUniCode;
/*N*/
/*N*/ public:
-/*N*/ SfxPSStringProperty_Impl( UINT32 nIdP, const String& aStr ) :
-/*N*/ aString(aStr), SfxPSProperty_Impl( nIdP, VT_LPSTR ), bIsUniCode(FALSE)
+/*N*/ SfxPSStringProperty_Impl( UINT32 nIdP, const String& aStr )
+/*N*/ : SfxPSProperty_Impl( nIdP, VT_LPSTR )
+/*N*/ , aString(aStr)
+/*N*/ , bIsUniCode(FALSE)
/*N*/ {
/*N*/ nEncoding = RTL_TEXTENCODING_UTF8;
/*N*/ }
@@ -279,8 +281,10 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ UINT32 aInt;
/*N*/
/*N*/ public:
-/*N*/ SfxPSUINT32Property_Impl( UINT32 nIdP, UINT32 aIntP ) :
-/*N*/ aInt( aIntP ), SfxPSProperty_Impl( nIdP, VT_I4 ) {}
+/*N*/ SfxPSUINT32Property_Impl( UINT32 nIdP, UINT32 aIntP )
+/*N*/ : SfxPSProperty_Impl( nIdP, VT_I4 )
+/*N*/ , aInt( aIntP )
+/*N*/ {}
/*N*/
/*N*/ virtual ULONG Save( SvStream& rStream );
/*N*/ virtual ULONG Len();
@@ -309,8 +313,10 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ DateTime aDateTime;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list