CWS-TOOLING: integrate CWS cmcfixes49

10 files changed, 28 insertions, 28 deletions

diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 94d8a50aa5..02327edd81 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 f5c9a20970..139d9cb30e 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 0b700e65a7..759d9fb810 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 80cfc46b58..70f4d8ec81 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 c501ca3acb..596bcdd787 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 6aecef4614..95ab93dbc3 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 9c0b9244e3..84c9f7feb5 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 fda9402d0d..e0b30c8b72 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 03631bcd8d..6ca20b3622 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 fc1d6eb3c7..e2c5edf141 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 )
             {