diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-10 13:02:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-10 13:02:43 +0000 |
| commit | a3458db24dc4688fcca14242917ec3bd62a6adcb (patch) | |
| tree | b902384544d6fb83961786eae1fdc3554475ce1e | |
| parent | 7f0a1dea69541e73a8a38da7906a65aad63c8902 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes49
56 files changed, 193 insertions, 187 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 0fef77f3b9ed..0461bc6c345d 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: app.cxx,v $ - * $Revision: 1.80 $ + * $Revision: 1.79.14.2 $ * * This file is part of OpenOffice.org. * @@ -1465,7 +1465,7 @@ long BasicFrame::Command( short nID, BOOL bChecked ) else { AppWin *w = NULL; - for ( w = pList->Last() ; w ? !w->ISA(AppBasEd) : FALSE ; w = pList->Prev() ); + for ( w = pList->Last() ; w ? !w->ISA(AppBasEd) : FALSE ; w = pList->Prev() ) ; if ( w ) { p = ((AppBasEd*)w); diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 3bae67443f99..596b4d0c2804 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sbintern.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.56.1 $ * * This file is part of OpenOffice.org. * @@ -35,7 +35,10 @@ #include <unotools/transliterationwrapper.hxx> #include "sb.hxx" -class ::utl::TransliterationWrapper; +namespace utl +{ + class TransliterationWrapper; +} class SbUnoFactory; class SbTypeFactory; class SbOLEFactory; diff --git a/configmgr/source/inc/simpleinteractionrequest.hxx b/configmgr/source/inc/simpleinteractionrequest.hxx index 0476a45a7bcb..817d465859cd 100644 --- a/configmgr/source/inc/simpleinteractionrequest.hxx +++ b/configmgr/source/inc/simpleinteractionrequest.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: simpleinteractionrequest.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.18.1 $ * * This file is part of OpenOffice.org. * @@ -77,7 +77,7 @@ namespace apihelper { * @return the continuation choosen by an interaction handler or * CONTINUATION_UNKNOWN, if the request was not (yet) handled. */ - const Continuation getResponse() const; + Continuation getResponse() const; }; /** These are the constants that can be passed to the constructor of class diff --git a/configmgr/source/misc/simpleinteractionrequest.cxx b/configmgr/source/misc/simpleinteractionrequest.cxx index 135a4fa42cb1..db32ce2301c6 100644 --- a/configmgr/source/misc/simpleinteractionrequest.cxx +++ b/configmgr/source/misc/simpleinteractionrequest.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: simpleinteractionrequest.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.18.1 $ * * This file is part of OpenOffice.org. * @@ -74,7 +74,7 @@ SimpleInteractionRequest::SimpleInteractionRequest( } //========================================================================= -const SimpleInteractionRequest::Continuation SimpleInteractionRequest::getResponse() const +SimpleInteractionRequest::Continuation SimpleInteractionRequest::getResponse() const { uno::Reference< task::XInteractionContinuation > xSelection = this->getSelection(); if ( xSelection.is() ) diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx index 67b01cfd3c1c..e350a596b38e 100644 --- a/connectivity/source/drivers/dbase/DIndexIter.cxx +++ b/connectivity/source/drivers/dbase/DIndexIter.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DIndexIter.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.66.1 $ * * This file is part of OpenOffice.org. * @@ -175,13 +175,13 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst) switch (ePredicateType) { case SQLFilterOperator::NOT_EQUAL: - while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)); + while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ; break; case SQLFilterOperator::LESS: - while ( ( ( pKey = GetNextKey() ) != NULL ) && pKey->getValue().isNull()); + while ( ( ( pKey = GetNextKey() ) != NULL ) && pKey->getValue().isNull()) ; break; case SQLFilterOperator::LESS_EQUAL: - while ( ( pKey = GetNextKey() ) != NULL ); + while ( ( pKey = GetNextKey() ) != NULL ) ; break; case SQLFilterOperator::GREATER_EQUAL: case SQLFilterOperator::EQUAL: @@ -190,7 +190,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst) case SQLFilterOperator::GREATER: pKey = GetFirstKey(m_aRoot,*m_pOperand); if ( !pKey ) - while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)); + while ( ( ( pKey = GetNextKey() ) != NULL ) && !m_pOperator->operate(pKey,m_pOperand)) ; } } else diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 179533157756..7f751ac0103e 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dindexnode.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.66.1 $ * * This file is part of OpenOffice.org. * @@ -214,7 +214,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft) else // Position unbekannt { USHORT nPos = NODE_NOTFOUND; - while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()); + while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ; --nCount; // (sonst bekomme ich u.U. Assertions und GPFs - 60593) bResult = Insert(nPos, rNode); diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx index bf57f4df9e4a..379dfba4b21e 100644 --- a/connectivity/source/drivers/evoab/LDriver.cxx +++ b/connectivity/source/drivers/evoab/LDriver.cxx @@ -230,7 +230,6 @@ sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url ) OSL_ASSERT( hStdout ); sal_Char pBuffer[256]; sal_uInt64 nBytesRead; - OSL_ASSERT( pBuffer ); oslFileError nFileErr = osl_File_E_None; nFileErr = osl_readFile( hStdout, pBuffer, 256, &nBytesRead); if ( nFileErr != osl_File_E_None ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index a638ce6ebdbd..158a9e146b29 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MNSMozabProxy.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.66.1 $ * * This file is part of OpenOffice.org. * @@ -319,7 +319,7 @@ MNSMozabProxy::testLDAPConnection( ) { const MLDAPMessageListener* pListener( static_cast< const MLDAPMessageListener* >( m_Args->arg5 ) ); if ( pListener->initialized() ) - rv = pListener->goodConnection() ? 0 : PR_NOT_CONNECTED_ERROR; + rv = pListener->goodConnection() ? 0 : (nsresult)PR_NOT_CONNECTED_ERROR; else rv = (nsresult)PR_CONNECT_TIMEOUT_ERROR; } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index 46dd26d197dc..75dc59732403 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: MQuery.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.66.1 $ * * This file is part of OpenOffice.org. * @@ -111,9 +111,9 @@ namespace connectivity { } - const ::rtl::OUString& getName() { return m_aName; } - const MQueryOp::cond_type getCond() { return m_aBooleanCondition; } - const ::rtl::OUString& getValue() { return m_aValue; } + const ::rtl::OUString& getName() const { return m_aName; } + MQueryOp::cond_type getCond() const { return m_aBooleanCondition; } + const ::rtl::OUString& getValue() const { return m_aValue; } }; class MQuery; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 6965b0264c00..8798710f9abd 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: officeipcthread.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.62.44.1 $ * * This file is part of OpenOffice.org. * @@ -885,7 +885,7 @@ void SAL_CALL OfficeIPCThread::run() nBytes = 0; while ( (nResult = maStreamPipe.send(sc_aConfirmationSequence+nBytes, sc_nCSeqLength-nBytes))>0 && - ((nBytes += nResult) < sc_nCSeqLength) ); + ((nBytes += nResult) < sc_nCSeqLength) ) ; // now we can close, don't we? // maStreamPipe.close(); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index a74fe7b41e35..9c755354fbf6 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dp_gui_updateinstalldialog.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.126.1 $ * * This file is part of OpenOffice.org. * @@ -55,7 +55,9 @@ namespace com { namespace sun { namespace star { namespace xml { namespace xpath }}}}} class Window; -class ::osl::Condition; +namespace osl { + class Condition; +} namespace dp_gui { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index b079a6b61c89..805ea3ea7d00 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unopkg_app.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.58.1 $ * * This file is part of OpenOffice.org. * @@ -252,7 +252,7 @@ extern "C" int unopkg_main() return 0; } //consume all bootstrap variables which may occur before the subcommannd - while(isBootstrapVariable(&nPos)); + while(isBootstrapVariable(&nPos)) ; if(nPos >= nCount) return 0; diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 21aa511d2f26..b37f820eca9e 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: queries.h,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.80.1 $ * * This file is part of OpenOffice.org. * @@ -363,19 +363,19 @@ class QueryAnalyzer // return type of query. User can decide then, which action should be started. // For faster work we converted query string into corresponding enum value! //--------------------------------------------------------------------------------------------------------- - EQuery getQueryType() { return m_eQuery; } const + EQuery getQueryType() const { return m_eQuery; } //--------------------------------------------------------------------------------------------------------- // access to additional parameter values // Methods return default of realy set values! //--------------------------------------------------------------------------------------------------------- - sal_uInt32 getIFlags () { return m_nIFlags ; } const - sal_uInt32 getEFlags () { return m_nEFlags ; } const - ESortProp getSortProp () { return m_eSortProp ; } const - sal_Bool getDescending () { return m_bDescending ; } const - sal_Bool getCaseSensitive() { return m_bCaseSensitive; } const - sal_Bool getUseOrder () { return m_bUseOrder ; } const - sal_Bool getDefaultFirst () { return m_bDefaultFirst ; } const + sal_uInt32 getIFlags () const { return m_nIFlags ; } + sal_uInt32 getEFlags () const { return m_nEFlags ; } + ESortProp getSortProp () const { return m_eSortProp ; } + sal_Bool getDescending () const { return m_bDescending ; } + sal_Bool getCaseSensitive() const { return m_bCaseSensitive; } + sal_Bool getUseOrder () const { return m_bUseOrder ; } + sal_Bool getDefaultFirst () const { return m_bDefaultFirst ; } //--------------------------------------------------------------------------------------------------------- // this method checks if given string match any supported query. diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx index d2436162a764..9540e1e396b2 100644 --- a/sfx2/inc/sfx2/macrconf.hxx +++ b/sfx2/inc/sfx2/macrconf.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macrconf.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.142.1 $ * * This file is part of OpenOffice.org. * @@ -141,7 +141,7 @@ public: sal_uInt16 GetSlotId(SfxMacroInfoPtr); void ReleaseSlotId(sal_uInt16 nId); void RegisterSlotId(sal_uInt16 nId); - const SfxMacroInfoPtr GetMacroInfo(sal_uInt16 nId) const; + SfxMacroInfo* GetMacroInfo(sal_uInt16 nId) const; sal_Bool ExecuteMacro(sal_uInt16 nId, const String& rArgs ) const; sal_Bool ExecuteMacro( SfxObjectShell*, const SvxMacro*, const String& ) const; sal_Bool CheckMacro(sal_uInt16 nId) const; @@ -149,7 +149,7 @@ public: //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE static void Release_Impl(); - SAL_DLLPRIVATE const SfxMacroInfoPtr GetMacroInfo_Impl( const SvxMacro *pMacro ) const; + SAL_DLLPRIVATE const SfxMacroInfo* GetMacroInfo_Impl( const SvxMacro *pMacro ) const; DECL_DLLPRIVATE_LINK( CallbackHdl_Impl, SfxMacroConfig*); DECL_DLLPRIVATE_LINK( EventHdl_Impl, SfxMacroInfo*); //#endif diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 2559338d564c..ef1110bbdd45 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabdlg.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.104.1 $ * * This file is part of OpenOffice.org. * @@ -181,7 +181,7 @@ public: const SfxItemSet* GetOutputItemSet() const { return pOutSet; } const SfxItemSet* GetOutputItemSet( USHORT nId ) const; int FillOutputItemSet(); - const BOOL IsFormat() const { return bFmt; } + BOOL IsFormat() const { return bFmt; } const OKButton& GetOKButton() const { return aOKBtn; } OKButton& GetOKButton() { return aOKBtn; } diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 791cf4e95629..7dd5cc25d6ee 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: appdde.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.142.1 $ * * This file is part of OpenOffice.org. * @@ -122,8 +122,8 @@ public: }; -SV_DECL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const, 4, 4 ) -SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) +SV_DECL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *, 4, 4 ) +SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl *) //======================================================================== diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 21cd2895dbb7..192da5439667 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: appopen.cxx,v $ - * $Revision: 1.121 $ + * $Revision: 1.121.96.1 $ * * This file is part of OpenOffice.org. * @@ -211,7 +211,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded SfxViewFrame::GetFirst( xDoc, TYPE(SfxTopViewFrame) ); pFrame && !pFrame->IsVisible_Impl(); pFrame = (SfxTopViewFrame*) - SfxViewFrame::GetNext( *pFrame, xDoc, TYPE(SfxTopViewFrame) ) ); + SfxViewFrame::GetNext( *pFrame, xDoc, TYPE(SfxTopViewFrame) ) ) ; if ( pFrame ) { SfxViewFrame *pCur = SfxViewFrame::Current(); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 3e81ebb53da7..fe4f7ae0f831 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bindings.cxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.53.46.1 $ * * This file is part of OpenOffice.org. * @@ -232,9 +232,9 @@ struct SfxFoundCache_Impl {} int operator<( const SfxFoundCache_Impl &r ) const - { return nWhichId < r.nWhichId; } const + { return nWhichId < r.nWhichId; } - int operator==( const SfxFoundCache_Impl &r ) + int operator==( const SfxFoundCache_Impl &r ) const { return nWhichId== r.nWhichId; } }; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index c497bbd2d29d..3f8186acfa93 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dispatch.cxx,v $ - * $Revision: 1.56 $ + * $Revision: 1.56.126.1 $ * * This file is part of OpenOffice.org. * @@ -2340,7 +2340,7 @@ sal_Bool SfxDispatcher::_FindServer // Makro-Slot? if ( SfxMacroConfig::IsMacroSlot( nSlot ) ) { - SfxMacroInfo* pInfo = pSfxApp->GetMacroConfig()->GetMacroInfo(nSlot); + const SfxMacroInfo* pInfo = pSfxApp->GetMacroConfig()->GetMacroInfo(nSlot); if ( pInfo ) { const SfxSlot* pSlot = pInfo->GetSlot(); diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index 144449990b7e..ebc621a56bd9 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macrconf.cxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.142.1 $ * * This file is part of OpenOffice.org. * @@ -662,7 +662,7 @@ void SfxMacroConfig::RegisterSlotId(sal_uInt16 nId) //========================================================================== -const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const +SfxMacroInfo* SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const { sal_uInt16 nCount = pImp->aArr.Count(); for (sal_uInt16 i=0; i<nCount; i++) @@ -674,7 +674,7 @@ const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const //========================================================================== -const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo_Impl( const SvxMacro *pMacro ) const +const SfxMacroInfo* SfxMacroConfig::GetMacroInfo_Impl( const SvxMacro *pMacro ) const { sal_uInt16 nCount = pImp->aArr.Count(); for (sal_uInt16 i=0; i<nCount; i++) @@ -687,7 +687,7 @@ const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo_Impl( const SvxMacro *pMacro sal_Bool SfxMacroConfig::ExecuteMacro( sal_uInt16 nId, const String& rArgs ) const { - const SfxMacroInfoPtr pInfo = GetMacroInfo( nId ); + const SfxMacroInfo* pInfo = GetMacroInfo( nId ); if ( !pInfo ) return sal_False; @@ -790,7 +790,7 @@ sal_Bool SfxMacroConfig::CheckMacro( SfxObjectShell *pSh, const SvxMacro* pMacro sal_Bool SfxMacroConfig::CheckMacro( sal_uInt16 nId ) const { - const SfxMacroInfoPtr pInfo = GetMacroInfo( nId ); + const SfxMacroInfo* pInfo = GetMacroInfo( nId ); if ( !pInfo ) return sal_False; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 636c7e20c8e2..737e78bf86e5 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -554,7 +554,7 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget, for(SvLBoxEntry *pTmpEntry=FirstChild(pTarget); pTmpEntry && COMPARE_LESS==pCollator->compareString( GetEntryText(pTmpEntry),GetEntryText(pEntry)); - pTmpEntry=NextSibling(pTmpEntry),lPos++); + pTmpEntry=NextSibling(pTmpEntry),lPos++) ; return bRet? (BOOL)2: FALSE; } @@ -695,7 +695,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) for ( ii = 0; ii < pCmp->Count() && COMPARE_LESS == pCollator->compareString( (*pCmp->pChilds)[ii]->aName, - pEntry->aName);++ii); + pEntry->aName);++ii) ; pCmp->Put(pEntry,ii); break; } @@ -2871,7 +2871,7 @@ void SfxTemplateCatalog_Impl::CheckItem(USHORT nMesId, BOOL /*bCheck*/) if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR ) return; USHORT i; - for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ ); + for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ ) ; aFamList.SelectEntryPos(i); } diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 25f20461a0de..929e486f824a 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docfilt.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.142.1 $ * * This file is part of OpenOffice.org. * @@ -119,8 +119,8 @@ String SfxFilter::GetDefaultExtension() const String SfxFilter::GetSuffixes() const { String aRet = GetWildcard()(); - while( aRet.SearchAndReplaceAscii( "*.", String() ) != STRING_NOTFOUND ); - while( aRet.SearchAndReplace( ';', ',' ) != STRING_NOTFOUND ); + while( aRet.SearchAndReplaceAscii( "*.", String() ) != STRING_NOTFOUND ) ; + while( aRet.SearchAndReplace( ';', ',' ) != STRING_NOTFOUND ) ; return aRet; } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 948ef861bd8f..82bddbe763a1 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: frame.cxx,v $ - * $Revision: 1.55 $ + * $Revision: 1.55.142.1 $ * * This file is part of OpenOffice.org. * @@ -532,7 +532,7 @@ void SfxFrame::CancelTransfers( sal_Bool /*bCancelLoadEnv*/ ) SfxViewFrame* pFrm; for( pFrm = SfxViewFrame::GetFirst( pObj ); pFrm && pFrm->GetFrame() == this; - pFrm = SfxViewFrame::GetNext( *pFrm, pObj ) ); + pFrm = SfxViewFrame::GetNext( *pFrm, pObj ) ) ; // Keine anderer Frame mehr auf Doc -> Cancel if( !pFrm ) { diff --git a/svx/inc/gallery1.hxx b/svx/inc/gallery1.hxx index 6d10ffea4e7a..f38bf0dda5d9 100644 --- a/svx/inc/gallery1.hxx +++ b/svx/inc/gallery1.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gallery1.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.216.1 $ * * This file is part of OpenOffice.org. * @@ -158,7 +158,7 @@ public: SVX_DLLPUBLIC static Gallery* GetGalleryInstance(); - const ULONG GetThemeCount() const { return aThemeList.Count(); } + ULONG GetThemeCount() const { return aThemeList.Count(); } const GalleryThemeEntry* GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); } const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx index 2df289399c15..459ef98b9a84 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/galtheme.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: galtheme.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.216.1 $ * * This file is part of OpenOffice.org. * @@ -127,7 +127,7 @@ public: static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ); - const ULONG GetObjectCount() const { return aObjectList.Count(); } + ULONG GetObjectCount() const { return aObjectList.Count(); } SgaObject* AcquireObject( ULONG nPos ); void ReleaseObject( SgaObject* pObj ); diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx index 4318387c36f3..6c8422e60d0e 100644 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/hlnkitem.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hlnkitem.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.216.1 $ * * This file is part of OpenOffice.org. * @@ -101,7 +101,7 @@ public: const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; } void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; } - const USHORT GetMacroEvents() const { return nMacroEvents; } + USHORT GetMacroEvents() const { return nMacroEvents; } virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; virtual SfxPoolItem* Create( SvStream &, USHORT nVer ) const; diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx index 10554575fae0..50bc798af490 100644 --- a/svx/inc/svx/brkitem.hxx +++ b/svx/inc/svx/brkitem.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: brkitem.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.216.1 $ * * This file is part of OpenOffice.org. * @@ -83,7 +83,7 @@ public: // MS VC4.0 kommt durcheinander void SetValue( USHORT nNewVal ) {SfxEnumItem::SetValue(nNewVal); } - const SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } + SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } void SetBreak( const SvxBreak eNew ) { SetValue( (USHORT)eNew ); } }; diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx index 588d83fb0b25..906d73e7fdeb 100644 --- a/svx/inc/svx/deflt3d.hxx +++ b/svx/inc/svx/deflt3d.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: deflt3d.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.216.1 $ * * This file is part of OpenOffice.org. * @@ -94,11 +94,11 @@ public: const B3dMaterial& GetDefaultBackMaterial() { return aDefaultBackMaterial; } void SetDefaultBackMaterial(const B3dMaterial& rNew) { aDefaultBackMaterial = rNew; } - const BOOL GetDefaultCreateNormals() { return bDefaultCreateNormals; } + BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; } void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; } - const BOOL GetDefaultCreateTexture() { return bDefaultCreateTexture; } + BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; } void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; } - const BOOL GetDefaultUseDifferentBackMaterial() { return bDefaultUseDifferentBackMaterial; } + BOOL GetDefaultUseDifferentBackMaterial() const { return bDefaultUseDifferentBackMaterial; } void SetDefaultUseDifferentBackMaterial(const BOOL bNew) { bDefaultUseDifferentBackMaterial = bNew; } // Cube-Objekt @@ -106,9 +106,9 @@ public: void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; } const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; } void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; } - const UINT16 GetDefaultCubeSideFlags() { return nDefaultCubeSideFlags; } + UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; } void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; } - const BOOL GetDefaultCubePosIsCenter() { return bDefaultCubePosIsCenter; } + BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; } // Sphere-Objekt @@ -118,33 +118,33 @@ public: void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; } // Lathe-Objekt - const long GetDefaultLatheEndAngle() { return nDefaultLatheEndAngle; } + long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; } void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; } - const BOOL GetDefaultLatheSmoothed() { return bDefaultLatheSmoothed; } + BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; } - const BOOL GetDefaultLatheSmoothFrontBack() { return bDefaultLatheSmoothFrontBack; } + BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; } - const BOOL GetDefaultLatheCharacterMode() { return bDefaultLatheCharacterMode; } + BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; } - const BOOL GetDefaultLatheCloseFront() { return bDefaultLatheCloseFront; } + BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; } - const BOOL GetDefaultLatheCloseBack() { return bDefaultLatheCloseBack; } + BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; } // Extrude-Objekt - const BOOL GetDefaultExtrudeSmoothed() { return bDefaultExtrudeSmoothed; } + BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; } - const BOOL GetDefaultExtrudeSmoothFrontBack() { return bDefaultExtrudeSmoothFrontBack; } + BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; } - const BOOL GetDefaultExtrudeCharacterMode() { return bDefaultExtrudeCharacterMode; } + BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; } - const BOOL GetDefaultExtrudeCloseFront() { return bDefaultExtrudeCloseFront; } + BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; } - const BOOL GetDefaultExtrudeCloseBack() { return bDefaultExtrudeCloseBack; } + BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; } // Scene-Objekt - const BOOL GetDefaultDither() { return bDefaultDither; } + BOOL GetDefaultDither() const { return bDefaultDither; } void SetDefaultDither(const BOOL bNew) { bDefaultDither = bNew; } }; diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx index 2a45a95f074b..3baa51d7cd7c 100644 --- a/svx/inc/svx/lspcitem.hxx +++ b/svx/inc/svx/lspcitem.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: lspcitem.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.216.1 $ * * This file is part of OpenOffice.org. * @@ -107,7 +107,7 @@ public: } // Vergroessert oder verkleinert die Zeilenhoehe. - const BYTE GetPropLineSpace() const { return nPropLineSpace; } + BYTE GetPropLineSpace() const { return nPropLineSpace; } inline void SetPropLineSpace( const BYTE nProp ) { nPropLineSpace = nProp; diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 73b7c8b76082..125fc108f2b3 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svdoashp.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.6.90.2 $ * * This file is part of OpenOffice.org. * @@ -134,8 +134,8 @@ public: // #i37011# const SdrObject* GetSdrObjectFromCustomShape() const; const SdrObject* GetSdrObjectShadowFromCustomShape() const; - const sal_Bool GetTextBounds( Rectangle& rTextBound ) const; - const sal_Bool IsTextPath() const; + sal_Bool GetTextBounds( Rectangle& rTextBound ) const; + sal_Bool IsTextPath() const; static SVX_DLLPRIVATE basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed ); protected: @@ -144,15 +144,15 @@ protected: public: - const sal_Bool UseNoFillStyle() const; + sal_Bool UseNoFillStyle() const; - const sal_Bool IsMirroredX() const; - const sal_Bool IsMirroredY() const; + sal_Bool IsMirroredX() const; + sal_Bool IsMirroredY() const; void SetMirroredX( const sal_Bool bMirroredX ); void SetMirroredY( const sal_Bool bMirroredY ); - const double GetObjectRotation() const; - const double GetExtraTextRotation() const; + double GetObjectRotation() const; + double GetExtraTextRotation() const; TYPEINFO(); SdrObjCustomShape(); diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 3f6f80d89568..63d479c89a13 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: EnhancedCustomShapeGeometry.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.92.1 $ * * This file is part of OpenOffice.org. * @@ -5565,7 +5565,7 @@ static const sal_uInt16 mso_DefaultFillingTable[] = { 0x0000, 0x0018, 0x01ff, 0x0000, 0x0c00, 0x01e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000 }; -const sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ) +sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ) { sal_Bool bIsFilledByDefault = sal_True; sal_uInt32 i = (sal_uInt32)eSpType; @@ -5573,7 +5573,7 @@ const sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ) bIsFilledByDefault = ( mso_DefaultFillingTable[ i >> 4 ] & ( 1 << ( i & 0xf ) ) ) == 0; return bIsFilledByDefault; } -const sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ) +sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ) { sal_Int16 nGluePointType = com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS; const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); @@ -5610,7 +5610,7 @@ static const sal_uInt16 mso_DefaultStrokingTable[] = 0x0000, 0x0000, 0x0000, 0x0000 }; // #i28269# -const sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ) +sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ) { sal_Bool bIsStrokedByDefault = sal_True; sal_uInt32 i = (sal_uInt32)eSpType; @@ -5623,7 +5623,7 @@ static const sal_uInt16 msoSortFilledObjectsToBackTable[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType ) +sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType ) { sal_Bool bSortFilledObjectsToBackByDefault = sal_True; sal_uInt32 i = (sal_uInt32)eSpType; diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx index f7df0a64655c..b3544b8185da 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: EnhancedCustomShapeGeometry.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.216.1 $ * * This file is part of OpenOffice.org. * @@ -92,12 +92,12 @@ struct mso_CustomShape #define MSO_I | (sal_Int32)0x80000000 -const sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType ); -const sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ); -const sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ); +sal_Bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType ); +sal_Bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ); +sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ); // #i28269# -const sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ); +sal_Bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ); const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ); diff --git a/svx/source/dialog/cfg.cxx b/svx/source/dialog/cfg.cxx index 10bed2a27c90..9b2dca755453 100644 --- a/svx/source/dialog/cfg.cxx +++ b/svx/source/dialog/cfg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cfg.cxx,v $ - * $Revision: 1.50 $ + * $Revision: 1.50.84.1 $ * * This file is part of OpenOffice.org. * @@ -2376,7 +2376,7 @@ bool SvxConfigPage::MoveEntryData( SvxEntries::const_iterator end = pEntries->end(); // advance the iterator to the position of the target entry - while (*iter != pTargetData && ++iter != end); + while (*iter != pTargetData && ++iter != end) ; // insert the source entry at the position after the target pEntries->insert( ++iter, pSourceData ); @@ -3042,8 +3042,8 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) SvxEntries::const_iterator end = GetEntries()->end(); // Advance the iterators to the positions of the source and target - while (*iter1 != pSourceData && ++iter1 != end); - while (*iter2 != pTargetData && ++iter2 != end); + while (*iter1 != pSourceData && ++iter1 != end) ; + while (*iter2 != pTargetData && ++iter2 != end) ; // Now swap the entries in the menu list and in the UI if ( iter1 != end && iter2 != end ) diff --git a/svx/source/dialog/cuihyperdlg.hxx b/svx/source/dialog/cuihyperdlg.hxx index 90e4b8695f77..c2f247f9455c 100644 --- a/svx/source/dialog/cuihyperdlg.hxx +++ b/svx/source/dialog/cuihyperdlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cuihyperdlg.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.216.1 $ * * This file is part of OpenOffice.org. * @@ -107,7 +107,7 @@ public: USHORT SetPage( SvxHyperlinkItem* pItem ); void EnableInetBrowse( sal_Bool bEnable = sal_True ); void SetReadOnlyMode( sal_Bool bReadOnly = sal_False ); - inline const BOOL IsHTMLDoc() const { return mbIsHTMLDoc; } + inline BOOL IsHTMLDoc() const { return mbIsHTMLDoc; } inline SfxBindings* GetBindings() const { return mpBindings; }; inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx index cde6ef4bb5a4..88b9b645961d 100644 --- a/svx/source/dialog/hangulhanja.cxx +++ b/svx/source/dialog/hangulhanja.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hangulhanja.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.102.1 $ * * This file is part of OpenOffice.org. * @@ -317,7 +317,9 @@ namespace svx m_nSourceLang == LANGUAGE_CHINESE_SIMPLIFIED && m_nTargetLang == LANGUAGE_CHINESE_TRADITIONAL) m_eConvType = HHC::eConvSimplifiedTraditional; else + { DBG_ERROR( "failed to determine conversion type from languages" ); + } // set remaining conversion parameters to their default values m_nConvOptions = _nOptions; diff --git a/svx/source/dialog/hlmarkwn.cxx b/svx/source/dialog/hlmarkwn.cxx index 6314f312872d..86dc32c6d720 100644 --- a/svx/source/dialog/hlmarkwn.cxx +++ b/svx/source/dialog/hlmarkwn.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hlmarkwn.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.216.1 $ * * This file is part of OpenOffice.org. * @@ -186,7 +186,7 @@ USHORT SvxHlinkDlgMarkWnd::SetError( USHORT nError) |* |************************************************************************/ -const BOOL SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) +BOOL SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) { if ( !mbUserMoved ) { @@ -206,7 +206,7 @@ void SvxHlinkDlgMarkWnd::Move () mbUserMoved = TRUE; } -const BOOL SvxHlinkDlgMarkWnd::ConnectToDialog( BOOL bDoit ) +BOOL SvxHlinkDlgMarkWnd::ConnectToDialog( BOOL bDoit ) { BOOL bOldStatus = mbUserMoved; diff --git a/svx/source/dialog/hltpbase.cxx b/svx/source/dialog/hltpbase.cxx index d5f84ea8d875..d2ae791745ba 100644 --- a/svx/source/dialog/hltpbase.cxx +++ b/svx/source/dialog/hltpbase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hltpbase.cxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.37.216.1 $ * * This file is part of OpenOffice.org. * @@ -539,7 +539,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus() |* |************************************************************************/ -const BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const +BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const { return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc(); } diff --git a/svx/source/dialog/hltpbase.hxx b/svx/source/dialog/hltpbase.hxx index ec04565218c5..a92b7bd68397 100644 --- a/svx/source/dialog/hltpbase.hxx +++ b/svx/source/dialog/hltpbase.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hltpbase.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.216.1 $ * * This file is part of OpenOffice.org. * @@ -212,7 +212,7 @@ protected: USHORT GetMacroEvents(); SvxMacroTableDtor* GetMacroTable(); - const BOOL IsHTMLDoc() const; + BOOL IsHTMLDoc() const; }; #endif // _SVX_TABBASE_HYPERLINK_HXX diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 9784086c231b..c5f7f26b2ed5 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2719,7 +2719,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) const USHORT nIdx = GetDragAryPos()+TAB_GAP; pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos; pRuler_Imp->SetPercSize(nTabCount); - for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0); + for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ; for(USHORT i = nIdx+1; i < nTabCount; ++i) { const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9fea8d2467e2..26588db87a61 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filtnav.cxx,v $ - * $Revision: 1.48 $ + * $Revision: 1.48.216.1 $ * * This file is part of OpenOffice.org. * @@ -1535,7 +1535,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } //------------------------------------------------------------------------ -SvLBoxEntry* FmFilterNavigator::FindEntry(FmFilterData* pItem) +SvLBoxEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const { SvLBoxEntry* pEntry = NULL; if (pItem) @@ -1553,7 +1553,7 @@ SvLBoxEntry* FmFilterNavigator::FindEntry(FmFilterData* pItem) //------------------------------------------------------------------------ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos) { - FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel(); + const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel(); // insert the item SvLBoxEntry* pParentEntry = FindEntry(pParent); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index bf3cc30114b6..5f48c24e1085 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filtnav.hxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.216.1 $ * * This file is part of OpenOffice.org. * @@ -273,7 +273,7 @@ public: virtual ~FmFilterNavigator(); void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > & xCurrent); - FmFilterModel* const GetFilterModel() const {return m_pModel;} + const FmFilterModel* GetFilterModel() const {return m_pModel;} protected: using Control::Notify; @@ -292,7 +292,7 @@ protected: void DeleteSelection(); void Clear(); - SvLBoxEntry* FindEntry(FmFilterData* pItem); + SvLBoxEntry* FindEntry(const FmFilterData* pItem) const; void Insert(FmFilterData* pItem, sal_Int32 nPos); void Remove(FmFilterData* pItem); diff --git a/svx/source/inc/hlmarkwn.hxx b/svx/source/inc/hlmarkwn.hxx index 41721d8492c9..6853eac1ccb6 100644 --- a/svx/source/inc/hlmarkwn.hxx +++ b/svx/source/inc/hlmarkwn.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hlmarkwn.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.216.1 $ * * This file is part of OpenOffice.org. * @@ -101,11 +101,11 @@ public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); ~SvxHlinkDlgMarkWnd(); - const BOOL MoveTo ( Point aNewPos ); + BOOL MoveTo ( Point aNewPos ); void RefreshTree ( String aStrURL ); void SelectEntry ( String aStrMark ); - const BOOL ConnectToDialog( BOOL bDoit = TRUE ); + BOOL ConnectToDialog( BOOL bDoit = TRUE ); USHORT SetError( USHORT nError); }; diff --git a/svx/source/items/svxfont.cxx b/svx/source/items/svxfont.cxx index 52486e471bc8..1ce7190393a7 100644 --- a/svx/source/items/svxfont.cxx +++ b/svx/source/items/svxfont.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svxfont.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.216.1 $ * * This file is part of OpenOffice.org. * @@ -231,8 +231,8 @@ public: inline OutputDevice *GetOut() { return pOut; } inline const XubString &GetTxt() const { return rTxt; } - inline const xub_StrLen GetIdx() const { return nIdx; } - inline const xub_StrLen GetLen() const { return nLen; } + xub_StrLen GetIdx() const { return nIdx; } + xub_StrLen GetLen() const { return nLen; } }; void SvxDoCapitals::DoSpace( const BOOL /*bDraw*/ ) { } diff --git a/svx/source/msfilter/escherex.cxx b/svx/source/msfilter/escherex.cxx index 79cc795a70fc..c327cec80d1b 100644 --- a/svx/source/msfilter/escherex.cxx +++ b/svx/source/msfilter/escherex.cxx @@ -3568,7 +3568,7 @@ EscherGraphicProvider::EscherGraphicProvider( sal_uInt32 nFlags ) : EscherGraphicProvider::~EscherGraphicProvider() { - for ( UINT32 i = 0; i < mnBlibEntrys; delete mpBlibEntrys[ i++ ] ); + for ( UINT32 i = 0; i < mnBlibEntrys; delete mpBlibEntrys[ i++ ] ) ; delete[] mpBlibEntrys; } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 96b13ba0d7d1..6cb515067c24 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svdoashp.cxx,v $ - * $Revision: 1.52 $ + * $Revision: 1.51.52.2 $ * * This file is part of OpenOffice.org. * @@ -420,7 +420,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const return mpLastShadowGeometry; } -const sal_Bool SdrObjCustomShape::IsTextPath() const +sal_Bool SdrObjCustomShape::IsTextPath() const { const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) ); sal_Bool bTextPathOn = sal_False; @@ -431,7 +431,7 @@ const sal_Bool SdrObjCustomShape::IsTextPath() const return bTextPathOn; } -const sal_Bool SdrObjCustomShape::UseNoFillStyle() const +sal_Bool SdrObjCustomShape::UseNoFillStyle() const { sal_Bool bRet = sal_False; rtl::OUString sShapeType; @@ -445,7 +445,7 @@ const sal_Bool SdrObjCustomShape::UseNoFillStyle() const return bRet; } -const sal_Bool SdrObjCustomShape::IsMirroredX() const +sal_Bool SdrObjCustomShape::IsMirroredX() const { sal_Bool bMirroredX = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); @@ -455,7 +455,7 @@ const sal_Bool SdrObjCustomShape::IsMirroredX() const *pAny >>= bMirroredX; return bMirroredX; } -const sal_Bool SdrObjCustomShape::IsMirroredY() const +sal_Bool SdrObjCustomShape::IsMirroredY() const { sal_Bool bMirroredY = sal_False; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); @@ -488,12 +488,12 @@ void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) SetMergedItem( aGeometryItem ); } -const double SdrObjCustomShape::GetObjectRotation() const +double SdrObjCustomShape::GetObjectRotation() const { return fObjectRotation; } -const double SdrObjCustomShape::GetExtraTextRotation() const +double SdrObjCustomShape::GetExtraTextRotation() const { const com::sun::star::uno::Any* pAny; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); @@ -504,7 +504,7 @@ const double SdrObjCustomShape::GetExtraTextRotation() const *pAny >>= fExtraTextRotateAngle; return fExtraTextRotateAngle; } -const sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const +sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const { sal_Bool bRet = sal_False; Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine( this ) ); // a candidate for being cached diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx index a4779f3ce420..45b6fe990853 100644 --- a/svx/source/svrtf/svxrtf.cxx +++ b/svx/source/svrtf/svxrtf.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svxrtf.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.34.216.1 $ * * This file is part of OpenOffice.org. * @@ -61,7 +61,7 @@ using namespace ::com::sun::star; SV_IMPL_PTRARR( SvxRTFColorTbl, ColorPtr ) SV_IMPL_PTRARR( SvxRTFItemStackList, SvxRTFItemStackType* ) -const CharSet lcl_GetDefaultTextEncodingForRTF() +CharSet lcl_GetDefaultTextEncodingForRTF() { ::com::sun::star::lang::Locale aLocale; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index e6a6091abc65..7dbc426de107 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoprov.cxx,v $ - * $Revision: 1.72 $ + * $Revision: 1.72.92.1 $ * * This file is part of OpenOffice.org. * @@ -938,7 +938,7 @@ Svx_CompareMap(const void* pSmaller, const void* pBigger ) SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { - for(UINT16 i=0;i<SVXMAP_END;aMapArr[i++]=NULL); + for(UINT16 i=0;i<SVXMAP_END;aMapArr[i++]=NULL) ; } // --------------------------------------------------------------------- diff --git a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx index 86c6b1290c72..cb5cb1c67c73 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/QueryProcessor.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: QueryProcessor.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.26.1 $ * * This file is part of OpenOffice.org. * @@ -63,7 +63,7 @@ namespace xmlsearch { } - const sal_Int32 getHitCount() const { return nHits_; } + sal_Int32 getHitCount() const { return nHits_; } const std::vector< rtl::OUString >& getTerms() const { return terms_; } diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx index 5427b60ef4a4..14caa787669f 100644 --- a/xmloff/inc/xmloff/txtstyli.hxx +++ b/xmloff/inc/xmloff/txtstyli.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtstyli.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.102.1 $ * * This file is part of OpenOffice.org. * @@ -93,7 +93,7 @@ public: const ::rtl::OUString& GetListStyle() const { return sListStyleName; } // --> OD 2006-10-13 #i69629# - inline const sal_Bool IsListStyleSet() const + sal_Bool IsListStyleSet() const { return mbListStyleSet; } diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 88f8c0a12411..fbf80b322771 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlexp.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.48.1 $ * * This file is part of OpenOffice.org. * @@ -551,14 +551,14 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceFactory(); // --> OD 2006-03-10 #i51726# - inline const SvtModuleOptions::EFactory GetModelType() const + SvtModuleOptions::EFactory GetModelType() const { return meModelType; } // <-- // --> OD 2006-09-27 #i69627# - const sal_Bool writeOutlineStyleAsNormalListStyle() const; + sal_Bool writeOutlineStyleAsNormalListStyle() const; // <-- bool isExperimentalOdfExportEnabled() const { return mbEnableExperimentalOdfExport; } diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx index b8d3f4a4ef55..19f77be19732 100644 --- a/xmloff/inc/xmloff/xmlprmap.hxx +++ b/xmloff/inc/xmloff/xmlprmap.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlprmap.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.74.1 $ * * This file is part of OpenOffice.org. * @@ -99,17 +99,17 @@ public: void AddMapperEntry( const UniReference < XMLPropertySetMapper >& rMapper ); /** Return number of entries in input-array */ - const sal_Int32 GetEntryCount() const { return aMapEntries.size(); } + sal_Int32 GetEntryCount() const { return aMapEntries.size(); } /** Returns the flags of an entry */ - const sal_uInt32 GetEntryFlags( sal_Int32 nIndex ) const + sal_uInt32 GetEntryFlags( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return aMapEntries[nIndex].nType & ~MID_FLAG_MASK; } /** Returns the type of an entry */ - const sal_uInt32 GetEntryType( sal_Int32 nIndex, + sal_uInt32 GetEntryType( sal_Int32 nIndex, sal_Bool bWithFlags = sal_True ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); @@ -120,7 +120,7 @@ public: } /** Returns the namespace-key of an entry */ - const sal_uInt16 GetEntryNameSpace( sal_Int32 nIndex ) const + sal_uInt16 GetEntryNameSpace( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return aMapEntries[nIndex].nXMLNameSpace; @@ -141,14 +141,14 @@ public: } /** returns the entry context id. -1 is a valid index here. */ - const sal_Int16 GetEntryContextId( sal_Int32 nIndex ) const + sal_Int16 GetEntryContextId( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= -1) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return nIndex == -1 ? 0 : aMapEntries[nIndex].nContextId; } /** returns the earliest odf version for which this property should be exported. */ - const SvtSaveOptions::ODFDefaultVersion GetEarliestODFVersionForExport( sal_Int32 nIndex ) const + SvtSaveOptions::ODFDefaultVersion GetEarliestODFVersionForExport( sal_Int32 nIndex ) const { DBG_ASSERT( (nIndex >= -1) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" ); return nIndex == -1 ? SvtSaveOptions::ODFVER_UNKNOWN : aMapEntries[nIndex].nEarliestODFVersionForExport; @@ -156,7 +156,7 @@ public: /** Returns the index of an entry with the given XML-name and namespace If there is no matching entry the method returns -1 */ - const sal_Int32 GetEntryIndex( sal_uInt16 nNamespace, + sal_Int32 GetEntryIndex( sal_uInt16 nNamespace, const ::rtl::OUString& rStrName, sal_uInt32 nPropType, sal_Int32 nStartAt = -1 ) const; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f25a4ec689b5..f83510d2a901 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2279,7 +2279,7 @@ void SvXMLExport::DisposingModel() } // --> OD 2006-09-27 #i69627# -const sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const +sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const { return mpImpl->mbOutlineStyleAsNormalListStyle; } diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index a99c60f32b02..2ddbd04ccf47 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: layerexport.cxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.36.102.1 $ * * This file is part of OpenOffice.org. * @@ -512,7 +512,7 @@ namespace xmloff { struct AccumulateSize : public ::std::binary_function< size_t, MapPropertySet2Map::value_type, size_t > { - const size_t operator()( size_t _size, const MapPropertySet2Map::value_type& _map ) + size_t operator()( size_t _size, const MapPropertySet2Map::value_type& _map ) const { return _size + _map.second.size(); } diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index 0beeab24262f..7178a641a9f2 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlprmap.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.74.1 $ * * This file is part of OpenOffice.org. * @@ -170,7 +170,7 @@ sal_Bool XMLPropertySetMapper::importXML( // the index of the entry // If there is no matching entry the method returns -1 // -const sal_Int32 XMLPropertySetMapper::GetEntryIndex( +sal_Int32 XMLPropertySetMapper::GetEntryIndex( sal_uInt16 nNamespace, const OUString& rStrName, sal_uInt32 nPropType, diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index f7119970c319..caf40d608e1f 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -8,9 +8,9 @@ * * $RCSfile: XMLTextNumRuleInfo.hxx,v $ <<<<<<< XMLTextNumRuleInfo.hxx - * $Revision: 1.10 $ + * $Revision: 1.10.64.1 $ ======= - * $Revision: 1.10 $ + * $Revision: 1.10.64.1 $ >>>>>>> 1.6.266.4 * * This file is part of OpenOffice.org. @@ -106,7 +106,7 @@ public: { return mxNumRules; } - inline const sal_Int16 GetListLevelStartValue() const + inline sal_Int16 GetListLevelStartValue() const { return mnListLevelStartValue; } diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 5ed74d0399d0..17c6417ae5b5 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtflde.cxx,v $ - * $Revision: 1.84 $ + * $Revision: 1.84.102.1 $ * * This file is part of OpenOffice.org. * @@ -235,21 +235,21 @@ SvXMLEnumStringMapEntry __READONLY_DATA aFieldServiceNameMapping[] = // property accessor helper functions -inline sal_Bool const GetBoolProperty(const OUString&, +inline sal_Bool GetBoolProperty(const OUString&, const Reference<XPropertySet> &); -inline sal_Bool const GetOptionalBoolProperty(const OUString&, +inline sal_Bool GetOptionalBoolProperty(const OUString&, const Reference<XPropertySet> &, const Reference<XPropertySetInfo> &, sal_Bool bDefault); -inline double const GetDoubleProperty(const OUString&, +inline double GetDoubleProperty(const OUString&, const Reference<XPropertySet> &); inline OUString const GetStringProperty(const OUString&, const Reference<XPropertySet> &); -inline sal_Int32 const GetIntProperty(const OUString&, +inline sal_Int32 GetIntProperty(const OUString&, const Reference<XPropertySet> &); -inline sal_Int16 const GetInt16Property(const OUString&, +inline sal_Int16 GetInt16Property(const OUString&, const Reference<XPropertySet> &); -inline sal_Int8 const GetInt8Property(const OUString&, +inline sal_Int8 GetInt8Property(const OUString&, const Reference<XPropertySet> &); inline DateTime const GetDateTimeProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet); @@ -3430,7 +3430,7 @@ OUString XMLTextFieldExport::MakeSequenceRefName( // -inline sal_Bool const GetBoolProperty( +inline sal_Bool GetBoolProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) { @@ -3439,7 +3439,7 @@ inline sal_Bool const GetBoolProperty( return bBool; } -inline sal_Bool const GetOptionalBoolProperty( +inline sal_Bool GetOptionalBoolProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet, const Reference<XPropertySetInfo> & xPropSetInfo, @@ -3449,7 +3449,7 @@ inline sal_Bool const GetOptionalBoolProperty( ? GetBoolProperty( sPropName, xPropSet ) : bDefault; } -inline double const GetDoubleProperty( +inline double GetDoubleProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) { @@ -3469,7 +3469,7 @@ inline OUString const GetStringProperty( return sString; } -inline sal_Int32 const GetIntProperty( +inline sal_Int32 GetIntProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) { @@ -3479,7 +3479,7 @@ inline sal_Int32 const GetIntProperty( return nInt; } -inline sal_Int16 const GetInt16Property( +inline sal_Int16 GetInt16Property( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) { @@ -3489,7 +3489,7 @@ inline sal_Int16 const GetInt16Property( return nInt; } -inline sal_Int8 const GetInt8Property( +inline sal_Int8 GetInt8Property( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) { |