diff options
Diffstat (limited to 'extensions')
43 files changed, 141 insertions, 153 deletions
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index ee84e9a560f6..532e9b664c9b 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 ranges 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/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index 7db1c67e1585..9c10fadadb06 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -35,6 +35,9 @@ END_OBJECT_MAP() #ifndef KEY_WOW64_64KEY #define KEY_WOW64_64KEY (0x0100) #endif +#ifndef KEY_WOW64_32KEY + #define KEY_WOW64_32KEY (0x0200) +#endif const REGSAM n64KeyAccess = KEY_ALL_ACCESS | KEY_WOW64_64KEY; const REGSAM n32KeyAccess = KEY_ALL_ACCESS; @@ -46,7 +49,9 @@ const BOOL bX64 = FALSE; #endif // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502. +extern "C" { WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); +} ///////////////////////////////////////////////////////////////////////////// // DLL Entry Point 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 a554741c666a..03cdb8a80201 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 1d322a9b383f..5a95f61f50c1 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 468fbf5837db..1db38bcb647b 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/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index df23100e3859..92bcab19bd59 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -310,7 +310,8 @@ char* NSP_getProductName() char *pEnd = 0; while(!feof(fp)) { - fgets( line, sizeof(line), fp ); + if (fgets( line, sizeof(line), fp ) == NULL) + continue; if (NULL == (pStart = strstr( line, "ProductKey=" ))) continue; pStart += strlen("ProductKey="); 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/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index e965a5696f94..c3ba2a4fd605 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -102,8 +102,13 @@ NPNetscapeFuncs aNPNFuncs = NPN_MemFree, NPN_MemFlush, NPN_ReloadPlugins, +#ifdef OJI NPN_GetJavaEnv, NPN_GetJavaPeer, +#else + 0, + 0, +#endif NPN_GetURLNotify, NPN_PostURLNotify, NPN_GetValue, diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 1f1d291daf8d..bce8cd76a7ac 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -175,6 +175,12 @@ static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rD return nDescriptions > 0; } +union maxDirent +{ + char aBuffer[ sizeof( struct dirent ) + _PC_NAME_MAX +1 ]; + struct dirent asDirent; +}; + static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions ) { rtl::OStringBuffer aPath( 1024 ); @@ -200,14 +206,13 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes } // check subdirectories - long aBuffer[ sizeof( struct dirent ) + _PC_NAME_MAX +1 ]; - DIR* pDIR = opendir( rPath.getStr() ); struct dirent* pDirEnt = NULL; struct stat aStat; - while( pDIR && ! readdir_r( pDIR, (struct dirent*)aBuffer, &pDirEnt ) && pDirEnt ) + maxDirent u; + while( pDIR && ! readdir_r( pDIR, &u.asDirent, &pDirEnt ) && pDirEnt ) { - char* pBaseName = ((struct dirent*)aBuffer)->d_name; + char* pBaseName = u.asDirent.d_name; if( rtl_str_compare( ".", pBaseName ) && rtl_str_compare( "..", pBaseName ) ) { rtl::OStringBuffer aBuf( 1024 ); @@ -262,9 +267,8 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th aSearchPath += ByteString( String( rPaths.getConstArray()[i] ), aEncoding ); } - - long aBuffer[ sizeof( struct dirent ) + _PC_NAME_MAX +1 ]; int nPaths = aSearchPath.GetTokenCount( ':' ); + maxDirent u; for( i = 0; i < nPaths; i++ ) { ByteString aPath( aSearchPath.GetToken( i, ':' ) ); @@ -272,9 +276,9 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th { DIR* pDIR = opendir( aPath.GetBuffer() ); struct dirent* pDirEnt = NULL; - while( pDIR && ! readdir_r( pDIR, (struct dirent*)aBuffer, &pDirEnt ) && pDirEnt ) + while( pDIR && ! readdir_r( pDIR, &u.asDirent, &pDirEnt ) && pDirEnt ) { - char* pBaseName = ((struct dirent*)aBuffer)->d_name; + char* pBaseName = u.asDirent.d_name; if( pBaseName[0] != '.' || pBaseName[1] != '.' || pBaseName[2] != 0 ) 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 197a1cfb41f9..e6ef80f5ba6b 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 f21e70a20f47..440d5237f3b1 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/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/util/hidother.src b/extensions/util/hidother.src index 308e4ed2ab88..7fe4a237e896 100644 --- a/extensions/util/hidother.src +++ b/extensions/util/hidother.src @@ -424,7 +424,6 @@ hidspecial UID_PROP_DLG_XSD_READONLY { HelpId = UID_PROP_DLG_XSD_READ hidspecial UID_PROP_DLG_XSD_RELEVANT { HelpId = UID_PROP_DLG_XSD_RELEVANT; } hidspecial UID_PROP_DLG_XSD_REQUIRED { HelpId = UID_PROP_DLG_XSD_REQUIRED; } hidspecial UID_PROP_REMOVE_DATA_TYPE { HelpId = UID_PROP_REMOVE_DATA_TYPE; } - hidspecial HID_FM_PROPDLG_TABCTR { HelpId = HID_FM_PROPDLG_TABCTR; } hidspecial HID_FM_PROPDLG_TAB_GENERAL { HelpId = HID_FM_PROPDLG_TAB_GENERAL; } hidspecial HID_FM_PROPDLG_TAB_DATA { HelpId = HID_FM_PROPDLG_TAB_DATA; } 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 ) { |