diff options
113 files changed, 275 insertions, 298 deletions
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 847c8ad2f0af..5f264b388fda 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -32,7 +32,7 @@ #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/textdata.hxx> #include <svtools/texteng.hxx> #include <svtools/textview.hxx> diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst index cd30f3452a30..f410ece56d9b 100755 --- a/accessibility/prj/build.lst +++ b/accessibility/prj/build.lst @@ -14,4 +14,5 @@ ac accessibility\workben\org\openoffice\accessibility\misc nmake - ac accessibility\workben\org\openoffice\accessibility\awb\canvas nmake - all ac_awb_canvas ac_awb_tree NULL ac accessibility\workben\org\openoffice\accessibility\awb\tree nmake - all ac_awb_tree ac_awb_misc NULL ac accessibility\workben\org\openoffice\accessibility\awb\view nmake - all ac_awb_view ac_awb_view_text NULL -ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake - all ac_awb_view_text NULL +# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk +ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake - all ac_awb_view_text ac_awb_misc NULL diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index 2a7b702e38cb..3804ad3048e5 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -31,7 +31,7 @@ #ifndef _COMMUNI_HXX #define _COMMUNI_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vos/thread.hxx> #include <vos/mutex.hxx> #include <vcl/timer.hxx> diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx index 0ab2b48d3579..55048d05cbb0 100644 --- a/automation/source/miniapp/testapp.hxx +++ b/automation/source/miniapp/testapp.hxx @@ -58,7 +58,7 @@ #ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "editwin.hxx" diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx index 8888a007918c..a8abce528746 100644 --- a/automation/source/server/scmdstrm.cxx +++ b/automation/source/server/scmdstrm.cxx @@ -30,9 +30,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_automation.hxx" -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include "scmdstrm.hxx" #include "svcommstream.hxx" #include "rcontrol.hxx" diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 988f4055a2eb..890e6ace540d 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -55,7 +55,7 @@ #if 1 #include <svtools/ttprops.hxx> #include <basic/ttstrhlp.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/stringtransfer.hxx> #include <vcl/sound.hxx> #include "testtool.hrc" diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 4219d1d5b099..2816d18285d3 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -85,7 +85,7 @@ #include <vcl/wintypes.hxx> #include <svtools/valueset.hxx> #include <svtools/roadmap.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svtools/extensionlistbox.hxx> // Hat keinen Includeschutz #include <svtools/svtdata.hxx> @@ -102,14 +102,14 @@ //#include <vcl/drag.hxx> #endif #include <tools/fsys.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/ttprops.hxx> #ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> #endif #include <basic/dispdefs.hxx> #include <vos/socket.hxx> -#include <svtools/pickerhistory.hxx> +#include <svl/pickerhistory.hxx> #include <com/sun/star/util/XCancellable.hpp> #include <sot/storage.hxx> diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk index 79a811fdaee7..e72c92c3b8e1 100644 --- a/automation/source/testtool/makefile.mk +++ b/automation/source/testtool/makefile.mk @@ -84,9 +84,9 @@ $(INCCOM)$/r_cmds.hxx : ..$/inc$/rcontrol.hxx \ $(MISC)$/xfilter.pl $(PERL) $(MISC)$/xfilter.pl ..$/inc rcontrol.hxx $(INCCOM)$/r_cmds RC_ -$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/vcl$/wintypes.hxx \ +$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/wintypes.hxx \ $(MISC)$/xfilter.pl - $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) vcl$/wintypes.hxx $(INCCOM)$/res_type WINDOW_ + $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) tools$/wintypes.hxx $(INCCOM)$/res_type WINDOW_ diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index e068530459a8..1e2ae5a63f1e 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::devtools; #include <vcl/svapp.hxx> #endif #include <svtools/stringtransfer.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> //#ifndef _SBXCLASS_HXX //autogen #include <basic/sbx.hxx> //#endif diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx index 4863f1fd428c..f31d397a7a00 100644 --- a/automation/source/testtool/tcommuni.hxx +++ b/automation/source/testtool/tcommuni.hxx @@ -30,7 +30,7 @@ #include <automation/communi.hxx> #include <tools/link.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vos/thread.hxx> diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index 0ff13c806a07..00356d2bc5c4 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // Help-Ids -------------------------------------------------------------- diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index e975d6464194..be1612ea7429 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -77,19 +77,19 @@ #include "vcl/svapp.hxx" #include "vcl/scrbar.hxx" -#include "svtools/svarray.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemset.hxx" -#include "svtools/aeitem.hxx" -#include "svtools/stritem.hxx" -#include "svtools/whiter.hxx" +#include "svl/svarray.hxx" +#include "svl/itempool.hxx" +#include "svl/itemset.hxx" +#include "svl/aeitem.hxx" +#include "svl/stritem.hxx" +#include "svl/whiter.hxx" #include "svtools/langtab.hxx" #include "svtools/texteng.hxx" #include "svtools/textview.hxx" #include "svtools/xtextedt.hxx" #include "svtools/txtattr.hxx" #include "svtools/textwindowpeer.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #define _BASIC_TEXTPORTIONS #include "basic/sbdef.hxx" diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi index bb9cd1172af9..d2b3cb602ab8 100644 --- a/basctl/sdi/basslots.sdi +++ b/basctl/sdi/basslots.sdi @@ -28,8 +28,6 @@ * ************************************************************************/ -import "svxslots.ilb" - module "6706E0E7-FB05-101B-804c-04021c007002" "6806E0E7-FB05-101B-804c-04021c007002" @@ -37,10 +35,14 @@ BasicIDE [ HelpText( "BasicIDE" ) SlotIdFile( "basslots.hrc" ) -TypeLibFile( "basslots.tlb" ) ] { //========================================================================= + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" include "baside.sdi" diff --git a/basctl/sdi/makefile.mk b/basctl/sdi/makefile.mk index d94921bf9ae2..2244eafcd654 100644 --- a/basctl/sdi/makefile.mk +++ b/basctl/sdi/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 @@ -45,7 +45,11 @@ SDI1EXPORT=basctl # --- Files -------------------------------------------------------- SVSDI1DEPEND= \ - $(SOLARINCXDIR)$/svxslots.ilb \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ baside.sdi # --- Targets ------------------------------------------------------- diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index e21a0c9d09c6..25f47c980c5d 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -32,7 +32,7 @@ #define _BASICBOX_HXX #include "doceventnotifier.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svheader.hxx> #include <sfx2/tbxctrl.hxx> #include <vcl/lstbox.hxx> diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 030fa5e68e26..e23cd68a75af 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1430,7 +1430,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) : m_aSyntaxColors[TT_UNKNOWN] = aColor; m_aSyntaxColors[TT_WHITESPACE] = aColor; m_aSyntaxColors[TT_EOL] = aColor; - StartListening(m_aColorConfig); + m_aColorConfig.AddListener(this); m_aSyntaxColors[TT_IDENTIFIER] = Color(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).nColor); m_aSyntaxColors[TT_NUMBER] @@ -1458,7 +1458,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) : ModulWindowLayout::~ModulWindowLayout() { - EndListening(m_aColorConfig); + m_aColorConfig.RemoveListener(this); } void __EXPORT ModulWindowLayout::Resize() @@ -1602,7 +1602,7 @@ void ModulWindowLayout::DockaWindow( DockingWindow* pDockingWindow ) // evtl. Sonderbehandlung... ArrangeWindows(); } -#ifndef PRODUCT +#ifdef DBG_UTIL else DBG_ERROR( "Wer will sich denn hier andocken ?" ); #endif @@ -1652,13 +1652,8 @@ void ModulWindowLayout::DataChanged(DataChangedEvent const & rDCEvt) } // virtual -void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint) +void ModulWindowLayout::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - (void)rBc; - - if (rHint.ISA(SfxSimpleHint) - && (static_cast< SfxSimpleHint const & >(rHint).GetId() - == SFX_HINT_COLORS_CHANGED)) { Color aColor(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER). nColor); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 7c9fd764cef0..7b7655737ae8 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -48,7 +48,7 @@ class SvxSearchItem; #endif #include <basic/sbmod.hxx> #include <vcl/split.hxx> -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include <svtools/colorcfg.hxx> #include <sfx2/progress.hxx> @@ -58,6 +58,10 @@ DBG_NAMEEX( ModulWindow ) #define MARKER_NOMARKER 0xFFFF +namespace utl +{ + class SourceViewConfig; +}; // #108672 Helper functions to get/set text in TextEngine // using the stream interface (get/setText() only supports @@ -108,13 +112,13 @@ namespace svt { class SourceViewConfig; } -class EditorWindow : public Window, public SfxListener +class EditorWindow : public Window, public SfxListener, public utl::ConfigurationListener { private: ExtTextView* pEditView; ExtTextEngine* pEditEngine; - svt::SourceViewConfig* pSourceViewConfig; + utl::SourceViewConfig* pSourceViewConfig; long nCurTextWidth; @@ -151,6 +155,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ); virtual void LoseFocus(); virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); void DoSyntaxHighlight( ULONG nPara ); String GetWordAtCursor(); @@ -442,7 +447,7 @@ public: void SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; } }; -class ModulWindowLayout: public Window, public SfxListener +class ModulWindowLayout: public Window, public utl::ConfigurationListener { private: @@ -465,8 +470,7 @@ private: virtual void DataChanged(DataChangedEvent const & rDCEvt); - using Window::Notify; - virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); void updateSyntaxHighlighting(); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 27dce8dccc2f..efebad44adfe 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -32,7 +32,7 @@ #include "precompiled_basctl.hxx" -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #define _BASIC_TEXTPORTIONS #include <basic/sbdef.hxx> #include <ide_pch.hxx> @@ -40,7 +40,7 @@ #include <tools/urlobj.hxx> #include <unotools/charclass.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <basic/sbx.hxx> #include <vcl/sound.hxx> #include <svtools/xtextedt.hxx> @@ -62,7 +62,7 @@ //#ifndef _SFX_HELP_HXX //autogen //#include <sfx2/sfxhelp.hxx> //#endif -#include <svtools/sourceviewconfig.hxx> +#include <unotools/sourceviewconfig.hxx> #ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_ #include <com/sun/star/script/XLibraryContainer2.hpp> @@ -172,7 +172,7 @@ EditorWindow::EditorWindow( Window* pParent ) : pModulWindow = 0; pEditView = 0; pEditEngine = 0; - pSourceViewConfig = new svt::SourceViewConfig; + pSourceViewConfig = new utl::SourceViewConfig; bHighlightning = FALSE; pProgress = 0; nCurTextWidth = 0; @@ -181,15 +181,14 @@ EditorWindow::EditorWindow( Window* pParent ) : SetPointer( Pointer( POINTER_TEXT ) ); SetHelpId( HID_BASICIDE_EDITORWINDOW ); - - StartListening( *pSourceViewConfig ); + pSourceViewConfig->AddListener(this); } __EXPORT EditorWindow::~EditorWindow() { - EndListening( *pSourceViewConfig ); + pSourceViewConfig->RemoveListener(this); delete pSourceViewConfig; aSyntaxIdleTimer.Stop(); @@ -662,7 +661,7 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt) } } -void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) +void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if ( rHint.ISA( TextHint ) ) { @@ -718,10 +717,11 @@ void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) DoDelayedSyntaxHighlight( rTextHint.GetValue() ); } } - else if ( &rBC == pSourceViewConfig ) - { - ImplSetFont(); - } +} + +void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) +{ + ImplSetFont(); } void EditorWindow::SetScrollBarRanges() diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index b821c7ca51c6..044c61d5cc21 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -36,7 +36,7 @@ #define GLOBALOVERFLOW2 #include <basic/sbx.hxx> #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <ide_pch.hxx> #define _SOLAR__PRIVATE 1 diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index e6b147cc46c8..2d2e0f6a5693 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -52,7 +52,7 @@ #define _SOLAR__PRIVATE 1 #include <basic/sbx.hxx> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #include <tools/diagnose_ex.h> #include <basidesh.hrc> #include <basidesh.hxx> diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index e4abb3fad92e..f7ddd62e144a 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -36,7 +36,7 @@ #include <vector> #include <algorithm> #include <basic/sbx.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <basobj.hxx> diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 8ef06af7dc25..a1887e0ea7a0 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -36,7 +36,7 @@ #include <vector> #include <algorithm> #include <basic/sbx.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <iderdll.hxx> #include <iderdll2.hxx> diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index d10bdbc0e7f2..ce96ca3892a9 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -37,7 +37,7 @@ #define _SVICNVW_HXX #include <svtools/svtreebx.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <basic/sbstar.hxx> #include <sbxitem.hxx> #include "basobj.hxx" diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc index aaf243b5475a..1fcfc9286cff 100644 --- a/basctl/source/basicide/brkdlg.hrc +++ b/basctl/source/basicide/brkdlg.hrc @@ -30,7 +30,7 @@ #ifndef _BRKDLG_HRC #define _BRKDLG_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_BASICIDE_BREAKPOINTDLG ( RID_BASICIDE_START + 80 ) diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx index 4029e45fe082..9f294b87577d 100644 --- a/basctl/source/basicide/ide_pch.hxx +++ b/basctl/source/basicide/ide_pch.hxx @@ -33,11 +33,11 @@ #include <vcl/msgbox.hxx> #include <vcl/menu.hxx> -#include <svtools/svarray.hxx> -#include <svtools/itemset.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/svarray.hxx> +#include <svl/itemset.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> #define _BASIC_TEXTPORTIONS #include <basic/sbdef.hxx> diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index cf8ed498d474..5f2ed2301758 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -41,7 +41,7 @@ #include <sfx2/genlink.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <iderdll.hxx> #include <iderdll2.hxx> #include <iderid.hxx> diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc index 6702af8febab..23005cddd294 100644 --- a/basctl/source/basicide/macrodlg.hrc +++ b/basctl/source/basicide/macrodlg.hrc @@ -30,7 +30,7 @@ #ifndef _MACRODLG_HRC #define _MACRODLG_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_MACROCHOOSER ( RID_BASICIDE_START + 50 ) #define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 ) diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index f0143cc8517b..ea5f7cec9878 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -72,7 +72,7 @@ #include "com/sun/star/ucb/XCommandEnvironment.hpp" #include <com/sun/star/ucb/NameClash.hpp> #include "com/sun/star/packages/manifest/XManifestWriter.hpp" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/util/VetoException.hpp> diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc index 88f167167d42..755e382cf618 100644 --- a/basctl/source/basicide/moduldlg.hrc +++ b/basctl/source/basicide/moduldlg.hrc @@ -30,7 +30,7 @@ #ifndef _MODULDLG_HRC #define _MODULDLG_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_STR_LIB 1 #define RID_TRLBOX 2 diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc index a03a90c2d59a..ca1e43e080fb 100644 --- a/basctl/source/basicide/moptions.hrc +++ b/basctl/source/basicide/moptions.hrc @@ -30,7 +30,7 @@ #ifndef _MOPTIONS_HRC #define _MOPTIONS_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_MACROOPTIONS ( RID_BASICIDE_START + 55 ) diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc index 7004541ea465..490a38a5c8fd 100644 --- a/basctl/source/basicide/objdlg.hrc +++ b/basctl/source/basicide/objdlg.hrc @@ -30,7 +30,7 @@ #ifndef _OBJDLG_HRC #define _OBJDLG_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 ) #define RID_FT_MACRODESCR 8 diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index b9ffe708e6fa..a87ad521c2f5 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -70,7 +70,7 @@ #include <xmlscript/xmldlg_imexp.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx index e2af9e0346a1..b23f540f2c10 100644 --- a/basctl/source/basicide/tbxctl.cxx +++ b/basctl/source/basicide/tbxctl.cxx @@ -42,7 +42,7 @@ #include <tbxctl.hrc> #include <idetemp.hxx> #include <sfx2/imagemgr.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <vcl/toolbox.hxx> using namespace ::com::sun::star::uno; diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc index 1811614d9d37..b26570b5b8bf 100644 --- a/basctl/source/basicide/tbxctl.hrc +++ b/basctl/source/basicide/tbxctl.hrc @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_TBXCONTROLS ( RID_BASICIDE_START + 65 ) #define RID_TOOLBOX ( RID_BASICIDE_START + 66 ) diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 6d1080ed659b..423ef39079a0 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -46,7 +46,7 @@ #include <iderdll.hxx> #include <vcl/scrbar.hxx> #include <tools/shl.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <sfx2/viewfrm.hxx> #ifndef _SVX_SVXIDS_HRC diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 8552f9f09e10..db446d479ead 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -37,7 +37,7 @@ #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> #include <tools/link.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <vector> diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 45eace9f6137..4c361d4545f5 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -36,7 +36,7 @@ #endif #include <bastypes.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/lstbox.hxx> diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index c917de5a6dee..a2911dcccb8f 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -32,7 +32,7 @@ #include "scriptdocument.hxx" #include <tools/string.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_ #include <com/sun/star/io/XInputStreamProvider.hpp> diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 908331b0ad63..9a75e80a53e2 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -38,8 +38,8 @@ #include <tools/link.hxx> #include <tools/gen.hxx> #include <vcl/timer.hxx> -#include <svtools/hint.hxx> -#include <svtools/brdcst.hxx> +#include <svl/hint.hxx> +#include <svl/brdcst.hxx> #define DLGED_PAGE_WIDTH_MIN 1280 #define DLGED_PAGE_HEIGHT_MIN 1024 diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc index 928434749862..b92be11b286f 100644 --- a/basctl/source/inc/dlgresid.hrc +++ b/basctl/source/inc/dlgresid.hrc @@ -33,7 +33,7 @@ // include ----------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // Dialog Control Id's ----------------------------------------------------------- diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 8e3fa615d960..f9be90b38b4b 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -37,8 +37,8 @@ #include <com/sun/star/frame/XFrame.hpp> #include <comphelper/composedprops.hxx> #include <sfx2/basedlgs.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <sfx2/childwin.hxx> #include <svx/svdmark.hxx> diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index 654e283128fb..b1192b51d9bf 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -31,7 +31,7 @@ #define _SBXITEM_HXX #include "scriptdocument.hxx" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> const USHORT BASICIDE_TYPE_UNKNOWN = 0; const USHORT BASICIDE_TYPE_SHELL = 1; diff --git a/crashrep/source/unx/res.cxx b/crashrep/source/unx/res.cxx index 63910d606a09..54968bb2259d 100755 --- a/crashrep/source/unx/res.cxx +++ b/crashrep/source/unx/res.cxx @@ -28,13 +28,6 @@ * ************************************************************************/ -#if OSL_DEBUG_LEVEL == 0 -# ifndef NDEBUG -# define NDEBUG -# endif -#endif -#include <assert.h> - #include <interface.hxx> #include <cstdio> #include <hash_map> @@ -49,7 +42,7 @@ static string getResFileName( const char* progname ) string aRet = progname; size_t pos = aRet.rfind( '/' ); // FIXME: search PATH if necessary - assert( pos != string::npos ); + OSL_ASSERT( pos != string::npos ); aRet.erase( pos ); aRet.append( "/resource/crash_dump.res" ); diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index 6af1dc5b04fb..f763ce8f81c6 100644 --- a/extensions/inc/extensio.hrc +++ b/extensions/inc/extensio.hrc @@ -30,7 +30,7 @@ #ifndef EXTENSIONS_INC_EXTENSIO_HRC #define EXTENSIONS_INC_EXTENSIO_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // ----------------------------------------------------------------------- // - resource id areas diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx index 45763b2dccdb..dc490b49c28e 100644 --- a/extensions/inc/pch/precompiled_extensions.hxx +++ b/extensions/inc/pch/precompiled_extensions.hxx @@ -507,11 +507,11 @@ -#include "svtools/filenotation.hxx" +#include "svl/filenotation.hxx" #include "svtools/imgdef.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" -#include "svtools/numuno.hxx" +#include "unotools/moduleoptions.hxx" +#include "svl/numuno.hxx" #include "svx/flagsdef.hxx" diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 4ea4cd755658..1489e2a4e0e4 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -1,4 +1,5 @@ -ex extensions : l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc uui officecfg ZLIB:zlib NULL +ex extensions : officecfg l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib NULL + ex extensions usr1 - all ex_mkout NULL ex extensions\inc nmake - all ex_inc NULL ex extensions\inc\ucbhelper get - all ex_incucbh ex_inc NULL 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.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 43d8c7af5889..efc79f53744d 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..e6f4aebee5dd 100644 --- a/extensions/source/propctrlr/formhelpid.hrc +++ b/extensions/source/propctrlr/formhelpid.hrc @@ -32,10 +32,10 @@ #define _EXTENSIONS_FORMCTRLR_FORMHELPID_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif -// TODO: create a new help id range in <svtools/solar.hrc> +// TODO: create a new help id range in <svl/solar.hrc> // at the moment, the help ids are ripped from svx/inc/fmhelper.hrc // (the old property browser was implemented in svx) 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> //........................................................................ diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx index 9aa0ee22f794..80ebe1dd9f13 100644 --- a/extensions/test/sax/testsax.cxx +++ b/extensions/test/sax/testsax.cxx @@ -43,11 +43,6 @@ #include <tools/string.hxx> #include <vos/conditn.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> - #include <smart/com/sun/star/io/XOutputStream.hxx> #include <smart/com/sun/star/xml/sax/SAXParseException.hxx> #include <smart/com/sun/star/xml/sax/XParser.hxx> @@ -309,12 +304,12 @@ Sequence< UString > OSaxParserTest::getWarnings(void) THRO XInputStreamRef createStreamFromSequence( const Sequence<BYTE> seqBytes , XMultiServiceFactoryRef &xSMgr ) { XInterfaceRef xOutStreamService = xSMgr->createInstance( L"com.sun.star.io.Pipe" ); - assert( xOutStreamService.is() ); + OSL_ASSERT( xOutStreamService.is() ); XOutputStreamRef rOutStream( xOutStreamService , USR_QUERY ); - assert( rOutStream.is() ); + OSL_ASSERT( rOutStream.is() ); XInputStreamRef rInStream( xOutStreamService , USR_QUERY ); - assert( rInStream.is() ); + OSL_ASSERT( rInStream.is() ); rOutStream->writeBytes( seqBytes ); rOutStream->flush(); @@ -442,7 +437,7 @@ public: // ExtendedDocumentHandler } virtual void endElement(const UString& aName) THROWS( (SAXException,UsrSystemException) ) { - assert( m_iLevel ); + OSL_ASSERT( m_iLevel ); m_iLevel --; if( m_bPrint ) { int i; diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx index e27601c92d34..b4ab9d3f73ea 100644 --- a/extensions/test/sax/testwriter.cxx +++ b/extensions/test/sax/testwriter.cxx @@ -50,11 +50,6 @@ #include <usr/weak.hxx> #include <tools/string.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> - #include <usr/factoryhlp.hxx> #include <usr/reflserv.hxx> // for EXTERN_SERVICE_CALLTYPE @@ -401,7 +396,7 @@ void AttributeListImpl::clear() vector<struct TagAttribute> dummy; m_pImpl->vecAttribute.swap( dummy ); - assert( ! getLength() ); + OSL_ASSERT( ! getLength() ); } diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index 5edc414e7f2c..be302d877432 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -52,10 +52,6 @@ #include <vos/mutex.hxx> #include <vos/thread.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> #include <string.h> #include "testfactreg.hxx" @@ -206,13 +202,13 @@ INT32 ODataStreamTest::test( const UString& TestName, x->queryInterface( XActiveDataSource::getSmartUik() , rSource ); } - assert( rPipeInput.is() ); - assert( rPipeOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); rSink->setInputStream( rPipeInput ); rSource->setOutputStream( rPipeOutput ); - assert( rSink->getInputStream().is() ); - assert( rSource->getOutputStream().is() ); + OSL_ASSERT( rSink->getInputStream().is() ); + OSL_ASSERT( rSource->getOutputStream().is() ); if( 1 == hTestHandle ) { testSimple( rInput , rOutput ); @@ -767,10 +763,10 @@ INT32 OObjectStreamTest::test( const UString& TestName, XOutputStreamRef markableOutput( x , USR_QUERY ); XActiveDataSourceRef markableSource( x , USR_QUERY ); - assert( markableInput.is() ); - assert( markableOutput.is() ); - assert( markableSink.is() ); - assert( markableSource.is() ); + OSL_ASSERT( markableInput.is() ); + OSL_ASSERT( markableOutput.is() ); + OSL_ASSERT( markableSink.is() ); + OSL_ASSERT( markableSource.is() ); markableSink->setInputStream( rPipeInput ); markableSource->setOutputStream( rPipeOutput ); @@ -786,14 +782,14 @@ INT32 OObjectStreamTest::test( const UString& TestName, x->queryInterface( XActiveDataSource::getSmartUik() , rSource ); } - assert( rPipeInput.is() ); - assert( rPipeOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); rSink->setInputStream( markableInput ); rSource->setOutputStream( markableOutput ); - assert( rSink->getInputStream().is() ); - assert( rSource->getOutputStream().is() ); + OSL_ASSERT( rSink->getInputStream().is() ); + OSL_ASSERT( rSource->getOutputStream().is() ); if( 1 + DATASTREAM_TEST_MAX_HANDLE == hTestHandle ) { testObject( rOutput , rInput); diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index 8bba9bbebc86..2cc19c2ae265 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.cxx @@ -48,10 +48,6 @@ #include <vos/mutex.hxx> #include <vos/thread.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> #include <string.h> #include "testfactreg.hxx" @@ -166,8 +162,8 @@ INT32 OMarkableOutputStreamTest::test( const UString& TestName, XOutputStreamRef rOutput( TestObject , USR_QUERY ); - assert( rPipeInput.is() ); - assert( rOutput.is() ); + OSL_ASSERT( rPipeInput.is() ); + OSL_ASSERT( rOutput.is() ); if( 1 == hTestHandle ) { // checks usual streaming testSimple( rOutput , rPipeInput ); @@ -533,8 +529,8 @@ INT32 OMarkableInputStreamTest::test( const UString& TestName, XInputStreamRef rInput( TestObject , USR_QUERY ); - assert( rPipeOutput.is() ); - assert( rInput.is() ); + OSL_ASSERT( rPipeOutput.is() ); + OSL_ASSERT( rInput.is() ); if( 1 == hTestHandle ) { // checks usual streaming testSimple( rPipeOutput , rInput ); diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx index 4f4337ceff45..233979230708 100644 --- a/extensions/test/stm/pipetest.cxx +++ b/extensions/test/stm/pipetest.cxx @@ -45,10 +45,6 @@ #include <vos/mutex.hxx> #include <vos/thread.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> #include <string.h> #include "testfactreg.hxx" @@ -404,7 +400,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r ) XInputStreamRef input( x , USR_QUERY ); XOutputStreamRef output( x , USR_QUERY ); - assert( output.is() ); + OSL_ASSERT( output.is() ); while( TRUE ) { // basic read/write Sequence<BYTE> seqWrite( 500 ); diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index ad38869c4c38..9cb61f00b3e8 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -44,10 +44,6 @@ #include <usr/weak.hxx> #include <tools/string.hxx> #include <vos/conditn.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> using namespace rtl; using namespace vos; @@ -302,7 +298,7 @@ void TestListener::cmdLine() void TestListener::detach() { - assert( m_pDebuggingRef ); + OSL_ASSERT( m_pDebuggingRef ); m_pDebuggingRef = 0; } @@ -322,15 +318,15 @@ void checkInvokation( const XInvokationRef &xInvoke ) UsrAny anyList; // check exporting an object as an invokation - assert( xInvoke->hasProperty( L"list" ) ); + OSL_ASSERT( xInvoke->hasProperty( L"list" ) ); anyList = xInvoke->getValue( L"list" ); - assert( anyList.getReflection() == XInvokation_getReflection() ); + OSL_ASSERT( anyList.getReflection() == XInvokation_getReflection() ); XInvokationRef *pRef = ( XInvokationRef * ) anyList.get(); - assert( (*pRef).is() ); + OSL_ASSERT( (*pRef).is() ); - assert( (*pRef)->hasMethod( L"append" ) ); - assert( (*pRef)->hasMethod( L"count" ) ); + OSL_ASSERT( (*pRef)->hasMethod( L"append" ) ); + OSL_ASSERT( (*pRef)->hasMethod( L"count" ) ); Sequence<UsrAny> seq(1); UsrAny any( (INT32) 1); @@ -342,7 +338,7 @@ void checkInvokation( const XInvokationRef &xInvoke ) any = (*pRef)->invoke( L"append" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); any = (*pRef)->invoke( L"count" , seq , Sequence<INT16>(), Sequence<UsrAny>() ); - assert( nOldSize + 1 == any.getINT32() ); + OSL_ASSERT( nOldSize + 1 == any.getINT32() ); } // just for testing ! @@ -448,30 +444,30 @@ int __LOADONCALLAPI main (int argc, char **argv) *****/ // get/set an int ! { - assert( xInvoke->hasProperty( L"nIntTest" ) ); + OSL_ASSERT( xInvoke->hasProperty( L"nIntTest" ) ); UsrAny any = xInvoke->getValue( L"nIntTest" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 5 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 5 ); // simple test: set an int ! xInvoke->setValue( L"nIntTest" , UsrAny( (INT32) 10 ) ); any = xInvoke->getValue( L"nIntTest" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 10 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 10 ); } // call a python method ! { xEngine->run( L"def foo():\n" L" return 'this is foo'\n" , XInterfaceRef() , Sequence<UsrAny> () ); - assert( xInvoke->hasMethod( L"foo" ) ); + OSL_ASSERT( xInvoke->hasMethod( L"foo" ) ); UsrAny any = xInvoke->invoke( L"foo" , Sequence<UsrAny>(), Sequence<INT16>() , Sequence<UsrAny> () ); - assert( any.getString() == L"this is foo" ); + OSL_ASSERT( any.getString() == L"this is foo" ); } @@ -480,7 +476,7 @@ int __LOADONCALLAPI main (int argc, char **argv) try { xInvoke->invoke( L"foo" , Sequence<UsrAny>(1) , Sequence<INT16>(), Sequence<UsrAny> () ); // wrong number of arguments - assert( 0 ); + OSL_ASSERT( 0 ); } catch ( IllegalArgumentException& e ) { } @@ -501,21 +497,21 @@ int __LOADONCALLAPI main (int argc, char **argv) *******/ { XIntrospectionAccessRef xIntrospection = xInvoke->getIntrospection(); - assert( xIntrospection.is() ); + OSL_ASSERT( xIntrospection.is() ); // no further test, simply call them xIntrospection->getMethods(0); xIntrospection->getProperties(0); - assert( xIntrospection->getSuppliedMethodConcepts() == 0 ); - assert( xIntrospection->getSuppliedPropertyConcepts() == 0 ); + OSL_ASSERT( xIntrospection->getSuppliedMethodConcepts() == 0 ); + OSL_ASSERT( xIntrospection->getSuppliedPropertyConcepts() == 0 ); Property prop = xIntrospection->getProperty( L"nIntTest" ,0 ); - assert( prop.Name == L"nIntTest" ); - assert( prop.Type->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( prop.Name == L"nIntTest" ); + OSL_ASSERT( prop.Type->getTypeClass() == TypeClass_LONG ); XIdlMethodRef method = xIntrospection->getMethod( L"foo" , 0 ); - assert( method->getName() == L"foo" ); + OSL_ASSERT( method->getName() == L"foo" ); } @@ -567,8 +563,8 @@ int __LOADONCALLAPI main (int argc, char **argv) xEngine->run( L"import testmodul\n" L"x = testmodul.testmethod()\n" , XInterfaceRef() , Sequence<UsrAny>() ); UsrAny any = xInvoke->getValue( L"x" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 42 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 42 ); } // check other imports @@ -577,11 +573,11 @@ int __LOADONCALLAPI main (int argc, char **argv) xEngine->run( L"import math\n" L"dMathTest = math.exp(0)\n" , XInterfaceRef() , Sequence<UsrAny> () ); - assert( xInvoke->hasProperty( L"dMathTest" ) ); + OSL_ASSERT( xInvoke->hasProperty( L"dMathTest" ) ); UsrAny any = xInvoke->getValue( L"dMathTest" ); - assert( any.getReflection()->getTypeClass() == TypeClass_DOUBLE ); - assert( any.getDouble() == 1. ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_DOUBLE ); + OSL_ASSERT( any.getDouble() == 1. ); } // Test connection to root object ! @@ -592,36 +588,36 @@ int __LOADONCALLAPI main (int argc, char **argv) L"z = y.value\n" , XInterfaceRef() , Sequence<UsrAny> () ); UsrAny any = xInvoke->getValue( L"x" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 15 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 15 ); any = xInvoke->getValue( L"z" ); - assert( any.getReflection()->getTypeClass() == TypeClass_LONG ); - assert( any.getINT32() == 15 ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_LONG ); + OSL_ASSERT( any.getINT32() == 15 ); } // Test exactName interface { UsrAny any = xInvoke->getValue( L"__builtins__" ); - assert( any.getReflection()->getTypeClass() == TypeClass_INTERFACE ); + OSL_ASSERT( any.getReflection()->getTypeClass() == TypeClass_INTERFACE ); XInvokationRef rInv( *((XInterfaceRef *) any.get() ), USR_QUERY ); - assert( rInv.is() ); + OSL_ASSERT( rInv.is() ); XExactNameRef rName( *((XInterfaceRef*) any.get() ), USR_QUERY ); - assert( rName.is() ); + OSL_ASSERT( rName.is() ); UString str = rName->getExactName( L"SYNTAXERROR" ); - assert( str.len() ); + OSL_ASSERT( str.len() ); } // Test exactName interface of the engine itself { XExactNameRef rName( xInvoke , USR_QUERY ); - assert( rName.is() ); + OSL_ASSERT( rName.is() ); UString str = rName->getExactName( L"STARDIV" ); - assert( str.len() ); + OSL_ASSERT( str.len() ); } diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index 5e2efff66f26..796884dff8aa 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -45,10 +45,6 @@ #include <usr/weak.hxx> #include <tools/string.hxx> #include <vos/conditn.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> using namespace rtl; using namespace vos; @@ -453,7 +449,7 @@ void CmdDebugger::dumpVarToStream( const char *pc , const UsrAny &aValue, FILE * void CmdDebugger::detach() { - assert( m_pDebuggingRef ); + OSL_ASSERT( m_pDebuggingRef ); m_bIsRunning = FALSE; m_pDebuggingRef = 0; diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 869f5331752e..08d8af4831b8 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -52,11 +52,6 @@ #include <tools/string.hxx> #include <vos/conditn.hxx> -#if OSL_DEBUG_LEVEL == 0 -#define NDEBUG -#endif -#include <assert.h> - #include <smart/com/sun/star/test/XSimpleTest.hxx> using namespace rtl; @@ -84,7 +79,7 @@ int __LOADONCALLAPI main (int argc, char **argv) // create service manager // XMultiServiceFactoryRef xSMgr = getProcessServiceManager(); XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); - assert( xSMgr.is() ); + OSL_ASSERT( xSMgr.is() ); registerUsrServices( xSMgr ); setProcessServiceManager( xSMgr ); @@ -98,9 +93,9 @@ int __LOADONCALLAPI main (int argc, char **argv) x->queryInterface( XImplementationRegistration::getSmartUik() , xReg ); /* x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" ); - assert( x.is() ); + OSL_ASSERT( x.is() ); x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg ); - assert( xSimpleReg.is() ); + OSL_ASSERT( xSimpleReg.is() ); xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE ); */ } catch( Exception& e ) { diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index 734020cc1613..402323630361 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -335,15 +335,15 @@ #include "svtools/cliplistener.hxx" #include "svtools/imageresourceaccess.hxx" -#include "svtools/inetstrm.hxx" -#include "svtools/inettype.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemset.hxx" -#include "svtools/languageoptions.hxx" -#include "svtools/lingucfg.hxx" -#include "svtools/numuno.hxx" -#include "svtools/poolitem.hxx" -#include "svtools/solar.hrc" +#include "svl/inetstrm.hxx" +#include "svl/inettype.hxx" +#include "svl/itempool.hxx" +#include "svl/itemset.hxx" +#include "svl/languageoptions.hxx" +#include "unotools/lingucfg.hxx" +#include "svl/numuno.hxx" +#include "svl/poolitem.hxx" +#include "svl/solar.hrc" #include "svtools/transfer.hxx" #include "svx/editdata.hxx" diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 3a4182b82c99..4e59eecd0365 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms : l10n svx sfx2 ucb configmgr fileaccess QADEVOOO:qadevOOo NULL +fm forms : l10n svx sfx2 QADEVOOO:qadevOOo NULL fm forms usr1 - all fm_mkofrm NULL fm forms\inc nmake - all fm_inc NULL fm forms\source\inc get - all fm_sinc NULL diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 1b19b794d273..28fb27c94958 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -34,7 +34,7 @@ #include <tools/debug.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/svapp.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> //......................................................................... namespace frm diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 96412feed10a..cc5cf9ee7a27 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -81,8 +81,8 @@ #include <osl/mutex.hxx>
#include <rtl/math.hxx>
#include <rtl/tencinfo.h>
-#include <svtools/inetstrm.hxx>
-#include <svtools/inettype.hxx>
+#include <svl/inetstrm.hxx>
+#include <svl/inettype.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/fsys.hxx>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index bc0e952f1735..9fd440ffa460 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -42,8 +42,8 @@ #include <comphelper/numbers.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/numuno.hxx> +#include <svl/zforlist.hxx> +#include <svl/numuno.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <vcl/wintypes.hxx> diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 5d30c2776659..47391b390958 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -65,7 +65,7 @@ #include <comphelper/extract.hxx> #include <comphelper/guarding.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #include <memory> diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc index b446914fd114..c25ca4f2b6e4 100644 --- a/forms/source/inc/frm_resource.hrc +++ b/forms/source/inc/frm_resource.hrc @@ -32,7 +32,7 @@ #define _FRM_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //------------------------------------------------------------------------------ diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index aa2df00e28c5..b3369b865475 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -39,7 +39,7 @@ //--------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //......................................................................... diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index 68a3660d65e1..9f6c4c15ed68 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -32,8 +32,8 @@ #include "precompiled_forms.hxx" #include "parametrizedattributedispatcher.hxx" #include <svx/editview.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 43f784f2219c..76973f5e0348 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -51,8 +51,8 @@ #include <svx/svxids.hrc> #include <svx/editview.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <sfx2/msgpool.hxx> //-------------------------------------------------------------------------- diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index b13a6eebc94b..b87d6260b723 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "richtextengine.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/eeitem.hxx> #include <svx/editobj.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT @@ -44,8 +44,8 @@ #include <vcl/mapunit.hxx> #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> -#include <svtools/lingucfg.hxx> -#include <svtools/undo.hxx> +#include <unotools/lingucfg.hxx> +#include <svl/undo.hxx> #include <vos/mutex.hxx> #include <algorithm> diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index bcfb0fc2ad35..f85bab638499 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -43,8 +43,8 @@ #include <svx/scripttypeitem.hxx> #include <svx/editobj.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <vcl/mapunit.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index f3c56cc6cd88..495a85c02162 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -32,9 +32,9 @@ #include "precompiled_forms.hxx" #include "richtextvclcontrol.hxx" #include "richtextimplcontrol.hxx" -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/languageoptions.hxx> #if OSL_DEBUG_LEVEL > 0 #ifndef _TOOLS_TEMPFILE_HXX #include <tools/tempfile.hxx> diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 8760a59bc180..d1090b82d914 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -36,8 +36,8 @@ #include <svx/svxids.hrc> #endif #include <svx/eeitem.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <vcl/mapunit.hxx> #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index 3cc79ad7bef3..d5874ea566c2 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -33,7 +33,7 @@ #include <tools/solar.h> #include <sal/types.h> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //........................................................................ namespace frm diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst index 46272c68b69f..65e8459bea3f 100644 --- a/lingucomponent/prj/build.lst +++ b/lingucomponent/prj/build.lst @@ -1,4 +1,4 @@ -lc lingucomponent : linguistic libtextcat svtools hyphen HUNSPELL:hunspell NULL +lc lingucomponent : linguistic libtextcat svl hyphen HUNSPELL:hunspell NULL lc lingucomponent usr1 - all lc_mkout NULL lc lingucomponent\inc nmake - all lc_inc NULL lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index b24bc6ee80f5..69390656d40e 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -39,8 +39,8 @@ #include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/registry/XRegistryKey.hpp> #include <i18npool/mslangid.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include <tools/debug.hxx> #include <unotools/processfactory.hxx> #include <osl/mutex.hxx> @@ -57,9 +57,9 @@ #include <rtl/ustrbuf.hxx> #include <linguistic/lngprops.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> +#include <unotools/lingucfg.hxx> #include <osl/file.hxx> #include "dictmgr.hxx" diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index bd2c29430f76..fd3e123e1d26 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <unotools/localfilehelper.hxx> #include <osl/thread.h> diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index d32af21f7e7a..2e00035628bc 100644 --- a/lingucomponent/source/lingutil/lingutil.cxx +++ b/lingucomponent/source/lingutil/lingutil.cxx @@ -49,8 +49,8 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/lingucfg.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/pathoptions.hxx> #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <linguistic/misc.hxx> diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx index d1d8103eedd5..7244a4988236 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx @@ -46,8 +46,8 @@ //#include <linguistic/lngprops.hxx> #include <linguistic/spelldta.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> #include <osl/file.hxx> #include <rtl/ustrbuf.hxx> diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk index ac3ac3b7d3a0..e4bf1d88d220 100644 --- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk +++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk @@ -71,9 +71,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(VOSLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ $(SVLLIB) \ - $(VCLLIB) \ $(SALLIB) \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk index 623ade9f3f3c..cbc41c00633b 100644 --- a/lingucomponent/source/spellcheck/spell/makefile.mk +++ b/lingucomponent/source/spellcheck/spell/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 @@ -65,6 +65,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(I18NISOLANGLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(SVLLIB) \ $(SALLIB) \ $(LNGLIB) \ diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index ed1ddf4ca77b..1a92db58a4dc 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -50,9 +50,9 @@ #include <linguistic/lngprops.hxx> #include <linguistic/spelldta.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/lingucfg.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/lingucfg.hxx> +#include <unotools/useroptions.hxx> #include <osl/file.hxx> #include <rtl/ustrbuf.hxx> diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 1ecba30bcb8c..c526d2b07444 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -41,8 +41,8 @@ #include <tools/debug.hxx> #include <unotools/processfactory.hxx> #include <osl/mutex.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/lingucfg.hxx> #include <rtl/string.hxx> #include <rtl/ustrbuf.hxx> diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 8835ff0d6ad2..fd3c4bb1f612 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -1,4 +1,4 @@ -pk setup_native : transex3 soltools sal xml2cmp NULL +pk setup_native : transex3 soltools xml2cmp sal unoil officecfg NULL pk setup_native usr1 - all sn_mkout NULL pk setup_native\scripts\source nmake - u sn_source NULL pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 8fb05fdaa895..88dd1b9a592d 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -39,7 +39,7 @@ #include <vcl/tabpage.hxx> #include <svtools/stdctrl.hxx> #include <svx/simptabl.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> namespace com { namespace sun { diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index dde41a4ac636..5882bdbafd4a 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -53,7 +53,7 @@ #include <com/sun/star/ucb/Command.hpp> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <com/sun/star/security/CertificateValidity.hpp> #include <com/sun/star/security/SerialNumberAdapter.hpp> #include <ucbhelper/contentbroker.hxx> diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index cf07edb7023e..b4df02bb2e78 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -88,6 +88,8 @@ namespace { sal_Int16 m_nODF; public: + virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); SaveODFItem(); //See group ODF in Common.xcs bool isLessODF1_2() @@ -96,6 +98,9 @@ namespace } }; +void SaveODFItem::Commit() {} +void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {} + SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Save"))), m_nODF(0) { diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc index 8d7e082cea6b..c0f9f4cd3dcb 100644 --- a/xmlsecurity/source/dialogs/helpids.hrc +++ b/xmlsecurity/source/dialogs/helpids.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include <svtools/solar.hrc> +#include <svl/solar.hrc> // Help-Ids -------------------------------------------------------------- diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 9d469a53a479..a1d48344820a 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/security/SerialNumberAdapter.hpp> #include <comphelper/sequence.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/pickerhelper.hxx> +#include <svl/pickerhelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index 693d003b0d77..f1b47c3f0f0d 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -36,8 +36,8 @@ #include <vcl/svapp.hxx> #include <vcl/fixed.hxx> #include <svtools/stdctrl.hxx> -#include <svtools/solar.hrc> -#include <svtools/syslocale.hxx> +#include <svl/solar.hrc> +#include <unotools/syslocale.hxx> #include <rtl/ustring.h> #include <rtl/ustrbuf.h> #include <vector> diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx index c0f2db15eff7..bc5747ed3c88 100644 --- a/xmlsecurity/source/dialogs/stbcontrl.cxx +++ b/xmlsecurity/source/dialogs/stbcontrl.cxx @@ -41,14 +41,14 @@ #endif #include <vcl/image.hxx> //#ifndef _SFXITEMPOOL_HXX -//#include <svtools/itempool.hxx> +//#include <svl/itempool.hxx> //#endif #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <xmlsecurity/stbcontrl.hxx> |