diff options
25 files changed, 15 insertions, 59 deletions
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index bd2f8b809..f795ce75c 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 6aa893e80..e9b98645f 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 4589fb9e7..3a2d9659b 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 a9187267b..2a040d313 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 0cf72835b..b1d0971a8 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 066e6c235..ea4e8ddee 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 b2709038e..9f5c989d6 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 2e4d3fbee..83484c92d 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 78f88c3eb..c4915e9f0 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 9b86bd0e5..8bf6b815f 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 a3b069209..b03151e31 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 ad913709b..d58751330 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::XPr 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 147f3f0cd..4231a9200 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 3a9552ef8..ded10e7bb 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 bb4bff9b6..f0fbb2d03 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(); diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index f43ba873b..b7561e916 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -89,7 +89,7 @@ namespace rptui If the formula denotes an expression, then the <em>undecorated content</em> is the expression itself. */ - const ::rtl::OUString& getUndecoratedContent() const;// { return m_sUndecoratedContent; } + const ::rtl::OUString& getUndecoratedContent() const; /// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression inline ::rtl::OUString getFieldName() const; diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java index 2a7cc5ad5..a827406c9 100644 --- a/reportdesign/qa/complex/ReportDesignerTest.java +++ b/reportdesign/qa/complex/ReportDesignerTest.java @@ -206,12 +206,10 @@ public class ReportDesignerTest extends ComplexTestCase { private static XMultiServiceFactory m_xXMultiServiceFactory = null; private void startOffice() { - // int tempTime = param.getInt("SingleTimeOut"); param.put("TimeOut", new Integer(300000)); System.out.println("TimeOut: " + param.getInt("TimeOut")); System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut")); - // OfficeProvider aProvider = null; m_aProvider = new OfficeProvider(); m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param); param.put("ServiceFactory", m_xXMultiServiceFactory); @@ -253,18 +251,12 @@ public class ReportDesignerTest extends ComplexTestCase { m_sUPDMinor = System.getProperty("UPDMINOR"); m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP"); - // createDBEntry(); log.println("Current CWS: " + m_sCWS_WORK_STAMP); log.println("Current MWS: " + m_sUPDMinor); - // System.exit(1); - sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); log.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); - // an other way to replace strings - // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser); - checkIfOfficeExists(sAppExecutionCommand); param.put("AppExecutionCommand", new String(sAppExecutionCommand)); diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index c6bee7b10..d171dd2e9 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -171,7 +171,6 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj) SdrObject* pObject = RemoveObject(i); (void)pObject; break; - // delete pObject; } } } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index b4d643c98..67ef2500a 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -538,7 +538,6 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon // be notified of any changes in the container elements Reference< XContainer > xSimpleContainer( _rxContainer, UNO_QUERY ); - // OSL_ENSURE( xSimpleContainer.is(), "OXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" ); if ( xSimpleContainer.is() ) { if ( _bStartListening ) @@ -583,7 +582,6 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec } catch( const Exception& ) { - //OSL_ENSURE( sal_False, "OXUndoEnvironment::switchListening: caught an exception!" ); } } diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 8c670ba5d..9b774e6a2 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -49,7 +49,6 @@ class OReportController; \************************************************************************/ class ODateTimeDialog : public ModalDialog { - // FixedLine m_aFLDate; CheckBox m_aDate; FixedText m_aFTDateFormat; ListBox m_aDateListBox; diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx index 858aa54a7..b4802d864 100644 --- a/reportdesign/source/ui/inc/FixedTextColor.hxx +++ b/reportdesign/source/ui/inc/FixedTextColor.hxx @@ -54,8 +54,6 @@ namespace rptui void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey); - // sal_Int32 getTextColor(); - public: FixedTextColor(const OReportController & _aObserver); virtual ~FixedTextColor(); diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 378a59913..ebbf5b289 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -49,12 +49,11 @@ namespace rptui class OXReportControllerObserverImpl; //======================================================================== - class /* REPORTDESIGN_DLLPUBLIC */ OXReportControllerObserver + class OXReportControllerObserver : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::util::XModifyListener > - /*,public SfxListener*/ { const ::std::auto_ptr<OXReportControllerObserverImpl> m_pImpl; @@ -69,7 +68,6 @@ namespace rptui public: OXReportControllerObserver(const OReportController& _rController); -// protected: // XPropertyChangeListener virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); @@ -91,9 +89,6 @@ namespace rptui void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection); void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection ); - // SfxListener - // virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - /** Create an object ob OUndoEnvLock locks the undo possibility As long as in the OUndoEnvLock scope, no undo is possible for manipulated object. @@ -117,7 +112,6 @@ namespace rptui void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(()); void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(()); - // void ModeChanged(); // will be called from 'Notify' DECL_LINK(SettingsChanged, VclWindowEvent* ); private: diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index c87566859..fc9f7ba60 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -252,7 +252,6 @@ namespace rptui /** returns the report section window for the given xsection @param _xSection the section */ - // ::boost::shared_ptr<OSectionWindow> getReportSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; /** checks if the keycode is known by the child windows @@ -328,7 +327,6 @@ namespace rptui OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt); void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove /*= true */, bool _bControlKeySet); - // void MovAction2(const Point& rPnt,const OSectionView* _pSection); sal_uInt32 getMarkedObjectCount() const; diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 7e34b6667..c923879bc 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -47,7 +47,6 @@ namespace rptui { //........................................................................ using namespace ::com::sun::star; -// using namespace comphelper; ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentContext > const & context) :ReportComponentHandler_Base(m_aMutex) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index b31f0f4a7..fbd722647 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -115,7 +115,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re } m_pFunc.reset(new DlgEdFuncSelect( this )); - m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( /* m_pParent->getViewsWindow()->getView()->getReportView()->getController().getORB() */ ) ); + m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor() ); } //------------------------------------------------------------------------------ OReportSection::~OReportSection() |