diff options
Diffstat (limited to 'dbaccess/source')
29 files changed, 51 insertions, 79 deletions
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 6af9365ceb0a..0dbfdaf724c2 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -241,7 +241,7 @@ namespace dbaccess virtual void SAL_CALL visibilityChanged( sal_Bool /*bVisible*/ ) throw (WrongStateException, RuntimeException, std::exception) override { } - inline void resetClient(ODocumentDefinition* _pClient) { m_pClient = _pClient; } + inline void resetClient() { m_pClient = nullptr; } }; // LockModifiable @@ -457,7 +457,7 @@ void ODocumentDefinition::closeObject() m_xEmbeddedObject = nullptr; if ( m_pClientHelper.is() ) { - m_pClientHelper->resetClient(nullptr); + m_pClientHelper->resetClient(); m_pClientHelper.clear(); } } diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index efa4339cdce5..b0c4d49fc682 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -31,8 +31,8 @@ namespace dbmm class RangeProgressBar { public: - explicit RangeProgressBar(ProgressBar *pBar = nullptr) - : m_pBar(pBar) + explicit RangeProgressBar() + : m_pBar(nullptr) , m_nRange(0) { } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 9ce77d3666c6..011b5c0dda9a 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -948,13 +948,12 @@ void OGenericUnoController::stopConnectionListening(const Reference< XConnection xComponent->removeEventListener(static_cast<XFrameActionListener*>(this)); } -Reference< XConnection > OGenericUnoController::connect( const Reference< XDataSource>& _xDataSource, - ::dbtools::SQLExceptionInfo* _pErrorInfo ) +Reference< XConnection > OGenericUnoController::connect( const Reference< XDataSource>& _xDataSource ) { WaitObject aWaitCursor( getView() ); ODatasourceConnector aConnector( getORB(), getView(), OUString() ); - Reference< XConnection > xConnection = aConnector.connect( _xDataSource, _pErrorInfo ); + Reference< XConnection > xConnection = aConnector.connect( _xDataSource, nullptr ); startConnectionListening( xConnection ); return xConnection; diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 574eabe402c0..e0225324aabc 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -556,8 +556,8 @@ VclPtr<FmGridControl> SbaXGridPeer::imp_CreateControl(vcl::Window* pParent, WinB // SbaGridHeader -SbaGridHeader::SbaGridHeader(BrowseBox* pParent, WinBits nWinBits) - :FmGridHeader(pParent, nWinBits) +SbaGridHeader::SbaGridHeader(BrowseBox* pParent) + :FmGridHeader(pParent, WB_STDHEADERBAR | WB_DRAG) ,DragSourceHelper(this) { } diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index e7f427bcc89a..c4fffa78dd01 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -26,8 +26,8 @@ namespace dbaui { - CharSetListBox::CharSetListBox( vcl::Window* _pParent, WinBits _nBits = WB_DROPDOWN ) - : ListBox( _pParent, _nBits ) + CharSetListBox::CharSetListBox( vcl::Window* _pParent ) + : ListBox( _pParent, WB_DROPDOWN ) { SetDropDownLineCount( 20 ); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index f22a2fdbd800..72c88019890f 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -66,8 +66,8 @@ private: OSqlEdit & editor_; }; -OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : - MultiLineEditSyntaxHighlight( pParent, nWinStyle ) +OSqlEdit::OSqlEdit( OQueryTextView* pParent ) : + MultiLineEditSyntaxHighlight( pParent, WB_LEFT | WB_VSCROLL | WB_BORDER ) ,m_pView(pParent) ,m_bAccelAction( false ) ,m_bStopTimer(false ) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 8d8c8c4be8aa..7e6b29fbdd3b 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -699,9 +699,8 @@ OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage } // OSQLErrorBox -OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, - const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) - :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, _nStyle, OSQLMessageBox::Error, _pAdditionalErrorInfo ) +OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage ) + :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr ) { } diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 56731055ab10..538df2d369d6 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -55,9 +55,7 @@ namespace dbaui OHTMLReader(SvStream& rIn, const SharedConnection& _rxConnection, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, - const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const TColumnVector* rList = nullptr, - const OTypeInfoMap* _pInfoMap = nullptr); + const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // required for automatic type recognition OHTMLReader(SvStream& rIn, sal_Int32 nRows, diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 3dff933c2736..e4f9361f8359 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -199,7 +199,7 @@ namespace dbaui */ sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const; - OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false,const OTableConnection* _rpFirstAfter = nullptr) const; + OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false) const; /** clear the window map and connection vector without destroying it diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 1ad04c2bbc8b..5070de338048 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -43,9 +43,7 @@ namespace dbaui ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF, - const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const TColumnVector* rList = nullptr, - const OTypeInfoMap* _pInfoMap = nullptr); + const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // required for automatic type recognition ORTFReader( SvStream& rIn, sal_Int32 nRows, diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 253fc5432400..e1067f2f281b 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -65,9 +65,9 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) - : ComboBox(_pParent,nStyle) - , OSQLNameChecker(_rAllowedChars) + OSQLNameComboBox(vcl::Window* _pParent) + : ComboBox(_pParent, WB_BORDER) + , OSQLNameChecker(OUString()) { } diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 4b4a3f3aeefd..00d7aa10dd9a 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -36,7 +36,7 @@ namespace dbaui virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) override; public: - OColumnTreeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER ); + OColumnTreeBox( vcl::Window* pParent ); void FillListBox( const ODatabaseExport::TColumnVector& _rList); void SetReadOnly() { m_bReadOnly = true; } diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 54324110623b..bf2d3a4aecb8 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -51,7 +51,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const override; public: - OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=nullptr); + OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage); virtual ~OWizTypeSelectControl(); virtual void dispose() override; @@ -72,8 +72,8 @@ namespace dbaui virtual bool PreNotify( NotifyEvent& rNEvt ) override; VclPtr<vcl::Window> m_pParentTabPage; public: - OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER | WB_SIMPLEMODE ) - : MultiListBox(pParent,nStyle) + OWizTypeSelectList( vcl::Window* pParent ) + : MultiListBox(pParent, WB_BORDER | WB_SIMPLEMODE) , m_bPKey(false) , m_pParentTabPage(nullptr) {} diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 02641062174a..5a965f2fc205 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -33,7 +33,7 @@ namespace dbaui class CharSetListBox : public ListBox { public: - CharSetListBox( vcl::Window* _pParent, WinBits _nBits ); + CharSetListBox( vcl::Window* _pParent ); void SelectEntryByIanaName( const OUString& _rIanaName ); bool StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId ); diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index a74b7ae43014..0a55f4f77cac 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -84,7 +84,7 @@ namespace dbaui void initialize() override { m_pViewSwitch->initialize(); } void SaveUIConfig() { m_pViewSwitch->SaveUIConfig(); } - void reset( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { m_pViewSwitch->reset( _pErrorInfo ); } + void reset() { m_pViewSwitch->reset( nullptr ); } bool switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo ); void forceInitialView(); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 11606ddd9d5c..3f5093f322f4 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -169,7 +169,7 @@ namespace dbaui ,public DragSourceHelper { public: - SbaGridHeader(BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG); + SbaGridHeader(BrowseBox* pParent); virtual void dispose() override; virtual ~SbaGridHeader(); protected: diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index b408159300e8..b91efb11dff4 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -64,7 +64,7 @@ namespace dbaui DECL_LINK_TYPED(ModifyHdl, Edit&, void); public: - OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle = WB_LEFT | WB_VSCROLL |WB_BORDER); + OSqlEdit( OQueryTextView* pParent); virtual ~OSqlEdit(); virtual void dispose() override; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 9524247f3502..d7cad2de79be 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -119,9 +119,7 @@ class OSQLErrorBox : public OSQLMessageBox { public: OSQLErrorBox( vcl::Window* _pParent, - const OUString& _rMessage, - WinBits _nStyle = WB_OK | WB_DEF_OK, - const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr ); + const OUString& _rMessage ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 1fc6e4da1b0c..e36bd7bee673 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -69,11 +69,9 @@ using namespace ::com::sun::star::awt; // OHTMLReader OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection, const Reference< css::util::XNumberFormatter >& _rxNumberF, - const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const TColumnVector* pList, - const OTypeInfoMap* _pInfoMap) + const css::uno::Reference< css::uno::XComponentContext >& _rxContext) : HTMLParser(rIn) - , ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn ) + , ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, nullptr, nullptr, rIn ) , m_nTableCount(0) , m_nWidth(0) , m_nColumnWidth(87) diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 2b026c0d7b8a..5386ef879706 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -61,11 +61,9 @@ using namespace ::com::sun::star::awt; ORTFReader::ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, const Reference< css::util::XNumberFormatter >& _rxNumberF, - const css::uno::Reference< css::uno::XComponentContext >& _rxContext, - const TColumnVector* pList, - const OTypeInfoMap* _pInfoMap) + const css::uno::Reference< css::uno::XComponentContext >& _rxContext) :SvRTFParser(rIn) - ,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn ) + ,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, nullptr, nullptr, rIn ) { m_bAppendFirstLine = false; } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 42917c625cbf..afb4e1f1956d 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -354,13 +354,13 @@ void OColumnString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::Rende rRenderContext.Pop(); } -OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits ) - : OMarkableTreeListBox(pParent, nBits) +OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent ) + : OMarkableTreeListBox(pParent, WB_BORDER) , m_bReadOnly(false) { SetDragDropMode( DragDropMode::NONE ); EnableInplaceEditing( false ); - SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL | nBits); + SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL ); SetSelectionMode( SelectionMode::Single ); } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index b2b839d7b62b..054dff335d22 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -43,8 +43,8 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; // OWizTypeSelectControl -OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar) - : OFieldDescControl(pParent, pHelpBar) +OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage) + : OFieldDescControl(pParent, nullptr) { m_pParentTabPage = pParentTabPage; } diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 7d520a44d2a7..fb0a4d546c33 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -314,7 +314,7 @@ namespace dbaui // now really reconnect ... if ( bReConnect ) { - m_pImpl->m_xConnection.reset( connect( m_pImpl->m_aDataSource.getDataSource(), nullptr ), SharedConnection::TakeOwnership ); + m_pImpl->m_xConnection.reset( connect( m_pImpl->m_aDataSource.getDataSource() ), SharedConnection::TakeOwnership ); m_pImpl->m_aSdbMetaData.reset( m_pImpl->m_xConnection ); } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index f08e94b2bfbd..657582fde435 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1192,7 +1192,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt) Window::Command(rEvt); } -OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin,const OTableConnection* _rpFirstAfter) const +OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin) const { OTableConnection* pConn = nullptr; OSL_ENSURE(pRhs || pLhs, "OJoinTableView::GetTabConn : invalid args !"); @@ -1200,8 +1200,6 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab if ((!pLhs || pLhs->ExistsAConn()) && (!pRhs || pRhs->ExistsAConn())) { - bool bFoundStart = _rpFirstAfter == nullptr; - auto aIter = m_vTableConnection.begin(); auto aEnd = m_vTableConnection.end(); for(;aIter != aEnd;++aIter) @@ -1225,19 +1223,8 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab if ( supressCrossNaturalJoin(pData->GetData()) ) continue; } - if (bFoundStart) - { - pConn = pData; - break; - } - - if (!pConn) - // used as fallback : if there is no conn after _rpFirstAfter the first conn between the two tables - // will be used - pConn = pData; - - if (pData == _rpFirstAfter) - bFoundStart = true; + pConn = pData; + break; } } } diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 1a374ab96173..041c4d0d0f7e 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -49,14 +49,11 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace dbaui; // class OQueryTableWindow -OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias) +OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData) :OTableWindow( pParent, pTabWinData ) ,m_nAliasNum(0) { - if (pszInitialAlias != nullptr) - m_strInitialAlias = OUString(pszInitialAlias); - else - m_strInitialAlias = GetAliasName(); + m_strInitialAlias = GetAliasName(); // if table name matches alias, do not pass to InitialAlias, // as the appending of a possible token could not succeed... diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index 9947905f6794..e9cb775783cd 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -28,9 +28,9 @@ namespace dbaui class OQueryTableWindow : public OTableWindow { sal_Int32 m_nAliasNum; - OUString m_strInitialAlias; + OUString m_strInitialAlias; public: - OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = nullptr ); + OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData ); OUString GetAliasName() const { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 432160bf6519..abdb2f01449f 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1911,7 +1911,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings void OQueryController::reset() { impl_reset(); - getContainer()->reset( nullptr ); + getContainer()->reset(); ClearUndoManager(); } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 0a1f4a6aa15f..686809058d92 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -73,11 +73,11 @@ using namespace ::com::sun::star::sdb; // Maximum length in description field #define MAX_DESCR_LEN 256 -OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl* _pOwner) +OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(OTableEditorCtrl* _pOwner) : m_pOwner(_pOwner) { - m_aInvalidateTimer.SetTimeout(nTimeout); + m_aInvalidateTimer.SetTimeout(500); m_aInvalidateTimer.SetTimeoutHdl(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate)); m_aInvalidateTimer.Start(); } @@ -144,7 +144,7 @@ OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow) ,nOldDataPos(-1) ,bSaveOnMove(true) ,bReadOnly(true) - ,m_aInvalidate(500,this) + ,m_aInvalidate(this) { SetHelpId(HID_TABDESIGN_BACKGROUND); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index f0af73a4d780..51cb83be5a07 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -73,7 +73,7 @@ namespace dbaui VclPtr<OTableEditorCtrl> m_pOwner; public: - ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*); + ClipboardInvalidator(OTableEditorCtrl*); ~ClipboardInvalidator(); void Stop(); |