INTEGRATION: CWS warnings01 (1.7.220); FILE MERGED

2006/04/06 14:39:46 ab 1.7.220.1: #i55991# warning-free code

2 files changed, 38 insertions, 29 deletions

diff --git a/svx/source/dialog/insdlg.cxx b/svx/source/dialog/insdlg.cxx
index 248c807c3a34..22cad99283a7 100644
--- a/svx/source/dialog/insdlg.cxx
+++ b/svx/source/dialog/insdlg.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: insdlg.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 21:22:42 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 15:17:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -225,7 +225,6 @@ SvInsertOleDlg::SvInsertOleDlg
     const SvObjectServerList* pServers
 )
     : InsertObjectDialog_Impl( pParent, ResId( MD_INSERT_OLEOBJECT, DIALOG_MGR() ), xStorage ),
-    m_pServers( pServers ),
     aRbNewObject( this, ResId( RB_NEW_OBJECT ) ),
     aRbObjectFromfile( this, ResId( RB_OBJECT_FROMFILE ) ),
     aLbObjecttype( this, ResId( LB_OBJECTTYPE ) ),
@@ -236,7 +235,8 @@ SvInsertOleDlg::SvInsertOleDlg
     aOKButton1( this, ResId( 1 ) ),
     aCancelButton1( this, ResId( 1 ) ),
     aHelpButton1( this, ResId( 1 ) ),
-    aStrFile( ResId( STR_FILE ) )
+    aStrFile( ResId( STR_FILE ) ),
+    m_pServers( pServers )
 {
     FreeResource();
     _aOldStr = aGbObject.GetText();
@@ -251,7 +251,7 @@ SvInsertOleDlg::SvInsertOleDlg
 
 short SvInsertOleDlg::Execute()
 {
-    short nRet;
+    short nRet = RET_OK;
     SvObjectServerList  aObjS;
     if ( !m_pServers )
     {
@@ -453,8 +453,8 @@ SvInsertPlugInDialog::SvInsertPlugInDialog( Window* pParent, const uno::Referenc
     aGbPluginsOptions( this, ResId( GB_PLUGINS_OPTIONS ) ),
     aOKButton1( this, ResId( 1 ) ),
     aCancelButton1( this, ResId( 1 ) ),
-    m_pURL(0),
-    aHelpButton1( this, ResId( 1 ) )
+    aHelpButton1( this, ResId( 1 ) ),
+    m_pURL(0)
 {
     FreeResource();
     aBtnFileurl.SetClickHdl( LINK( this, SvInsertPlugInDialog, BrowseHdl ) );
@@ -488,7 +488,7 @@ static void Plugin_ImplFillCommandSequence( const String& aCommands, uno::Sequen
 
 short SvInsertPlugInDialog::Execute()
 {
-    short nRet;
+    short nRet = RET_OK;
     m_aCommands.Erase();
     DBG_ASSERT( m_xStorage.is(), "No storage!");
     if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK )
@@ -600,8 +600,8 @@ SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Referenc
     aGbAppletOptions( this, ResId( GB_APPLET_OPTIONS ) ),
     aOKButton1( this, ResId( 1 ) ),
     aCancelButton1( this, ResId( 1 ) ),
-    m_pURL(0),
-    aHelpButton1( this, ResId( 1 ) )
+    aHelpButton1( this, ResId( 1 ) ),
+    m_pURL(0)
 {
     FreeResource();
     aBtnClass.SetClickHdl( LINK( this, SvInsertAppletDialog, BrowseHdl ) );
@@ -619,8 +619,8 @@ SvInsertAppletDialog::SvInsertAppletDialog( Window* pParent, const uno::Referenc
     aGbAppletOptions( this, ResId( GB_APPLET_OPTIONS ) ),
     aOKButton1( this, ResId( 1 ) ),
     aCancelButton1( this, ResId( 1 ) ),
-    m_pURL(0),
-    aHelpButton1( this, ResId( 1 ) )
+    aHelpButton1( this, ResId( 1 ) ),
+    m_pURL(0)
 {
     m_xObj = xObj;
     FreeResource();
@@ -635,7 +635,7 @@ SvInsertAppletDialog::~SvInsertAppletDialog()
 
 short SvInsertAppletDialog::Execute()
 {
-    short nRet;
+    short nRet = RET_OK;
     m_aClass.Erase();
     m_aCommands.Erase();
 
@@ -821,7 +821,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con
 
 short SfxInsertFloatingFrameDialog::Execute()
 {
-    short nRet;
+    short nRet = RET_OK;
     BOOL bOK = FALSE;
     uno::Reference < beans::XPropertySet > xSet;
     if ( m_xObj.is() )
diff --git a/svx/source/dialog/linkdlg.cxx b/svx/source/dialog/linkdlg.cxx
index 0541b0f39ed9..89d135a4461b 100644
--- a/svx/source/dialog/linkdlg.cxx
+++ b/svx/source/dialog/linkdlg.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: linkdlg.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 21:26:47 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 15:18:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -86,11 +86,8 @@ static long nTabs[] =
 
 
 SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, SvLinkManager* pMgr, BOOL bHtml )
-    : ModalDialog( pParent, ResId( MD_UPDATE_BASELINKS, DIALOG_MGR() ) )
-    , pLinkMgr( NULL )
-    , bHtmlMode(bHtml)
-    , aTbLinks( this, ResId(TB_LINKS ) )
-    , aFtFiles( this, ResId( FT_FILES ) ),
+    : ModalDialog( pParent, ResId( MD_UPDATE_BASELINKS, DIALOG_MGR() ) ),
+    aFtFiles( this, ResId( FT_FILES ) ),
     aFtLinks( this, ResId( FT_LINKS ) ),
     aFtType( this, ResId( FT_TYPE ) ),
     aFtStatus( this, ResId( FT_STATUS ) ),
@@ -116,7 +113,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, SvLinkManager* pMgr, BOOL bHtm
     aStrButtonclose( ResId( STR_BUTTONCLOSE, DIALOG_MGR() ) ),
     aStrCloselinkmsg( ResId( STR_CLOSELINKMSG, DIALOG_MGR() ) ),
     aStrCloselinkmsgMulti( ResId( STR_CLOSELINKMSG_MULTI, DIALOG_MGR() ) ),
-    aStrWaitinglink( ResId( STR_WAITINGLINK, DIALOG_MGR() ) )
+    aStrWaitinglink( ResId( STR_WAITINGLINK, DIALOG_MGR() ) ),
+    pLinkMgr( NULL ),
+    bHtmlMode(bHtml),
+    aTbLinks( this, ResId(TB_LINKS ) )
 {
     FreeResource();
 
@@ -239,6 +239,8 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
 
 IMPL_LINK_INLINE_START( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
 {
+    (void)pSvTabListBox;
+
     ChangeSourceClickHdl( 0 );
     return 0;
 }
@@ -246,6 +248,8 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTa
 
 IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton )
 {
+    (void)pRadioButton;
+
     USHORT nPos;
     SvBaseLink* pLink = GetSelEntry( &nPos );
     if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
@@ -257,6 +261,8 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioBu
 
 IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
 {
+    (void)pRadioButton;
+
     USHORT nPos;
     SvBaseLink* pLink = GetSelEntry( &nPos );
     if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
@@ -268,6 +274,8 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButto
 
 IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, pPushButton )
 {
+    (void)pPushButton;
+
     SvTabListBox& rListBox = Links();
     USHORT nSelCnt = (USHORT)rListBox.GetSelectionCount();
     if( 255 < nSelCnt )
@@ -275,8 +283,6 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, pPushButton )
     SvPtrarr aLnkArr( (BYTE)nSelCnt );
     SvUShorts aPosArr( (BYTE)nSelCnt );
 
-    USHORT nFirstPos = USHRT_MAX;
-
     SvLBoxEntry* pE = rListBox.FirstSelected();
     while( pE )
     {
@@ -296,7 +302,6 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, pPushButton )
             SvBaseLinkRef xLink = (SvBaseLink*)aLnkArr[ n ];
 
             // suche erstmal im Array nach dem Eintrag
-            USHORT nFndPos = USHRT_MAX;
             for( USHORT i = 0; i < pLinkMgr->GetLinks().Count(); ++i )
                 if( &xLink == *pLinkMgr->GetLinks()[ i ] )
                 {
@@ -352,6 +357,8 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushBut
 
 IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
 {
+    (void)pPushButton;
+
     USHORT nSelectionCount = (USHORT)Links().GetSelectionCount();
     if(nSelectionCount > 1)
     {
@@ -382,9 +389,9 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
                 pLink = (SvBaseLink*)pEntry->GetUserData();
                 DBG_ASSERT(pLink,"Wo ist der Link")
                 pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, &sLinkName, &sFilter );
-                INetURLObject aUrl(sFile);
+                INetURLObject aUrl_(sFile);
                 INetURLObject aUrl2(aPath, INET_PROT_FILE);
-                aUrl2.insertName( aUrl.getName() );
+                aUrl2.insertName( aUrl_.getName() );
                 String sNewLinkName;
                 MakeLnkName( sNewLinkName, 0 ,
                         aUrl2.GetMainURL(INetURLObject::DECODE_TO_IURI), sLinkName, &sFilter);
@@ -442,6 +449,8 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
 
 IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
 {
+    (void)pPushButton;
+
     BOOL bModified = FALSE;
     if(Links().GetSelectionCount() <= 1)
     {
@@ -533,6 +542,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
 
 IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
 {
+    (void)pTimer;
 //    for( SvLBoxEntry* pBox = Links().First(); pBox;
 //          pBox = Links().Next( pBox ))
 
@@ -615,7 +625,6 @@ void SvBaseLinksDlg::SetManager( SvLinkManager* pNewMgr )
 void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool bSelect )
 {
     String aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
-    const SvLinkSource* pObj = rLink.GetObj();
 
     pLinkMgr->GetDisplayNames( (SvBaseLink*)&rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter );
 
@@ -643,7 +652,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool
     aEntry += '\t';
     aEntry += ImplGetStateStr( rLink );
 
-    SvLBoxEntry * pE = Links().InsertEntry( aEntry, nPos );
+    SvLBoxEntry * pE = Links().InsertEntryToColumn( aEntry, nPos );
     pE->SetUserData( (void*)&rLink );
     if(bSelect)
         Links().Select(pE);