diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-06 07:38:24 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-06 07:38:24 +0200 |
| commit | 94b766188d41dcdeff1762844d593967a7d64583 (patch) | |
| tree | 50a85e75632f62dd13825c81f8d7e736947f0bf5 /dbaccess/source/ui/control | |
| parent | 7ad2b927fbc4166f497d8923793cc4a1b34d8727 (diff) | |
#103496#: move VCL free ConfigItems to unotools
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/opendoccontrols.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/sqledit.cxx | 14 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 5b089f764337..5a99fdf226bc 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -72,7 +72,7 @@ #include <vcl/help.hxx> #endif #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #endif #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include <comphelper/sequenceashashmap.hxx> diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 61bc0882570f..84d86948cf97 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -67,7 +67,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : ImplSetFont(); // listen for change of Font and Color Settings - StartListening(m_SourceViewConfig); + m_SourceViewConfig.AddListener( this ); StartListening(m_ColorConfig); //#i97044# @@ -80,7 +80,7 @@ OSqlEdit::~OSqlEdit() DBG_DTOR(OSqlEdit,NULL); if (m_timerUndoActionCreation.IsActive()) m_timerUndoActionCreation.Stop(); - EndListening(m_SourceViewConfig); + m_SourceViewConfig.RemoveListener(this); EndListening(m_ColorConfig); } //------------------------------------------------------------------------------ @@ -198,12 +198,16 @@ void OSqlEdit::startTimer() void OSqlEdit::Notify( SfxBroadcaster& rBC, const SfxHint& /*rHint*/ ) { - if (&rBC == &m_SourceViewConfig) - ImplSetFont(); - else if (&rBC == &m_ColorConfig) + if (&rBC == &m_ColorConfig) MultiLineEditSyntaxHighlight::UpdateData(); } +void OSqlEdit::ConfigurationChanged( utl::ConfigurationBroadcaster* pOption ) +{ + if ( pOption == &m_SourceViewConfig ) + ImplSetFont(); +} + void OSqlEdit::ImplSetFont() { AllSettings aSettings = GetSettings(); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 86f5d02f5054..6a22d8303a29 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -73,7 +73,7 @@ #include <svtools/miscopt.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> |