[Libreoffice-commits] core.git: dbaccess/source drawinglayer/source editeng/source include/dbaccess include/drawinglayer include/editeng svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Sep 13 06:15:38 UTC 2016
dbaccess/source/core/dataaccess/documentdefinition.cxx | 4 +-
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 4 +-
dbaccess/source/ui/browser/genericcontroller.cxx | 5 +--
dbaccess/source/ui/browser/sbagrid.cxx | 4 +-
dbaccess/source/ui/control/charsetlistbox.cxx | 4 +-
dbaccess/source/ui/control/sqledit.cxx | 4 +-
dbaccess/source/ui/dlg/sqlmessage.cxx | 5 +--
dbaccess/source/ui/inc/HtmlReader.hxx | 4 --
dbaccess/source/ui/inc/JoinTableView.hxx | 2 -
dbaccess/source/ui/inc/RtfReader.hxx | 4 --
dbaccess/source/ui/inc/SqlNameEdit.hxx | 6 ++--
dbaccess/source/ui/inc/WNameMatch.hxx | 2 -
dbaccess/source/ui/inc/WTypeSelect.hxx | 6 ++--
dbaccess/source/ui/inc/charsetlistbox.hxx | 2 -
dbaccess/source/ui/inc/querycontainerwindow.hxx | 2 -
dbaccess/source/ui/inc/sbagrid.hxx | 2 -
dbaccess/source/ui/inc/sqledit.hxx | 2 -
dbaccess/source/ui/inc/sqlmessage.hxx | 4 --
dbaccess/source/ui/misc/HtmlReader.cxx | 6 +---
dbaccess/source/ui/misc/RtfReader.cxx | 6 +---
dbaccess/source/ui/misc/WNameMatch.cxx | 6 ++--
dbaccess/source/ui/misc/WTypeSelect.cxx | 4 +-
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2 -
dbaccess/source/ui/querydesign/JoinTableView.cxx | 19 ++-----------
dbaccess/source/ui/querydesign/QTableWindow.cxx | 7 +---
dbaccess/source/ui/querydesign/QTableWindow.hxx | 4 +-
dbaccess/source/ui/querydesign/querycontroller.cxx | 2 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 6 ++--
dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 -
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 3 --
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 3 --
editeng/source/editeng/editeng.cxx | 4 +-
editeng/source/editeng/editundo.cxx | 4 +-
editeng/source/items/borderline.cxx | 4 --
editeng/source/uno/unoedhlp.cxx | 2 -
include/dbaccess/genericcontroller.hxx | 3 --
include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx | 1
include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx | 1
include/editeng/borderline.hxx | 3 --
include/editeng/editeng.hxx | 2 -
include/editeng/unoedhlp.hxx | 3 --
svx/source/sdr/contact/viewcontactofe3dextrude.cxx | 2 -
svx/source/sdr/contact/viewcontactofe3dlathe.cxx | 2 -
43 files changed, 65 insertions(+), 102 deletions(-)
New commits:
commit 6dd4905a7ac93a48dc87358da3ba0a8078bbb6cf
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Sep 12 12:56:25 2016 +0200
loplugin:constantparam in dbaccess..editeng
Change-Id: I1d0dc3d89933d86cd229e503b350fccc1523dedc
Reviewed-on: https://gerrit.libreoffice.org/28833
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 6af9365..0dbfdaf 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 efa4339..b0c4d49 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 9ce77d3..011b5c0 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 574eabe..e022532 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 e7f427b..c4fffa7 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 f22a2fd..72c8801 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 8d8c8c4..7e6b29f 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 5673105..538df2d 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 3dff933c..e4f9361 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 1ad04c2..5070de3 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 253fc54..e1067f2 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 4b4a3f3..00d7aa1 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 5432411..bf2d3a4 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 0264106..5a965f2 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 a74b7ae..0a55f4f 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 11606dd..3f5093f 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 b408159..b91efb1 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 9524247..d7cad2d 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 1fc6e4d..e36bd7b 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 2b026c0..5386ef8 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 42917c6..afb4e1f 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 b2b839d..054dff3 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 7d520a4..fb0a4d5 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 f08e94b..657582f 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 1a374ab..041c4d0 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 9947905..e9cb775 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 432160b..abdb2f01 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 0a1f4a6..6868090 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 f0af73a..51cb83b 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();
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index be15838..ce69c28 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -393,7 +393,6 @@ namespace drawinglayer
double fDiagonal,
double fBackScale,
bool bSmoothNormals,
- bool bSmoothHorizontalNormals,
bool bSmoothLids,
bool bCharacterMode,
bool bCloseFront,
@@ -407,7 +406,7 @@ namespace drawinglayer
mfBackScale(fBackScale),
mpLastRLGViewInformation(nullptr),
mbSmoothNormals(bSmoothNormals),
- mbSmoothHorizontalNormals(bSmoothHorizontalNormals),
+ mbSmoothHorizontalNormals(true),
mbSmoothLids(bSmoothLids),
mbCharacterMode(bCharacterMode),
mbCloseFront(bCloseFront),
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index f831aba..89eeea9 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -251,7 +251,6 @@ namespace drawinglayer
double fBackScale,
double fRotation,
bool bSmoothNormals,
- bool bSmoothHorizontalNormals,
bool bSmoothLids,
bool bCharacterMode,
bool bCloseFront,
@@ -267,7 +266,7 @@ namespace drawinglayer
mfRotation(fRotation),
mpLastRLGViewInformation(nullptr),
mbSmoothNormals(bSmoothNormals),
- mbSmoothHorizontalNormals(bSmoothHorizontalNormals),
+ mbSmoothHorizontalNormals(true),
mbSmoothLids(bSmoothLids),
mbCharacterMode(bCharacterMode),
mbCloseFront(bCloseFront),
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 65866a3..4a87e92 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -710,9 +710,9 @@ void EditEngine::InsertFeature(const EditSelection& rEditSelection, const SfxPoo
pImpEditEngine->ImpInsertFeature(rEditSelection, rItem);
}
-EditSelection EditEngine::MoveParagraphs(const Range& rParagraphs, sal_Int32 nNewPos, EditView* pCurView)
+EditSelection EditEngine::MoveParagraphs(const Range& rParagraphs, sal_Int32 nNewPos)
{
- return pImpEditEngine->MoveParagraphs(rParagraphs, nNewPos, pCurView);
+ return pImpEditEngine->MoveParagraphs(rParagraphs, nNewPos, nullptr);
}
void EditEngine::RemoveCharAttribs(sal_Int32 nPara, sal_uInt16 nWhich, bool bRemoveFeatures)
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 62d7e3f..1e09ce6 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -429,14 +429,14 @@ void EditUndoMoveParagraphs::Undo()
else
nTmpDest += aTmpRange.Len();
- EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, nTmpDest, nullptr);
+ EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, nTmpDest);
GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
void EditUndoMoveParagraphs::Redo()
{
DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
- EditSelection aNewSel = GetEditEngine()->MoveParagraphs(nParagraphs, nDest, nullptr);
+ EditSelection aNewSel = GetEditEngine()->MoveParagraphs(nParagraphs, nDest);
GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 1ae6914..16dd8fd 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -91,8 +91,7 @@ Color SvxBorderLine::threeDMediumColor( Color aMain )
SvxBorderLine::SvxBorderLine( const Color *pCol, long nWidth,
SvxBorderStyle nStyle,
- Color (*pColorOutFn)( Color ), Color (*pColorInFn)( Color ),
- Color (*pColorGapFn)( Color ) )
+ Color (*pColorOutFn)( Color ), Color (*pColorInFn)( Color ) )
: m_nWidth( nWidth )
, m_bMirrorWidths( false )
, m_aWidthImpl( SvxBorderLine::getWidthImpl( nStyle ) )
@@ -102,7 +101,6 @@ SvxBorderLine::SvxBorderLine( const Color *pCol, long nWidth,
, m_bUseLeftTop( false )
, m_pColorOutFn( pColorOutFn )
, m_pColorInFn( pColorInFn )
-, m_pColorGapFn( pColorGapFn )
{
if ( pCol )
aColor = *pCol;
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 04202aa..68e5ccb 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -85,7 +85,7 @@ sal_uLong SvxEditSourceHint::GetValue() const
case EE_NOTIFY_INPUT_END:
return ::std::unique_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
- return ::std::unique_ptr<SfxHint>( new SvxEditSourceHintEndPara( EDITSOURCE_HINT_SELECTIONCHANGED ) );
+ return ::std::unique_ptr<SfxHint>( new SvxEditSourceHintEndPara );
default:
OSL_FAIL( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
break;
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 53c32cb..7b7fed2 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -374,8 +374,7 @@ namespace dbaui
// connect to a datasource
css::uno::Reference< css::sdbc::XConnection > connect(
- const css::uno::Reference< css::sdbc::XDataSource>& _xDataSource,
- ::dbtools::SQLExceptionInfo* _pErrorInfo
+ const css::uno::Reference< css::sdbc::XDataSource>& _xDataSource
);
// connect to a datasource
diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index be0165f..32f6625 100644
--- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
@@ -87,7 +87,6 @@ namespace drawinglayer
double fDiagonal,
double fBackScale,
bool bSmoothNormals,
- bool bSmoothHorizontalNormals,
bool bSmoothLids,
bool bCharacterMode,
bool bCloseFront,
diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index e9c3fd0..a880c6f 100644
--- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
@@ -91,7 +91,6 @@ namespace drawinglayer
double fBackScale,
double fRotation,
bool bSmoothNormals,
- bool bSmoothHorizontalNormals,
bool bSmoothLids,
bool bCharacterMode,
bool bCloseFront,
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index cc0a33f..98e2245 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -72,8 +72,7 @@ namespace editeng {
long nWidth = 0,
SvxBorderStyle nStyle = css::table::BorderLineStyle::SOLID,
Color (*pColorOutFn)( Color ) = &darkColor,
- Color (*pColorInFn)( Color ) = &darkColor,
- Color (*pColorGapFn)( Color ) = nullptr );
+ Color (*pColorInFn)( Color ) = &darkColor );
SvxBorderLine( const SvxBorderLine& r );
SvxBorderLine& operator=( const SvxBorderLine& r );
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index d30b3b0..4825865 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -590,7 +590,7 @@ public:
void InsertFeature(const EditSelection& rEditSelection, const SfxPoolItem& rItem);
- EditSelection MoveParagraphs(const Range& rParagraphs, sal_Int32 nNewPos, EditView* pCurView);
+ EditSelection MoveParagraphs(const Range& rParagraphs, sal_Int32 nNewPos);
void RemoveCharAttribs(sal_Int32 nPara, sal_uInt16 nWhich = 0, bool bRemoveFeatures = false);
void RemoveCharAttribs(const EditSelection& rSel, bool bRemoveParaAttribs, sal_uInt16 nWhich);
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index c58393f..836bb51 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -55,8 +55,7 @@ public:
class SvxEditSourceHintEndPara :public SvxEditSourceHint
{
public:
- SvxEditSourceHintEndPara( sal_uInt32 nId )
- :SvxEditSourceHint(nId) {}
+ SvxEditSourceHintEndPara() : SvxEditSourceHint(EDITSOURCE_HINT_SELECTIONCHANGED) {}
};
/** Helper class for common functionality in edit sources
*/
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index be77f9e..55fe8fd 100644
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
@@ -74,7 +74,7 @@ namespace sdr
const drawinglayer::primitive3d::Primitive3DReference xReference(
new drawinglayer::primitive3d::SdrExtrudePrimitive3D(
aWorldTransform, aTextureSize, aAttribute, *pSdr3DObjectAttribute,
- aPolyPolygon, fDepth, fDiagonal, fBackScale, bSmoothNormals, true, bSmoothLids,
+ aPolyPolygon, fDepth, fDiagonal, fBackScale, bSmoothNormals, bSmoothLids,
bCharacterMode, bCloseFront, bCloseBack));
xRetval = { xReference };
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index e7ffa94..7418cbd 100644
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
@@ -90,7 +90,7 @@ namespace sdr
aWorldTransform, aTextureSize, aAttribute, *pSdr3DObjectAttribute,
aPolyPolygon, nHorizontalSegments, nVerticalSegments,
fDiagonal, fBackScale, fRotation,
- bSmoothNormals, true, bSmoothLids, bCharacterMode, bCloseFront, bCloseBack));
+ bSmoothNormals, bSmoothLids, bCharacterMode, bCloseFront, bCloseBack));
xRetval = { xReference };
return xRetval;
More information about the Libreoffice-commits
mailing list