diff options
Diffstat (limited to 'extensions/source')
28 files changed, 50 insertions, 60 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index ac6c01693c2d..a12003e5d1a9 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -37,9 +37,9 @@ #include <tools/urlobj.hxx> #include <unotools/ucbhelper.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #include <sfx2/docfilt.hxx> #include <vcl/msgbox.hxx> diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index 8830b9144409..9ecf96b89246 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 4cab6ef50526..218d15455cbd 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -32,7 +32,7 @@ #include "precompiled_extensions.hxx" #include <bibconfig.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/debug.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -244,6 +244,10 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) SetModified(); }; //--------------------------------------------------------------------------- +void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +{ +} + void BibConfig::Commit() { const Sequence<OUString> aPropertyNames = GetPropertyNames(); diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 178da765818f..7237b0a12695 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -114,6 +114,7 @@ public: ~BibConfig(); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); BibDBDescriptor GetBibliographyURL(); void SetBibliographyURL(const BibDBDescriptor& rDesc); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 3d9667b94f06..e73c13b55814 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -36,9 +36,9 @@ #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <cppuhelper/weak.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <uno/environment.h> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> #endif diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 573c5756132b..3b9d7e53b8d7 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -34,7 +34,7 @@ #include <tools/resmgr.hxx> #include <tools/urlobj.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/util/XLocalizedAliases.hpp> #include <com/sun/star/lang/XLocalizable.hpp> diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 5a901447865f..0c47c2917e46 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -60,7 +60,7 @@ #include <ucbhelper/content.hxx> #include <ucbhelper/contentidentifier.hxx> #include <comphelper/container.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> #include <vcl/dialog.hxx> diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index ac7ce58a8f49..99304c394021 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <cppuhelper/implbase5.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include "bibmod.hxx" class BibDataManager; diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src index d06cce2e4361..6b68a97afa3d 100644 --- a/extensions/source/bibliography/menu.src +++ b/extensions/source/bibliography/menu.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <svx/svxids.hrc> #ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 416ff1e1845b..d00eecfa1350 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -238,7 +238,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): aLBSource.Show(); aLBSource.SetSelectHdl(LINK( this, BibToolBar, SelHdl)); - SvtMiscOptions().AddListener( LINK( this, BibToolBar, OptionsChanged_Impl ) ); + SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) ); Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) ); aTimer.SetTimeoutHdl(LINK( this, BibToolBar, SendSelHdl)); @@ -271,7 +271,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): BibToolBar::~BibToolBar() { - SvtMiscOptions().RemoveListener( LINK( this, BibToolBar, OptionsChanged_Impl ) ); + SvtMiscOptions().RemoveListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) ); Application::RemoveEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) ); ::bib::RemoveFromTaskPaneList( this ); } diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 899154682264..f3a322f038e8 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -39,7 +39,7 @@ #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vcl/timer.hxx> #include <cppuhelper/implbase1.hxx> // helper for implementations diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 1d02cac88a4b..176efc59d35f 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -50,10 +50,10 @@ #include <vcl/stdtext.hxx> #include <vcl/waitobj.hxx> #include <sfx2/docfilt.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif //......................................................................... namespace dbp diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk index 5591a11b9d36..aba20a2f105a 100644 --- a/extensions/source/dbpilots/makefile.mk +++ b/extensions/source/dbpilots/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -89,6 +89,7 @@ SHL1STDLIBS= \ $(SVLLIB) \ $(SFXLIB) \ $(DBTOOLSLIB) \ + $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 33bc61be819a..653006035eae 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -31,7 +31,7 @@ #include "componentmodule.hxx" #include <tools/resmgr.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <comphelper/sequence.hxx> #include <tools/debug.hxx> diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 2d6fc581f3a6..1893b1579dc2 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.cxx @@ -46,8 +46,8 @@ #include <svx/svxdlg.hxx> #include <vcl/svapp.hxx> #include <vos/mutex.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> #include <sfx2/app.hxx> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index bb5422c69a51..1cc09221e67e 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -38,7 +38,7 @@ #include "plugin/impl.hxx" #include "osl/mutex.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "vcl/configsettings.hxx" #include "com/sun/star/container/XEnumerationAccess.hpp" diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index dfba6a755201..b4ac6686a71e 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -89,6 +89,7 @@ SHL1STDLIBS= \ SHL1STDLIBS+= \ $(VCLLIB) \ $(SVLLIB) \ + $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(VOSLIB) \ $(UCBHELPERLIB) \ diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk index db8b58b6e118..143d866773b7 100644 --- a/extensions/source/preload/makefile.mk +++ b/extensions/source/preload/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -69,6 +69,7 @@ SHL1STDLIBS= \ $(VCLLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx index 8456c1a05c37..0279dbc3f4ab 100644 --- a/extensions/source/preload/oemwiz.cxx +++ b/extensions/source/preload/oemwiz.cxx @@ -34,10 +34,10 @@ #include "componentmodule.hxx" #include <tools/debug.hxx> #include <sfx2/docfile.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <vcl/msgbox.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #ifndef _EXTENSIONS_PRELOAD_PRELOAD_HRC_ #include "preload.hrc" #endif diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx index 49b43114d20e..cde464dd88cb 100644 --- a/extensions/source/preload/oemwiz.hxx +++ b/extensions/source/preload/oemwiz.hxx @@ -40,7 +40,7 @@ #include <vcl/tabpage.hxx> #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <vcl/scrbar.hxx> //......................................................................... diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 05d0984349b4..56a4c0685c8d 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -71,8 +71,8 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <sfx2/app.hxx> -#include <svtools/eitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/eitem.hxx> +#include <svl/itemset.hxx> #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <tools/diagnose_ex.h> diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index e28eb2e89224..8d7429ce63de 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -89,14 +89,14 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> #include <svtools/colrdlg.hxx> -#include <svtools/filenotation.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itemset.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/numuno.hxx> -#include <svtools/urihelper.hxx> +#include <svl/filenotation.hxx> +#include <svl/intitem.hxx> +#include <svl/itemset.hxx> +#include <unotools/moduleoptions.hxx> +#include <svl/numuno.hxx> +#include <svl/urihelper.hxx> #include <svx/dialogs.hrc> #include <svx/numinf.hxx> #include <svx/svxdlg.hxx> diff --git a/extensions/source/propctrlr/formhelpid.hrc b/extensions/source/propctrlr/formhelpid.hrc index 529c3b30d97b..851a9f30307f 100644 --- a/extensions/source/propctrlr/formhelpid.hrc +++ b/extensions/source/propctrlr/formhelpid.hrc @@ -31,25 +31,7 @@ #ifndef _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ #define _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ -#ifndef _SOLAR_HRC -#include <svtools/solar.hrc> -#endif - -// TODO: create a new help id range in <svtools/solar.hrc> -// at the moment, the help ids are ripped from svx/inc/fmhelper.hrc -// (the old property browser was implemented in svx) - -#define HID_PROPCONTROLLER_START HID_FORMS_START + 400 - -// FREE -// FREE -// FREE -// FREE -// FREE -#define HID_FM_PROPDLG_TABCTR (HID_PROPCONTROLLER_START + 5) -#define HID_FM_PROPDLG_TAB_GENERAL (HID_PROPCONTROLLER_START + 6) -#define HID_FM_PROPDLG_TAB_DATA (HID_PROPCONTROLLER_START + 7) -#define HID_FM_PROPDLG_TAB_EVT (HID_PROPCONTROLLER_START + 8) +#include <extensio.hrc> #endif // _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 8d730d3e8c9c..d81966e39257 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -45,7 +45,7 @@ #include <tools/debug.hxx> #include <unotools/confignode.hxx> #include <unotools/localedatawrapper.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <algorithm> diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc index 705638accf98..338b0eebab88 100644 --- a/extensions/source/propctrlr/propresid.hrc +++ b/extensions/source/propctrlr/propresid.hrc @@ -31,7 +31,7 @@ #ifndef EXTENSIONS_PROPRESID_HRC #define EXTENSIONS_PROPRESID_HRC -// TODO: create a new resource range in <svtools/solar.hrc> +// TODO: create a new resource range in <svl/solar.hrc> #define RID_PROPCONTROLLER_START 1000 // arbitrary at the moment diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 26d46aa7dec9..dac5ccca77d5 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -55,7 +55,7 @@ #include <vcl/floatwin.hxx> #include <svtools/svmedit.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/datetime.hxx> #include <i18npool/mslangid.hxx> #ifndef _SV_BUTTON_HXX diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 005659f3576a..b27afa750fa6 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -36,10 +36,10 @@ #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> /** === end UNO includes === **/ -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <rtl/math.hxx> #include <tools/debug.hxx> -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #include <connectivity/dbconversion.hxx> #include <com/sun/star/util/Time.hpp> #include "modulepcr.hxx" diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index 70759e9c5ad7..ea34b2678d14 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/xforms/XDataTypeRepository.hpp> /** === end UNO includes === **/ -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/diagnose_ex.h> //........................................................................ |