mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constantparam in basctl

Browse Source 
Change-Id: I07d22585e768335f61d70bf18807479a2675804a
This commit is contained in:
Noel Grandin
2016-03-08 16:38:38 +02:00
parent cc091b0343
commit 5c1c8f53d7
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
basctl/source/basicide/baside3.cxx
View File

@@ -80,7 +80,7 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rD
: Reference<frame::XModel>(), xDialogModel)) : Reference<frame::XModel>(), xDialogModel))
,pUndoMgr(new SfxUndoManager) ,pUndoMgr(new SfxUndoManager)
{ {
InitSettings( true, true, true ); InitSettings( true );
pEditor->GetModel().SetNotifyUndoActionHdl( pEditor->GetModel().SetNotifyUndoActionHdl(
LINK(this, DialogWindow, NotifyUndoActionHdl) LINK(this, DialogWindow, NotifyUndoActionHdl)
@@ -1325,29 +1325,23 @@ void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt )
{ {
if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) if( (rDCEvt.GetType()==DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{ {
InitSettings( true, true, true ); InitSettings( true );
Invalidate(); Invalidate();
} }
else else
BaseWindow::DataChanged( rDCEvt ); BaseWindow::DataChanged( rDCEvt );
} }
void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground) void DialogWindow::InitSettings(bool bBackground)
{ {
// FIXME RenderContext // FIXME RenderContext
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont ) vcl::Font aFont;
{ aFont = rStyleSettings.GetFieldFont();
vcl::Font aFont; SetPointFont(*this, aFont);
aFont = rStyleSettings.GetFieldFont();
SetPointFont(*this, aFont);
}
if( bForeground || bFont ) SetTextColor( rStyleSettings.GetFieldTextColor() );
{ SetTextFillColor();
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
}
if( bBackground ) if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() ); SetBackground( rStyleSettings.GetFieldColor() );

2
basctl/source/inc/baside3.hxx
View File

@@ -77,7 +77,7 @@ protected:
virtual void DoInit() override; virtual void DoInit() override;
virtual void DoScroll( ScrollBar* pCurScrollBar ) override; virtual void DoScroll( ScrollBar* pCurScrollBar ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void InitSettings(bool bFont, bool bForeground, bool bBackground); void InitSettings(bool bBackground);
public: public:
DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel); DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel);