Remove unused code and fix typos

15 files changed, 12 insertions, 33 deletions

diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 0d53b83a5e9a..1d6f69f54f45 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -186,7 +186,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
                 }
                 catch(const Exception&)
                 {
-                    // DBG_UNHANDLED_EXCEPTION();
                 }
                 m_pCacheSet = NULL;
                 m_xCacheSet.clear();
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index e17f89f0f3e0..9c446a18ff1f 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -130,7 +130,6 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
 OTableContainer::~OTableContainer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::OTableContainer" );
-    //  dispose();
     DBG_DTOR(OTableContainer, NULL);
 }
 
@@ -480,7 +479,7 @@ void SAL_CALL OTableContainer::disposing()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" );
     OFilteredContainer::disposing();
-    // say our listeners goobye
+    // say goodbye to our listeners
     m_xTableDefinitions = NULL;
     m_pTableMediator = NULL;
 }
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 4800b79b8f85..7cae5e38e1ce 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -89,7 +89,6 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
 
 OViewContainer::~OViewContainer()
 {
-    //  dispose();
     DBG_DTOR(OViewContainer, NULL);
 }
 
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index f670d3b383fc..663323d71a94 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -135,7 +135,7 @@ void SAL_CALL ODefinitionContainer::disposing()
 
     MutexGuard aGuard(m_aMutex);
 
-    // say our listeners goobye
+    // say goodbye to our listeners
     EventObject aEvt(*this);
     m_aApproveListeners.disposeAndClear(aEvt);
     m_aContainerListeners.disposeAndClear(aEvt);
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 9416347412d6..d9e52edeaa1b 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-// #106016# ------------------------------------
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include "UITools.hxx"
@@ -328,7 +327,6 @@ DBG_NAME(OConnectionHelper)
                     if (RET_OK == aSelector.Execute())
                     {
                         setURLNoPrefix(aSelector.GetSelected());
-                        //  checkCreateDatabase( ::dbaccess::DST_ADABAS);
                         SetRoadmapStateValue(sal_True);
                         callModifiedHdl();
                     }
@@ -406,7 +404,7 @@ DBG_NAME(OConnectionHelper)
                         aProfiles.insert(pArray[index]);
 
 
-                    // excute the select dialog
+                    // execute the select dialog
                     ODatasourceSelectDialog aSelector(GetParent(), aProfiles, eType);
                     ::rtl::OUString sOldProfile=getURLNoPrefix();
 
@@ -584,7 +582,6 @@ DBG_NAME(OConnectionHelper)
                 break;
 
                 case RET_NO:
-                     // SetRoadmapStateValue(sal_False);
                     callModifiedHdl();
                     return RET_OK;
 
@@ -697,7 +694,7 @@ DBG_NAME(OConnectionHelper)
         }
         return aInstalledDBs;
     }
-    // #106016# -------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
     IS_PATH_EXIST OConnectionHelper::pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const
     {
         ::ucbhelper::Content aCheckExistence;
@@ -763,7 +760,6 @@ DBG_NAME(OConnectionHelper)
         ::std::vector< ::rtl::OUString > aToBeCreated;  // the to-be-created levels
 
         // search a level which exists
-        // #106016# ---------------------
         IS_PATH_EXIST eParentExists = PATH_NOT_EXIST;
         while ( eParentExists == PATH_NOT_EXIST && aParser.getSegmentCount())
         {
@@ -856,7 +852,7 @@ DBG_NAME(OConnectionHelper)
                 const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
 
                 if ( ( ::dbaccess::DST_CALC == eType) || ( ::dbaccess::DST_MSACCESS == eType) || ( ::dbaccess::DST_MSACCESS_2007 == eType) )
-                { // #106016# --------------------------
+                {
                     if( pathExists(sURL, sal_True) == PATH_NOT_EXIST )
                     {
                         String sFile = String( ModuleRes( STR_FILE_DOES_NOT_EXIST ) );
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index fcc5af853afd..a311acd6d8cf 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -56,7 +56,6 @@
 #include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-// #106016# ------------------------------------
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index 38ee66e46719..9aa06d59e1d3 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -87,7 +87,6 @@ DBG_NAME( dbu_OExtensionNotPresentDialog )
 
     // get message string out of the resource
     String sText =          String( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) );
-    // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) );
     String sExtensionName = getFromConfigurationExtension("Name");
     sText.SearchAndReplaceAscii("%RPT_EXTENSION_NAME", sExtensionName);
 
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index e87ca6a93d45..acfc272d2e7e 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -163,7 +163,7 @@ namespace dbaui
         else
         {
             aEnumeration.getDatasourceNames(aOdbcDatasources);
-            // excute the select dialog
+            // execute the select dialog
             ODatasourceSelectDialog aSelector(GetParent(), aOdbcDatasources, false);
             if (_sCurr.getLength())
                 aSelector.Select(_sCurr);
diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
index 9252a6b3974c..dcea387599ea 100644
--- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
+++ b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
@@ -58,10 +58,6 @@ class OExtensionNotPresentDialog :  public ModalDialog
     ::com::sun::star::lang::Locale          m_nLocale;
     com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory;
 
-    /** returns the format string.
-    */
-    // ::rtl::OUString getFormatString(::sal_Int16 _nNumberFormatIndex);
-
     DECL_LINK(Download_Click,PushButton*);
 
     // not CopyCTOR, no self assignment
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index 7aa6c138bd1b..d36a4438c554 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -43,7 +43,7 @@ namespace dbaui
         OCopyTableWizard*           m_pParent;
         sal_Bool                    m_bFirstTime;   // Page wird das erste mal gerufen ; should be set in the reset methode
 
-        OWizardPage( Window* pParent, const ResId& rResId );// : TabPage(pParent,rResId),m_pParent((OCopyTableWizard*)pParent),m_bFirstTime(sal_True) {};
+        OWizardPage( Window* pParent, const ResId& rResId );
 
     public:
         virtual void        Reset ( )           = 0;
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 144996500527..212322c7fd2c 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -488,15 +488,11 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
                 m_sTextToken.Erase();
                 break;
             case HTML_TABLEDATA_ON:
-                // m_bAppendFirstLine = true;
-                // run through
             case HTML_TABLEHEADER_ON:
                 TableDataOn(eVal,nTmpToken2);
                 bTableHeader = TRUE;
                 break;
             case HTML_TABLEDATA_OFF:
-                // m_bAppendFirstLine = true;
-                // run through
             case HTML_TABLEHEADER_OFF:
                 {
                     aColumnName.EraseLeadingChars();
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index e813d2c24f81..0a949d24703e 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -211,7 +211,6 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
                 if (!xHandler.is())
                 {
                     OSL_ENSURE(sal_False, "createConnection: could not instantiate an interaction handler!");
-                    // ShowServiceNotAvailableError(NULL, String(SERVICE_TASK_INTERACTION_HANDLER), sal_True);
                         // TODO: a real parent!
                 }
                 else
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index c1b5c4dedee5..9d143636b3a8 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -125,8 +125,6 @@ void OWizColumnSelect::Reset()
         m_lbOrgColumnNames.SetEntryData(nPos,(*aIter)->second);
     }
 
-    // m_pParent->clearDestColumns();
-
     if(m_lbOrgColumnNames.GetEntryCount())
         m_lbOrgColumnNames.SelectEntryPos(0);
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 05e95d2f0933..017347595520 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -432,7 +432,6 @@ namespace
     // -----------------------------------------------------------------------------
     BOOL isScrollAllowed( OJoinTableView* _pView,long nDelta, BOOL bHoriz)
     {
-        BOOL bRet = TRUE;
         //////////////////////////////////////////////////////////////////////
         // adjust ScrollBar-Positions
         ScrollBar* pBar = _pView->GetVScrollBar();
@@ -442,9 +441,9 @@ namespace
         long nOldThumbPos = pBar->GetThumbPos();
         long nNewThumbPos = nOldThumbPos + nDelta;
         if( nNewThumbPos < 0 )
-            nNewThumbPos = 0;// bRet = FALSE;
+            nNewThumbPos = 0;
         else if( nNewThumbPos > pBar->GetRangeMax() )
-            nNewThumbPos = pBar->GetRangeMax();// bRet = FALSE;
+            nNewThumbPos = pBar->GetRangeMax();
 
         if ( bHoriz )
         {
@@ -454,7 +453,7 @@ namespace
         else if ( nNewThumbPos == _pView->GetScrollOffset().Y() )
             return FALSE;
 
-        return bRet;
+        return TRUE;
     }
     // -----------------------------------------------------------------------------
     BOOL getMovementImpl(OJoinTableView* _pView,const Point& _rPoint,const Size& _rSize,long& _nScrollX,long& _nScrollY)
@@ -576,7 +575,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
 
         //////////////////////////////////////////////////////////////////
         // Belegte Bereiche dieser Zeile pruefen
-        OTableWindow* pOtherTabWin;// = GetTabWinMap()->First();
+        OTableWindow* pOtherTabWin;
         OTableWindowMapIterator aIter = m_aTableMap.begin();
         OTableWindowMapIterator aEnd = m_aTableMap.end();
         for(;aIter != aEnd;++aIter)
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 390f339384f7..07ccb440d3fb 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -208,7 +208,7 @@ namespace dbaui
             nDialogStyle = WB_RETRY_CANCEL | WB_DEF_RETRY;
         }
 
-        // excute the dialog
+        // execute the dialog
         OSQLMessageBox aDialog(NULL, _rSqlInfo, nDialogStyle);
             // TODO: need a way to specify the parent window
         sal_Int16 nResult = aDialog.Execute();