Spelling mistakes and dead code

14 files changed, 11 insertions, 62 deletions

diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 6eccad4d4..2b8ab81e8 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -211,7 +211,6 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG )
                 QueryBox aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) );
                 if ( aBox.Execute() != RET_YES )
                     return 0;
-                // xNameContainer->removeByName(sName);
             }
             m_aName.SetText(sName);
             EndDialog( TRUE );
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 36c3979d5..a21dff0ff 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -446,7 +446,7 @@ DBG_NAME(OConnectionHelper)
         {
             if ( m_pCollection->isFileSystemBased( m_eType ) )
             {
-                // get the tow parts: prefix and file URL
+                // get the two parts: prefix and file URL
                 String sTypePrefix, sFileURLEncoded;
                 if ( _bPrefix )
                 {
@@ -492,7 +492,7 @@ DBG_NAME(OConnectionHelper)
         {
             if ( m_pCollection->isFileSystemBased( m_eType ) )
             {
-                // get the tow parts: prefix and file URL
+                // get the two parts: prefix and file URL
                 String sTypePrefix, sFileURLDecoded;
                 if ( _bPrefix )
                 {
@@ -742,7 +742,7 @@ DBG_NAME(OConnectionHelper)
                             return 1L;	// handled
                     }
                     break;
-            } // switch (_rNEvt.GetType())
+            }
         }
 
         return OGenericAdministrationPage::PreNotify( _rNEvt );
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index af1745c72..7293cce9b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -268,7 +268,7 @@ namespace dbaui
                     m_aJavaDriver.SetText(sDefaultJdbcDriverName);
                     m_aJavaDriver.SetModifyFlag();
                 }
-            } // if ( !pJdbcDrvItem->GetValue().Len() )
+            }
             else
                 m_aJavaDriver.SetText(pJdbcDrvItem->GetValue());
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 75c0bdd46..2bc095442 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -73,14 +73,6 @@ namespace dbaui
 {
 //.........................................................................
 using namespace ::com::sun::star;
-//	using namespace ::com::sun::star::ucb;
-//	using namespace ::com::sun::star::ui::dialogs;
-//	using namespace ::com::sun::star::sdbc;
-//	using namespace ::com::sun::star::beans;
-//	using namespace ::com::sun::star::lang;
-//	using namespace ::com::sun::star::container;
-//	using namespace ::dbtools;
-//	using namespace ::svt;
 
     OGenericAdministrationPage*	OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
@@ -218,7 +210,6 @@ DBG_NAME(OTextConnectionPageSetup)
             bChangedSomething = sal_True;
         }
 
-        // fillString(_rSet,&m_aETHostServer, DSID_CONNECTURL, bChangedSomething);
         fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
         return bChangedSomething;
     }
@@ -664,8 +655,8 @@ DBG_NAME(OMySQLIntroPageSetup)
                 {
                     m_aETDriverClass.SetText(sDefaultJdbcDriverName);
                     m_aETDriverClass.SetModifyFlag();
-                } // if ( sDefaultJdbcDriverName.Len() )
-            } // if ( !pJdbcDrvItem->GetValue().Len() )
+                }
+            }
             else
             {
                 m_aETDriverClass.SetText(pDrvItem->GetValue());
@@ -686,7 +677,6 @@ DBG_NAME(OMySQLIntroPageSetup)
         BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
         bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0);
         return bEnableTestConnection;
-//		m_aTestConnection.Enable(bEnableTestConnection);
     }
 
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 32d5eb409..23d805355 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -586,7 +586,6 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
             break;
         case  ::dbaccess::DST_LDAP:
             {
-                //	SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True);
                 sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue());
                 sNewUrl += lcl_createHostWithPort(NULL,pPortNumber);
@@ -1119,7 +1118,6 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
     USHORT nPortNumberId	= 0;
     sal_Int32 nPortNumber	= -1;
     String sNewHostName;
-    //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue());
     String sUrlPart;
 
     pCollection->extractHostNamePort(pUrlItem->GetValue(),sUrlPart,sNewHostName,nPortNumber);
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index ff1f6407d..b2709038e 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -130,19 +130,6 @@ DBG_NAME( dbu_OExtensionNotPresentDialog )
 
     m_aFI_WARNING.SetImage(WarningBox::GetStandardImage());
 
-    // set an image in high contrast
-    // m_aFI_WARNING.SetModeImage(Image(BMP_EXCEPTION_WARNING_SCH), BMP_COLOR_HIGHCONTRAST);
-
-    // to resize images
-    // WinBits aBits = m_aFI_WARNING.GetStyle();
-    // aBits |= WB_SCALE;
-    // m_aFI_WARNING.SetStyle(aBits);
-    // 
-    // Size aImageSize = m_aFI_WARNING.GetSizePixel();
-    // (void) aImageSize;
-    // m_aFI_WARNING.Resize();
-
-    
     Resize();
     FreeResource();
 }
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 238667498..08616e60e 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -190,7 +190,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
                     m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
             }
             sTables = xTables->getElementNames();
-        } // if ( xTables.is() )
+        }
 
         xViewSupp.set( xTableSupp, UNO_QUERY );
         if ( xViewSupp.is() )
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 2783d030b..ed31bb8eb 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -149,7 +149,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
     {
         case  ::dbaccess::DST_DBASE:
             addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase);
-            //	bResetPasswordRequired = sal_True;
             break;
 
         case  ::dbaccess::DST_ADO:
@@ -158,7 +157,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
 
         case  ::dbaccess::DST_FLAT:
             addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText);
-            //	bResetPasswordRequired = sal_True;
             break;
 
         case  ::dbaccess::DST_ODBC:
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 965329384..5c2d19a35 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -229,7 +229,7 @@ void ODbTypeWizDialogSetup::declareAuthDepPath( const ::rtl::OUString& _sURL, Pa
     {
         if ( bHasAuthentication || ( *aIter != PAGE_DBSETUPWIZARD_AUTHENTIFICATION ) )
             aPath.push_back( *aIter );
-    } // for(;aIter != aEnd;++aIter)
+    }
 
     // call base method
     ::svt::RoadmapWizard::declarePath( _nPathId, aPath );
@@ -655,7 +655,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt
         case  OMySQLIntroPageSetup::VIA_NATIVE:
             sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:"));
             break;
-    } // switch( _pMySQLIntroPageSetup->getMySQLMode() )
+    }
     activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True);
     return sal_True;
 }
@@ -867,8 +867,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
             ::rtl::OUString sPrefix = eType;
             sUrl = aDBPathURL.GetMainURL( INetURLObject::NO_DECODE);
             xSimpleFileAccess->createFolder(sUrl);
-            //OFileNotation aFileNotation(sUrl);
-            //sUrl = aFileNotation.get(OFileNotation::N_SYSTEM);
              sUrl = sPrefix.concat(sUrl);
         }
         m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, sUrl));
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 6e5d8a9b6..2700b38ca 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -63,7 +63,6 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumb
         SetText(aTitle);
     if( nFlags & TP_ATTR_CHAR )
     {
-//        AddTabPage( RID_SVXPAGE_CHAR_STD,String(ModuleRes(TP_ATTR_CHAR)),SvxCharStdPage::Create,            0 );
         DBG_ERROR( "found flag TP_ATTR_CHAR" );
     }
     if( nFlags & TP_ATTR_NUMBER )
@@ -96,14 +95,11 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 
         case RID_SVXPAGE_CHAR_STD:
         {
-            //	((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem());
         }
         break;
 
         case RID_SVXPAGE_ALIGNMENT:
         {
-//           aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, WBA_NO_ORIENTATION|WBA_NO_LINEBREAK|WBA_NO_GRIDLINES|WBA_NO_VERTICAL|WBA_NO_LEFTINDENT));
-//           rTabPage.PageCreated(aSet);
         }
         break;
 
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index c1f70a7e8..7876596b3 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -213,7 +213,7 @@ namespace dbaui
                         ++loop
                     )
                     insertDatasourceTypeEntryData( loop->eType, loop->sDisplayName );
-            } // if ( m_pCollection )
+            }
         }
     }
 
@@ -607,7 +607,6 @@ namespace dbaui
         const SfxFilter* pFilter = getStandardDatabaseFilter();
         if ( pFilter )
         {
-//			aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
             aFileDlg.SetCurrentFilter(pFilter->GetUIName());
         }
         if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 8e0376a36..695549aa4 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -239,14 +239,6 @@ DBG_NAME(DbaIndexDialog)
 
         m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog));
 
-        // get our most recent geometry settings
-//		if (m_aGeometrySettings.Exists())
-//		{
-//			Point aPos;
-//			m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y());
-//			SetPosPixel(aPos);
-//		}
-
         // if all of the indexes have an empty description, we're not interested in displaying it
         Indexes::const_iterator aCheck;
 
@@ -342,10 +334,6 @@ DBG_NAME(DbaIndexDialog)
         delete m_pIndexes;
         delete m_pFields;
 
-        // save our geometry settings
-//		Point aPos = GetPosPixel();
-//		m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y());
-    
         DBG_DTOR(DbaIndexDialog,NULL);
     }
 
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index e4b786257..03c07275f 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -198,7 +198,6 @@ DBG_NAME(IndexFieldsControl)
         // insert rows for the the fields
         RowInserted(GetRowCount(), m_aFields.size(), sal_False);
         // insert an additional row for a new field for that index
-//		if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex )
         RowInserted(GetRowCount(), 1, sal_False);
         SetUpdateMode(sal_True);
 
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index a6baa7f06..5f973e8dc 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -363,7 +363,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
                     sTableName += _rFilter.Name;
                     _rFilter.Name = sTableName;
                 }
-            } // if ( !bFunction )
+            }
         }
     }
     catch(Exception)
@@ -586,11 +586,9 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const String& rField )
 {
     DBG_CHKTHIS(DlgFilterCrit,NULL);
     sal_uInt16 nCnt = rBox.GetEntryCount();
-    //	sal_Bool bCase = m_rIterator.TablesAreSensitive();
 
     for( sal_uInt16 i=0 ; i<nCnt ; i++ )
     {
-        //	if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField))
         if(rBox.GetEntry(i) == rField)
         {
             rBox.SelectEntryPos(i);
@@ -781,7 +779,6 @@ void DlgFilterCrit::BuildWherePart()
     Sequence<Sequence<PropertyValue> > aFilter,aHaving;
     aFilter.realloc(1);
     aHaving.realloc(1);
-    //	::rtl::OUString aFilter;
 
     if( LbPos(aLB_WHEREFIELD1) != 0 )
     {