diff options
Diffstat (limited to 'dbaccess/source')
27 files changed, 43 insertions, 38 deletions
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 22f3aa7c5bd7..b32d8841e8d0 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -70,7 +70,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> #include <svtools/filenotation.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/fsys.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index b1d8792ae281..a2142fd99d4e 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -47,7 +47,7 @@ #include <comphelper/numberedcollection.hxx> #include <comphelper/genericpropertyset.hxx> #include <comphelper/property.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <framework/titlehelper.hxx> diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index 638de55757dd..f189dec2c46c 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -75,7 +75,7 @@ #include <vcl/waitobj.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index 182bd9acbed9..f9e281c74e49 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -79,7 +79,7 @@ #include <tools/urlobj.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index fb9352018689..ca59f54229bf 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -75,7 +75,7 @@ #include <cppuhelper/implbase2.hxx> #include <osl/file.hxx> #include <sfx2/docfile.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 8008416956f4..b1f5e9040690 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -104,7 +104,7 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #endif #include <svtools/filenotation.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <tools/diagnose_ex.h> #include <connectivity/DriversConfig.hxx> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 4cc82ad5e772..faea08399b42 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -59,7 +59,7 @@ #endif #include <comphelper/sequence.hxx> #include <svtools/filenotation.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include "dsntypes.hxx" namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index ed31ce7ef6c1..4fa30ee6885d 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -124,7 +124,7 @@ #include <vos/mutex.hxx> #endif #include <svtools/sfxecode.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> #endif diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b87b7706d87f..ba8546a97332 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -135,10 +135,10 @@ #include <vcl/menu.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX -#include <svtools/internaloptions.hxx> +#include <unotools/internaloptions.hxx> #endif #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> @@ -178,7 +178,7 @@ #include <sfx2/mailmodelapi.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> @@ -219,7 +219,7 @@ #include <sfx2/QuerySaveDocument.hxx> #endif #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ #include <svtools/filenotation.hxx> diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index a509986e8849..d83b6278f15b 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -204,7 +204,7 @@ #include <sfx2/filedlghelper.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 1f9288bf489a..7b059e258553 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -106,7 +106,7 @@ #include "browserids.hxx" #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #include "IApplicationController.hxx" diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index a24c2d4e30dc..f8b5bd0ea7aa 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -111,7 +111,7 @@ #include "datasourceconnector.hxx" #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 8f2528e1f96a..34cfe666814e 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -116,7 +116,7 @@ #include <sot/storage.hxx> #include <svtools/filenotation.hxx> #include <svtools/intitem.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/svlbitm.hxx> #include <svtools/svtreebx.hxx> #include <svx/algitem.hxx> 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> diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 1f7d45706391..256016d77dea 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -106,7 +106,7 @@ #include <com/sun/star/awt/XWindow.hpp> #endif #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index ba0925d224ad..db8d2d4553d9 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -48,13 +48,13 @@ #include <svtools/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _SFX_FCONTNR_HXX #include <sfx2/fcontnr.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index db21de4d9a76..dc714d6f751e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -47,7 +47,7 @@ #include <svtools/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> @@ -59,7 +59,7 @@ #include <svtools/intitem.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 6b22d79e4b18..21b131c4a666 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -47,7 +47,7 @@ #include <svtools/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 2e155dfb4572..0d380585200d 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -109,7 +109,7 @@ #include "finteraction.hxx" #include <connectivity/CommonTools.hxx> #include "dbaccess_helpid.hrc" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/roadmapwizard.hxx> #include "TextConnectionHelper.hxx" diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index d183f97acba5..89467a81ae38 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -141,7 +141,7 @@ #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 558c454b5d05..12ee457f41ef 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -60,7 +60,7 @@ #include <tools/urlobj.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index bab1dcca3694..3b86f2aef3db 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -40,7 +40,7 @@ #include "dsnItem.hxx" #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index b8a89b0dbf8d..26ee146ca237 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -62,7 +62,7 @@ #include <svtools/svtreebx.hxx> #endif #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #endif #ifndef _DBAUI_INDEXES_HXX_ #include "indexes.hxx" diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 039ea9f8404b..603421e52d64 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -33,12 +33,12 @@ #include <svtools/editsyntaxhighlighter.hxx> #include <svtools/lstner.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/sourceviewconfig.hxx> +#include <unotools/sourceviewconfig.hxx> namespace dbaui { class OQueryTextView; - class OSqlEdit : public MultiLineEditSyntaxHighlight, SfxListener + class OSqlEdit : public MultiLineEditSyntaxHighlight, SfxListener, utl::ConfigurationListener { private: Timer m_timerInvalidate; @@ -48,7 +48,7 @@ namespace dbaui OQueryTextView* m_pView; BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt BOOL m_bStopTimer; - svt::SourceViewConfig m_SourceViewConfig; + utl::SourceViewConfig m_SourceViewConfig; svtools::ColorConfig m_ColorConfig; DECL_LINK(OnUndoActionTimer, void*); @@ -83,6 +83,7 @@ namespace dbaui void startTimer(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* ); using MultiLineEditSyntaxHighlight::Notify; }; } diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 25a6299bae12..e876ef731023 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -286,7 +286,7 @@ #include <svtools/numuno.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ #include <svtools/filenotation.hxx> |