summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-14 13:41:38 +0200
committerNoel Grandin <noel@peralex.com>2016-03-15 08:27:25 +0200
commitb47cb646ff2a62fcd3fac0e453a7261bbaefbcb7 (patch)
tree49a2dc78e998baa77212776d7d94fb8d72dc0f00 /dbaccess/source/ui
parent89e0663c55f7f1763536a345d63111115c71ef26 (diff)
loplugin:constantparam
Change-Id: I270e068b3c83e966e741b0a072fecce9d92d53f5
Diffstat (limited to 'dbaccess/source/ui')
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx20
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx26
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx4
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx10
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx2
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx9
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx2
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx17
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/VertSplitView.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx17
13 files changed, 50 insertions, 65 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 2f2e240d4e8c..68c231761b7c 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -128,7 +128,7 @@ namespace
class OTablePreviewWindow : public vcl::Window
{
DECL_LINK_TYPED(OnDisableInput, void*, void);
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
@@ -137,7 +137,7 @@ namespace
};
OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
{
- ImplInitSettings( true );
+ ImplInitSettings();
}
bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt )
{
@@ -157,11 +157,11 @@ namespace
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
- void OTablePreviewWindow::ImplInitSettings( bool bBackground )
+ void OTablePreviewWindow::ImplInitSettings()
{
//FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -173,8 +173,7 @@ namespace
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- if( bBackground )
- SetBackground( rStyleSettings.GetFieldColor() );
+ SetBackground( rStyleSettings.GetFieldColor() );
}
}
@@ -1245,7 +1244,7 @@ void OAppDetailPageHelper::ImplInitSettings()
OPreviewWindow::OPreviewWindow(vcl::Window* _pParent)
: Window(_pParent)
{
- ImplInitSettings( true );
+ ImplInitSettings();
}
bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
@@ -1304,12 +1303,12 @@ void OPreviewWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
-void OPreviewWindow::ImplInitSettings( bool bBackground )
+void OPreviewWindow::ImplInitSettings()
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -1321,8 +1320,7 @@ void OPreviewWindow::ImplInitSettings( bool bBackground )
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- if( bBackground )
- SetBackground( rStyleSettings.GetFieldColor() );
+ SetBackground( rStyleSettings.GetFieldColor() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 96c8423969b0..819a521d0c73 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -62,7 +62,7 @@ namespace dbaui
<TRUE/> when successful
*/
bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index e42d80587382..763265b908d2 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -360,7 +360,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai
m_aCreation->SetDefaultCollapsedEntryBmp( aFolderImage );
m_aCreation->SetDefaultExpandedEntryBmp( aFolderImage );
- ImplInitSettings(true);
+ ImplInitSettings();
}
OTasksWindow::~OTasksWindow()
@@ -386,12 +386,12 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
-void OTasksWindow::ImplInitSettings( bool bBackground )
+void OTasksWindow::ImplInitSettings()
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -407,13 +407,10 @@ void OTasksWindow::ImplInitSettings( bool bBackground )
m_aDescription->SetTextColor( rStyleSettings.GetFieldTextColor() );
m_aDescription->SetTextFillColor();
- if( bBackground )
- {
- SetBackground( rStyleSettings.GetFieldColor() );
- m_aHelpText->SetBackground( rStyleSettings.GetFieldColor() );
- m_aDescription->SetBackground( rStyleSettings.GetFieldColor() );
- m_aFL->SetBackground( rStyleSettings.GetFieldColor() );
- }
+ SetBackground( rStyleSettings.GetFieldColor() );
+ m_aHelpText->SetBackground( rStyleSettings.GetFieldColor() );
+ m_aDescription->SetBackground( rStyleSettings.GetFieldColor() );
+ m_aFL->SetBackground( rStyleSettings.GetFieldColor() );
aFont = m_aDescription->GetControlFont();
aFont.SetWeight(WEIGHT_BOLD);
@@ -533,7 +530,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
,m_rBorderWin(_rParent)
{
SetUniqueId(UID_APP_DETAIL_VIEW);
- ImplInitSettings( true );
+ ImplInitSettings();
m_pControlHelper = VclPtr<OAppDetailPageHelper>::Create(m_aContainer.get(),m_rBorderWin,_ePreviewMode);
m_pControlHelper->Show();
@@ -575,7 +572,7 @@ void OApplicationDetailView::dispose()
OSplitterView::dispose();
}
-void OApplicationDetailView::ImplInitSettings( bool bBackground )
+void OApplicationDetailView::ImplInitSettings()
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -587,8 +584,7 @@ void OApplicationDetailView::ImplInitSettings( bool bBackground )
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- if( bBackground )
- SetBackground( rStyleSettings.GetFieldColor() );
+ SetBackground( rStyleSettings.GetFieldColor() );
m_aHorzSplitter->SetBackground( rStyleSettings.GetDialogColor() );
m_aHorzSplitter->SetFillColor( rStyleSettings.GetDialogColor() );
@@ -605,7 +601,7 @@ void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 7ae2f3ab25af..5c092036b431 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -118,7 +118,7 @@ namespace dbaui
VclPtr<OApplicationDetailView> m_pDetailView;
DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void );
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
@@ -153,7 +153,7 @@ namespace dbaui
::std::vector< TaskPaneData > m_aTaskPaneData;
MnemonicGenerator m_aExternalMnemonics;
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 2b89d8481fb7..6d9b50f5d31e 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -42,8 +42,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorde
,m_eLastType(E_NONE)
,m_rBorderWin( _rBorderWindow )
{
-
- ImplInitSettings( true );
+ ImplInitSettings();
m_aIconControl->SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl));
m_aIconControl->setControlActionListener( &m_rBorderWin.getView()->getAppController() );
@@ -75,7 +74,7 @@ void OApplicationSwapWindow::Resize()
m_aIconControl->ArrangeIcons();
}
-void OApplicationSwapWindow::ImplInitSettings( bool bBackground )
+void OApplicationSwapWindow::ImplInitSettings()
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -87,8 +86,7 @@ void OApplicationSwapWindow::ImplInitSettings( bool bBackground )
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- if( bBackground )
- SetBackground( rStyleSettings.GetFieldColor() );
+ SetBackground( rStyleSettings.GetFieldColor() );
}
void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
@@ -100,7 +98,7 @@ void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index c77877b6c792..fc7fadf49e60 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -35,7 +35,7 @@ namespace dbaui
ElementType m_eLastType;
OAppBorderWindow& m_rBorderWin;
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
DECL_LINK_TYPED( OnContainerSelectHdl, SvtIconChoiceCtrl*, void );
DECL_LINK_TYPED( ChangeToLastSelected, void*, void );
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index ede0411301f4..c0126e115a66 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -37,7 +37,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n
setTitle(_nTitleId);
SetBorderStyle(WindowBorderStyle::MONO);
- ImplInitSettings( true );
+ ImplInitSettings();
const StyleSettings& rStyle = Application::GetSettings().GetStyleSettings();
vcl::Window* pWindows[] = { m_aSpace1.get(), m_aSpace2.get(), m_aTitle.get() };
@@ -134,12 +134,12 @@ void OTitleWindow::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE)) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
-void OTitleWindow::ImplInitSettings( bool bBackground )
+void OTitleWindow::ImplInitSettings()
{
// FIXME RenderContext
AllSettings aAllSettings = GetSettings();
@@ -157,8 +157,7 @@ void OTitleWindow::ImplInitSettings( bool bBackground )
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- if( bBackground )
- SetBackground( rStyleSettings.GetFieldColor() );
+ SetBackground( rStyleSettings.GetFieldColor() );
}
void OTitleWindow::ApplySettings(vcl::RenderContext& rRenderContext)
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 3bd1c6088418..6df02ac04ed5 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -30,7 +30,7 @@ namespace dbaui
VclPtr<FixedText> m_aTitle;
VclPtr<vcl::Window> m_pChild;
bool m_bShift;
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index ed5b85e16622..5a8213a89958 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -576,7 +576,7 @@ void SbaTableQueryBrowser::initializePreviewMode()
{
getBrowserView()->getVclControl()->AlwaysEnableInput( false );
getBrowserView()->getVclControl()->EnableInput( false );
- getBrowserView()->getVclControl()->ForceHideScrollbars( true );
+ getBrowserView()->getVclControl()->ForceHideScrollbars();
}
Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY);
if ( xDataSourceSet.is() )
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index cb086c037006..2b063e207371 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -34,7 +34,7 @@ OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pP
,m_pRight(nullptr)
,m_bVertical(_bVertical)
{
- ImplInitSettings( true );
+ ImplInitSettings();
}
OSplitterView::~OSplitterView()
@@ -64,7 +64,7 @@ IMPL_LINK_NOARG_TYPED( OSplitterView, SplitHdl, Splitter*, void )
Resize();
}
-void OSplitterView::ImplInitSettings( bool bBackground )
+void OSplitterView::ImplInitSettings()
{
// FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -80,13 +80,10 @@ void OSplitterView::ImplInitSettings( bool bBackground )
aTextColor = GetControlForeground();
SetTextColor( aTextColor );
- if ( bBackground )
- {
- if( IsControlBackground() )
- SetBackground( GetControlBackground() );
- else
- SetBackground( rStyleSettings.GetFaceColor() );
- }
+ if( IsControlBackground() )
+ SetBackground( GetControlBackground() );
+ else
+ SetBackground( rStyleSettings.GetFaceColor() );
}
void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt )
@@ -96,7 +93,7 @@ void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index e39bcc8b4ec5..acb6ab4f5638 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -36,7 +36,7 @@ namespace dbaui
VclPtr<OTableFieldDescWin> m_pFieldDescWin;
VclPtr<OTableEditorCtrl> m_pEditorCtrl;
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
DECL_LINK_TYPED( SplitHdl, Splitter*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index 4a36f8668058..bdc95a51e054 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -32,7 +32,7 @@ namespace dbaui
VclPtr<vcl::Window> m_pRight;
bool m_bVertical;
- void ImplInitSettings( bool bBackground );
+ void ImplInitSettings();
DECL_LINK_TYPED( SplitHdl, Splitter*, void );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 97f062113e2d..febe92a3a8df 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -45,7 +45,7 @@ OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB
,m_aHorzSplitter( VclPtr<Splitter>::Create(this) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
// Children erzeugen
m_pEditorCtrl = VclPtr<OTableEditorCtrl>::Create( this);
m_pFieldDescWin = VclPtr<OTableFieldDescWin>::Create( this );
@@ -114,7 +114,7 @@ IMPL_LINK_TYPED( OTableBorderWindow, SplitHdl, Splitter*, pSplit, void )
}
}
-void OTableBorderWindow::ImplInitSettings( bool bBackground )
+void OTableBorderWindow::ImplInitSettings()
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -130,13 +130,10 @@ void OTableBorderWindow::ImplInitSettings( bool bBackground )
aTextColor = GetControlForeground();
SetTextColor( aTextColor );
- if ( bBackground )
- {
- if( IsControlBackground() )
- SetBackground( GetControlBackground() );
- else
- SetBackground( rStyleSettings.GetFaceColor() );
- }
+ if( IsControlBackground() )
+ SetBackground( GetControlBackground() );
+ else
+ SetBackground( rStyleSettings.GetFaceColor() );
}
void OTableBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
@@ -146,7 +143,7 @@ void OTableBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- ImplInitSettings( true );
+ ImplInitSettings();
Invalidate();
}
}